improved error handling

This commit is contained in:
Roland Gruber 2005-07-28 09:45:48 +00:00
parent c2de13f7c1
commit c652f37e62
1 changed files with 16 additions and 0 deletions

View File

@ -168,6 +168,10 @@ class Config {
$conffile = substr(__FILE__, 0, strlen(__FILE__) - 15) . "/config/" . $this->file . ".conf"; $conffile = substr(__FILE__, 0, strlen(__FILE__) - 15) . "/config/" . $this->file . ".conf";
if (is_file($conffile) == True) { if (is_file($conffile) == True) {
$file = fopen($conffile, "r"); $file = fopen($conffile, "r");
if (!$file) {
StatusMessage("ERROR", "", _("Unable to load configuration!") . " (" . $conffile . ")");
return;
}
while (!feof($file)) { while (!feof($file)) {
$line = fgets($file, 1024); $line = fgets($file, 1024);
$line = trim($line); // remove spaces at the beginning and end $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"; $conffile = substr(__FILE__, 0, strlen(__FILE__) - 15) . "/config/" . $this->file . ".conf";
if (is_file($conffile) == True) { if (is_file($conffile) == True) {
$file = fopen($conffile, "r"); $file = fopen($conffile, "r");
if (!$file) {
StatusMessage("ERROR", "", _("Cannot open config file!") . " (" . $conffile . ")");
return;
}
$file_array = array(); $file_array = array();
// read config file // read config file
while (!feof($file)) { while (!feof($file)) {
@ -719,6 +727,10 @@ class CfgMain {
$conffile = substr(__FILE__, 0, strlen(__FILE__) - 15) . "/config/config.cfg"; $conffile = substr(__FILE__, 0, strlen(__FILE__) - 15) . "/config/config.cfg";
if (is_file($conffile) == True) { if (is_file($conffile) == True) {
$file = fopen($conffile, "r"); $file = fopen($conffile, "r");
if (!$file) {
StatusMessage("ERROR", "", _("Unable to load configuration!") . " (" . $conffile . ")");
return;
}
while (!feof($file)) { while (!feof($file)) {
$line = fgets($file, 1024); $line = fgets($file, 1024);
$line = trim($line); // remove spaces at the beginning and end $line = trim($line); // remove spaces at the beginning and end
@ -747,6 +759,10 @@ class CfgMain {
// booleans to check if value was already saved // booleans to check if value was already saved
$save_password = $save_default = False; $save_password = $save_default = False;
$file = fopen($conffile, "r"); $file = fopen($conffile, "r");
if (!$file) {
StatusMessage("ERROR", "", _("Cannot open config file!") . " (" . $conffile . ")");
return;
}
$file_array = array(); $file_array = array();
// read config file // read config file
while (!feof($file)) { while (!feof($file)) {