From b28bec15e868a605710e9ff2d70abeae578c829d Mon Sep 17 00:00:00 2001
From: alex-brainstorm <alex-brainstorm@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 29 Jul 2003 10:19:22 +0000
Subject: [PATCH] Removed the last code dependency on a specific version

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5467 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/imap_asearch.php | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/functions/imap_asearch.php b/functions/imap_asearch.php
index e4699e46..7a515cec 100644
--- a/functions/imap_asearch.php
+++ b/functions/imap_asearch.php
@@ -88,7 +88,21 @@ function sqimap_asearch_error_box($response, $query, $message)
 		$title = _("ERROR : Unknown imap response.");
 	else
 		$title = $imap_error_titles[$response];
-	sqimap_error_box($title, $query, _("Reason Given: "), $message);
+	$message_title = _("Reason Given: ");
+	if (function_exists('sqimap_error_box'))
+		sqimap_error_box($title, $query, $message_title, $message);
+	else {	//Straight copy of 1.5 imap_general.php:sqimap_error_box(). Can be removed at a later time
+    require_once(SM_PATH . 'functions/display_messages.php');
+    $string = "<font color=$color[2]><b>\n" . $title . "</b><br>\n";
+    if ($query != '')
+        $string .= _("Query:") . ' ' . htmlspecialchars($query) . '<br>';
+    if ($message_title != '')
+        $string .= $message_title;
+    if ($message != '')
+        $string .= htmlspecialchars($message);
+    $string .= "</font><br>\n";
+    error_box($string,$color);
+	}
 }
 
 /* This is to avoid the E_NOTICE warnings signaled by marc AT squirrelmail.org. Thanks Marc! */
@@ -99,7 +113,7 @@ function asearch_nz(&$var)
 	return '';
 }
 
-/* This should give the same results as PHP 4 >= 4.3.0's html_entity_decode() */
+/* This should give the same results as PHP 4 >= 4.3.0's html_entity_decode(), except it doesn't handle hex constructs */
 function asearch_unhtmlentities($string) {
 	$trans_tbl = array_flip(get_html_translation_table(HTML_ENTITIES));
 	for ($i=127; $i<255; $i++)	/* Add &#<dec>; entities */
@@ -115,7 +129,7 @@ function s_debug_dump($var_name, $var_var)
 {
 	global $imap_asearch_debug_dump;
 	if ($imap_asearch_debug_dump) {
-		if (function_exists('sm_print_r'))
+		if (function_exists('sm_print_r'))	//Only exists since 1.4.2
 			sm_print_r($var_name, $var_var);	//Better be the 'varargs' version ;)
 		else {
 			echo '<pre>';
-- 
2.25.1