drop some unused globals

[squirrelmail.git] / src / addrbook_search_html.php

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 4c8f9177e9527e7bd8063b00edb852094fff8860..a534da0a149e8a8264edfb19f8a578d2ebb493c6 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -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, $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 */
@@ -174,4 +173,3 @@ if ($addrquery == '' || sizeof($res) == 0) {
 echo '<hr />';
 
 $oTemplate->display('footer.tpl');
-?>