cacert/cacert-webdb
9
0
Fork 0
Code Issues Pull requests 3 Projects Releases 4 Wiki Activity

Fix for https://bugs.cacert.org/view.php?id=569

Browse source 
"output order when removing email address"
This commit is contained in:
Wytze van der Raay 2013-10-21 09:17:17 +00:00
parent b9729ffae1
commit fc979343e1
1 changed files with 83 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
includes/account.php
View file

@ -149,8 +149,13 @@
$delcount = 0;
if(array_key_exists('delid',$_REQUEST) && is_array($_REQUEST['delid']))
{
$deltitle=false;
foreach($_REQUEST['delid'] as $id)
{
if (!$deltitle) {
echo _('The following email addresses have been removed:')."<br>\n";
$deltitle=true;
}
$id = intval($id);
$query = "select * from `email` where `id`='$id' and `memid`='".intval($_SESSION['profile']['id'])."' and
`email`!='".$_SESSION['profile']['email']."'";
@ -168,11 +173,9 @@
{
echo _("You did not select any email accounts for removal.");
}
if($delcount > 0)
if(0 == $delcount)
{
echo _("The following accounts have been removed:")."<br>\n";
} else {
echo _("You failed to select any accounts to be removed, or you attempted to remove the default account. No action was taken.");
echo _("You did not select any accounts to be removed, or you attempted to remove the default account. No action was taken.");
}
showfooter();