X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=c9beedde0f3f66cb8f9155822617b270a313ee9e;hp=ac0be5609901293ef996935f7239efd147327d13;hb=eceb3fe56e7ef548f83797639e9d6d993254695b;hpb=3523532820419e678843408d5a31db951636fa55

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index ac0be560..c9beedde 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -6,7 +6,7 @@
  *
  * This file is included from compose.php
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2009 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -20,16 +20,20 @@
  * 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('addrquery', $addrquery, SQ_POST))
+if (! sqgetGlobalVar('query', $addrquery, SQ_POST))
      $addrquery='';
 sqgetGlobalVar('listall',   $listall,   SQ_POST);
 sqgetGlobalVar('backend',   $backend,   SQ_POST);
@@ -38,20 +42,27 @@ sqgetGlobalVar('backend',   $backend,   SQ_POST);
  * Insert hidden data
  */
 function addr_insert_hidden() {
-    global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox,
-           $identity, $session;
+    global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox, $mailprio,
+           $request_mdn, $request_dr, $identity, $session, $composeMessage;
 
+//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 addHidden('body', "\n".$body);
    } else {
        echo addHidden('body', $body);
    }
 
+   if (is_object($composeMessage) && $composeMessage->entities)
+       echo addHidden('attachments', 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');
@@ -64,90 +75,20 @@ function addr_insert_hidden() {
  * @param bool $includesource If true, adds backend column to address listing
  */
 function addr_display_result($res, $includesource = true) {
-    global $color, $javascript_on, $PHP_SELF, $squirrelmail_language;
+    global $PHP_SELF, $oTemplate, $oErrorHandler;
+    
 
-    if (sizeof($res) <= 0) return;
-
-    echo addForm($PHP_SELF, 'post', 'addrbook').
+    echo addForm($PHP_SELF, 'post', 'addressbook').
          addHidden('html_addr_search_done', 'true');
     addr_insert_hidden();
-    $line = 0;
-
-    if ($javascript_on) {
-        print
-            '<script 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>';
-    } else {
-        // check_all links are used only in JavaScript. disable links in js=off environment.
-        $chk_all = '';
-    }
-    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) {
-        $email = AddressBook::full_address($row);
-        if ($line % 2) {
-            $tr_bgcolor = $color[12];
-        } else {
-            $tr_bgcolor = $color[4];
-        }
-
-        echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
-        html_tag( 'td',
-            addCheckBox('send_to_search[T'.$line.']', FALSE, $email).
-            '&nbsp;' . _("To") . '&nbsp;' .
-            addCheckBox('send_to_search[C'.$line.']', FALSE, $email).
-            '&nbsp;' . _("Cc") . '&nbsp;' .
-            addCheckBox('send_to_search[B'.$line.']', FALSE, $email).
-            '&nbsp;' . _("Bcc") . '&nbsp;' ,
-        'center', '', 'width="5%" style="white-space: nowrap;"' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' );
-
-        if ($includesource) {
-            echo html_tag( 'td', '&nbsp;' . $row['source'] . '&nbsp;', 'left', '', 'style="white-space: 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") . '" /> ' .
-                        '<input type="submit" name="addr_search_cancel" value="' .
-                        _("Cancel") . '" />',
-                'center', '', 'colspan="'. $td_colspan .'"' )
-            ) .
-         '</table>' .
-         addHidden('html_addr_search_done', '1').
-         '</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 --- */
@@ -160,57 +101,26 @@ else {
 }
 
 /** set correct value of $default_charset */
-global $default_charset;
 set_my_charset();
 
 /* Initialize addressbook */
 $abook = addressbook_init();
 
 
-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"' );
-
-
 /* Search form */
-echo '<div style="text-align: center;">' .
-    html_tag( 'table', '', 'center', '', 'border="0"' ) .
-    html_tag( 'tr' ) .
-    html_tag( 'td', '', 'left', '', 'style="white-space: nowrap;" valign="middle"' ) . "\n" .
-    addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f').
-    "\n<div style=\"text-align: center;\">\n" .
-    '  <nobr><strong>' . _("Search for") . "</strong>\n";
+echo addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f');
 addr_insert_hidden();
-echo addInput('addrquery', $addrquery, 26);
-
-/* 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;';
-
-    $selopts['-1'] = _("All address books");
-    $ret = $abook->get_backend_list();
-
-    while (list($undef,$v) = each($ret)) {
-        $selopts[$v->bnum] = $v->sname;
-    }
-    echo addSelect('backend', $selopts, $backend, TRUE);
-} else {
-    echo addHidden('backend', '-1');
-}
 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></div></td></tr></table>' . "\n";
-echo '</div>';
-do_hook('addrbook_html_search_below');
+$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 */
@@ -221,18 +131,13 @@ 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 {
@@ -251,30 +156,21 @@ if ($addrquery == '' || ! empty($listall)) {
     }
 
     if (!is_array($res)) {
-        echo html_tag( 'p', '<b><br />' .
-                       _("Your search failed with the following error(s)") .
-                       ':<br />' . nl2br(htmlspecialchars($abook->error)) . "</b>\n" ,
-                       'center' ) . "\n";
-        $oTemplate->display('footer.tpl');
+        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 {
-        if (sizeof($res) == 0) {
-            echo html_tag( 'p', '<br /><b>' .
-                           _("No persons matching your search were found") . "</b>\n" ,
-                           'center' ) . "\n";
-            $oTemplate->display('footer.tpl');
-        } else {
-            addr_display_result($res);
-        }
+        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.
-    echo html_tag( 'p', '<br /><b>' .
-                   _("Nothing to search") . "</b>\n" ,
-                   'center' );
+    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');
     addr_insert_hidden();
@@ -282,5 +178,6 @@ if ($addrquery == '' || sizeof($res) == 0) {
          '</form></div></nobr>';
 }
 
+echo '<hr />';
+
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file