X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=252f4e1a67548c30e5a13d045403e15780efee78;hp=b81a7531e076ddbf46b227fef2b798f5957a56e8;hb=babad50305f1b991f32209a7f2e3b72a5eefe5c7;hpb=abb3c512ea6977cc33e959fdf65bb2fdc8ddd5e8

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index b81a7531..252f4e1a 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -1,148 +1,97 @@
 <?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
  *
- * $Id$
+ * @copyright 1999-2019 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage addressbook
  */
 
-/* Path for SquirrelMail required files. */
-if (! defined('SM_PATH') ) {
-	define('SM_PATH','../');
+/**
+ * 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. */
-require_once(SM_PATH . 'include/validate.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');
+/** 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');
 
-$session = $_POST['session'];
-$mailbox = $_POST['mailbox'];
-if ( isset($_POST['addrquery']) ) {
-    $addrquery = $_POST['addrquery'];
-}
-if ( isset($_POST['listall']) ) {
-    $listall = $_POST['listall'];
-}
-if ( isset($_POST['backend'] ) ) {
-    $backend = $_POST['backend'];
-}
+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, $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";
-   }
+    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 */
+/**
+ * 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 $color, $javascript_on, $PHP_SELF;
-
-    if (sizeof($res) <= 0) return;
+    global $PHP_SELF, $oTemplate, $oErrorHandler;
+    
 
-    echo '<form method=post action="' . $PHP_SELF . '" name="addrbook">'."\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;
-
-if ($javascript_on) {
-    print
-        '<script language="JavaScript" type="text/javascript">' .
-        "\n<!-- \n" .
-        "function CheckAll(ch) {\n" .
-        "   for (var i = 0; i < document.addrbook.elements.length; i++) {\n" .
-        "       if( document.addrbook.elements[i].type == 'checkbox' &&\n" .
-        "           document.addrbook.elements[i].name.substr(0,16) == 'send_to_search['+ch ) {\n" .
-        "           document.addrbook.elements[i].checked = !(document.addrbook.elements[i].checked);\n".
-        "       }\n" .
-        "   }\n" .
-        "}\n" .
-        "//-->\n" .
-        "</script>\n";
-    $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>'.
-            '&nbsp;&nbsp;'.
-            '<a href="#" onClick="CheckAll(\'B\');">' . _("All") . '</a>';
-    }
-    echo html_tag( 'table', '', 'center', '', 'border="0" width="98%"' ) .
-    html_tag( 'tr', '', '', $color[9] ) .
-    html_tag( 'th', '&nbsp;' . $chk_all, 'left' ) .
-    html_tag( 'th', '&nbsp;' . _("Name"), 'left' ) .
-    html_tag( 'th', '&nbsp;' . _("E-mail"), 'left' ) .
-    html_tag( 'th', '&nbsp;' . _("Info"), 'left' );
-
-    if ($includesource) {
-        echo html_tag( 'th', '&nbsp;' . _("Source"), 'left', '', 'width="10%"' );
-    }
-
-    echo "</tr>\n";
-
-    foreach ($res as $row) {
-        $tr_bgcolor = '';
-        $email = AddressBook::full_address($row);
-        if ($line % 2) { $tr_bgcolor = $color[0]; }
-        echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
-        html_tag( 'td',
-             '<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;' . 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' );
-         }
-         echo "</tr>\n";
-         $line ++;
-    }
-    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") . '">' ,
-                'center', '', 'colspan="'. $td_colspan .'"' )
-            ) .
-         '</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 --- */
@@ -153,87 +102,45 @@ if ($compose_new_win == '1') {
 else {
     displayPageHeader($color, $mailbox);
 }
-/* Initialize addressbook */
-$abook = addressbook_init();
 
+/** set correct value of $default_charset */
+set_my_charset();
 
-echo '<br>' .
-html_tag( 'table',
-    html_tag( 'tr',
-        html_tag( 'td', '<b>' . _("Address Book Search") . '</b>', 'center', $color[0] )
-    ) ,
-'center', '', 'width="95%" cellpadding="2" cellspacing="2" border="0"' );
+/* Initialize addressbook */
+$abook = addressbook_init();
 
 
 /* Search form */
-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";
+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 "<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";
-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 html_tag( 'p', '<strong><br>' .
-                 sprintf(_("Unable to list addresses from %s"), 
-                 $abook->backends[$backend]->sname) . "</strong>\n" ,
-            'center' );
+            plain_error_message(_("Unable to list addresses from %s"), $abook->backends[$backend]->sname);
         }
 
     } else {
@@ -241,45 +148,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 html_tag( 'p', '<b><br>' .
-                             _("Your search failed with the following error(s)") .
-                            ':<br>' . $abook->error . "</b>\n" ,
-                   'center' ) .
-            "\n</BODY></HTML>\n";
-        } else {
-            if (sizeof($res) == 0) {
-                echo html_tag( 'p', '<br><b>' .
-                                 _("No persons matching your search was found") . "</b>\n" ,
-                       'center' ) .
-                "\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(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) {
-    /* 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');