From 167c6996539f53f02cd6fdbbaac71acb50c64774 Mon Sep 17 00:00:00 2001 From: stevetruckstuff Date: Tue, 15 Aug 2006 17:36:15 +0000 Subject: [PATCH] Fix cancel button in HTML address book. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11596 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/compose.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/compose.php b/src/compose.php index 80784195..742d4bc9 100644 --- a/src/compose.php +++ b/src/compose.php @@ -80,13 +80,14 @@ if ( sqgetGlobalVar('startMessage',$startMessage) ) { /** POST VARS */ -sqgetGlobalVar('sigappend', $sigappend, SQ_POST); -sqgetGlobalVar('from_htmladdr_search', $from_htmladdr_search, SQ_POST); -sqgetGlobalVar('addr_search_done', $html_addr_search_done, SQ_POST); -sqgetGlobalVar('send_to_search', $send_to_search, SQ_POST); -sqgetGlobalVar('do_delete', $do_delete, SQ_POST); -sqgetGlobalVar('delete', $delete, SQ_POST); -sqgetGlobalVar('restoremessages', $restoremessages, SQ_POST); +sqgetGlobalVar('sigappend', $sigappend, SQ_POST); +sqgetGlobalVar('from_htmladdr_search', $from_htmladdr_search, SQ_POST); +sqgetGlobalVar('addr_search_done', $html_addr_search_done, SQ_POST); +sqgetGlobalVar('addr_search_cancel', $html_addr_search_cancel, SQ_POST); +sqgetGlobalVar('send_to_search', $send_to_search, SQ_POST); +sqgetGlobalVar('do_delete', $do_delete, SQ_POST); +sqgetGlobalVar('delete', $delete, SQ_POST); +sqgetGlobalVar('restoremessages', $restoremessages, SQ_POST); if ( sqgetGlobalVar('return', $temp, SQ_POST) ) { $html_addr_search_done = 'Use Addresses'; } @@ -561,7 +562,7 @@ if ($send) { } } showInputForm($session); -} elseif (isset($html_addr_search)) { +} elseif (isset($html_addr_search) && !isset($html_addr_search_cancel)) { if (isset($_FILES['attachfile']) && $_FILES['attachfile']['tmp_name'] && $_FILES['attachfile']['tmp_name'] != 'none') { -- 2.25.1