X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search.php;h=f6d637486f76bcf4299bc2378aaae4629149fcde;hb=4f664925c839b9a9f58e4699718a1254ba35a8d7;hp=46e6cdc743cd6473ae0a565f6f44b026cb8ad367;hpb=a10110a50f284e8afdef868cab40e07e7deeea44;p=squirrelmail.git

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 46e6cdc7..f6d63748 100644
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -15,7 +15,13 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/html.php');
 
 /* Function to include JavaScript code */
 function insert_javascript() {
@@ -92,40 +98,45 @@ function display_result($res, $includesource = true) {
     insert_javascript();
         
     $line = 0;
-    echo '<TABLE BORDER="0" WIDTH="98%" ALIGN=center>' .
-         '<TR BGCOLOR="' . $color[9] . '"><TH ALIGN=left>&nbsp;' .
-         '<TH ALIGN=left>&nbsp;' . _("Name") .
-         '<TH ALIGN=left>&nbsp;' . _("E-mail") .
-         '<TH ALIGN=left>&nbsp;' . _("Info");
+    echo html_tag( 'table', '', 'center', '', 'border="0" width="98%"' ) .
+    html_tag( 'tr', '', '', $color[9] ) .
+    html_tag( 'th', '&nbsp;', 'left' ) .
+    html_tag( 'th', '&nbsp;' . _("Name"), 'left' ) .
+    html_tag( 'th', '&nbsp;' . _("E-mail"), 'left' ) .
+    html_tag( 'th', '&nbsp;' . _("Info"), 'left' );
 
     if ($includesource) {
-        echo '<TH ALIGN=left WIDTH="10%">&nbsp;' . _("Source");
+        echo html_tag( 'th', '&nbsp;' . _("Source"), 'left', 'width="10%"' );
     }    
-    echo "</TR>\n";
+    echo "</tr>\n";
     
     while (list($undef, $row) = each($res)) {
-        echo '<tr';
-        if ($line % 2) { echo ' bgcolor="' . $color[0] . '"'; }
-        echo ' nowrap><td valign=top nowrap align=center width="5%">' .
+        $tr_bgcolor = '';
+        $email = htmlspecialchars(addcslashes(AddressBook::full_address($row), "'"), ENT_QUOTES);
+        if ($line % 2) { $tr_bgcolor = $color[0]; }
+        echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
+        html_tag( 'td',
              '<small><a href="javascript:to_address(' . 
-                                       "'" . $row['email'] . "');\">To</A> | " .
+                                       "'" . $email . "');\">To</A> | " .
              '<a href="javascript:cc_address(' . 
-                                       "'" . $row['email'] . "');\">Cc</A> | " .
+                                       "'" . $email . "');\">Cc</A> | " .
              '<a href="javascript:bcc_address(' . 
-                                 "'" . $row['email'] . "');\">Bcc</A></small>" .
-             '<td nowrap valign=top>&nbsp;' .
-                                 $row['name'] . '&nbsp;<td nowrap valign=top>' .
-             '&nbsp;<a href="javascript:to_and_close(' .
-                 "'" . $row['email'] . "');\">" . $row['email'] . '</A>&nbsp;' .
-             '<td valign=top>&nbsp;' . $row['label'] . '&nbsp;';
+                                 "'" . $email . "');\">Bcc</A></small>",
+        'center', '', 'valign="top" width="5%" nowrap' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']), 'left', '', 'valign="top" nowrap' ) .
+        html_tag( 'td', '&nbsp;' .
+             '<a href="javascript:to_and_close(' .
+                 "'" . $email . "');\">" . htmlspecialchars($row['email']) . '</A>'
+        , 'left', '', 'valign="top"' ) .
+        html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" nowrap' );
         if ($includesource) {
-            echo '<td nowrap valign=top>&nbsp;' . $row['source'];
+            echo html_tag( 'td', '&nbsp;' . $row['source'], 'left', '', 'valign="top" nowrap' );
         }
 
-        echo "</TR>\n";
+        echo "</tr>\n";
         $line++;
     }
-    echo '</TABLE>';
+    echo '</table>';
 }
 
 /* ================= End of functions ================= */
@@ -139,9 +150,10 @@ displayHtmlHeader();
 /* Initialize vars */
 if (!isset($query)) { $query = ''; }
 if (!isset($show))  { $show  = ''; }
+if (!isset($backend)) { $backend = ''; }
 
 /* Choose correct colors for top and bottom frame */
-if ($show == 'form') {
+if ($show == 'form' && !isset($listall)) {
     echo '<BODY TEXT="' . $color[6] . '" BGCOLOR="' . $color[3] . '" ' .
                'LINK="' . $color[6] . '" VLINK="'   . $color[6] . '" ' .
                                         'ALINK="'   . $color[6] . '" ' .
@@ -154,9 +166,10 @@ if ($show == 'form') {
 
 /* Empty search */
 if (empty($query) && empty($show) && empty($listall)) {
-    echo '<P ALIGN=center><BR>' .
-          _("No persons matching your search was found") .
-          "</P>\n</BODY></HTML>\n",
+    echo html_tag( 'p', '<br>' .
+                      _("No persons matching your search was found"),
+            'center' ) .
+          "\n</BODY></HTML>\n",
     exit;
 }
 
@@ -164,14 +177,15 @@ if (empty($query) && empty($show) && empty($listall)) {
 $abook = addressbook_init();
 
 /* Create search form */
-if ($show == 'form') {
-    echo '<FORM NAME=sform TARGET=abookres ACTION="' . $PHP_SELF .
+if ($show == 'form' && empty($listall)) {
+    echo '<FORM NAME=sform TARGET=abookres ACTION="addrbook_search.php'. 
          '" METHOD="POST">' . "\n" .
-         '<TABLE BORDER="0" WIDTH="100%" HEIGHT="100%">' .
-         '<TR><TD NOWRAP VALIGN=middle>' . "\n" .
-         '  <STRONG>' . _("Search for") . "</STRONG>\n" .
-         '  <INPUT TYPE=text NAME=query VALUE="' . htmlspecialchars($query) .
-         "\" SIZE=26>\n";
+         html_tag( 'table', '', '', '', 'border="0" width="100%" height="100%"' ) .
+         html_tag( 'tr' ) .
+         html_tag( 'td', '  <strong>' . _("Search for") . "</strong>\n", 'left', '', 'nowrap valign="middle" width="10%"' ) .
+         html_tag( 'td', '', 'left', '', '' ) .
+                 '<INPUT TYPE=text NAME=query VALUE="' . htmlspecialchars($query) .
+                 "\" SIZE=28>\n";
 
     /* List all backends to allow the user to choose where to search */
     if ($abook->numbackends > 1) {
@@ -186,17 +200,22 @@ if ($show == 'form') {
         echo '<INPUT TYPE=hidden NAME=backend VALUE=-1>' . "\n";
     }
         
-    echo '<INPUT TYPE=submit VALUE="' . _("Search") . '">' .
-         '&nbsp;|&nbsp;<INPUT TYPE=submit VALUE="' . _("List all") .
-         '" NAME=listall>' . "\n" .
-         '</TD><TD ALIGN=right>' . "\n" .
-         '<INPUT TYPE=button VALUE="' . _("Close window") .
-         '" onclick="parent.close();">' . "\n" .
-         '</TD></TR></TABLE></FORM>' . "\n";
+    echo '</td></tr>' .
+    html_tag( 'tr',
+                    html_tag( 'td', '', 'left' ) .
+                    html_tag( 'td',
+                            '<INPUT TYPE=submit VALUE="' . _("Search") . '" NAME=show>' .
+                            '&nbsp;|&nbsp;<INPUT TYPE=submit VALUE="' . _("List all") .
+                            '" NAME=listall>' . "\n" .
+                            '&nbsp;|&nbsp;<INPUT TYPE=button VALUE="' . _("Close") .
+                            '" onclick="parent.close();">' . "\n" ,
+                    'left' )
+            ) .
+         '</table></form>' . "\n";
 } else {
 
     /* Show personal addressbook */
-    if ($show == 'blank' || !empty($listall)) {
+    if ($show == 'blank' && empty($listall)) {
 
         if($backend != -1 || $show == 'blank') {
             if ($show == 'blank') {
@@ -208,10 +227,10 @@ if ($show == 'form') {
                 usort($res,'alistcmp');
                 display_result($res, false);
             } else {
-                echo '<P ALIGN=center><STRONG>' .
-                     sprintf(_("Unable to list addresses from %s"),
-                         $abook->backends[$backend]->sname) .
-                     '</STRONG></P>' . "\n";
+                echo html_tag( 'p', '<strong>' .
+                                 sprintf(_("Unable to list addresses from %s"),
+                                     $abook->backends[$backend]->sname) . '</strong>' ,
+                       'center' ) . "\n";
             }
         } else {
             $res = $abook->list_addr();
@@ -220,9 +239,12 @@ if ($show == 'form') {
         }
 
     } else {
+        if( !empty( $listall ) ){
+          $query = '*';
+        }
 
         /* Do the search */
-        if (!empty($query) && empty($listall)) {
+        if (!empty($query)) {
     
             if($backend == -1) {
                 $res = $abook->s_search($query);
@@ -231,16 +253,19 @@ if ($show == 'form') {
             }
         
             if (!is_array($res)) {
-                echo '<P ALIGN=center><B><BR>' .
-                     _("Your search failed with the following error(s)") .
-                     ':<br>' . $abook->error . "</B></P>\n</BODY></HTML>\n";
+                echo html_tag( 'p', '<b><br>' .
+                                 _("Your search failed with the following error(s)") .
+                                 ':<br>' . $abook->error . "</b>\n" ,
+                       'center' ) .
+                "\n</BODY></HTML>\n";
                 exit;
             }
         
             if (sizeof($res) == 0) {
-                echo '<P ALIGN=center><BR><B>' .
-                     _("No persons matching your search was found") .
-                     ".</B></P>\n</BODY></HTML>\n";
+                echo html_tag( 'p', '<br><b>' .
+                                 _("No persons matching your search was found") . "</b>\n" ,
+                       'center' ) .
+                "\n</BODY></HTML>\n";
                 exit;
             }