mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-20 03:36:20 +02:00
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
This commit is contained in:
parent
cc0a63ce3a
commit
cffa61c652
16
delete.php
16
delete.php
@ -21,7 +21,7 @@
|
||||
*
|
||||
* Template Variables:
|
||||
*
|
||||
* tMessage
|
||||
* none
|
||||
*
|
||||
* Form POST \ GET Variables:
|
||||
*
|
||||
@ -122,18 +122,18 @@ elseif ($fTable == "alias" or $fTable == "mailbox")
|
||||
if ($result['rows'] != 1 || !$postdel_res)
|
||||
{
|
||||
$error = 1;
|
||||
$tMessage = $PALANG['pDelete_delete_error'] . "$fDelete (";
|
||||
$deletionMessage = $PALANG['pDelete_delete_error'] . "$fDelete (";
|
||||
if ($result['rows']!=1)
|
||||
{
|
||||
$tMessage.='mailbox';
|
||||
if (!$postdel_res) $tMessage.=', ';
|
||||
$deletionMessage.='mailbox';
|
||||
if (!$postdel_res) $deletionMessage.=', ';
|
||||
}
|
||||
if (!$postdel_res)
|
||||
{
|
||||
$tMessage.='post-deletion';
|
||||
$deletionMessage.='post-deletion';
|
||||
}
|
||||
$tMessage.=')';
|
||||
flash_error($tMessage);
|
||||
$deletionMessage.=')';
|
||||
flash_error($deletionMessage);
|
||||
}
|
||||
db_log ($fDomain, 'delete_mailbox', $fDelete);
|
||||
}
|
||||
@ -171,7 +171,7 @@ else
|
||||
|
||||
# we should most probably never reach this point
|
||||
$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');
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user