[SM-CVS] CVS: squirrelmail/functions mailbox_display.php,1.243.2.10,1.243.2.11 file_prefs.php,1.5.2.15,1.5.2.16

[Jonathan A. <jan...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv4145/functions

Modified Files:
      Tag: SM-1_2-STABLE
	mailbox_display.php file_prefs.php 
Log Message:

A couple of fixes for PHP 4.3.x.  This should allow prefs to be saved now,
and should remove the warning about a bug in PHP 4.2.3 in the mailbox view.

Thank you very much Troy Settle for use of his server for testing



Index: mailbox_display.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/mailbox_display.php,v
retrieving revision 1.243.2.10
retrieving revision 1.243.2.11
diff -u -w -r1.243.2.10 -r1.243.2.11
--- mailbox_display.php	24 Jan 2003 02:14:55 -0000	1.243.2.10
+++ mailbox_display.php	25 Mar 2003 06:20:54 -0000	1.243.2.11
@@ -232,6 +232,16 @@
            $auto_expunge, $thread_sort_messages, $allow_server_sort,
            $data_dir, $username, $server_sort_order;
 
+    /*
+     * For some reason, on PHP 4.3+, this being unset, and set in the session causes havoc
+     * so setting it to an empty array beforehand seems to clean up the issue, and stopping the
+     * "Your script possibly relies on a session side-effect which existed until PHP 4.2.3" error
+     */
+
+    if (!isset($msort)) {
+        $msort = array();
+    }
+
     /* if $start_msg is lower than $num_msgs, we probably deleted all messages
      * in the last page. We need to re-adjust the start_msg
      */

Index: file_prefs.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/file_prefs.php,v
retrieving revision 1.5.2.15
retrieving revision 1.5.2.16
diff -u -w -r1.5.2.15 -r1.5.2.16
--- file_prefs.php	21 Dec 2002 10:06:29 -0000	1.5.2.15
+++ file_prefs.php	25 Mar 2003 06:20:55 -0000	1.5.2.16
@@ -130,6 +130,7 @@
     @copy($filename . '.tmp',$filename);
     @unlink($filename . '.tmp');
     chmod($filename, 0600);
+    sqsession_register($prefs_cache , 'prefs_cache');
 }
 
 /**