From d39322fdd72f5680b38b72e3ae7cf7e8558d822e Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Thu, 17 Aug 2006 03:16:14 +0000 Subject: [PATCH] Ripping out more stuff that is now implemented elsewhere --- kernel.php | 216 ----------------------------------------------------- 1 file changed, 216 deletions(-) diff --git a/kernel.php b/kernel.php index 181c195..d3ad141 100644 --- a/kernel.php +++ b/kernel.php @@ -92,19 +92,7 @@ class ISSO * @var array */ private $modules = array(); - - // ################################################################### - /** - * Constructor - */ - public function __construct() - { - $GLOBALS['isso:callback'] = null; - // error reporting - set_error_handler(array(&$this, '_error_handler')); - } - // ################################################################### /** * Prints a list of all currently loaded framework modules @@ -140,210 +128,6 @@ class ISSO } } - // ################################################################### - /** - * Prints an ISSO message - * - * @param string The title of the message - * @param string The content of the message - * @param integer Type of message to be printed - * @param bool Return the output? - * @param bool Show the debug stack? - * @param integer Message width - * - * @return mixed Output or null - */ - public function message($title, $message, $type, $return = false, $stack = true, $width = 500) - { - switch ($type) - { - // Message - case 1: - $prefix = 'Message'; - $color = '#669900'; - $font = '#000000'; - break; - - // Warning - case 2: - $prefix = 'Warning'; - $color = '#003399'; - $font = '#FFFFFF'; - break; - - case 3: - $prefix = 'Error'; - $color = '#990000'; - $font = '#EFEFEF'; - break; - } - - $backtrace = debug_backtrace(); - array_shift($backtrace); - - if (isset($backtrace[0]) AND $backtrace[0]['function'] == '_error_handler') - { - array_shift($backtrace); - } - - $trace = $this->format_debug_trace($backtrace); - - $output = "\n
\n"; - $output .= "\n\n\t\n"; - $output .= "\n\n\t\n"; - $output .= (($stack AND $GLOBALS['isso:callback']->debug) ? "\n\n\t\n" : ''); - $output .= "\n
$prefix: $title
$message
Debug Stack: 
" . implode("\n", $trace) . "
\n
\n"; - - if ($return) - { - return $output; - } - else - { - print($output); - } - } - - // ################################################################### - /** - * Prepares a debug_backtrace() array for output to the browser by - * compressing the array into visible text - * - * @param array debug_backtrace() array - * - * @return array Formatted trace output - */ - public function format_debug_trace($backtrace) - { - $trace = array(); - foreach ($backtrace AS $i => $step) - { - $args = ''; - $file = $step['file'] . ':' . $step['line']; - $funct = (isset($step['class']) ? $step['class'] . '::' . $step['function'] : $step['function']); - - if (isset($step['args']) AND is_array($step['args'])) - { - // we need to do this so we don't get "Array to string conversion" notices - foreach ($step['args'] AS $id => $arg) - { - if (is_array($arg)) - { - $step['args']["$id"] = 'Array'; - } - } - $args = implode(', ', $step['args']); - } - - $trace[] = "#$i $funct($args) called at [$file]"; - } - - return $trace; - } - - // ################################################################### - /** - * Custom error handler for ISSO; only handle E_WARNING, E_NOTICE, - * E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE - * - * @param integer Error number - * @param string Error message string - * @param string File that contains the error - * @param string The line number of the error - * @param string The active symbol table at which point the error occurred - */ - public function _error_handler($errno, $errstr, $errfile, $errline, $errcontext) - { - $level = ini_get('error_reporting'); - - switch ($errno) - { - // Fatal - case E_USER_ERROR: - $title = 'Fatal'; - $mode = 3; - if (!($level & E_USER_ERROR)) - { - return; - } - break; - - // Error - case E_USER_WARNING: - case E_WARNING: - $title = 'Warning'; - $mode = 2; - if (! (($level & E_USER_WARNING) AND ($level & E_WARNING)) ) - { - return; - } - break; - - // Warning - case E_USER_NOTICE: - case E_NOTICE: - default: - $title = 'Notice'; - $mode = 1; - if (! (($level & E_USER_NOTICE) AND ($level & E_NOTICE)) ) - { - return; - } - break; - } - - $errstr .= " in $errfile on line $errline"; - - $errstr = str_replace(array(getcwd(), dirname(getcwd())), '', $errstr); - - $this->message($title, $errstr, $mode); - - if ($errno == E_USER_ERROR) - { - exit; - } - } - - // ################################################################### - /** - * Creates a table that explains the error reporting levels and their - * state - */ - public function explain_error_reporting() - { - $levels = array( - 'E_ERROR' => E_ERROR, - 'E_WARNING' => E_WARNING, - 'E_PARSE' => E_PARSE, - 'E_NOTICE' => E_NOTICE, - 'E_CORE_ERROR' => E_CORE_ERROR, - 'E_CORE_WARNING' => E_CORE_WARNING, - 'E_COMPILE_ERROR' => E_COMPILE_ERROR, - 'E_COMPILE_WARNING' => E_COMPILE_WARNING, - 'E_USER_ERROR' => E_USER_ERROR, - 'E_USER_WARNING' => E_USER_WARNING, - 'E_USER_NOTICE' => E_USER_NOTICE, - 'E_ALL' => E_ALL, - 'E_STRICT' => E_STRICT - ); - - $table = ''; - - foreach ($levels AS $name => $value) - { - $table .= ' - - - - '; - } - - $table .= ' -
' . $name . '' . (ini_get('error_reporting') & $value) . '
'; - - $this->message('Error Reporting', $table, 1); - } - // ################################################################### /** * Constructs a debug information box that contains various debugging -- 2.22.5