banananetwork
/
postfixadmin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

delete.php: fix alias_domain deletion and reindent

Browse Source 
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@519 a1433add-5e2c-0410-b055-b7f2511e0802
postfixadmin-2.3
David Goodwin 16 years ago
parent 049a9ecc96
commit 49079bd1e5
1 changed files with 98 additions and 96 deletions
Show Stats Download Patch File Download Diff File

194
delete.php
Unescape Escape View File

@ -45,122 +45,124 @@ $error=0;
if ($fTable == "admin") if ($fTable == "admin")
{ {
authentication_require_role('global-admin'); authentication_require_role('global-admin');
$fWhere = 'username'; $fWhere = 'username';
$result_admin = db_delete ($table_admin,$fWhere,$fDelete); $result_admin = db_delete ($table_admin,$fWhere,$fDelete);
$result_domain_admins = db_delete ($table_domain_admins,$fWhere,$fDelete); $result_domain_admins = db_delete ($table_domain_admins,$fWhere,$fDelete);
if (!($result_admin == 1) and ($result_domain_admins >= 0)) if (!($result_admin == 1) and ($result_domain_admins >= 0))
{ {
$error = 1; $error = 1;
$tMessage = $PALANG['pAdminDelete_admin_error']; $tMessage = $PALANG['pAdminDelete_admin_error'];
} }
else else
{ {
$url = "list-admin.php"; $url = "list-admin.php";
header ("Location: $url"); header ("Location: $url");
} }
} # ($fTable == "admin") } # ($fTable == "admin")
elseif ($fTable == "domain") elseif ($fTable == "domain")
{ {
authentication_require_role('global-admin'); authentication_require_role('global-admin');
$fWhere = 'domain'; $fWhere = 'domain';
$result_domain_admins = db_delete ($table_domain_admins,$fWhere,$fDelete); $result_domain_admins = db_delete ($table_domain_admins,$fWhere,$fDelete);
$result_alias = db_delete ($table_alias,$fWhere,$fDelete); $result_alias = db_delete ($table_alias,$fWhere,$fDelete);
$result_mailbox = db_delete ($table_mailbox,$fWhere,$fDelete); $result_mailbox = db_delete ($table_mailbox,$fWhere,$fDelete);
$result_log = db_delete ($table_log,$fWhere,$fDelete); $result_log = db_delete ($table_log,$fWhere,$fDelete);
if ($CONF['vacation'] == "YES") if ($CONF['vacation'] == "YES")
{ {
$result_vacation = db_delete ($table_vacation,$fWhere,$fDelete); $result_vacation = db_delete ($table_vacation,$fWhere,$fDelete);
} }
$result_domain = db_delete ($table_domain,$fWhere,$fDelete); $result_domain = db_delete ($table_domain,$fWhere,$fDelete);
if (!$result_domain || !domain_postdeletion($fDelete)) if (!$result_domain || !domain_postdeletion($fDelete))
{ {
$error = 1; $error = 1;
$tMessage = $PALANG['pAdminDelete_domain_error']; $tMessage = $PALANG['pAdminDelete_domain_error'];
} }
else else
{ {
$url = "list-domain.php"; $url = "list-domain.php";
header ("Location: $url"); header ("Location: $url");
} }
} # ($fTable == "domain") } # ($fTable == "domain")
elseif ($fTable == "alias_domain") elseif ($fTable == "alias_domain")
{ {
authentication_require_role('global-admin'); authentication_require_role('global-admin');
$fWhere = 'domain'; $table_domain_alias = table_by_key('alias_domain');
if(db_delete ($table_domain_alias,$fWhere,$fDelete)) { $fWhere = 'alias_domain';
$url = "list-domain.php"; $fDelete = $fDomain;
header ("Location: $url"); if(db_delete($table_domain_alias,$fWhere,$fDelete)) {
} $url = "list-domain.php";
header ("Location: $url");
}
} # ($fTable == "alias_domain") } # ($fTable == "alias_domain")
elseif ($fTable == "alias" or $fTable == "mailbox") elseif ($fTable == "alias" or $fTable == "mailbox")
{ {
if (!check_owner ($SESSID_USERNAME, $fDomain)) if (!check_owner ($SESSID_USERNAME, $fDomain))
{ {
$error = 1; $error = 1;
$tMessage = $PALANG['pDelete_domain_error'] . "<b>$fDomain</b>!</span>"; $tMessage = $PALANG['pDelete_domain_error'] . "<b>$fDomain</b>!</span>";
} }
elseif (!check_alias_owner ($SESSID_USERNAME, $fDelete)) elseif (!check_alias_owner ($SESSID_USERNAME, $fDelete))
{ {
$error = 1; $error = 1;
$tMessage = $PALANG['pDelete_alias_error'] . "<b>$fDelete</b>!</span>"; $tMessage = $PALANG['pDelete_alias_error'] . "<b>$fDelete</b>!</span>";
} }
else else
{ {
if ($CONF['database_type'] == "pgsql") db_query('BEGIN'); if ($CONF['database_type'] == "pgsql") db_query('BEGIN');
/* there may be no aliases to delete */ /* there may be no aliases to delete */
$result = db_query("SELECT * FROM $table_alias WHERE address = '$fDelete' AND domain = '$fDomain'"); $result = db_query("SELECT * FROM $table_alias WHERE address = '$fDelete' AND domain = '$fDomain'");
if($result['rows'] == 1) { if($result['rows'] == 1) {
$result = db_query ("DELETE FROM $table_alias WHERE address='$fDelete' AND domain='$fDomain'"); $result = db_query ("DELETE FROM $table_alias WHERE address='$fDelete' AND domain='$fDomain'");
db_log ($SESSID_USERNAME, $fDomain, 'delete_alias', $fDelete); db_log ($SESSID_USERNAME, $fDomain, 'delete_alias', $fDelete);
} }
/* is there a mailbox? if do delete it from orbit; it's the only way to be sure */ /* is there a mailbox? if do delete it from orbit; it's the only way to be sure */
$result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'"); $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'");
if ($result['rows'] == 1) if ($result['rows'] == 1)
{ {
$result = db_query ("DELETE FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'"); $result = db_query ("DELETE FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'");
$postdel_res=mailbox_postdeletion($fDelete,$fDomain); $postdel_res=mailbox_postdeletion($fDelete,$fDomain);
if ($result['rows'] != 1 || !$postdel_res) if ($result['rows'] != 1 || !$postdel_res)
{
$error = 1;
$tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (";
if ($result['rows']!=1)
{ {
$tMessage.='mailbox'; $error = 1;
if (!$postdel_res) $tMessage.=', '; $tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (";
if ($result['rows']!=1)
{
$tMessage.='mailbox';
if (!$postdel_res) $tMessage.=', ';
}
if (!$postdel_res)
{
$tMessage.='post-deletion';
}
$tMessage.=')</span>';
} }
if (!$postdel_res) }
{ $result = db_query("SELECT * FROM $table_vacation WHERE email = '$fDelete' AND domain = '$fDomain'");
$tMessage.='post-deletion'; if($result['rows'] == 1) {
} db_query ("DELETE FROM $table_vacation WHERE email='$fDelete' AND domain='$fDomain'");
$tMessage.=')</span>'; db_query ("DELETE FROM $table_vacation_notification WHERE on_vacation ='$fDelete' "); /* should be caught by cascade, if PgSQL */
} }
} }
$result = db_query("SELECT * FROM $table_vacation WHERE email = '$fDelete' AND domain = '$fDomain'");
if($result['rows'] == 1) {
db_query ("DELETE FROM $table_vacation WHERE email='$fDelete' AND domain='$fDomain'");
db_query ("DELETE FROM $table_vacation_notification WHERE on_vacation ='$fDelete' "); /* should be caught by cascade, if PgSQL */
}
}
if ($error != 1) if ($error != 1)
{ {
if ($CONF['database_type'] == "pgsql") db_query('COMMIT'); if ($CONF['database_type'] == "pgsql") db_query('COMMIT');
header ("Location: list-virtual.php?domain=$fDomain"); header ("Location: list-virtual.php?domain=$fDomain");
exit; exit;
} else { } else {
$tMessage .= $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (physical mail)!</span>"; $tMessage .= $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (physical mail)!</span>";
if ($CONF['database_type'] == "pgsql") db_query('ROLLBACK'); if ($CONF['database_type'] == "pgsql") db_query('ROLLBACK');
} }
} }
else else
{ {
flash_error($PALANG['invalid_parameter']); flash_error($PALANG['invalid_parameter']);
} }

Write Preview
Loading…
Cancel
Save