X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fprefs.php;h=30bfd06ada945e97d99af38d1076571d01ccbdc7;hp=1f6891bd663ef2c85d22e1027f1cbad39651491b;hb=19acd99fabdc29d6e87eebb355f5f8c6b0fac4da;hpb=65b14f90f66fb256ca4cfe5d4096a251f5a1eaf0

diff --git a/functions/prefs.php b/functions/prefs.php
index 1f6891bd..30bfd06a 100644
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -5,9 +5,16 @@
     **  This contains functions for manipulating user preferences
     **/
 
+   $prefs_php = true;
+
    /** returns the value for $string **/
-   function getPref($username, $string) {
-      $filename = "../data/$username.pref";
+   function getPref($data_dir, $username, $string) {
+      $filename = "$data_dir$username.pref";
+      if (!file_exists($filename)) {
+         echo _("Preference file ") . "\"$filename\"" . _(" not found.  Exiting abnormally");
+         exit;
+      }
+
       $file = fopen($filename, "r");
 
       /** read in all the preferences **/
@@ -15,7 +22,7 @@
          $pref = fgets($file, 1024);
          if (substr($pref, 0, strpos($pref, "=")) == $string) {
             fclose($file);
-            return substr($pref, strpos($pref, "=")+1);
+            return trim(substr($pref, strpos($pref, "=")+1));
          }
       }
       fclose($file);
@@ -23,11 +30,11 @@
    }
 
    /** sets the pref, $string, to $set_to **/
-   function setPref($username, $string, $set_to) {
-      $filename = "../data/$username.pref";
+   function setPref($data_dir, $username, $string, $set_to) {
+      $filename = "$data_dir$username.pref";
       $found = false;
       if (!file_exists($filename)) {
-         echo "Preference file, $filename, does not exist.  Log out, and log back in to create a default preference file.<BR>";
+         echo _("Preference file, ") . "\"$filename\"" . _(", does not exist.  Log out, and log back in to create a default preference file. ") ."<BR>";
          exit;
       }
       $file = fopen($filename, "r");
@@ -61,15 +68,46 @@
       fclose($file);
    }
 
-   /** This checks if there is a pref file, if there isn't, it will create it. **/
-   function checkForPrefs($username) {
-      $filename = "../data/default_pref";
+
+
+
+   /** This checks if there is a pref file, if there isn't, it will
+       create it. **/
+   function checkForPrefs($data_dir, $username) {
+      $filename = "$data_dir$username.pref";
       if (!file_exists($filename)) {
-         if (!copy("../config/default.pref", $filename)) {
-            echo "Error opening $filename";
+         if (!copy("$data_dir" . "default_pref", $filename)) {
+            echo _("Error opening ") ."$filename";
             exit;
          }
       }
-      return;
    }
-?>
\ No newline at end of file
+
+
+
+   /** Writes the Signature **/
+   function setSig($data_dir, $username, $string) {
+      $filename = "$data_dir$username.sig";
+      $file = fopen($filename, "w");
+      fwrite($file, $string);
+      fclose($file);
+   }
+
+
+
+   /** Gets the signature **/
+   function getSig($data_dir, $username) {
+      $filename = "$data_dir$username.sig";
+      if (file_exists($filename)) {
+         $file = fopen($filename, "r");
+         while (!feof($file)) {
+            $sig .= fgets($file, 1024);
+         }
+         fclose($file);
+      } else {
+         echo _("Signature file not found.");
+         exit;
+      }
+      return $sig;
+   }
+?>