X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=5a6a98340dbbdd56f59bfe8ba836d1f97781ff64;hb=d04cab4213efb37756cced1d8dcbb8bd22280ac2;hp=0150e815dbf3de45d693a9db56f81f90c2522bab;hpb=e842b215cc74203501fe50e52497f9f0329e721b;p=squirrelmail.git

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 0150e815..5a6a9834 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -3,22 +3,27 @@
 /**
  * addrbook_search_html.php
  *
- * Copyright (c) 1999-2003 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 with pure html.
  *
  * This file is included from compose.php
  *
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage addressbook
  */
 
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 if (! defined('SM_PATH') ) {
-	define('SM_PATH','../');
+    define('SM_PATH','../');
 }
 
-/* SquirrelMail required files. */
+/** SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/date.php');
@@ -34,41 +39,42 @@ sqgetGlobalVar('addrquery', $addrquery, SQ_POST);
 sqgetGlobalVar('listall',   $listall,   SQ_POST);
 sqgetGlobalVar('backend',   $backend,   SQ_POST);
 
-/* Insert hidden data */
+/**
+ * Insert hidden data
+ */
 function addr_insert_hidden() {
     global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox,
            $identity, $session;
 
-   echo '<input type=hidden value="';
    if (substr($body, 0, 1) == "\r") {
-       echo "\n";
-   }
-   echo htmlspecialchars($body) . '" name=body>' . "\n" .
-        '<input type=hidden value="' . $session . '" name=session>' . "\n" .
-        '<input type=hidden value="' . htmlspecialchars($subject) .
-        '" name=subject>' . "\n" .
-        '<input type=hidden value="' . htmlspecialchars($send_to) .
-        '" name=send_to>' . "\n" .
-        '<input type=hidden value="' . htmlspecialchars($send_to_cc) .
-        '" name=send_to_cc>' . "\n" .
-        '<input type=hidden value="' . htmlspecialchars($send_to_bcc) .
-        '" name=send_to_bcc>' . "\n" .
-        '<input type=hidden value="' . htmlspecialchars($identity) .
-        '" name=identity>' . "\n" .
-        '<input type=hidden name=mailbox value="' . htmlspecialchars($mailbox) .
-        "\">\n" . '<input type=hidden value="true" name=from_htmladdr_search>' .
-        "\n";
+       echo addHidden('body', "\n".$body);
+   } else {
+       echo addHidden('body', $body);
    }
 
+   echo addHidden('session', $session).
+        addHidden('subject', $subject).
+        addHidden('send_to', $send_to).
+        addHidden('send_to_bcc', $send_to_bcc).
+        addHidden('send_to_cc', $send_to_cc).
+        addHidden('identity', $identity).
+        addHidden('mailbox', $mailbox).
+        addHidden('from_htmladdr_search', 'true');
+}
+
 
-/* List search results */
+/**
+ * List search results
+ * @param array $res Array containing results of search
+ * @param bool $includesource UNDOCUMENTED [Default=true]
+ */
 function addr_display_result($res, $includesource = true) {
     global $color, $javascript_on, $PHP_SELF, $squirrelmail_language;
 
     if (sizeof($res) <= 0) return;
 
-    echo '<form method=post action="' . $PHP_SELF . '" name="addrbook">'."\n" .
-         '<input type=hidden name="html_addr_search_done" value="true">' . "\n";
+    echo addForm($PHP_SELF, 'post', 'addrbook').
+         addHidden('html_addr_search_done', 'true');
     addr_insert_hidden();
     $line = 0;
 
@@ -86,11 +92,11 @@ if ($javascript_on) {
         "}\n" .
         "//-->\n" .
         "</script>\n";
-    $chk_all = '<a href="#" onClick="CheckAll(\'T\');">' . _("All") . '</a>&nbsp;<font color="'.$color[9].'">To</font>'.
+    $chk_all = '<a href="#" onclick="CheckAll(\'T\');">' . _("All") . '</a>&nbsp;<font color="'.$color[9].'">'._("To").'</font>'.
             '&nbsp;&nbsp;'.
-            '<a href="#" onClick="CheckAll(\'C\');">' . _("All") . '</a>&nbsp;<font color="'.$color[9].'">Cc</font>'.
+            '<a href="#" onclick="CheckAll(\'C\');">' . _("All") . '</a>&nbsp;<font color="'.$color[9].'">'._("Cc").'</font>'.
             '&nbsp;&nbsp;'.
-            '<a href="#" onClick="CheckAll(\'B\');">' . _("All") . '</a>';
+            '<a href="#" onclick="CheckAll(\'B\');">' . _("All") . '</a>';
     }
     echo html_tag( 'table', '', 'center', '', 'border="0" width="98%"' ) .
     html_tag( 'tr', '', '', $color[9] ) .
@@ -106,40 +112,43 @@ if ($javascript_on) {
     echo "</tr>\n";
 
     foreach ($res as $row) {
-        $tr_bgcolor = '';
         $email = AddressBook::full_address($row);
-        if ($line % 2) { $tr_bgcolor = $color[0]; }
+        if ($line % 2) {
+            $tr_bgcolor = $color[12];
+        } else {
+            $tr_bgcolor = $color[4];
+        }
         if ($squirrelmail_language == 'ja_JP')
             {
-        echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
+        echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
         html_tag( 'td',
-             '<input type=checkbox name="send_to_search[T' . $line . ']" value = "' .
-             htmlspecialchars($email) . '">&nbsp;' . _("To") . '&nbsp;' .
-             '<input type=checkbox name="send_to_search[C' . $line . ']" value = "' .
-             htmlspecialchars($email) . '">&nbsp;' . _("Cc") . '&nbsp;' .
-             '<input type=checkbox name="send_to_search[B' . $line . ']" value = "' .
-             htmlspecialchars($email) . '">&nbsp;' . _("Bcc") . '&nbsp;' ,
-        'center', '', 'width="5%" nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . '&nbsp;', 'left', '', 'nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'nowrap' );
+             '<input type="checkbox" name="send_to_search[T' . $line . ']" value = "' .
+             htmlspecialchars($email) . '" />&nbsp;' . _("To") . '&nbsp;' .
+             '<input type="checkbox" name="send_to_search[C' . $line . ']" value = "' .
+             htmlspecialchars($email) . '" />&nbsp;' . _("Cc") . '&nbsp;' .
+             '<input type="checkbox" name="send_to_search[B' . $line . ']" value = "' .
+             htmlspecialchars($email) . '" />&nbsp;' . _("Bcc") . '&nbsp;' ,
+        'center', '', 'width="5%" style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' );
             } else {
-        echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
+        echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
         html_tag( 'td',
-             '<input type=checkbox name="send_to_search[T' . $line . ']" value = "' .
-             htmlspecialchars($email) . '">&nbsp;' . _("To") . '&nbsp;' .
-             '<input type=checkbox name="send_to_search[C' . $line . ']" value = "' .
-             htmlspecialchars($email) . '">&nbsp;' . _("Cc") . '&nbsp;' .
-             '<input type=checkbox name="send_to_search[B' . $line . ']" value = "' .
-             htmlspecialchars($email) . '">&nbsp;' . _("Bcc") . '&nbsp;' ,
-        'center', '', 'width="5%" nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']) . '&nbsp;', 'left', '', 'nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'nowrap' );
+            addCheckBox('send_to_search[T'.$line.']', FALSE, $email).
+            '&nbsp;' . _("To") . '&nbsp;' .
+            addCheckBox('send_to_search[C'.$line.']', FALSE, $email).
+            '&nbsp;' . _("Cc") . '&nbsp;' .
+            addCheckBox('send_to_search[B'.$line.']', FALSE, $email).
+            '&nbsp;' . _("Bcc") . '&nbsp;' ,
+        'center', '', 'width="5%" style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' );
             }
 
          if ($includesource) {
-             echo html_tag( 'td', '&nbsp;' . $row['source'] . '&nbsp;', 'left', '', 'nowrap' );
+             echo html_tag( 'td', '&nbsp;' . $row['source'] . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' );
          }
          echo "</tr>\n";
          $line ++;
@@ -147,13 +156,13 @@ if ($javascript_on) {
     if ($includesource) { $td_colspan = '5'; } else { $td_colspan = '4'; }
     echo html_tag( 'tr',
                 html_tag( 'td',
-                        '<INPUT TYPE=submit NAME="addr_search_done" VALUE="' .
-                        _("Use Addresses") . '">' ,
+                        '<input type="submit" name="addr_search_done" value="' .
+                        _("Use Addresses") . '" />' ,
                 'center', '', 'colspan="'. $td_colspan .'"' )
             ) .
-         '</TABLE>' .
-         '<INPUT TYPE=hidden VALUE=1 NAME="html_addr_search_done">' .
-         '</FORM>';
+         '</table>' .
+         addHidden('html_addr_search_done', '1').
+         '</form>';
 }
 
 /* --- End functions --- */
@@ -164,11 +173,16 @@ if ($compose_new_win == '1') {
 else {
     displayPageHeader($color, $mailbox);
 }
+
+/** set correct value of $default_charset */
+global $default_charset;
+set_my_charset();
+
 /* Initialize addressbook */
 $abook = addressbook_init();
 
 
-echo '<br>' .
+echo '<br />' .
 html_tag( 'table',
     html_tag( 'tr',
         html_tag( 'td', '<b>' . _("Address Book Search") . '</b>', 'center', $color[0] )
@@ -180,41 +194,38 @@ html_tag( 'table',
 echo '<center>' .
     html_tag( 'table', '', 'center', '', 'border="0"' ) .
     html_tag( 'tr' ) .
-    html_tag( 'td', '', 'left', '', 'nowrap valign="middle"' ) . "\n" .
-    '<FORM METHOD=post NAME=f ACTION="' . $PHP_SELF .
-    '?html_addr_search=true">' . "\n<CENTER>\n" .
-    '  <nobr><STRONG>' . _("Search for") . "</STRONG>\n";
+    html_tag( 'td', '', 'left', '', 'style="white-space: nowrap;" valign="middle"' ) . "\n" .
+    addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f').
+    "\n<center>\n" .
+    '  <nobr><strong>' . _("Search for") . "</strong>\n";
 addr_insert_hidden();
 if (! isset($addrquery))
     $addrquery = '';
-echo '  <INPUT TYPE=text NAME=addrquery VALUE="' .
-     htmlspecialchars($addrquery) . "\" SIZE=26>\n";
+echo addInput('addrquery', $addrquery, 26);
 
 /* List all backends to allow the user to choose where to search */
 if (!isset($backend)) { $backend = ''; }
 if ($abook->numbackends > 1) {
-    echo '<STRONG>' . _("in") . '</STRONG>&nbsp;<SELECT NAME=backend>' . "\n" .
-         '<OPTION VALUE=-1';
-    if ($backend == -1) { echo ' SELECTED'; }
-    echo '>' . _("All address books") . "\n";
+    echo '<strong>' . _("in") . '</strong>&nbsp;';
+
+    $selopts['-1'] = _("All address books");
     $ret = $abook->get_backend_list();
+
     while (list($undef,$v) = each($ret)) {
-        echo '<OPTION VALUE=' . $v->bnum;
-        if ($backend == $v->bnum) { echo ' SELECTED'; }
-        echo '>' . $v->sname . "\n";
+        $selopts[$v->bnum] = $v->sname;
     }
-    echo "</SELECT>\n";
+    echo addSelect('backend', $selopts, $backend, TRUE);
 } else {
-    echo '<INPUT TYPE=hidden NAME=backend VALUE=-1>' . "\n";
+    echo addHidden('backend', '-1');
 }
 if (isset($session)) {
-    echo "<input type=hidden name=\"session\" value=\"$session\">";
+    echo addHidden('session', $session);
 }
 
-echo '<INPUT TYPE=submit VALUE="' . _("Search") . '">' .
-     '&nbsp;|&nbsp;<INPUT TYPE=submit VALUE="' . _("List all") .
-     '" NAME=listall>' . "\n" .
-     '</FORM></center></TD></TR></TABLE>' . "\n";
+echo '<input type="submit" value="' . _("Search") . '" />' .
+     '&nbsp;|&nbsp;<input type="submit" value="' . _("List all") .
+     '" name="listall" />' . "\n" .
+     '</form></center></td></tr></table>' . "\n";
 addr_insert_hidden();
 echo '</center>';
 do_hook('addrbook_html_search_below');
@@ -233,7 +244,7 @@ if ($addrquery == '' && empty($listall)) {
             $backend = $abook->localbackend;
         }
 
-        /* echo '<H3 ALIGN=center>' . $abook->backends[$backend]->sname) . "</H3>\n"; */
+        /* echo '<h3 align="center">' . $abook->backends[$backend]->sname) . "</h3>\n"; */
 
         $res = $abook->list_addr($backend);
 
@@ -241,8 +252,8 @@ if ($addrquery == '' && empty($listall)) {
             usort($res,'alistcmp');
             addr_display_result($res, false);
         } else {
-            echo html_tag( 'p', '<strong><br>' .
-                 sprintf(_("Unable to list addresses from %s"), 
+            echo html_tag( 'p', '<strong><br />' .
+                 sprintf(_("Unable to list addresses from %s"),
                  $abook->backends[$backend]->sname) . "</strong>\n" ,
             'center' );
         }
@@ -266,17 +277,17 @@ else {
         }
 
         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";
         } else {
             if (sizeof($res) == 0) {
-                echo html_tag( 'p', '<br><b>' .
-                                 _("No persons matching your search was found") . "</b>\n" ,
+                echo html_tag( 'p', '<br /><b>' .
+                                 _("No persons matching your search were found") . "</b>\n" ,
                        'center' ) .
-                "\n</BODY></HTML>\n";
+                "\n</body></html>\n";
             } else {
                 addr_display_result($res);
             }
@@ -285,12 +296,13 @@ else {
 }
 
 if ($addrquery == '' || sizeof($res) == 0) {
-    /* printf('<center><FORM METHOD=post NAME=k ACTION="compose.php">'."\n", $PHP_SELF); */
-    echo '<center><FORM METHOD=post NAME=k ACTION="compose.php">' . "\n";
+    /* printf('<center><form method="post" name="k" action="compose.php">'."\n", $PHP_SELF); */
+    echo '<center>'.
+        addForm('compose.php','post','k');
     addr_insert_hidden();
-    echo '<INPUT TYPE=submit VALUE="' . _("Return") . '" NAME=return>' . "\n" .
+    echo '<input type="submit" value="' . _("Return") . '" name="return" />' . "\n" .
          '</form></center></nobr>';
 }
 
 ?>
-</body></html>
+</body></html>
\ No newline at end of file