Jelajahi Sumber

Tweak IMAP connection error display (#1203154).

Thijs Kinkhorst 20 tahun lalu
induk
melakukan
6a3f0ffce5
2 mengubah file dengan 6 tambahan dan 3 penghapusan
  1. 1 0
      ChangeLog
  2. 5 3
      functions/imap_general.php

+ 1 - 0
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
 -------------------------------

+ 5 - 3
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));
 }
 
-?>
+?>