X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=b1b97e1bb32854c9e3d89bd934f40b230b98e387;hp=81cb0bc4ebf2c91ed53db422f61334ff5ca33802;hb=ace75dcb5845d993449daa54968499df519d0d77;hpb=9c3e6cd4518d9e0d072a146fd6d19acd4daac243

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 81cb0bc4..b1b97e1b 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -1,191 +1,144 @@
 <?php
-
 /**
  * addrbook_search_html.php
  *
- * Copyright (c) 1999-2002 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$
+ * @copyright 1999-2012 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');
 
-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');
+    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 */
+/**
+ * Insert hidden data
+ */
 function addr_insert_hidden() {
-    global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox,
-           $identity;
+    global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox, $mailprio,
+           $request_mdn, $request_dr, $identity, $session, $composeMessage;
 
-   echo '<input type=hidden value="';
+//FIXME Do not echo HTML from the core.  This file already uses templates mostly, so why are we echoing here at all?!?
    if (substr($body, 0, 1) == "\r") {
-       echo "\n";
-   }
-   echo htmlspecialchars($body) . '" name=body>' . "\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);
    }
 
+   if (is_object($composeMessage) && $composeMessage->entities)
+       echo addHidden('attachments', urlencode(serialize($composeMessage->entities)));
+
+   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('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 */
-function addr_display_result($res, $includesource = true) {
-    global $color, $PHP_SELF;
 
-    if (sizeof($res) <= 0) return;
+/**
+ * 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;
+    
 
-    echo '<form method=post action="' . $PHP_SELF . "\">\n" .
-         '<input type=hidden name="html_addr_search_done" value="true">' . "\n";
+//FIXME: no HTML output from core
+    echo addForm($PHP_SELF, 'post', 'addressbook', '', '', array(), TRUE).
+         addHidden('html_addr_search_done', 'true');
     addr_insert_hidden();
-    $line = 0;
-
-    echo '<TABLE BORDER=0 WIDTH="98%" ALIGN=center>' .
-         '<TR BGCOLOR="' . $color[9] . '"><TH ALIGN=left>&nbsp;' .
-         '<TH ALIGN=left>&nbsp;' . _("Name") .
-         '<TH ALIGN=left>&nbsp;' . _("E-mail") .
-         '<TH ALIGN=left>&nbsp;' . _("Info");
-
-    if ($includesource) {
-        echo '<TH ALIGN=left WIDTH="10%">&nbsp;' . _("Source");
-    }
-
-    echo "</TR>\n";
-
-    foreach ($res as $row) {
-        echo '<tr';
-        if ($line % 2) { echo ' bgcolor="' . $color[0] . '"'; }
-        echo ' nowrap><td nowrap align=center width="5%">' .
-             '<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;' . 
-             '</td><td nowrap>&nbsp;' . $row['name'] . '&nbsp;</td>' .
-             '<td nowrap>&nbsp;' . $row['email'] . '&nbsp;</td>' .
-             '<td nowrap>&nbsp;' . $row['label'] . '&nbsp;</td>';
-         if ($includesource) {
-             echo '<td nowrap>&nbsp;' . $row['source'] . '&nbsp;</td>';
-         }
-         echo "</tr>\n";
-         $line ++;
-    }
-    echo '<TR><TD ALIGN=center COLSPAN=';
-    if ($includesource) { echo '4'; } else { echo '5'; }
-    echo '><INPUT TYPE=submit NAME="addr_search_done" VALUE="' .
-         _("Use Addresses") . '"></TD></TR>' .
-         '</TABLE>' .
-         '<INPUT TYPE=hidden VALUE=1 NAME="html_addr_search_done">' .
-         '</FORM>';
+    
+    $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 --- */
 
-global $mailbox;
 if ($compose_new_win == '1') {
     compose_Header($color, $mailbox);
 }
 else {
     displayPageHeader($color, $mailbox);
 }
-/* Initialize addressbook */
-$abook = addressbook_init();
 
-?>
+/** set correct value of $default_charset */
+set_my_charset();
 
-<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>
+/* Initialize addressbook */
+$abook = addressbook_init();
 
-<?php
 
 /* Search form */
-echo "<CENTER>\n<TABLE BORDER=0><TR><TD 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";
+echo addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f');
 addr_insert_hidden();
-if (! isset($addrquery))
-    $addrquery = '';
-echo '  <INPUT TYPE=text NAME=addrquery VALUE="' .
-     htmlspecialchars($addrquery) . "\" SIZE=26>\n";
-
-/* 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";
-    $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";
-    }
-    echo "</SELECT>\n";
-} else {
-    echo '<INPUT TYPE=hidden NAME=backend VALUE=-1>' . "\n";
+if (isset($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";
-addr_insert_hidden();
-echo '</CENTER>';
-do_hook('addrbook_html_search_below');
-/* End search form */
 
-/* Show personal addressbook */
+$oTemplate->assign('compose_addr_pop', false);
+$oTemplate->assign('backends', getBackends());
 
-if ( !empty( $listall ) ){
-    $addrquery = '*';
-}
+$oTemplate->display('addressbook_search_form.tpl');
 
-if ($addrquery == '' && empty($listall)) {
+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 == '') {
+        if ($addrquery == '' && empty($listall)) {
             $backend = $abook->localbackend;
         }
 
-        /* echo '<H3 ALIGN=center>' . $abook->backends[$backend]->sname) . "</H3>\n"; */
-
         $res = $abook->list_addr($backend);
 
         if (is_array($res)) {
             usort($res,'alistcmp');
             addr_display_result($res, false);
         } else {
-            echo '<P ALIGN=center><STRONG>' .
-                 sprintf(_("Unable to list addresses from %s"), 
-                     $abook->backends[$backend]->sname) .
-                 "</STRONG></P>\n";
+            plain_error_message(_("Unable to list addresses from %s"), $abook->backends[$backend]->sname);
         }
 
     } else {
@@ -193,42 +146,39 @@ if ($addrquery == '' && empty($listall)) {
         usort($res,'alistcmp');
         addr_display_result($res, true);
     }
+    $oTemplate->display('footer.tpl');
     exit;
-}
-else {
-
+} elseif (!empty($addrquery)) {
     /* Do the search */
-    if (!empty($addrquery)) {
-
-        if ($backend == -1) {
-            $res = $abook->s_search($addrquery);
-        } else {
-            $res = $abook->s_search($addrquery, $backend);
-        }
+    if ($backend == -1) {
+        $res = $abook->s_search($addrquery);
+    } else {
+        $res = $abook->s_search($addrquery, $backend);
+    }
 
-        if (!is_array($res)) {
-            echo '<P ALIGN=center><B><BR>' .
-                 _("Your search failed with the following error(s)") . ':<br>' .
-                  $abook->error . "</B></P>\n</BODY></HTML>\n";
-        } else {
-            if (sizeof($res) == 0) {
-                echo '<P ALIGN=center><BR><B>' .
-                     _("No persons matching your search was found") .
-                     ".</B></P>\n</BODY></HTML>\n";
-            } else {
-                addr_display_result($res);
-            }
-        }
+    if (!is_array($res)) {
+        plain_error_message(_("Your search failed with the following error(s)") .':<br />'. nl2br(htmlspecialchars($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) {
-    /* printf('<center><FORM METHOD=post NAME=k ACTION="compose.php">'."\n", $PHP_SELF); */
-    echo '<center><FORM METHOD=post NAME=k ACTION="compose.php">' . "\n";
+//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></center></nobr>';
+    echo '<input type="submit" value="' . _("Return") . '" name="return" />' . "\n" .
+         '</form></div></nobr>';
 }
 
-?>
-</body></html>
+echo '<hr />';
+
+$oTemplate->display('footer.tpl');