This is Philippe Mingo

Added query string to imap error

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2402 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_general.php b/functions/imap_general.php
index d322f30a2f1007135c5ad8dd50c11ccf49a1585a..332fee63aaaaf1d274e35f36b633302b09ead283 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -39,14 +39,14 @@ function sqimap_session_id() {
 function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$response, &$message) {
     $sid = sqimap_session_id();
     fputs ($imap_stream, $sid . ' ' . $query . "\r\n");
 function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$response, &$message) {
     $sid = sqimap_session_id();
     fputs ($imap_stream, $sid . ' ' . $query . "\r\n");

-    $read = sqimap_read_data_list ($imap_stream, $sid, $handle_errors, $response, $message);
+    $read = sqimap_read_data_list ($imap_stream, $sid, $handle_errors, $response, $message, $query );

     return $read;
 }
 
 function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, &$message) {
     $sid = sqimap_session_id();
     fputs ($imap_stream, $sid . ' ' . $query . "\r\n");
     return $read;
 }
 
 function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, &$message) {
     $sid = sqimap_session_id();
     fputs ($imap_stream, $sid . ' ' . $query . "\r\n");

-    $read = sqimap_read_data ($imap_stream, $sid, $handle_errors, $response, $message);
+    $read = sqimap_read_data ($imap_stream, $sid, $handle_errors, $response, $message, $query);

     return $read;
 }
 
     return $read;
 }
 


@@ -58,7 +58,7 @@ function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, &
  */
 
 function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
  */
 
 function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,

-                               &$response, &$message) {
+                               &$response, &$message, $query = '') {

     global $color, $squirrelmail_language;
 
     $read = '';
     global $color, $squirrelmail_language;
 
     $read = '';


@@ -155,6 +155,8 @@ function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
             echo "<br><b><font color=$color[2]>\n" .
                  _("ERROR : Could not complete request.") .
                  "</b><br>\n" .
             echo "<br><b><font color=$color[2]>\n" .
                  _("ERROR : Could not complete request.") .
                  "</b><br>\n" .

+                 _("Query:") .
+                 $query . '<br>' .

                  _("Reason Given: ") .
                  $message . "</font><br>\n";
             exit;
                  _("Reason Given: ") .
                  $message . "</font><br>\n";
             exit;


@@ -164,6 +166,8 @@ function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
         echo "<br><b><font color=$color[2]>\n" .
              _("ERROR : Bad or malformed request.") .
              "</b><br>\n" .
         echo "<br><b><font color=$color[2]>\n" .
              _("ERROR : Bad or malformed request.") .
              "</b><br>\n" .

+             _("Query:") .
+             $query . '<br>' .

              _("Server responded: ") .
              $message . "</font><br>\n";
         exit;
              _("Server responded: ") .
              $message . "</font><br>\n";
         exit;


@@ -172,9 +176,9 @@ function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
     }
 }
 
     }
 }
 

-function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
+function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message, $query = '') {

 
 

-    $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message);
+    $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message, $query);

     return $res[0];
 
 }
     return $res[0];
 
 }