X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Faddrbook_search.php;h=a1c0b7be3b7df331a15a80e058e9d4d3539e9503;hp=2fbd9346b660fe680d9f2be3ce42da421ec5335b;hb=6dda64534206bf0aa35c57e826605573809176e7;hpb=c44d8967a34d9683380c74063adb48323b759657

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 2fbd9346..a1c0b7be 100644
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -3,7 +3,7 @@
 /**
  * addrbook_search.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Handle addressbook searching in the popup window.
@@ -12,8 +12,9 @@
  *       addrbook_search_html.html -- If you change one,
  *       change the other one too!
  *
- * @version $Id$ 
+ * @version $Id$
  * @package squirrelmail
+ * @subpackage addressbook
  */
 
 /**
@@ -46,7 +47,7 @@ sqgetGlobalVar('backend', $backend, SQ_POST);
  */
 function insert_javascript() {
     ?>
-    <SCRIPT LANGUAGE="Javascript"><!--
+    <script language="Javascript"><!--
 
     function to_and_close($addr) {
         to_address($addr);
@@ -104,7 +105,7 @@ function insert_javascript() {
         }
     }
 
-// --></SCRIPT>
+// --></script>
 <?php
 } /* End of included JavaScript */
 
@@ -117,11 +118,11 @@ function insert_javascript() {
  */
 function display_result($res, $includesource = true) {
     global $color;
-        
+
     if(sizeof($res) <= 0) return;
-        
+
     insert_javascript();
-        
+
     $line = 0;
     echo html_tag( 'table', '', 'center', '', 'border="0" width="98%"' ) .
     html_tag( 'tr', '', '', $color[9] ) .
@@ -132,30 +133,33 @@ function display_result($res, $includesource = true) {
 
     if ($includesource) {
         echo html_tag( 'th', '&nbsp;' . _("Source"), 'left', 'width="10%"' );
-    }    
+    }
     echo "</tr>\n";
-    
+
     while (list($undef, $row) = each($res)) {
-        $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' ) .
+        if ($line % 2) {
+            $tr_bgcolor = $color[12];
+        } else {
+            $tr_bgcolor = $color[4];
+        }
+        echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
         html_tag( 'td',
-             '<small><a href="javascript:to_address(' . 
-                                       "'" . $email . "');\">To</A> | " .
-             '<a href="javascript:cc_address(' . 
-                                       "'" . $email . "');\">Cc</A> | " .
-             '<a href="javascript:bcc_address(' . 
-                                 "'" . $email . "');\">Bcc</A></small>",
-        'center', '', 'valign="top" width="5%" nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']), 'left', '', 'valign="top" nowrap' ) .
+             '<small><a href="javascript:to_address(' .
+                                       "'" . $email . "');\">"._("To")."</a> | " .
+             '<a href="javascript:cc_address(' .
+                                       "'" . $email . "');\">"._("Cc")."</a> | " .
+             '<a href="javascript:bcc_address(' .
+                                 "'" . $email . "');\">"._("Bcc")."</a></small>",
+        'center', '', 'valign="top" width="5%" style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']), 'left', '', 'valign="top" style="white-space: nowrap;"' ) .
         html_tag( 'td', '&nbsp;' .
              '<a href="javascript:to_and_close(' .
-                 "'" . $email . "');\">" . htmlspecialchars($row['email']) . '</A>'
+                 "'" . $email . "');\">" . htmlspecialchars($row['email']) . '</a>'
         , 'left', '', 'valign="top"' ) .
-        html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" nowrap' );
+        html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" style="white-space: nowrap;"' );
         if ($includesource) {
-            echo html_tag( 'td', '&nbsp;' . $row['source'], 'left', '', 'valign="top" nowrap' );
+            echo html_tag( 'td', '&nbsp;' . $row['source'], 'left', '', 'valign="top" style="white-space: nowrap;"' );
         }
 
         echo "</tr>\n";
@@ -165,12 +169,16 @@ function display_result($res, $includesource = true) {
 }
 
 /* ================= End of functions ================= */
-    
+
 require_once('../functions/strings.php');
 require_once('../functions/addressbook.php');
-    
+
 displayHtmlHeader();
-    
+
+/** set correct value of $default_charset */
+global $default_charset;
+set_my_charset();
+
 /* Initialize vars */
 if (!isset($query)) { $query = ''; }
 if (!isset($show))  { $show  = ''; }
@@ -178,61 +186,62 @@ if (!isset($backend)) { $backend = ''; }
 
 /* Choose correct colors for top and bottom frame */
 if ($show == 'form' && !isset($listall)) {
-    echo '<BODY TEXT="' . $color[6] . '" BGCOLOR="' . $color[3] . '" ' .
-               'LINK="' . $color[6] . '" VLINK="'   . $color[6] . '" ' .
-                                        'ALINK="'   . $color[6] . '" ' .
+    echo '<body text="' . $color[6] . '" bgcolor="' . $color[3] . '" ' .
+               'link="' . $color[6] . '" vlink="'   . $color[6] . '" ' .
+                                        'alink="'   . $color[6] . '" ' .
          'OnLoad="document.sform.query.focus();">';
 } else {
-    echo '<BODY TEXT="' . $color[8] . '" BGCOLOR="' . $color[4] . '" ' .
-               'LINK="' . $color[7] . '" VLINK="'   . $color[7] . '" ' .
-                                        'ALINK="'   . $color[7] . "\">\n";
+    echo '<body text="' . $color[8] . '" bgcolor="' . $color[4] . '" ' .
+               'link="' . $color[7] . '" vlink="'   . $color[7] . '" ' .
+                                        'alink="'   . $color[7] . "\">\n";
 }
 
 /* Empty search */
 if (empty($query) && empty($show) && empty($listall)) {
-    echo html_tag( 'p', '<br>' .
+    echo html_tag( 'p', '<br />' .
                       _("No persons matching your search were found"),
             'center' ) .
-          "\n</BODY></HTML>\n",
+          "\n</body></html>\n";
     exit;
 }
 
-/* Initialize addressbook */
-$abook = addressbook_init();
+/* Initialize addressbook, show init errors only in bottom frame */
+$showerr=($show=='form' ? false : true);
+$abook = addressbook_init($showerr);
 
 /* Create search form */
 if ($show == 'form' && empty($listall)) {
-    echo '<FORM NAME=sform TARGET=abookres ACTION="addrbook_search.php'. 
-         '" METHOD="POST">' . "\n" .
+    echo '<form name="sform" target="abookres" action="addrbook_search.php'.
+            '" method="post">' . "\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', '  <strong>' . _("Search for") . "</strong>\n", 'left', '', 'style="white-space: nowrap;" valign="middle" width="10%"' ) .
          html_tag( 'td', '', 'left', '', '' ) .
-	     addInput('query', $query, 28);
+         addInput('query', $query, 28);
 
     /* List all backends to allow the user to choose where to search */
     if ($abook->numbackends > 1) {
-        echo '<STRONG>' . _("in") . '</STRONG>&nbsp;'."\n".
-	$selopts['-1'] = _("All address books");
-	
+        echo '<strong>' . _("in") . '</strong>&nbsp;'."\n".
+             $selopts['-1'] = _("All address books");
+
         $ret = $abook->get_backend_list();
         while (list($undef,$v) = each($ret)) {
             $selopts[$v->bnum] = $v->sname;
         }
-	echo addSelect('backend', $selopts, '-1', TRUE);
+        echo addSelect('backend', $selopts, '-1', TRUE);
     } else {
         echo addHidden('backend', '-1');
     }
-        
+
     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" ,
+                            '<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";
@@ -269,36 +278,34 @@ if ($show == 'form' && empty($listall)) {
 
         /* Do the search */
         if (!empty($query)) {
-    
+
             if($backend == -1) {
                 $res = $abook->s_search($query);
             } else {
                 $res = $abook->s_search($query, $backend);
             }
-        
+
             if (!is_array($res)) {
-                echo html_tag( 'p', '<b><br>' .
+                echo html_tag( 'p', '<b><br />' .
                                  _("Your search failed with the following error(s)") .
-                                 ':<br>' . $abook->error . "</b>\n" ,
+                                 ':<br />' . $abook->error . "</b>\n" ,
                        'center' ) .
-                "\n</BODY></HTML>\n";
+                "\n</body></html>\n";
                 exit;
             }
-        
+
             if (sizeof($res) == 0) {
-                echo html_tag( 'p', '<br><b>' .
+                echo html_tag( 'p', '<br /><b>' .
                                  _("No persons matching your search were found") . "</b>\n" ,
                        'center' ) .
-                "\n</BODY></HTML>\n";
+                "\n</body></html>\n";
                 exit;
             }
-        
+
             display_result($res);
         }
     }
-   
-}
 
-echo "</BODY></HTML>\n";
-   
+}
 ?>
+</body></html>
\ No newline at end of file