diff options
Diffstat (limited to 'lib/log.lib.php')
| -rw-r--r-- | lib/log.lib.php | 168 |
1 files changed, 84 insertions, 84 deletions
diff --git a/lib/log.lib.php b/lib/log.lib.php index 37a1c790..19aad964 100644 --- a/lib/log.lib.php +++ b/lib/log.lib.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,25 +25,25 @@ * Logs an event to a defined log file based on config options */ function log_event($username, $event_name, $event_description, $log_name) { - /* Set it up here to make sure it's _always_ the same */ - $time = time(); - // Turn time into strings - $log_day = date('Ymd', $time); - $log_time = date('Y-m-d H:i:s', $time); + /* Set it up here to make sure it's _always_ the same */ + $time = time(); + // Turn time into strings + $log_day = date('Ymd', $time); + $log_time = date('Y-m-d H:i:s', $time); - /* must have some name */ - $log_name = $log_name ? $log_name : 'ampache'; - $username = $username ? $username : 'ampache'; + /* must have some name */ + $log_name = $log_name ? $log_name : 'ampache'; + $username = $username ? $username : 'ampache'; - $log_filename = Config::get('log_path') . "/$log_name.$log_day.log"; - $log_line = "$log_time [$username] ($event_name) -> $event_description \n"; + $log_filename = Config::get('log_path') . "/$log_name.$log_day.log"; + $log_line = "$log_time [$username] ($event_name) -> $event_description \n"; - // Do the deed - $log_write = error_log($log_line, 3, $log_filename); + // Do the deed + $log_write = error_log($log_line, 3, $log_filename); - if (!$log_write) { - echo "Warning: Unable to write to log ($log_filename) Please check your log_path variable in ampache.cfg.php"; - } + if (!$log_write) { + echo "Warning: Unable to write to log ($log_filename) Please check your log_path variable in ampache.cfg.php"; + } } // log_event @@ -54,67 +54,67 @@ function log_event($username, $event_name, $event_description, $log_name) { */ function ampache_error_handler($errno, $errstr, $errfile, $errline) { - /* Default level of 1 */ - $level = 1; - - switch ($errno) { - case E_WARNING: - $error_name = 'Runtime Error'; - break; - case E_COMPILE_WARNING: - case E_NOTICE: - case E_CORE_WARNING: - $error_name = 'Warning'; - $level = 6; - break; - case E_ERROR: - $error_name = 'Fatal run-time Error'; - break; - case E_PARSE: - $error_name = 'Parse Error'; - break; - case E_CORE_ERROR: - $error_name = 'Fatal Core Error'; - break; - case E_COMPILE_ERROR: - $error_name = 'Zend run-time Error'; - break; - case E_STRICT: - $error_name = "Strict Error"; - break; - default: - $error_name = "Error"; - $level = 2; - break; - } // end switch - - // List of things that should only be displayed if they told us to turn - // on the firehose - $ignores = array( - // We know var is deprecated, shut up - 'var: Deprecated. Please use the public/private/protected modifiers', - // getid3 spews errors, yay! - 'getimagesize() [', - 'Non-static method getid3', - 'Assigning the return value of new by reference is deprecated', - // The XML-RPC lib is broken (kinda) - 'used as offset, casting to integer' - ); - - foreach($ignores as $ignore) { - if (strpos($errstr, $ignore) !== false) { - $error_name = 'Ignored ' . $error_name; - $level = 7; - } - } - - if (strpos($errstr,"date.timezone") !== false) { - $error_name = 'Warning'; - $errstr = 'You have not set a valid timezone (date.timezone) in your php.ini file. This may cause display issues with dates. This warning is non-critical and not caused by Ampache.'; - } - - $log_line = "[$error_name] $errstr in file $errfile($errline)"; - debug_event('PHP', $log_line, $level, '', 'ampache'); + /* Default level of 1 */ + $level = 1; + + switch ($errno) { + case E_WARNING: + $error_name = 'Runtime Error'; + break; + case E_COMPILE_WARNING: + case E_NOTICE: + case E_CORE_WARNING: + $error_name = 'Warning'; + $level = 6; + break; + case E_ERROR: + $error_name = 'Fatal run-time Error'; + break; + case E_PARSE: + $error_name = 'Parse Error'; + break; + case E_CORE_ERROR: + $error_name = 'Fatal Core Error'; + break; + case E_COMPILE_ERROR: + $error_name = 'Zend run-time Error'; + break; + case E_STRICT: + $error_name = "Strict Error"; + break; + default: + $error_name = "Error"; + $level = 2; + break; + } // end switch + + // List of things that should only be displayed if they told us to turn + // on the firehose + $ignores = array( + // We know var is deprecated, shut up + 'var: Deprecated. Please use the public/private/protected modifiers', + // getid3 spews errors, yay! + 'getimagesize() [', + 'Non-static method getid3', + 'Assigning the return value of new by reference is deprecated', + // The XML-RPC lib is broken (kinda) + 'used as offset, casting to integer' + ); + + foreach($ignores as $ignore) { + if (strpos($errstr, $ignore) !== false) { + $error_name = 'Ignored ' . $error_name; + $level = 7; + } + } + + if (strpos($errstr,"date.timezone") !== false) { + $error_name = 'Warning'; + $errstr = 'You have not set a valid timezone (date.timezone) in your php.ini file. This may cause display issues with dates. This warning is non-critical and not caused by Ampache.'; + } + + $log_line = "[$error_name] $errstr in file $errfile($errline)"; + debug_event('PHP', $log_line, $level, '', 'ampache'); } // ampache_error_handler @@ -126,15 +126,15 @@ function ampache_error_handler($errno, $errstr, $errfile, $errline) { */ function debug_event($type, $message, $level, $file = '', $username = '') { - if (!Config::get('debug') || $level > Config::get('debug_level')) { - return false; - } + if (!Config::get('debug') || $level > Config::get('debug_level')) { + return false; + } - if (!$username && isset($GLOBALS['user'])) { - $username = $GLOBALS['user']->username; - } + if (!$username && isset($GLOBALS['user'])) { + $username = $GLOBALS['user']->username; + } - log_event($username, $type, $message, $file); + log_event($username, $type, $message, $file); } // debug_event |