X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=9cdf82a9117fa2def492f898742fdac89fe5b84c;hb=541506f3bbe3cfc966221c55c35e50e9bda6f181;hp=95b93fccaffaf0fbca9cff6df01d7f1a58195a1a;hpb=6e79bfe2ddadf23c78b15977f153ee53fcd5d170;p=squirrelmail.git

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 95b93fcc..9cdf82a9 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -12,45 +12,39 @@
     **  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$
     **/
 
-   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/load_prefs.php");
+   include('../src/validate.php');
+   include('../functions/date.php');
+   include('../functions/smtp.php');
+   include('../functions/display_messages.php');
+   include('../functions/addressbook.php');
+   include('../functions/plugin.php');
 
    // Insert hidden data
    function addr_insert_hidden() {
-      global $body, $subject, $send_to, $send_to_cc, $send_to_bcc;
-      printf("<input type=hidden value=\"%s\" name=body>\n", 
-             htmlspecialchars($body));
-      printf("<input type=hidden value=\"%s\" name=subject>\n", 
-             htmlspecialchars($subject));
-      printf("<input type=hidden value=\"%s\" name=send_to>\n", 
-             htmlspecialchars($send_to));
-      printf("<input type=hidden value=\"%s\" name=send_to_cc>\n", 
-             htmlspecialchars($send_to_cc));
-      printf("<input type=hidden value=\"%s\" name=send_to_bcc>\n", 
-             htmlspecialchars($send_to_bcc));     
-      printf("<input type=hidden value=\"true\" name=from_htmladdr_search>\n");
+      global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox,
+         $identity;
+      
+      echo '<input type=hidden value="';
+      if (substr($body, 0, 1) == "\r")
+          echo "\n";
+      echo htmlspecialchars($body) . '" name=body>' . "\n";
+      echo '<input type=hidden value="' . htmlspecialchars($subject)
+          . '" name=subject>' . "\n";
+      echo '<input type=hidden value="' . htmlspecialchars($send_to)
+          . '" name=send_to>' . "\n";
+      echo "<input type=hidden value=\"" . htmlspecialchars($send_to_cc)
+          . '" name=send_to_cc>' . "\n";
+      echo "<input type=hidden value=\"" . htmlspecialchars($send_to_bcc)
+          . '" name=send_to_bcc>' . "\n";
+      echo "<input type=hidden value=\"" . htmlspecialchars($identity)
+          . '" name=identity>' . "\n";
+      echo "<input type=hidden name=mailbox value=\"" .
+          htmlspecialchars($mailbox) . "\">\n";
+      echo "<input type=hidden value=\"true\" name=from_htmladdr_search>\n";
    }
 
 
@@ -60,8 +54,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;
 
@@ -76,44 +71,41 @@
 
       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>',
              4 + ($includesource ? 1 : 0), 
              _("Use Addresses"));
-      print "</TABLE>";
+      print '</TABLE>';
       print '<INPUT TYPE=hidden VALUE=1 NAME="html_addr_search_done">';
-      print "</FORM>";
+      print '</FORM>';
    }
 
    // --- End functions ---
 
-   displayPageHeader($color, "None");
-
+   global $mailbox;
+   displayPageHeader($color, $mailbox);
+   
    // 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>
@@ -126,15 +118,18 @@
    // Search form
    print "<CENTER>\n";
    print "<TABLE BORDER=0>\n";
-   printf("<TR><TD NOWRAP VALIGN=middle>\n");
+   print "<TR><TD NOWRAP VALIGN=middle>\n";
    printf('<FORM METHOD=post NAME=f ACTION="%s?html_addr_search=true">'."\n", $PHP_SELF);
    print "<CENTER>\n";
    printf("  <nobr><STRONG>%s</STRONG>\n", _("Search for"));
    addr_insert_hidden();
+   if (! isset($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"));
@@ -147,27 +142,27 @@
                 $v->bnum, 
                 ($backend == $v->bnum) ? "SELECTED" : "",
                 $v->sname);
-      printf("</SELECT>\n");
+      print "</SELECT>\n";
    } else {
-      printf("<INPUT TYPE=hidden NAME=backend VALUE=-1>\n");
+      print "<INPUT TYPE=hidden NAME=backend VALUE=-1>\n";
    }
    printf("<INPUT TYPE=submit VALUE=\"%s\">",
           _("Search"));
    printf("&nbsp;|&nbsp;<INPUT TYPE=submit VALUE=\"%s\" NAME=listall>\n",
           _("List all"));
-   print "</FORM></center>";
+   print '</FORM></center>';
 
-   printf("</TD></TR></TABLE>\n");
+   print "</TD></TR></TABLE>\n";
    addr_insert_hidden();
    print "</CENTER>";
-   do_hook("addrbook_html_search_below");
+   do_hook('addrbook_html_search_below');
    // End search form
 
    // Show personal addressbook
-   if(!isset($addrquery) || !empty($listall)) {
+   if($addrquery == '' || !empty($listall)) {
 
-      if($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);
@@ -210,12 +205,12 @@
       }
    }
 
-   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"));
-      printf('</form>');
-      printf("</center></nobr>");
+      print '</form>';
+      print '</center></nobr>';
    }   
 
 ?>