X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=1f145a5e0e5ccce77c1f2d6bf921f33730254f8e;hp=d7c18f8b7d60c272112892ac02cd7b42fddb6307;hb=de00443c7d9770fbae65402e6beabde8a3db302a;hpb=7b7834759e60809a314dbf7be376f5cac26d1c90

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index d7c18f8b..1f145a5e 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -3,64 +3,78 @@
 /**
  * addrbook_search_html.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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
  *
- * NOTE: A lot of this code is similar to the code in
- *       addrbook_search.html -- If you change one, change
- *       the other one too!
- *
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage addressbook
  */
 
-require_once('../src/validate.php');
-require_once('../functions/date.php');
-require_once('../functions/smtp.php');
-require_once('../functions/display_messages.php');
-require_once('../functions/addressbook.php');
-require_once('../functions/plugin.php');
-require_once('../functions/strings.php');
-require_once('../functions/html.php');
+/** 
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+if (! defined('SM_PATH') ) {
+    define('SM_PATH','../');
+}
 
-/* Insert hidden data */
+/** SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
+require_once(SM_PATH . 'functions/date.php');
+require_once(SM_PATH . 'functions/display_messages.php');
+require_once(SM_PATH . 'functions/addressbook.php');
+require_once(SM_PATH . 'functions/plugin.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/html.php');
+
+sqgetGlobalVar('session',   $session,   SQ_POST);
+sqgetGlobalVar('mailbox',   $mailbox,   SQ_POST);
+sqgetGlobalVar('addrquery', $addrquery, SQ_POST);
+sqgetGlobalVar('listall',   $listall,   SQ_POST);
+sqgetGlobalVar('backend',   $backend,   SQ_POST);
+
+/**
+ * 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;
+    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;
 
@@ -78,9 +92,9 @@ 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>';
     }
@@ -98,20 +112,40 @@ if ($javascript_on) {
     echo "</tr>\n";
 
     foreach ($res as $row) {
-        $tr_bgcolor = '';
-        if ($line % 2) { $tr_bgcolor = $color[0]; }
+        $email = AddressBook::full_address($row);
+        if ($line % 2) { 
+            $tr_bgcolor = $color[12];
+        } else {
+            $tr_bgcolor = $color[4];
+        }
+        if ($squirrelmail_language == 'ja_JP')
+            {
         echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
         html_tag( 'td',
-             '<input type=checkbox name="send_to_search[T' . $line . ']" value = "' .
-             htmlspecialchars($row['email']) . '">&nbsp;' . _("To") . '&nbsp;' .
-             '<input type=checkbox name="send_to_search[C' . $line . ']" value = "' .
-             htmlspecialchars($row['email']) . '">&nbsp;' . _("Cc") . '&nbsp;' .
-             '<input type=checkbox name="send_to_search[B' . $line . ']" value = "' .
-             htmlspecialchars($row['email']) . '">&nbsp;' . _("Bcc") . '&nbsp;' ,
+             '<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;' . $row['name'] . '&nbsp;', 'left', '', 'nowrap' ) .
-        html_tag( 'td', '&nbsp;' . $row['email'] . '&nbsp;', 'left', '', 'nowrap' ) .
-        html_tag( 'td', '&nbsp;' . $row['label'] . '&nbsp;', 'left', '', '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' );
+            } else {
+        echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
+        html_tag( 'td',
+            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%" 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' );
+            }
 
          if ($includesource) {
              echo html_tag( 'td', '&nbsp;' . $row['source'] . '&nbsp;', 'left', '', 'nowrap' );
@@ -122,18 +156,17 @@ 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 --- */
 
-global $mailbox;
 if ($compose_new_win == '1') {
     compose_Header($color, $mailbox);
 }
@@ -144,7 +177,7 @@ else {
 $abook = addressbook_init();
 
 
-echo '<br>' .
+echo '<br />' .
 html_tag( 'table',
     html_tag( 'tr',
         html_tag( 'td', '<b>' . _("Address Book Search") . '</b>', 'center', $color[0] )
@@ -157,40 +190,37 @@ 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";
+    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');
@@ -209,7 +239,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);
 
@@ -217,7 +247,7 @@ if ($addrquery == '' && empty($listall)) {
             usort($res,'alistcmp');
             addr_display_result($res, false);
         } else {
-            echo html_tag( 'p', '<strong><br>' .
+            echo html_tag( 'p', '<strong><br />' .
                  sprintf(_("Unable to list addresses from %s"), 
                  $abook->backends[$backend]->sname) . "</strong>\n" ,
             'center' );
@@ -242,17 +272,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);
             }
@@ -261,10 +291,11 @@ 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>';
 }