X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddressbook.php;h=67be4749c3d52abdf26385cc6ba48d6f04f71e86;hb=d46fbcf87c702f667a0a23832affb66de26092d7;hp=634e5c744106292d8708a51f2fd59148722e3cea;hpb=f6c945b9f6c7870dda5c65997f60adceb408cdcc;p=squirrelmail.git

diff --git a/src/addressbook.php b/src/addressbook.php
index 634e5c74..67be4749 100644
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -16,18 +16,6 @@ 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;
-}
-
 /* Make an input field */
 function adressbook_inp_field($label, $field, $name, $size, $values, $add) {
     global $color;
@@ -173,11 +161,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 +184,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 +233,10 @@ if($REQUEST_METHOD == 'POST') {
 
 /* Display error messages */
 if (!empty($formerror)) {
-    echo '<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>' . "\n" .
-         '<TR><TD ALIGN=CENTER>\n<br><STRONG>' .
+    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";
 }
 
 
@@ -287,7 +275,7 @@ if ($showaddrlist) {
             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" .
+                 "</STRONG>\n</TD></TR>\n</TABLE>\n" .
                  '<TABLE COLS="5" BORDER="0" CELLPADDING="1" CELLSPACING="0"' .
                  ' WIDTH="90%" ALIGN="center">' .
                  '<TR BGCOLOR="' . $color[9] .
@@ -333,18 +321,19 @@ if ($showaddrlist) {
              '<INPUT TYPE=submit NAME=editaddr VALUE="' . _("Edit selected") .
              "\">\n" .
              '<INPUT TYPE=submit NAME=deladdr VALUE="' . _("Delete selected") .
-             "\">\n" . '</TR></TABLE></FORM>';
+             "\">\n" . '</TR></TABLE>';
     }
+    echo '</FORM>';
 } /* end of addresslist */
 
 
 /* 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>';