From 91821fc06312fbe935b82ddaaaa6b0506e3f8f33 Mon Sep 17 00:00:00 2001 From: teepe Date: Fri, 18 Jan 2002 21:37:42 +0000 Subject: [PATCH] fix #505255 git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2168 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/addressbook.php | 130 ++++++++++++++++++++++---------------------- 1 file changed, 66 insertions(+), 64 deletions(-) diff --git a/src/addressbook.php b/src/addressbook.php index 67be4749..18edc261 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -257,73 +257,75 @@ if ($showaddrlist) { _("Add address") . "

\n"; /* List addresses */ - echo '
' . "\n"; - while(list($undef,$row) = each($alist)) { - - /* New table header for each backend */ - if($prevbackend != $row['backend']) { - if($prevbackend >= 0) { - echo '' . "\n" . - '\n" . - '\n\n" . - '' . - ' 
' . "\n"; + if (count($alist) > 0) { + echo '' . "\n"; + while(list($undef,$row) = each($alist)) { + + /* New table header for each backend */ + if($prevbackend != $row['backend']) { + if($prevbackend >= 0) { + echo '' . "\n" . + '\n" . + '\n\n" . + '' . + ' 
' . "\n"; + } + + echo '' . "\n" . + '\n
' . "\n" . + '' . $row['source'] . + "\n
\n" . + '' . + '\n"; + + $line = 0; + $headerprinted = true; + } /* End of header */ + + $prevbackend = $row['backend']; + + /* Check if this user is selected */ + if(in_array($row['backend'] . ':' . $row['nickname'], $defselected)) { + $selected = 'CHECKED'; + } else { + $selected = ''; } - - echo '
 ' . + _("Nickname") . '' . _("Name") . + '' . _("E-mail") . + '' . _("Info") . "
' . "\n" . - '\n
' . "\n" . - '' . $row['source'] . - "\n
\n" . - '' . - '\n"; - - $line = 0; - $headerprinted = true; - } /* End of header */ - - $prevbackend = $row['backend']; - - /* Check if this user is selected */ - if(in_array($row['backend'] . ':' . $row['nickname'], $defselected)) { - $selected = 'CHECKED'; - } else { - $selected = ''; + + /* Print one row */ + echo '' . + '' . + '', + ''."\n", + '' . + "\n"; + $line++; } - - /* Print one row */ - echo '' . - '' . - '', - ''."\n", - '' . - "\n"; - $line++; - } - - /* End of list. Close table. */ - if ($headerprinted) { - echo '
 ' . - _("Nickname") . '' . _("Name") . - '' . _("E-mail") . - '' . _("Info") . "
' . + ' ' . $row['nickname'] . + '  ' . $row['name'] . + '  ' . + '' . $row['email'] . '  ' . $row['label'] . ' 
' . - ' ' . $row['nickname'] . - '  ' . $row['name'] . - '  ' . - '' . $row['email'] . '  ' . $row['label'] . ' 
' . "\n" . - '\n" . - '\n" . '
'; + + /* End of list. Close table. */ + if ($headerprinted) { + echo '' . "\n" . + '\n" . + '\n" . ''; + } + echo '
'; } - echo ''; } /* end of addresslist */ -- 2.25.1