X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=71e7d0c9cae41780b388c98e27cf65d17e141454;hp=abe09e9f68ffcdcbf8cdb7fdd4d30e62ea469d12;hb=c4faef335b2362c81b8ebf026d4066c12d70536c;hpb=ff8a98e7e1d368c57b088522586bddcf68d443a5

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index abe09e9f..71e7d0c9 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -1,217 +1,186 @@
 <?php
-   /**
-    **  addrbook_search.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development 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$
-    **/
-
-   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');
-
-   // Insert hidden data
-   function addr_insert_hidden() {
-      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";
-   }
-
-
-   // List search results
-   function addr_display_result($res, $includesource = true) {
-      global $color, $PHP_SELF;
-
-      if(sizeof($res) <= 0) return;
-
-      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;
-
-      print "<TABLE BORDER=0 WIDTH=\"98%\" ALIGN=center>";
-      printf("<TR BGCOLOR=\"$color[9]\"><TH ALIGN=left>&nbsp;".
-             "<TH ALIGN=left>&nbsp;%s<TH ALIGN=left>&nbsp;%s".
-             "<TH ALIGN=left>&nbsp;%s",
-             _("Name"), _("E-mail"), _("Info"));
-
-      if($includesource)
-         printf("<TH ALIGN=left WIDTH=\"10%%\">&nbsp;%s", _("Source"));
-
-      print "</TR>\n";
-      
-      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)
-	    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 '<INPUT TYPE=hidden VALUE=1 NAME="html_addr_search_done">';
-      print '</FORM>';
-   }
-
-   // --- End functions ---
-
-   global $mailbox;
-   displayPageHeader($color, $mailbox);
-   
-   // Initialize addressbook
-   $abook = addressbook_init();
-
-?>
-
-<br>
-<table width=95% align=center cellpadding=2 cellspacing=2 border=0>
-<tr><td bgcolor="<?php echo $color[0] ?>">
-   <center><b><?php echo _("Address Book Search") ?></b></center>
-</td></tr></table>
-
-<?php
-   // Search form
-   print "<CENTER>\n";
-   print "<TABLE BORDER=0>\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"));
-      printf("<OPTION VALUE=-1 %s>%s\n", 
-             ($backend == -1) ? "SELECTED" : "",
-             _("All address books"));
-      $ret = $abook->get_backend_list();
-      while(list($undef,$v) = each($ret)) 
-         printf("<OPTION VALUE=%d %s>%s\n", 
-                $v->bnum, 
-                ($backend == $v->bnum) ? "SELECTED" : "",
-                $v->sname);
-      print "</SELECT>\n";
-   } else {
-      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 "</TD></TR></TABLE>\n";
-   addr_insert_hidden();
-   print "</CENTER>";
-   do_hook('addrbook_html_search_below');
-   // End search form
-
-   // Show personal addressbook
-   if($addrquery == '' || !empty($listall)) {
-
-      if(! isset($backend) || $backend != -1 || $addrquery == '') {
-         if($addrquery == '')
+/**
+ * addrbook_search_html.php
+ *
+ * Handle addressbook searching with pure html.
+ *
+ * This file is included from compose.php
+ *
+ * @copyright 1999-2020 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage addressbook
+ */
+
+/**
+ * Include the SquirrelMail initialization file.
+ * Because this file can also be included within compose we check for the $bInit
+ * var which is set inside ini.php. It's needed because compose already includes
+ * init.php.
+ */
+if (!isset($bInit)) {
+    /** This is the addrbook_search_html page */
+    define('PAGE_NAME', 'addrbook_search_html');
+
+    include('../include/init.php');
+}
+
+/** SquirrelMail required files. */
+include_once(SM_PATH . 'functions/date.php');
+include_once(SM_PATH . 'functions/addressbook.php');
+include_once(SM_PATH . 'templates/util_addressbook.php');
+
+sqgetGlobalVar('session',   $session,   SQ_POST);
+sqgetGlobalVar('mailbox',   $mailbox,   SQ_POST);
+if (! sqgetGlobalVar('query', $addrquery, SQ_POST))
+     $addrquery='';
+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, $mailprio,
+           $request_mdn, $request_dr, $identity, $session, $composeMessage, $action;
+
+//FIXME Do not echo HTML from the core.  This file already uses templates mostly, so why are we echoing here at all?!?
+   // someone tell me why this is needed and if so, why it isn't something like replace \r\n with \n
+   // if (substr($body, 0, 1) == "\r") {
+   //     echo addHidden('body', "\n".$body);
+   // } else {
+       echo addHidden('body', $body);
+   // }
+
+   if (is_object($composeMessage) && $composeMessage->entities)
+       echo addHidden('attachments', urlencode(serialize($composeMessage->entities)));
+
+   echo addHidden('session', $session).
+        addHidden('smaction', $action).
+        addHidden('subject', $subject).
+        addHidden('send_to', $send_to).
+        addHidden('send_to_bcc', $send_to_bcc).
+        addHidden('send_to_cc', $send_to_cc).
+        addHidden('mailprio', $mailprio).
+        addHidden('request_mdn', $request_mdn).
+        addHidden('request_dr', $request_dr).
+        addHidden('identity', $identity).
+        addHidden('mailbox', $mailbox).
+        addHidden('from_htmladdr_search', 'true');
+}
+
+
+/**
+ * List search results
+ * @param array $res Array containing results of search
+ * @param bool $includesource If true, adds backend column to address listing
+ */
+function addr_display_result($res, $includesource = true) {
+    global $PHP_SELF, $oTemplate, $oErrorHandler;
+    
+
+//FIXME: no HTML output from core
+    echo addForm($PHP_SELF, 'post', 'addressbook', '', '', array(), TRUE).
+         addHidden('html_addr_search_done', 'true');
+    addr_insert_hidden();
+    
+    $oTemplate->assign('compose_addr_pop', false);
+    $oTemplate->assign('include_abook_name', $includesource);
+    $oTemplate->assign('addresses', formatAddressList($res));
+    
+    $oTemplate->display('addrbook_search_list.tpl');
+    
+    echo '</form>';
+}
+
+/* --- End functions --- */
+
+if ($compose_new_win == '1') {
+    compose_Header($color, $mailbox);
+}
+else {
+    displayPageHeader($color, $mailbox);
+}
+
+/** set correct value of $default_charset */
+set_my_charset();
+
+/* Initialize addressbook */
+$abook = addressbook_init();
+
+
+/* Search form */
+echo addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f');
+addr_insert_hidden();
+if (isset($session)) {
+    echo addHidden('session', $session);
+}
+
+$oTemplate->assign('compose_addr_pop', false);
+$oTemplate->assign('backends', getBackends());
+
+$oTemplate->display('addressbook_search_form.tpl');
+
+echo "</form>\n";
+do_hook('addrbook_html_search_below', $null);
+/* End search form */
+
+/* List addresses. Show personal addressbook */
+if ($addrquery == '' || ! empty($listall)) {
+    // TODO: recheck all conditions and simplity if statements
+    if (! isset($backend) || $backend != -1 || $addrquery == '') {
+        if ($addrquery == '' && empty($listall)) {
             $backend = $abook->localbackend;
+        }
 
-         //printf("<H3 ALIGN=center>%s</H3>\n", $abook->backends[$backend]->sname);
-
-         $res = $abook->list_addr($backend);
+        $res = $abook->list_addr($backend);
 
-         if(is_array($res)) {
+        if (is_array($res)) {
+            usort($res,'alistcmp');
             addr_display_result($res, false);
-         } else {
-            printf("<P ALIGN=center><STRONG>"._("Unable to list addresses from %s").
-                   "</STRONG></P>\n", $abook->backends[$backend]->sname);
-         }
-
-      } else {
-         $res = $abook->list_addr();
-         addr_display_result($res, true);
-      }
-      exit;
-
-   } else
-
-   // Do the search
-   if(!empty($addrquery) && empty($listall)) {
-
-      if($backend == -1) {
-         $res = $abook->s_search($addrquery);
-      } else {
-         $res = $abook->s_search($addrquery, $backend);
-      }
-
-      if(!is_array($res)) {
-         printf("<P ALIGN=center><B><BR>%s:<br>%s</B></P>\n</BODY></HTML>\n",
-                _("Your search failed with the following error(s)"),
-                $abook->error);
-      } else if(sizeof($res) == 0) {
-         printf("<P ALIGN=center><BR><B>%s.</B></P>\n</BODY></HTML>\n",
-                _("No persons matching your search was found"));
-      } else {
-         addr_display_result($res);
-      }
-   }
-
-   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"));
-      print '</form>';
-      print '</center></nobr>';
-   }   
-
-?>
-</body></html>
+        } else {
+            plain_error_message(_("Unable to list addresses from %s"), $abook->backends[$backend]->sname);
+        }
+
+    } else {
+        $res = $abook->list_addr();
+        usort($res,'alistcmp');
+        addr_display_result($res, true);
+    }
+    $oTemplate->display('footer.tpl');
+    exit;
+} elseif (!empty($addrquery)) {
+    /* Do the search */
+    if ($backend == -1) {
+        $res = $abook->s_search($addrquery);
+    } else {
+        $res = $abook->s_search($addrquery, $backend);
+    }
+
+    if (!is_array($res)) {
+        plain_error_message(_("Your search failed with the following error(s)") .':<br />'. nl2br(sm_encode_html_special_chars($abook->error)));
+    } elseif (sizeof($res) == 0) {
+        $oTemplate->assign('note', _("No persons matching your search were found"));
+        $oTemplate->display('note.tpl');
+    } else {
+        addr_display_result($res);
+    }
+} else {
+    // not first time display, not listall and search is empty
+    // TODO: I think, this part of control structure is never reached.
+    plain_error_message(_("Nothing to search"));
+}
+
+if ($addrquery == '' || sizeof($res) == 0) {
+//FIXME don't echo HTML from core -- especially convoluted given that there is template code immediately above AND below this block
+    echo '<div style="text-align: center;">'.
+        addForm('compose.php','post','k', '', '', array(), TRUE);
+    addr_insert_hidden();
+    echo '<input type="submit" value="' . _("Return") . '" name="return" />' . "\n" .
+         '</form></div></nobr>';
+}
+
+echo '<hr />';
+
+$oTemplate->display('footer.tpl');