X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddressbook.php;h=2df29cdba9e572719b4cb41ca60edbe8ac30a5b1;hb=6a6ce0a3a52fdfd73fdab55e30f1b8f410115a7a;hp=64baea9626746a916230b6c4a8a646a945ab05e8;hpb=1af3cc73bfa2539035d739df7b142fab60be7823;p=squirrelmail.git

diff --git a/src/addressbook.php b/src/addressbook.php
index 64baea96..2df29cdb 100644
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -15,18 +15,7 @@ require_once('../src/validate.php');
 require_once('../functions/array.php');
 require_once('../functions/display_messages.php');
 require_once('../functions/addressbook.php');
-
-/* Sort array by the key "name" */
-function alistcmp($a,$b) {
-    if($a['backend'] > $b['backend']) {
-        return 1;
-    } else {
-        if($a['backend'] < $b['backend']) {
-            return -1;
-        }
-    }
-    return (strtolower($a['name']) > strtolower($b['name'])) ? 1 : -1;
-}
+require_once('../functions/strings.php');
 
 /* Make an input field */
 function adressbook_inp_field($label, $field, $name, $size, $values, $add) {
@@ -173,11 +162,11 @@ if($REQUEST_METHOD == 'POST') {
                         /* Display the "new address" form */
                         echo '<FORM ACTION="' . $PHP_SELF . '" METHOD="POST">' .
                              "\n" .
-                             '<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>' . "\n" .
+                             '<TABLE WIDTH="100%" COLS=1 ALIGN=CENTER>' . "\n" .
                              '<TR><TD BGCOLOR="' . $color[0] .
                              '" ALIGN=CENTER>' . "\n" . '<STRONG>' .
                              _("Update address") .
-                             "<STRONG>\n</TD></TR>\n</TABLE>\n";
+                             "</STRONG>\n</TD></TR>\n</TABLE>\n";
                         address_form("editaddr", _("Update address"), $olddata);
                         echo '<INPUT TYPE=hidden NAME=oldnick VALUE="' . 
                              htmlspecialchars($olddata["nickname"]) . "\">\n" .
@@ -196,20 +185,20 @@ if($REQUEST_METHOD == 'POST') {
                         /* Handle error messages */
                         if (!$r) {
                             /* Display error */
-                            echo '<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>' .
+                            echo '<TABLE WIDTH="100%" COLS=1 ALIGN=CENTER>' .
                                  "\n" . '<TR><TD ALIGN=CENTER>' . "\n" .
                                  '<br><STRONG><FONT COLOR="' . $color[2] .
                                  '">' . _("ERROR") . ": " . $abook->error .
-                                 '</FONT><STRONG>' . "\n</TD></TR>\n</TABLE>\n";
+                                 '</FONT></STRONG>' . "\n</TD></TR>\n</TABLE>\n";
 
                             /* Display the "new address" form again */
                             echo '<FORM ACTION="' . $PHP_SELF .
                                  '" METHOD="POST">' . "\n" .
-                                 '<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>' .
+                                 '<TABLE WIDTH="100%" COLS=1 ALIGN=CENTER>' .
                                  "\n" . '<TR><TD BGCOLOR="' . $color[0] .
                                  '" ALIGN=CENTER>' . "\n" . '<STRONG>' .
                                  _("Update address") .
-                                 "<STRONG>\n</TD></TR>\n</TABLE>\n";
+                                 "</STRONG>\n</TD></TR>\n</TABLE>\n";
                             address_form("editaddr", _("Update address"), $newdata);
                             echo '<INPUT TYPE=hidden NAME=oldnick VALUE="' .
                                  htmlspecialchars($oldnick) . "\">\n" .
@@ -245,10 +234,10 @@ if($REQUEST_METHOD == 'POST') {
 
 /* Display error messages */
 if (!empty($formerror)) {
-    echo '<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>' . "\n" .
+    echo '<TABLE WIDTH="100%" COLS=1 ALIGN=CENTER>' . "\n" .
          '<TR><TD ALIGN=CENTER>' . "\n" . '<br><STRONG>' .
          '<FONT COLOR="' . $color[2]. '">' . _("ERROR") . ': ' . $formerror .
-         '</FONT><STRONG>' . "\n</TD></TR>\n</TABLE>\n";
+         '</FONT></STRONG>' . "\n</TD></TR>\n</TABLE>\n";
 }
 
 
@@ -269,71 +258,77 @@ if ($showaddrlist) {
          _("Add address") . "</a></p>\n";
 
     /* List addresses */
-    echo '<FORM ACTION="' . $PHP_SELF . '" METHOD="POST">' . "\n";
-    while(list($undef,$row) = each($alist)) {
-
-        /* New table header for each backend */
-        if($prevbackend != $row['backend']) {
-            if($prevbackend >= 0) {
-                echo '<TR><TD COLSPAN=5 ALIGN=center>' . "\n" .
-                     '<INPUT TYPE=submit NAME=editaddr VALUE="' . 
-                     _("Edit selected") . "\">\n" .
-                     '<INPUT TYPE=submit NAME=deladdr VALUE="' .
-                     _("Delete selected") . "\">\n</tr>\n" .
-                     '<TR><TD COLSPAN="5" ALIGN=center>' .
-                     '&nbsp;<BR></TD></TR></TABLE>' . "\n";
+    if (count($alist) > 0) {
+        echo '<FORM ACTION="' . $PHP_SELF . '" METHOD="POST">' . "\n";
+        while(list($undef,$row) = each($alist)) {
+    
+            /* New table header for each backend */
+            if($prevbackend != $row['backend']) {
+                if($prevbackend < 0) {
+                    echo '<TR><TD COLSPAN=5 ALIGN=center>' . "\n" .
+                         '<INPUT TYPE=submit NAME=editaddr VALUE="' . 
+                         _("Edit selected") . "\">\n" .
+                         '<INPUT TYPE=submit NAME=deladdr VALUE="' .
+                         _("Delete selected") . "\">\n</tr>\n" .
+                         '<TR><TD COLSPAN="5" ALIGN=center>' .
+                         '&nbsp;<BR></TD></TR></TABLE>' . "\n";
+                }
+    
+                echo '<TABLE WIDTH="95%" COLS=1 ALIGN=CENTER>' . "\n" .
+                     '<TR><TD BGCOLOR="' . $color[0] . '" ALIGN=CENTER>' . "\n" .
+                     '<STRONG>' . $row['source'] .
+                     "</STRONG>\n</TD></TR>\n</TABLE>\n" .
+                     '<TABLE COLS="5" BORDER="0" CELLPADDING="1" CELLSPACING="0"' .
+                     ' WIDTH="90%" ALIGN="center">' .
+                     '<TR BGCOLOR="' . $color[9] .
+                     '"><TH ALIGN=left WIDTH="1%">&nbsp;<TH ALIGN=left WIDTH="1%">' .
+                     _("Nickname") . '<TH ALIGN=left WIDTH="1%">' . _("Name") .
+                     '<TH ALIGN=left WIDTH="1%">' . _("E-mail") .
+                     '<TH ALIGN=left WIDTH="%">' . _("Info") . "</TR>\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 '<TABLE WIDTH="95%" COLS=1 ALIGN=CENTER>' . "\n" .
-                 '<TR><TD BGCOLOR="' . $color[0] . '" ALIGN=CENTER>' . "\n" .
-                 '<STRONG>' . $row['source'] .
-                 "<STRONG>\n</TD></TR>\n</TABLE>\n" .
-                 '<TABLE COLS="5" BORDER="0" CELLPADDING="1" CELLSPACING="0"' .
-                 ' WIDTH="90%" ALIGN="center">' .
-                 '<TR BGCOLOR="' . $color[9] .
-                 '"><TH ALIGN=left WIDTH="1%">&nbsp;<TH ALIGN=left WIDTH="1%">' .
-                 _("Nickname") . '<TH ALIGN=left WIDTH="1%">' . _("Name") .
-                 '<TH ALIGN=left WIDTH="1%">' . _("E-mail") .
-                 '<TH ALIGN=left WIDTH="%">' . _("Info") . "</TR>\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 '<TR';
+            if ($line % 2) { echo ' bgcolor="' . $color[0]. '"'; }
+            echo '><TD VALIGN=top ALIGN=center WIDTH="1%"><SMALL>' .
+                 '<INPUT TYPE=checkbox ' . $selected . ' NAME="sel[]" VALUE="' .
+                 $row['backend'] . ':' . $row['nickname'] . '"></SMALL></TD>' .
+                 '<TD VALIGN=top NOWRAP WIDTH="1%">&nbsp;' . $row['nickname'] .
+                 '&nbsp;</TD>' .
+                 '<TD VALIGN=top NOWRAP WIDTH="1%">&nbsp;' . $row['name'] .
+                 '&nbsp;</TD>',
+                 '<TD VALIGN=top NOWRAP WIDTH="1%">&nbsp;' .
+                 '<A HREF="compose.php?send_to=' . rawurlencode($row['email']);
+                if ($compose_new_win == '1') {
+                     echo '" TARGET="compose_window" onClick="comp_in_new()"';
+                }
+                echo '">' . $row['email'] . '</A>&nbsp;</TD>'."\n",
+                 '<TD VALIGN=top WIDTH="1%">&nbsp;' . $row['label'] . '&nbsp;</TD>' .
+                 "</TR>\n";
+            $line++;
         }
-
-        /* Print one row */
-        echo '<TR';
-        if ($line % 2) { echo ' bgcolor="' . $color[0]. '"'; }
-        echo '><TD VALIGN=top ALIGN=center WIDTH="1%"><SMALL>' .
-             '<INPUT TYPE=checkbox ' . $selected . ' NAME="sel[]" VALUE="' .
-             $row['backend'] . ':' . $row['nickname'] . '"></SMALL></TD>' .
-             '<TD VALIGN=top NOWRAP WIDTH="1%">&nbsp;' . $row['nickname'] .
-             '&nbsp;</TD>' .
-             '<TD VALIGN=top NOWRAP WIDTH="1%">&nbsp;' . $row['name'] .
-             '&nbsp;</TD>',
-             '<TD VALIGN=top NOWRAP WIDTH="1%">&nbsp;' .
-             '<A HREF="compose.php?send_to=' . rawurlencode($row['email']) .
-             '">' . $row['email'] . '</A>&nbsp;</TD>'."\n",
-             '<TD VALIGN=top WIDTH="1%">&nbsp;' . $row['label'] . '&nbsp;</TD>' .
-             "</TR>\n";
-        $line++;
-    }
-
-    /* End of list. Close table. */
-    if ($headerprinted) {
-        echo '<TR><TD COLSPAN=5 ALIGN=center>' . "\n" .
-             '<INPUT TYPE=submit NAME=editaddr VALUE="' . _("Edit selected") .
-             "\">\n" .
-             '<INPUT TYPE=submit NAME=deladdr VALUE="' . _("Delete selected") .
-             "\">\n" . '</TR></TABLE></FORM>';
+    
+        /* End of list. Close table. */
+        if ($headerprinted) {
+            echo '<TR><TD COLSPAN=5 ALIGN=center>' . "\n" .
+                 '<INPUT TYPE=submit NAME=editaddr VALUE="' . _("Edit selected") .
+                 "\">\n" .
+                 '<INPUT TYPE=submit NAME=deladdr VALUE="' . _("Delete selected") .
+                 "\">\n" . '</TR></TABLE>';
+        }
+        echo '</FORM>';
     }
 } /* end of addresslist */
 
@@ -341,10 +336,10 @@ if ($showaddrlist) {
 /* Display the "new address" form */
 echo '<a name="AddAddress"></a>' . "\n" .
      '<FORM ACTION="' . $PHP_SELF . '" NAME=f_add METHOD="POST">' . "\n" .
-     '<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>' . "\n" .
+     '<TABLE WIDTH="100%" COLS=1 ALIGN=CENTER>' . "\n" .
      '<TR><TD BGCOLOR="' . $color[0] . '" ALIGN=CENTER>' . "\n" . '<STRONG>',
      sprintf(_("Add to %s"), $abook->localbackendname) .
-     "<STRONG>\n</TD></TR>\n" .
+     "</STRONG>\n</TD></TR>\n" .
      "</TABLE>\n";
 address_form('addaddr', _("Add address"), $defdata);
 echo '</FORM>';