delete.php:

- rename $tMessage to $deletionMessage
- replace tMessage with flash_error

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1080 a1433add-5e2c-0410-b055-b7f2511e0802
pull/2/head
Christian Boltz 15 years ago
parent cc0a63ce3a
commit cffa61c652

@ -21,7 +21,7 @@
* *
* Template Variables: * Template Variables:
* *
* tMessage * none
* *
* Form POST \ GET Variables: * Form POST \ GET Variables:
* *
@ -122,18 +122,18 @@ elseif ($fTable == "alias" or $fTable == "mailbox")
if ($result['rows'] != 1 || !$postdel_res) if ($result['rows'] != 1 || !$postdel_res)
{ {
$error = 1; $error = 1;
$tMessage = $PALANG['pDelete_delete_error'] . "$fDelete ("; $deletionMessage = $PALANG['pDelete_delete_error'] . "$fDelete (";
if ($result['rows']!=1) if ($result['rows']!=1)
{ {
$tMessage.='mailbox'; $deletionMessage.='mailbox';
if (!$postdel_res) $tMessage.=', '; if (!$postdel_res) $deletionMessage.=', ';
} }
if (!$postdel_res) if (!$postdel_res)
{ {
$tMessage.='post-deletion'; $deletionMessage.='post-deletion';
} }
$tMessage.=')'; $deletionMessage.=')';
flash_error($tMessage); flash_error($deletionMessage);
} }
db_log ($fDomain, 'delete_mailbox', $fDelete); db_log ($fDomain, 'delete_mailbox', $fDelete);
} }
@ -171,7 +171,7 @@ else
# we should most probably never reach this point # we should most probably never reach this point
$smarty->assign ('smarty_template', 'message'); $smarty->assign ('smarty_template', 'message');
$smarty->assign ('tMessage', $tMessage . " If you see this, please open a bugreport and include the exact delete.php parameters."); flash_error("If you see this, please open a bugreport and include the exact delete.php parameters.");
$smarty->display ('index.tpl'); $smarty->display ('index.tpl');

Loading…
Cancel
Save