fixed bug that always showed CC header even when no CC was available to display

[squirrelmail.git] / functions / prefs.php

diff --git a/functions/prefs.php b/functions/prefs.php
index 6962e6a585220d98a7cae5b262ae842aa76a3106..dc4599263eb104feb89beda44fb3093c93e244f1 100644 (file)
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -1,15 +1,19 @@
-<?
+<?php
    /**
     **  prefs.php
     **
     **  This contains functions for manipulating user preferences
+    **
+    **  $Id$
     **/
 
+   $prefs_php = true;
+
    /** returns the value for $string **/
    function getPref($data_dir, $username, $string) {
       $filename = "$data_dir$username.pref";
       if (!file_exists($filename)) {
-         echo _("Preference file ") "\"$filename\"" _(" not found.  Exiting abnormally");
+        printf (_("Preference file %s not found. Exiting abnormally"), $filename);
          exit;
       }
 
@@ -27,12 +31,51 @@
       return "";
    }
 
+   function removePref($data_dir, $username, $string) {
+      $filename = "$data_dir$username.pref";
+      $found = false;
+      if (!file_exists($filename)) {
+        printf (_("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename);
+        echo "<br>\n";
+         exit;
+      }
+      $file = fopen($filename, "r");
+
+      for ($i=0; !feof($file); $i++) {
+         $pref[$i] = fgets($file, 1024);
+         if (substr($pref[$i], 0, strpos($pref[$i], "=")) == $string) {
+            $i--;
+         }
+      }
+      fclose($file);
+
+      for ($i=0,$j=0; $i < count($pref); $i++) {
+         if (substr($pref[$i], 0, 9) == "highlight") {
+            $hlt[$j] = substr($pref[$i], strpos($pref[$i], "=")+1);
+            $j++;
+         }
+      }
+
+      $file = fopen($filename, "w");
+      for ($i=0; $i < count($pref); $i++) {
+         if (substr($pref[$i], 0, 9) != "highlight") {
+            fwrite($file, "$pref[$i]", 1024);
+         }   
+      }
+      for ($i=0; $i < count($hlt); $i++) {
+         fwrite($file, "highlight$i=$hlt[$i]");
+      }
+
+      fclose($file);
+   }
+   
    /** sets the pref, $string, to $set_to **/
    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>";
+        printf (_("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename);
+        echo "\n<br>\n";
          exit;
       }
       $file = fopen($filename, "r");
@@ -69,7 +112,8 @@
 
 
 
-   /** This checks if there is a pref file, if there isn't, it will create it. **/
+   /** 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)) {
@@ -78,7 +122,6 @@
             exit;
          }
       }
-      return;
    }
 
 
@@ -98,13 +141,11 @@
       $filename = "$data_dir$username.sig";
       if (file_exists($filename)) {
          $file = fopen($filename, "r");
+         $sig = "";
          while (!feof($file)) {
             $sig .= fgets($file, 1024);
          }
          fclose($file);
-      } else {
-         echo _("Signature file not found.");
-         exit;
       }
       return $sig;
    }