X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fprefs.php;h=a8c651246f4ffc2e3e7ebb677cef4a769b81a85f;hb=76e6ff644da9490671c2142a042165730ea6c0ea;hp=e43d18071970f33891b6869181ac259f3b4f1478;hpb=e9f8ea4ecb40efdb6f19631f8359ebd1fbf588be;p=squirrelmail.git diff --git a/functions/prefs.php b/functions/prefs.php index e43d1807..a8c65124 100644 --- a/functions/prefs.php +++ b/functions/prefs.php @@ -11,7 +11,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 +33,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. ") ."
"; + printf (_("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename); + echo "
\n"; exit; } $file = fopen($filename, "r"); @@ -71,7 +72,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. ") ."
"; + printf (_("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename); + echo "\n
\n"; exit; } $file = fopen($filename, "r"); @@ -137,6 +139,7 @@ $filename = "$data_dir$username.sig"; if (file_exists($filename)) { $file = fopen($filename, "r"); + $sig = ""; while (!feof($file)) { $sig .= fgets($file, 1024); }