Tweak IMAP connection error display (#1203154).

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

diff --git a/ChangeLog b/ChangeLog
index dfaf8e4a9beefed43c4793da0c6eabbbf483ced1..d056282a783ce2a4c628d643bcab85bb2c3fbafa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -351,6 +351,7 @@ Version 1.5.1 -- CVS
   - Added dovecot preset to configuration utility.
   - Modified mercury32 preset in order to remove INBOX prefix in mercury32 4.01.
   - Added peardb backend to change_password plugin.
+  - Tweak IMAP connection error display (#1203154).
 
 Version 1.5.0 - 2 February 2004
 -------------------------------

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 0a4aa5fb35bf801cbc9e09d3adc578f5c6c1181e..eca66b886dfefb96cd14958dfa3d92ade57ac1d6 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -645,7 +645,8 @@ function sqimap_create_stream($server,$port,$tls=false) {
                 '<br />'.
                 _("TLS is enabled, but this version of PHP does not support TLS sockets, or is missing the openssl extension.").
                 '<br /><br />'.
-                _("Please contact your system administrator and report this error.") );
+                _("Please contact your system administrator and report this error."),
+               sprintf(_("Error connecting to IMAP server: %s."), $server));
         }
     }
 
@@ -656,7 +657,8 @@ function sqimap_create_stream($server,$port,$tls=false) {
         set_up_language($squirrelmail_language, true);
         require_once(SM_PATH . 'functions/display_messages.php');
         logout_error( sprintf(_("Error connecting to IMAP server: %s."), $server).
-            "<br />\r\n$error_number : $error_string<br />\r\n" );
+            "<br />\r\n$error_number : $error_string<br />\r\n",
+           sprintf(_("Error connecting to IMAP server: %s."), $server) );
         exit;
     }
     $server_info = fgets ($imap_stream, 1024);
@@ -1167,4 +1169,4 @@ function map_yp_alias($username) {
    return chop(substr($yp, strlen($username)+1));
 }
 
-?>
\ No newline at end of file
+?>