[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] CVS: squirrelmail/functions imap_general.php,1.195,1.196
From:       Fredrik Jervfors <jervfors () users ! sourceforge ! net>
Date:       2004-09-28 5:36:40
Message-ID: E1CCAfI-00039g-Se () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12100/functions

Modified Files:
	imap_general.php 
Log Message:
Fixing undefined variables

Index: imap_general.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/imap_general.php,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -w -r1.195 -r1.196
--- imap_general.php	18 Aug 2004 20:16:46 -0000	1.195
+++ imap_general.php	28 Sep 2004 05:36:38 -0000	1.196
@@ -548,7 +548,7 @@
  * @return imap-stream resource identifier
  */
 function sqimap_create_stream($server,$port,$tls=false) {
-    global $username, $use_imap_tls;
+    global $username, $use_imap_tls, $squirrelmail_language;
 
     if ($tls == true) {
         if ((check_php_version(4,3)) and (extension_loaded('openssl'))) {
@@ -556,10 +556,11 @@
             $server = 'tls://' . $server;
         } else {
             require_once(SM_PATH . 'functions/display_messages.php');
-            $string = "Unable to connect to IMAP server!<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.";
-            logout_error($string,$color);
+            logout_error( sprintf(_("Error connecting to IMAP server: %s."), \
$server). +                '<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.") \
);  }
     }
 
@@ -569,10 +570,8 @@
     if (!$imap_stream) {
         set_up_language($squirrelmail_language, true);
         require_once(SM_PATH . 'functions/display_messages.php');
-        $string = sprintf (_("Error connecting to IMAP server: %s.") .
-           "<br />\r\n", $server) .
-           "$error_number : $error_string<br />\r\n";
-        logout_error($string,$color);
+        logout_error( sprintf(_("Error connecting to IMAP server: %s."), $server).
+            "<br />\r\n$error_number : $error_string<br />\r\n" );
         exit;
     }
     $server_info = fgets ($imap_stream, 1024);



-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs


[prev in list] [next in list] [prev in thread] [next in thread]