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 558d11b6a7e25e72387e8a86f970c53daffb89ce..dc4599263eb104feb89beda44fb3093c93e244f1 100644 (file)
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -3,6 +3,8 @@
     **  prefs.php
     **
     **  This contains functions for manipulating user preferences
+    **
+    **  $Id$
     **/
 
    $prefs_php = true;
@@ -11,7 +13,7 @@
    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;
       }
 
@@ -33,7 +35,8 @@
       $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 "<br>\n";
          exit;
       }
       $file = fopen($filename, "r");
@@ -71,7 +74,8 @@
       $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");