X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=a534da0a149e8a8264edfb19f8a578d2ebb493c6;hb=856e58ef5660063838b0ad5e457dcfeea195f8a2;hp=ec37906654d5a7acb9ba15641b2e08dcaa7d0c9e;hpb=3f92c0c765f985bbdf09b511f2e6289b5a506d1f;p=squirrelmail.git

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index ec379066..a534da0a 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-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -40,7 +40,7 @@ sqgetGlobalVar('backend',   $backend,   SQ_POST);
  */
 function addr_insert_hidden() {
     global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox,
-           $identity, $session;
+           $request_mdn, $request_dr, $identity, $session;
 
    if (substr($body, 0, 1) == "\r") {
        echo addHidden('body', "\n".$body);
@@ -53,6 +53,9 @@ function addr_insert_hidden() {
         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');
@@ -65,16 +68,13 @@ 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 $oTemplate, $oErrorHandler;
+    global $PHP_SELF, $oTemplate, $oErrorHandler;
     
-    if (sizeof($res) <= 0) return;
 
     echo addForm($PHP_SELF, 'post', 'addressbook').
          addHidden('html_addr_search_done', 'true');
     addr_insert_hidden();
-
+    
     $oTemplate->assign('use_js', false);
     $oTemplate->assign('include_abook_name', $includesource);
     $oTemplate->assign('addresses', formatAddressList($res));
@@ -94,7 +94,6 @@ else {
 }
 
 /** set correct value of $default_charset */
-global $default_charset;
 set_my_charset();
 
 /* Initialize addressbook */
@@ -114,7 +113,7 @@ $oTemplate->assign('backends', getBackends());
 $oTemplate->display('addressbook_search_form.tpl');
 
 echo "</form>\n";
-do_hook('addrbook_html_search_below');
+do_hook('addrbook_html_search_below', $null);
 /* End search form */
 
 /* List addresses. Show personal addressbook */
@@ -125,8 +124,6 @@ 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)) {
@@ -176,4 +173,3 @@ if ($addrquery == '' || sizeof($res) == 0) {
 echo '<hr />';
 
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file