Index: branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/debugger.php =================================================================== diff -u -r7008 -r7021 --- branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/debugger.php (.../debugger.php) (revision 7008) +++ branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/debugger.php (.../debugger.php) (revision 7021) @@ -70,15 +70,15 @@ * @var string */ var $baseURL = ''; - + function Debugger() { global $start, $dbg_options; // check if user haven't defined DEBUG_MODE contant directly if (defined('DEBUG_MODE') && DEBUG_MODE) { die('error: contant DEBUG_MODE defined directly, please use $dbg_options array instead'); } - + // check IP before enabling debug mode $ip_match = false; $ip_addresses = isset($dbg_options['DBG_IP']) ? explode(';', $dbg_options['DBG_IP']) : Array (); @@ -88,12 +88,12 @@ break; } } - + if (!$ip_match) { define('DEBUG_MODE', 0); return ; } - + // debug is allowed for user, continue initialization $this->InitDebugger(); $this->profileStart('kernel4_startup', 'Startup and Initialization of kernel4', $start); @@ -105,15 +105,15 @@ $this->scrollbarWidth = $this->isGecko() ? 22 : 25; // vertical scrollbar width differs in Firefox and other browsers $this->appendRequest(); } - + /** * Set's default values to constants debugger uses * */ function InitDebugger() { global $dbg_options; - + unset($_REQUEST['debug_host'], $_REQUEST['debug_fastfile'], $dbg_options['DBG_IP']); // this var messed up whole detection stuff :( // Detect fact, that this session beeing debugged by Zend Studio @@ -123,7 +123,7 @@ break; } } - + $this->safeDefine('DBG_ZEND_PRESENT', 0); // set this constant value to 0 (zero) to debug debugger using Zend Studio // set default values for debugger constants @@ -146,7 +146,7 @@ // user defined options override debugger defaults $dbg_constMap = $this->array_merge_recursive2($dbg_constMap, $dbg_options); - + foreach ($dbg_constMap as $dbg_constName => $dbg_constValue) { $this->safeDefine($dbg_constName, $dbg_constValue); } @@ -165,17 +165,17 @@ function array_merge_recursive2($paArray1, $paArray2) { - if (!is_array($paArray1) or !is_array($paArray2)) { + if (!is_array($paArray1) or !is_array($paArray2)) { return $paArray2; } - + foreach ($paArray2 AS $sKey2 => $sValue2) { $paArray1[$sKey2] = isset($paArray1[$sKey2]) ? array_merge_recursive2($paArray1[$sKey2], $sValue2) : $sValue2; } - + return $paArray1; } - + function netMatch($network, $ip) { $network = trim($network); @@ -212,7 +212,7 @@ return ($ip >= $from && $ip <= $to); } } - + function InitReport() { if (!class_exists('kApplication')) return false; @@ -388,7 +388,8 @@ if (is_null($array)) { return 'NULL'; - }elseif (!is_array($array)) { + } + elseif (!is_array($array)) { if ($cut_min_length != -1 && strlen($array) > $cut_min_length) { $array = substr($array, 0, $cut_first).' ...'; }