sqsession_register fix

[squirrelmail.git] / functions / file_prefs.php

diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index 082b1bce8b1f6b3533237ebba56f8824d6d7006b..0671b3ef582811ca465898704a94214c0f5dcb7b 100644 (file)
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -11,8 +11,6 @@
  * $Id$
  */
 
-global $prefs_are_cached, $prefs_cache;
-
 /**
  * Check the preferences into the session cache.
  */
@@ -23,8 +21,8 @@ function cachePrefValues($data_dir, $username) {
         return;
     }
     
-    session_unregister('prefs_cache');
-    session_unregister('prefs_are_cached');
+    sqsession_unregister('prefs_cache');
+    sqsession_unregister('prefs_are_cached');
     
     /* Calculate the filename for the user's preference file */
     $filename = getHashedFile($username, $data_dir, "$username.pref");
@@ -35,12 +33,18 @@ function cachePrefValues($data_dir, $username) {
 
     /* Make sure that the preference file now DOES exist. */
     if (!file_exists($filename)) {
-        include_once( '../functions/display_messages.php' );
+        include_once(SM_PATH . 'functions/display_messages.php');
         logout_error( sprintf( _("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename)  );
         exit;
     }
 
-    $file = fopen($filename, 'r');
+    /* Open the file, or else display an error to the user. */
+    if(!$file = @fopen($filename, 'r'))
+    {
+        include_once(SM_PATH . 'functions/display_messages.php');
+        logout_error( sprintf( _("Preference file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
+        exit;
+    }
 
     /* Read in the preferences. */
     $highlight_num = 0;
@@ -64,8 +68,8 @@ function cachePrefValues($data_dir, $username) {
 
     $prefs_are_cached = TRUE;
 
-    session_register('prefs_cache');
-    session_register('prefs_are_cached');
+    sqsession_register($prefs_cache, 'prefs_cache');
+    sqsession_register($prefs_are_cached, 'prefs_are_cached');
 }
    
 /**
@@ -94,7 +98,14 @@ function savePrefValues($data_dir, $username) {
    
     $filename = getHashedFile($username, $data_dir, "$username.pref");
 
-    $file = fopen($filename, 'w');
+    /* Open the file for writing, or else display an error to the user. */
+    if(!$file = @fopen($filename, 'w'))
+    {
+        include_once(SM_PATH . 'functions/display_messages.php');
+        logout_error( sprintf( _("Preference file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
+        exit;
+    }
+
     foreach ($prefs_cache as $Key => $Value) {
         if (isset($Value)) {
             fwrite($file, $Key . '=' . $Value . "\n");
@@ -155,7 +166,7 @@ function checkForPrefs($data_dir, $username, $filename = '') {
 
         /* If it is not there, check the internal data directory. */
         if (!@file_exists($default_pref)) {
-            $default_pref = '../data/default_pref';
+            $default_pref = SM_PATH . 'data/default_pref';
         }
 
         /* Otherwise, report an error. */
@@ -164,7 +175,7 @@ function checkForPrefs($data_dir, $username, $filename = '') {
             $errString = $errTitle . "<br>\n" .
                          _("Default preference file not found!") . "<br>\n" .
                          _("Please contact your system administrator and report this error.") . "<br>\n";
-            include_once( '../functions/display_messages.php' );
+            include_once(SM_PATH . 'functions/display_messages.php' );
             logout_error( $errString, $errTitle );
             exit;
         } else if (!@copy($default_pref, $filename)) {
@@ -177,7 +188,7 @@ function checkForPrefs($data_dir, $username, $filename = '') {
                        _("Could not create initial preference file!") . "<br>\n" .
                        sprintf( _("%s should be writable by user %s"), $data_dir, $uid ) .
                        "<br>\n" . _("Please contact your system administrator and report this error.") . "<br>\n";
-            include_once( '../functions/display_messages.php' );
+            include_once(SM_PATH . 'functions/display_messages.php' );
             logout_error( $errString, $errTitle );
             exit;
         }
@@ -189,7 +200,13 @@ function checkForPrefs($data_dir, $username, $filename = '') {
  */
 function setSig($data_dir, $username, $number, $value) {
     $filename = getHashedFile($username, $data_dir, "$username.si$number");
-    $file = fopen($filename, 'w');
+    /* Open the file for writing, or else display an error to the user. */
+    if(!$file = @fopen($filename, 'w'))
+    {
+        include_once(SM_PATH . '/functions/display_messages.php' );
+        logout_error( sprintf( _("Signature file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
+        exit;
+    }
     fwrite($file, $value);
     fclose($file);
 }
@@ -198,11 +215,16 @@ function setSig($data_dir, $username, $number, $value) {
  * Get the signature.
  */
 function getSig($data_dir, $username, $number) {
-    #$filename = $data_dir . $username . '.si$number';
     $filename = getHashedFile($username, $data_dir, "$username.si$number");
     $sig = '';
     if (file_exists($filename)) {
-        $file = fopen($filename, 'r');
+        /* Open the file, or else display an error to the user. */
+        if(!$file = @fopen($filename, 'r'))
+        {
+            include_once(SM_PATH . 'functions/display_messages.php');
+            logout_error( sprintf( _("Signature file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
+            exit;
+        }
         while (!feof($file)) {
             $sig .= fgets($file, 1024);
         }