diff --git a/system/functions.php b/system/functions.php index fb2c0413..c3e5f91a 100644 --- a/system/functions.php +++ b/system/functions.php @@ -1202,7 +1202,7 @@ function convert_bytes($size) function log_append($file, $str) { $f = fopen(LOGS . $file, 'a'); - fwrite($f, $str . PHP_EOL); + fwrite($f, '[' . date(DateTime::RFC1123) . '] ' . $str . PHP_EOL); fclose($f); } @@ -1215,8 +1215,11 @@ function load_config_lua($filename) die('ERROR: Cannot find ' . $filename . ' file.'); $tempFile = @tempnam('/tmp', 'lua'); - $file = fopen($tempFile, 'w'); - if(!$file) die('Cannot load server config!'); + $file = @fopen($tempFile, 'w'); + if(!$file) { + log_append('error.log', '[functions.php] Cannot load config.lua file. Error: ' . print_r(error_get_last(), true)); + die('Cannot load server config! More info in system/logs/error.log file.'); + } // TODO: new parser that will also load dofile() includes diff --git a/system/init.php b/system/init.php index 7fef463a..2e21d52e 100644 --- a/system/init.php +++ b/system/init.php @@ -19,7 +19,7 @@ if($config['server_path'][strlen($config['server_path']) - 1] != '/') $config['server_path'] .= '/'; // enable gzip compression if supported by the browser -if($config['gzip_output'] && (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false) && function_exists('ob_gzhandler')) +if($config['gzip_output'] && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('ob_gzhandler')) ob_start('ob_gzhandler'); // cache diff --git a/system/libs/pot/OTS_Group.php b/system/libs/pot/OTS_Group.php index 45041978..bca4c793 100644 --- a/system/libs/pot/OTS_Group.php +++ b/system/libs/pot/OTS_Group.php @@ -47,7 +47,7 @@ class OTS_Group extends OTS_Row_DAO implements IteratorAggregate, Countable * * @param DOMElement $group Group info. */ - public function __construct($data) + public function __construct($data = array()) { $this->data = $data; } diff --git a/system/libs/pot/OTS_Groups_List.php b/system/libs/pot/OTS_Groups_List.php index b9829df0..6e32cb63 100644 --- a/system/libs/pot/OTS_Groups_List.php +++ b/system/libs/pot/OTS_Groups_List.php @@ -51,6 +51,12 @@ class OTS_Groups_List implements IteratorAggregate, Countable global $config; $file = $config['data_path'] . 'XML/groups.xml'; } + + if(!@file_exists($file)) { + error('Error: Cannot load groups.xml. More info in system/logs/error.log file.'); + log_append('error.log', '[OTS_Groups_List.php] Fatal error: Cannot load groups.xml (' . $file . '). It doesnt exist.'); + return; + } global $cache; @@ -63,7 +69,9 @@ class OTS_Groups_List implements IteratorAggregate, Countable else { $groups = new DOMDocument(); - $groups->load($file); + error('Error: Cannot load groups.xml. More info in system/logs/error.log file.'); + return; + } // loads groups foreach( $groups->getElementsByTagName('group') as $group) @@ -85,8 +93,10 @@ class OTS_Groups_List implements IteratorAggregate, Countable { // loads DOM document $groups = new DOMDocument(); - $groups->load($file); - + error('Error: Cannot load groups.xml. More info in system/logs/error.log file.'); + return; + } + // loads groups foreach($groups->getElementsByTagName('group') as $group) { diff --git a/system/libs/pot/OTS_Player.php b/system/libs/pot/OTS_Player.php index cce07abd..3b8a79aa 100644 --- a/system/libs/pot/OTS_Player.php +++ b/system/libs/pot/OTS_Player.php @@ -644,7 +644,8 @@ class OTS_Player extends OTS_Row_DAO if($tmp) return $tmp; - echo 'error while loading group..'; + return new OTS_Group(); + // echo 'error while loading group..'; /* $_id = $this->data['group_id']; $tmpGroup = new OTS_Group;