Remove sqsetcookieflush call (not needed)

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

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 3ca36c03adf80b80c110a6dded21cc3e58712871..5d59f0c9f6a63c7704a089f95438b8e990ceec04 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -748,7 +748,7 @@ function sqimap_create_stream($server,$port,$tls=0) {
 
 /**
  * Logs the user into the IMAP server.  If $hide is set, no error messages
- * will be displayed (if set to 1, just exits, if set to 2, returns FALSE).  
+ * will be displayed (if set to 1, just exits, if set to 2, returns FALSE).
  * This function returns the IMAP connection handle.
  * @param string $username user name
  * @param string $password password encrypted with onetimepad. Since 1.5.2
@@ -762,7 +762,7 @@ function sqimap_create_stream($server,$port,$tls=0) {
  *                  2 = show no errors (return FALSE)
  *                  3 = show no errors (return error string)
  * @return mixed The IMAP connection stream, or if the connection fails,
- *               FALSE if $hide is set to 2 or an error string if $hide 
+ *               FALSE if $hide is set to 2 or an error string if $hide
  *               is set to 3.
  */
 function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) {
@@ -777,11 +777,11 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
 
     if(!empty($authz)) {
         /* authz plugin - specific:
-         * Get proxy login parameters from authz plugin configuration. If they 
+         * Get proxy login parameters from authz plugin configuration. If they
          * exist, they will override the current ones.
          * This is useful if we want to use different SASL authentication mechanism
          * and/or different TLS settings for proxy logins. */
-        global $authz_imap_auth_mech, $authz_use_imap_tls, $authz_imapPort_tls; 
+        global $authz_imap_auth_mech, $authz_use_imap_tls, $authz_imapPort_tls;
         $imap_auth_mech = !empty($authz_imap_auth_mech) ? strtolower($authz_imap_auth_mech) : $imap_auth_mech;
         $use_imap_tls = !empty($authz_use_imap_tls)? $authz_use_imap_tls : $use_imap_tls;
         $imap_port = !empty($authz_use_imap_tls)? $authz_imapPort_tls : $imap_port;
@@ -939,7 +939,7 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
 
                 set_up_language($squirrelmail_language, true);
                 sqsession_destroy();
-                sqsetcookieflush();
+
                 /* terminate the session nicely */
                 sqimap_logout($imap_stream);
                 if ($hide == 3) return _("Unknown user or password incorrect.");
@@ -1053,7 +1053,7 @@ function sqimap_get_delimiter ($imap_stream = false) {
              * OS: According to rfc2342 response from NAMESPACE command is:
              * OS: * NAMESPACE (PERSONAL NAMESPACES) (OTHER_USERS NAMESPACE) (SHARED NAMESPACES)
              * OS: We want to lookup all personal NAMESPACES...
-             * 
+             *
              * TODO: remove this in favour of the information from sqimap_get_namespace()
              */
             $read = sqimap_run_command($imap_stream, 'NAMESPACE', true, $a, $b);
@@ -1094,7 +1094,7 @@ function sqimap_get_namespace($imap_stream) {
     $read = sqimap_run_command($imap_stream, 'NAMESPACE', true, $a, $b);
     return sqimap_parse_namespace($read[0]);
 }
-    
+
 /**
  * Parses a NAMESPACE response and returns an array with the available
  * personal, users and shared namespaces.

diff --git a/src/login.php b/src/login.php
index 0ae20dd679eec094c69f79a97960ac3e8469ca9b..850f13d1e07621ddadb441b386c1a91d16c35cdc 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -115,10 +115,6 @@ if (! isset($color) || ! is_array($color)) {
     $color[7]  = '#0000cc';  /* blue          Links                  */
     $color[8]  = '#000000';  /* black         Normal text            */
 }
-/**
- * send out all the cookies
- */
-sqsetcookieflush();
 
 displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
 
@@ -127,7 +123,7 @@ displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
 /* If they don't have a logo, don't bother.. */
 $logo_str = '';
 if (isset($org_logo) && $org_logo) {
-    
+
     if (isset($org_logo_width) && is_numeric($org_logo_width) &&
      $org_logo_width>0) {
         $width = $org_logo_width;
@@ -141,7 +137,7 @@ if (isset($org_logo) && $org_logo) {
         $height = '';
     }
 
-    $logo_str = create_image($org_logo, sprintf(_("%s Logo"), $org_name), 
+    $logo_str = create_image($org_logo, sprintf(_("%s Logo"), $org_name),
                              $width, $height, '', 'sqm_loginImage');
 
 }

diff --git a/src/redirect.php b/src/redirect.php
index 389c6a9c7c6575c06678958fe3915e7669ce6b59..c417b76a16dd18fd2c53edc228cc735ab542c9d3 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -79,13 +79,9 @@ if (!sqsession_is_registered('user_is_logged_in')) {
      * function which gives us full control how the cookie is set. We do that
      * to add the HttpOnly cookie attribute which blocks javascript access on
      * IE6 SP1.
-     * sqsetcookieflush is needed to send out the headers. sqsetcookie caches
-     * the cookies to be send. If we don't do that we only can send 1 single cookie
-     * which is not sufficient.
      */
     sqsetcookie(session_name(),session_id(),false,$base_uri);
     sqsetcookie('key', $key, false, $base_uri);
-    sqsetcookieflush();
 
     sqsession_register($onetimepad, 'onetimepad');