updated docs

[squirrelmail.git] / src / addrbook_search_html.php

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 2fee39e987eee6ccae5dabbf091c016fda9eb2cd..4ff7aca37b8c926608b22954adb539a9bf028398 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -16,27 +16,15 @@
     **  $Id$
     **/
 
-   session_start();
-
-   if (!isset($config_php))
-      include('../config/config.php');
-   if (!isset($strings_php))
-      include('../functions/strings.php');
-   if (!isset($auth_php))
-      include('../functions/auth.php');
-   if (!isset($page_header_php))
-      include('../functions/page_header.php');
-   if (!isset($date_php))
-      include('../functions/date.php');
-   if (!isset($smtp_php))
-      include('../functions/smtp.php');
-   if (!isset($display_messages_php))
-      include('../functions/display_messages.php');
-   if (!isset($addressbook_php))
-      include('../functions/addressbook.php');
-   if (!isset($plugin_php))
-      include('../functions/plugin.php');
-
+   include('../src/validate.php');
+   include('../functions/strings.php');
+   include('../config/config.php');
+   include('../functions/page_header.php');
+   include('../functions/date.php');
+   include('../functions/smtp.php');
+   include('../functions/display_messages.php');
+   include('../functions/addressbook.php');
+   include('../functions/plugin.php');
    include('../src/load_prefs.php');
 
    // Insert hidden data
@@ -65,8 +53,9 @@
 
       if(sizeof($res) <= 0) return;
 
-      printf('<FORM METHOD=post ACTION="%s?html_addr_search_done=true">'."\n",
-             $PHP_SELF);
+      echo '<form method=post action="' . $PHP_SELF . "\">\n";
+      echo '<input type=hidden name="html_addr_search_done" value="true">';
+      echo "\n";
       addr_insert_hidden();
       $line = 0;
 
@@ -81,21 +70,23 @@
 
       print "</TR>\n";
       
-      while(list($undef, $row) = each($res)) {
-         printf("<tr%s nowrap><td nowrap align=center width=\"5%%\">".
-                "<input type=checkbox name=\"send_to_search[]\" value=\"%s\">&nbsp;To".
-                "<input type=checkbox name=\"send_to_cc_search[]\" value=\"%s\">&nbsp;Cc&nbsp;".
-                "<td nowrap>&nbsp;%s&nbsp;<td nowrap>&nbsp;".
-                "%s".
-                "<td nowrap>&nbsp;%s&nbsp;",
-                ($line % 2) ? " bgcolor=\"$color[0]\"" : "", 
-                htmlspecialchars($row["email"]), htmlspecialchars($row["email"]), 
-                $row["name"], $row["email"], $row["label"]);
+      foreach ($res as $row) {
+         echo '<tr';
+        if ($line % 2) echo ' bgcolor="' . $color[0] . '"';
+        echo ' nowrap><td nowrap align=center width="5%">';
+        echo '<input type=checkbox name="send_to_search[T' . $line . ']" value = "' .
+           htmlspecialchars($row['email']) . '">&nbsp;To&nbsp;';
+        echo '<input type=checkbox name="send_to_search[C' . $line . ']" value = "' .
+           htmlspecialchars($row['email']) . '">&nbsp;Cc&nbsp;';
+        echo '<input type=checkbox name="send_to_search[B' . $line . ']" value = "' .
+           htmlspecialchars($row['email']) . '">&nbsp;Bcc&nbsp;';
+         echo '</td><td nowrap>&nbsp;' . $row['name'] . '&nbsp;</td>';
+        echo '<td nowrap>&nbsp;' . $row['email'] . '&nbsp;</td>';
+        echo '<td nowrap>&nbsp;' . $row['label'] . '&nbsp;</td>';
          if($includesource)
-            printf("<td nowrap>&nbsp;%s", $row["source"]);
-         
-         print "</TR>\n";
-         $line++;
+           echo '<td nowrap>&nbsp;' . $row['source'] . '&nbsp;</td>';
+        echo "</tr>\n";
+        $line ++;
       }
       printf('<TR><TD ALIGN=center COLSPAN=%d><INPUT TYPE=submit '.
              'NAME="addr_search_done" VALUE="%s"></TD></TR>',
@@ -109,16 +100,10 @@
    // --- End functions ---
 
    displayPageHeader($color, 'None');
-
+   
    // Initialize addressbook
    $abook = addressbook_init();
 
-   $body = sqStripSlashes($body);
-   $send_to = sqStripSlashes($send_to);
-   $send_to_cc = sqStripSlashes($send_to_cc);
-   $send_to_bcc = sqStripSlashes($send_to_bcc);
-   $subject = sqStripSlashes($subject);
-
 ?>
 
 <br>
@@ -137,11 +122,12 @@
    printf("  <nobr><STRONG>%s</STRONG>\n", _("Search for"));
    addr_insert_hidden();
    if (! isset($addrquery))
-       $addrquery = "";
+       $addrquery = '';
    printf("  <INPUT TYPE=text NAME=addrquery VALUE=\"%s\" SIZE=26>\n",
           htmlspecialchars($addrquery));
 
    // List all backends to allow the user to choose where to search
+   if(!isset($backend)) $backend = "";
    if($abook->numbackends > 1) {
       printf("<STRONG>%s</STRONG>&nbsp;<SELECT NAME=backend>\n", 
              _("in"));
@@ -171,10 +157,10 @@
    // End search form
 
    // Show personal addressbook
-   if(!isset($addrquery) || !empty($listall)) {
+   if($addrquery == '' || !empty($listall)) {
 
-      if(! isset($backend) || $backend != -1 || !isset($addrquery)) {
-         if(!isset($addrquery)) 
+      if(! isset($backend) || $backend != -1 || $addrquery == '') {
+         if($addrquery == '')
             $backend = $abook->localbackend;
 
          //printf("<H3 ALIGN=center>%s</H3>\n", $abook->backends[$backend]->sname);
@@ -217,7 +203,7 @@
       }
    }
 
-   if (!$addrquery || sizeof($res) == 0) {  
+   if ($addrquery == '' || sizeof($res) == 0) {  
       printf('<center><FORM METHOD=post NAME=k ACTION="compose.php">'."\n", $PHP_SELF);
       addr_insert_hidden();
       printf("<INPUT TYPE=submit VALUE=\"%s\" NAME=return>\n", _("Return"));