From 191042a9e8726d0433d0886d1ab1945e27290b27 Mon Sep 17 00:00:00 2001
From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 6 Mar 2007 01:23:44 +0000
Subject: [PATCH] Fix Priority and Receipt compose options being reset after
 return from HTML addressbook, and allow returning from an empty address book
 (#1673056).

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12311 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 ChangeLog                    | 2 ++
 src/addrbook_search_html.php | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68d027a1..e7ee71f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -184,6 +184,8 @@ Version 1.5.2 - SVN
     in PHP 4.4.5 (#1664155).
   - If a date-header cannot be parsed, display the unparsed version as a
     better-than-nothing alternative.
+  - Fix Priority and Receipt compose options being reset after return from
+    HTML addressbook, and allow returning from an empty address book (#1673056).
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 4c8f9177..b877ca22 100644
--- 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');
@@ -69,12 +72,11 @@ function addr_display_result($res, $includesource = true) {
 
     global $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));
-- 
2.25.1