From c652f37e62576b60eb54232c8e35544ce5f8577c Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 28 Jul 2005 09:45:48 +0000 Subject: [PATCH] improved error handling --- lam-0.4/lib/config.inc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lam-0.4/lib/config.inc b/lam-0.4/lib/config.inc index a5f6b38b..666a63ce 100644 --- a/lam-0.4/lib/config.inc +++ b/lam-0.4/lib/config.inc @@ -168,6 +168,10 @@ class Config { $conffile = substr(__FILE__, 0, strlen(__FILE__) - 15) . "/config/" . $this->file . ".conf"; if (is_file($conffile) == True) { $file = fopen($conffile, "r"); + if (!$file) { + StatusMessage("ERROR", "", _("Unable to load configuration!") . " (" . $conffile . ")"); + return; + } while (!feof($file)) { $line = fgets($file, 1024); $line = trim($line); // remove spaces at the beginning and end @@ -202,6 +206,10 @@ class Config { $conffile = substr(__FILE__, 0, strlen(__FILE__) - 15) . "/config/" . $this->file . ".conf"; if (is_file($conffile) == True) { $file = fopen($conffile, "r"); + if (!$file) { + StatusMessage("ERROR", "", _("Cannot open config file!") . " (" . $conffile . ")"); + return; + } $file_array = array(); // read config file while (!feof($file)) { @@ -719,6 +727,10 @@ class CfgMain { $conffile = substr(__FILE__, 0, strlen(__FILE__) - 15) . "/config/config.cfg"; if (is_file($conffile) == True) { $file = fopen($conffile, "r"); + if (!$file) { + StatusMessage("ERROR", "", _("Unable to load configuration!") . " (" . $conffile . ")"); + return; + } while (!feof($file)) { $line = fgets($file, 1024); $line = trim($line); // remove spaces at the beginning and end @@ -747,6 +759,10 @@ class CfgMain { // booleans to check if value was already saved $save_password = $save_default = False; $file = fopen($conffile, "r"); + if (!$file) { + StatusMessage("ERROR", "", _("Cannot open config file!") . " (" . $conffile . ")"); + return; + } $file_array = array(); // read config file while (!feof($file)) {