diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..9d8bc1d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vendor/firephp"]
+ path = vendor/firephp
+ url = git://github.com/cadorn/firephp-libs.git
diff --git a/classes/debugtoolbar.php b/classes/debugtoolbar.php
index ffa2961..bf5b3b6 100644
--- a/classes/debugtoolbar.php
+++ b/classes/debugtoolbar.php
@@ -1,411 +1,11 @@
set('queries', $queries['data'])
- ->set('query_count', $queries['count'])
- ->set('total_time', $queries['time'])
- ->set('total_memory', $queries['memory']);
- }
-
- // Files panel
- if (Kohana::config('debug_toolbar.panels.files') === TRUE)
- {
- $template->set('files', self::get_files());
- }
-
- // Modules panel
- if (Kohana::config('debug_toolbar.panels.modules') === TRUE)
- {
- $template->set('modules', self::get_modules());
- }
-
- // Routes panel
- if (Kohana::config('debug_toolbar.panels.routes') === TRUE)
- {
- $template->set('routes', self::get_routes());
- }
-
- // Custom data
- if (Kohana::config('debug_toolbar.panels.customs') === TRUE)
- {
- $template->set('customs', self::get_customs());
- }
-
- // FirePHP
- if (Kohana::config('debug_toolbar.firephp_enabled') === TRUE)
- {
- self::firephp();
- }
-
- // Set alignment for toolbar
- switch (Kohana::config('debug_toolbar.align'))
- {
- case 'right':
- case 'center':
- case 'left':
- $template->set('align', Kohana::config('debug_toolbar.align'));
- break;
- default:
- $template->set('align', 'left');
- }
-
- // Javascript for toolbar
- $template->set('scripts', file_get_contents(Kohana::find_file('views', 'toolbar', 'js')));
-
- // CSS for toolbar
- $styles = file_get_contents(Kohana::find_file('views', 'toolbar', 'css'));
-
- Profiler::stop($token);
-
- // Benchmarks panel
- if (Kohana::config('debug_toolbar.panels.benchmarks') === TRUE)
- {
- $template->set('benchmarks', self::get_benchmarks());
- }
-
- if ($output = Request::initial()->response()->body() and self::is_enabled())
- {
- // Try to add css just before the tag
- if (stripos($output, '') !== FALSE)
- {
- $output = str_ireplace('', $styles.'', $output);
- }
- else
- {
- // No tag found, append styles to output
- $template->set('styles', $styles);
- }
-
- // Try to add js and HTML just before the
tag not found, just append toolbar to output
- $output .= $template->render();
- }
-
- Request::initial()->response()->body($output);
- }
- else
- {
- $template->set('styles', $styles);
-
- return ($print ? $template->render() : $template);
- }
- }
-
- /**
- * Adds custom data to render in a separate tab
- *
- * @param string $tab_name
- * @param mixed $data
- * @return void
- */
- public static function add_custom($tab_name, $data)
- {
- self::$_custom_tabs[$tab_name] = $data;
- }
-
- /**
- * Get user vars
- *
- * @return array
- */
- public static function get_customs()
- {
- $result = array();
-
- foreach(self::$_custom_tabs as $tab => $data)
- {
- if (is_array($data) OR is_object($data))
- {
- $data = Debug::dump($data);
- }
-
- $result[$tab] = $data;
- }
-
- return $result;
- }
-
- /**
- * Retrieves query benchmarks from Database
- *
- * @return array
- */
- public static function get_queries()
- {
- if (self::$_queries !== FALSE)
- {
- return self::$_queries;
- }
-
- $result = array();
- $count = $time = $memory = 0;
-
- $groups = Profiler::groups();
- foreach(Database::$instances as $name => $db)
- {
- $group_name = 'database (' . strtolower($name) . ')';
- $group = arr::get($groups, $group_name, FALSE);
-
- if ($group)
- {
- $sub_time = $sub_memory = $sub_count = 0;
- foreach ($group as $query => $tokens)
- {
- $sub_count += count($tokens);
- foreach ($tokens as $token)
- {
- $total = Profiler::total($token);
- $sub_time += $total[0];
- $sub_memory += $total[1];
- $result[$name][] = array('name' => $query, 'time' => $total[0], 'memory' => $total[1]);
- }
- }
- $count += $sub_count;
- $time += $sub_time;
- $memory += $sub_memory;
- $result[$name]['total'] = array($sub_count, $sub_time, $sub_memory);
- }
- }
- self::$_queries = array('count' => $count, 'time' => $time, 'memory' => $memory, 'data' => $result);
-
- return self::$_queries;
- }
-
- /**
- * Creates a formatted array of all Benchmarks
- *
- * @return array formatted benchmarks
- */
- public static function get_benchmarks()
- {
- if (Kohana::$profiling == FALSE)
- {
- return array();
- }
-
- if (self::$_benchmarks !== FALSE)
- {
- return self::$_benchmarks;
- }
-
- $groups = Profiler::groups();
- $result = array();
- foreach(array_keys($groups) as $group)
- {
- if (strpos($group, 'database (') === FALSE)
- {
- foreach($groups[$group] as $name => $marks)
- {
- $stats = Profiler::stats($marks);
- $result[$group][] = array
- (
- 'name' => $name,
- 'count' => count($marks),
- 'total_time' => $stats['total']['time'],
- 'avg_time' => $stats['average']['time'],
- 'total_memory' => $stats['total']['memory'],
- 'avg_memory' => $stats['average']['memory'],
- );
- }
- }
- }
- // add total stats
- $total = Profiler::application();
- $result['application'] = array
- (
- 'count' => 1,
- 'total_time' => $total['current']['time'],
- 'avg_time' => $total['average']['time'],
- 'total_memory' => $total['current']['memory'],
- 'avg_memory' => $total['average']['memory'],
-
- );
-
- self::$_benchmarks = $result;
-
- return $result;
- }
-
- /**
- * Get list of included files
- *
- * @return array file currently included by php
- */
- public static function get_files()
- {
- $files = (array)get_included_files();
- sort($files);
- return $files;
- }
-
- /**
- * Get module list
- *
- * @return array module_name => module_path
- */
- public static function get_modules()
- {
- return Kohana::modules();
- }
-
- /**
- * Returns all application routes
- *
- * @return array
- */
- public static function get_routes()
- {
- return Route::all();
- }
-
- /**
- * Add toolbar data to FirePHP console
- *
- */
- private static function firephp()
- {
- $firephp = FirePHP::getInstance(TRUE);
- $firephp->fb('KOHANA DEBUG TOOLBAR:');
-
- // Globals
- $globals = array(
- 'Post' => empty($_POST) ? array() : $_POST,
- 'Get' => empty($_GET) ? array() : $_GET,
- 'Cookie' => empty($_COOKIE) ? array() : $_COOKIE,
- 'Session' => empty($_SESSION) ? array() : $_SESSION
- );
-
- foreach ($globals as $name => $global)
- {
- $table = array();
- $table[] = array($name,'Value');
-
- foreach((array)$global as $key => $value)
- {
- if (is_object($value))
- {
- $value = get_class($value).' [object]';
- }
-
- $table[] = array($key, $value);
- }
-
- $message = "$name: ".count($global).' variables';
-
- $firephp->fb(array($message, $table), FirePHP::TABLE);
- }
-
- // Database
- $query_stats = self::get_queries();
-
- //$total_time = $total_rows = 0;
- $table = array();
- $table[] = array('DB profile', 'SQL Statement','Time','Memory');
-
- foreach ((array)$query_stats['data'] as $db => $queries)
- {unset($queries['total']);
- foreach ($queries as $query)
- {
- $table[] = array(
- $db,
- str_replace("\n",' ',$query['name']),
- number_format($query['time']*1000, 3),
- number_format($query['memory']/1024, 3),
- );
- }
- }
-
- $message = 'Queries: '.$query_stats['count'].' SQL queries took '.
- number_format($query_stats['time'], 3).' seconds and '.$query_stats['memory'].' b';
-
- $firephp->fb(array($message, $table), FirePHP::TABLE);
-
- // Benchmarks
- $groups = self::get_benchmarks();
- // application benchmarks
- $total = array_pop($groups);
-
- $table = array();
- $table[] = array('Group', 'Benchmark', 'Count', 'Time', 'Memory');
-
- foreach ((array)$groups as $group => $benchmarks)
- {
- foreach ((array)$benchmarks as $name => $benchmark)
- {
- $table[] = array(
- ucfirst($group),
- ucwords($benchmark['name']),
- number_format($benchmark['total_time'], 3). ' s',
- text::bytes($benchmark['total_memory']),
- );
- }
- }
-
- $message = 'Application tooks '.number_format($total['total_time'], 3).' seconds and '.text::bytes($total['total_memory']).' memory';
-
- $firephp->fb(array($message, $table), FirePHP::TABLE);
- }
-
- /**
- * Determines if all the conditions are correct to display the toolbar
- * (pretty kludgy, I know)
- *
- * @returns bool toolbar enabled
- */
- public static function is_enabled()
- {
- // Don't auto render toolbar for ajax requests
- if (Request::initial()->is_ajax())
- return FALSE;
-
- // Don't auto render toolbar if $_GET['debug'] = 'false'
- if (isset($_GET['debug']) and strtolower($_GET['debug']) == 'false')
- return FALSE;
-
- // Don't auto render if auto_render config is FALSE
- if (Kohana::config('debug_toolbar.auto_render') !== TRUE)
- return FALSE;
-
- // Auto render if secret key isset
- $secret_key = Kohana::config('debug_toolbar.secret_key');
- if ($secret_key !== FALSE and isset($_GET[$secret_key]))
- return TRUE;
-
- // Don't auto render when in PRODUCTION (this can obviously be
- // overridden by the above secret key)
- if (Kohana::$environment == Kohana::PRODUCTION)
- return FALSE;
-
- return TRUE;
- }
-}
\ No newline at end of file
+/**
+ * Kohana v3 Debug Toolbar
+ *
+ * @package Debug Toolbar
+ * @author Aaron Forsander
+ * @author Brotkin Ivan (BIakaVeron)
+ * @author Sergei Gladkovskiy
+ */
+abstract class DebugToolbar extends Kohana_DebugToolbar {}
\ No newline at end of file
diff --git a/classes/firephp.php b/classes/firephp.php
deleted file mode 100644
index ff798c2..0000000
--- a/classes/firephp.php
+++ /dev/null
@@ -1,1376 +0,0 @@
-
- * @license http://www.opensource.org/licenses/bsd-license.php
- * @package FirePHP
- */
-
-
-/**
- * Sends the given data to the FirePHP Firefox Extension.
- * The data can be displayed in the Firebug Console or in the
- * "Server" request tab.
- *
- * For more information see: http://www.firephp.org/
- *
- * @copyright Copyright (C) 2007-2008 Christoph Dorn
- * @author Christoph Dorn
- * @license http://www.opensource.org/licenses/bsd-license.php
- * @package FirePHP
- */
-class FirePHP {
-
- /**
- * FirePHP version
- *
- * @var string
- */
- const VERSION = '0.2.1';
-
- /**
- * Firebug LOG level
- *
- * Logs a message to firebug console.
- *
- * @var string
- */
- const LOG = 'LOG';
-
- /**
- * Firebug INFO level
- *
- * Logs a message to firebug console and displays an info icon before the message.
- *
- * @var string
- */
- const INFO = 'INFO';
-
- /**
- * Firebug WARN level
- *
- * Logs a message to firebug console, displays an warning icon before the message and colors the line turquoise.
- *
- * @var string
- */
- const WARN = 'WARN';
-
- /**
- * Firebug ERROR level
- *
- * Logs a message to firebug console, displays an error icon before the message and colors the line yellow. Also increments the firebug error count.
- *
- * @var string
- */
- const ERROR = 'ERROR';
-
- /**
- * Dumps a variable to firebug's server panel
- *
- * @var string
- */
- const DUMP = 'DUMP';
-
- /**
- * Displays a stack trace in firebug console
- *
- * @var string
- */
- const TRACE = 'TRACE';
-
- /**
- * Displays an exception in firebug console
- *
- * Increments the firebug error count.
- *
- * @var string
- */
- const EXCEPTION = 'EXCEPTION';
-
- /**
- * Displays an table in firebug console
- *
- * @var string
- */
- const TABLE = 'TABLE';
-
- /**
- * Starts a group in firebug console
- *
- * @var string
- */
- const GROUP_START = 'GROUP_START';
-
- /**
- * Ends a group in firebug console
- *
- * @var string
- */
- const GROUP_END = 'GROUP_END';
-
- /**
- * Singleton instance of FirePHP
- *
- * @var FirePHP
- */
- protected static $instance = null;
-
- /**
- * Wildfire protocol message index
- *
- * @var int
- */
- protected $messageIndex = 1;
-
- /**
- * Options for the library
- *
- * @var array
- */
- protected $options = array();
-
- /**
- * Filters used to exclude object members when encoding
- *
- * @var array
- */
- protected $objectFilters = array();
-
- /**
- * A stack of objects used to detect recursion during object encoding
- *
- * @var object
- */
- protected $objectStack = array();
-
- /**
- * Flag to enable/disable logging
- *
- * @var boolean
- */
- protected $enabled = true;
-
- /**
- * The object constructor
- */
- function __construct() {
- $this->options['maxObjectDepth'] = 10;
- $this->options['maxArrayDepth'] = 20;
- $this->options['useNativeJsonEncode'] = true;
- $this->options['includeLineNumbers'] = true;
- }
-
- /**
- * When the object gets serialized only include specific object members.
- *
- * @return array
- */
- public function __sleep() {
- return array('options','objectFilters','enabled');
- }
-
- /**
- * Gets singleton instance of FirePHP
- *
- * @param boolean $AutoCreate
- * @return FirePHP
- */
- public static function getInstance($AutoCreate=false) {
- if($AutoCreate===true && !self::$instance) {
- self::init();
- }
- return self::$instance;
- }
-
- /**
- * Creates FirePHP object and stores it for singleton access
- *
- * @return FirePHP
- */
- public static function init() {
- return self::$instance = new self();
- }
-
- /**
- * Enable and disable logging to Firebug
- *
- * @param boolean $Enabled TRUE to enable, FALSE to disable
- * @return void
- */
- public function setEnabled($Enabled) {
- $this->enabled = $Enabled;
- }
-
- /**
- * Check if logging is enabled
- *
- * @return boolean TRUE if enabled
- */
- public function getEnabled() {
- return $this->enabled;
- }
-
- /**
- * Specify a filter to be used when encoding an object
- *
- * Filters are used to exclude object members.
- *
- * @param string $Class The class name of the object
- * @param array $Filter An array or members to exclude
- * @return void
- */
- public function setObjectFilter($Class, $Filter) {
- $this->objectFilters[$Class] = $Filter;
- }
-
- /**
- * Set some options for the library
- *
- * Options:
- * - maxObjectDepth: The maximum depth to traverse objects (default: 10)
- * - maxArrayDepth: The maximum depth to traverse arrays (default: 20)
- * - useNativeJsonEncode: If true will use json_encode() (default: true)
- * - includeLineNumbers: If true will include line numbers and filenames (default: true)
- *
- * @param array $Options The options to be set
- * @return void
- */
- public function setOptions($Options) {
- $this->options = array_merge($this->options,$Options);
- }
-
- /**
- * Register FirePHP as your error handler
- *
- * Will throw exceptions for each php error.
- */
- public function registerErrorHandler()
- {
- //NOTE: The following errors will not be caught by this error handler:
- // E_ERROR, E_PARSE, E_CORE_ERROR,
- // E_CORE_WARNING, E_COMPILE_ERROR,
- // E_COMPILE_WARNING, E_STRICT
-
- set_error_handler(array($this,'errorHandler'));
- }
-
- /**
- * FirePHP's error handler
- *
- * Throws exception for each php error that will occur.
- *
- * @param int $errno
- * @param string $errstr
- * @param string $errfile
- * @param int $errline
- * @param array $errcontext
- */
- public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext)
- {
- // Don't throw exception if error reporting is switched off
- if (error_reporting() == 0) {
- return;
- }
- // Only throw exceptions for errors we are asking for
- if (error_reporting() & $errno) {
- throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
- }
- }
-
- /**
- * Register FirePHP as your exception handler
- */
- public function registerExceptionHandler()
- {
- set_exception_handler(array($this,'exceptionHandler'));
- }
-
- /**
- * FirePHP's exception handler
- *
- * Logs all exceptions to your firebug console and then stops the script.
- *
- * @param Exception $Exception
- * @throws Exception
- */
- function exceptionHandler($Exception) {
- $this->fb($Exception);
- }
-
- /**
- * Set custom processor url for FirePHP
- *
- * @param string $URL
- */
- public function setProcessorUrl($URL)
- {
- $this->setHeader('X-FirePHP-ProcessorURL', $URL);
- }
-
- /**
- * Set custom renderer url for FirePHP
- *
- * @param string $URL
- */
- public function setRendererUrl($URL)
- {
- $this->setHeader('X-FirePHP-RendererURL', $URL);
- }
-
- /**
- * Start a group for following messages
- *
- * @param string $Name
- * @return true
- * @throws Exception
- */
- public function group($Name) {
- return $this->fb(null, $Name, FirePHP::GROUP_START);
- }
-
- /**
- * Ends a group you have started before
- *
- * @return true
- * @throws Exception
- */
- public function groupEnd() {
- return $this->fb(null, null, FirePHP::GROUP_END);
- }
-
- /**
- * Log object with label to firebug console
- *
- * @see FirePHP::LOG
- * @param mixes $Object
- * @param string $Label
- * @return true
- * @throws Exception
- */
- public function log($Object, $Label=null) {
- return $this->fb($Object, $Label, FirePHP::LOG);
- }
-
- /**
- * Log object with label to firebug console
- *
- * @see FirePHP::INFO
- * @param mixes $Object
- * @param string $Label
- * @return true
- * @throws Exception
- */
- public function info($Object, $Label=null) {
- return $this->fb($Object, $Label, FirePHP::INFO);
- }
-
- /**
- * Log object with label to firebug console
- *
- * @see FirePHP::WARN
- * @param mixes $Object
- * @param string $Label
- * @return true
- * @throws Exception
- */
- public function warn($Object, $Label=null) {
- return $this->fb($Object, $Label, FirePHP::WARN);
- }
-
- /**
- * Log object with label to firebug console
- *
- * @see FirePHP::ERROR
- * @param mixes $Object
- * @param string $Label
- * @return true
- * @throws Exception
- */
- public function error($Object, $Label=null) {
- return $this->fb($Object, $Label, FirePHP::ERROR);
- }
-
- /**
- * Dumps key and variable to firebug server panel
- *
- * @see FirePHP::DUMP
- * @param string $Key
- * @param mixed $Variable
- * @return true
- * @throws Exception
- */
- public function dump($Key, $Variable) {
- return $this->fb($Variable, $Key, FirePHP::DUMP);
- }
-
- /**
- * Log a trace in the firebug console
- *
- * @see FirePHP::TRACE
- * @param string $Label
- * @return true
- * @throws Exception
- */
- public function trace($Label) {
- return $this->fb($Label, FirePHP::TRACE);
- }
-
- /**
- * Log a table in the firebug console
- *
- * @see FirePHP::TABLE
- * @param string $Label
- * @param string $Table
- * @return true
- * @throws Exception
- */
- public function table($Label, $Table) {
- return $this->fb($Table, $Label, FirePHP::TABLE);
- }
-
- /**
- * Check if FirePHP is installed on client
- *
- * @return boolean
- */
- public function detectClientExtension() {
- /* Check if FirePHP is installed on client */
- if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) ||
- !version_compare($m[1][0],'0.0.6','>=')) {
- return false;
- }
- return true;
- }
-
- /**
- * Log varible to Firebug
- *
- * @see http://www.firephp.org/Wiki/Reference/Fb
- * @param mixed $Object The variable to be logged
- * @return true Return TRUE if message was added to headers, FALSE otherwise
- * @throws Exception
- */
- public function fb($Object) {
-
- if(!$this->enabled) {
- return false;
- }
-
- if (headers_sent($filename, $linenum)) {
- throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
- }
-
- $Type = null;
- $Label = null;
-
- if(func_num_args()==1) {
- } else
- if(func_num_args()==2) {
- switch(func_get_arg(1)) {
- case self::LOG:
- case self::INFO:
- case self::WARN:
- case self::ERROR:
- case self::DUMP:
- case self::TRACE:
- case self::EXCEPTION:
- case self::TABLE:
- case self::GROUP_START:
- case self::GROUP_END:
- $Type = func_get_arg(1);
- break;
- default:
- $Label = func_get_arg(1);
- break;
- }
- } else
- if(func_num_args()==3) {
- $Type = func_get_arg(2);
- $Label = func_get_arg(1);
- } else {
- throw $this->newException('Wrong number of arguments to fb() function!');
- }
-
-
- if(!$this->detectClientExtension()) {
- return false;
- }
-
- $meta = array();
- $skipFinalObjectEncode = false;
-
- if($Object instanceof Exception) {
-
- $meta['file'] = $this->_escapeTraceFile($Object->getFile());
- $meta['line'] = $Object->getLine();
-
- $trace = $Object->getTrace();
- if($Object instanceof ErrorException
- && isset($trace[0]['function'])
- && $trace[0]['function']=='errorHandler'
- && isset($trace[0]['class'])
- && $trace[0]['class']=='FirePHP') {
-
- $severity = false;
- switch($Object->getSeverity()) {
- case E_WARNING: $severity = 'E_WARNING'; break;
- case E_NOTICE: $severity = 'E_NOTICE'; break;
- case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
- case E_USER_WARNING: $severity = 'E_USER_WARNING'; break;
- case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break;
- case E_STRICT: $severity = 'E_STRICT'; break;
- case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break;
- case E_DEPRECATED: $severity = 'E_DEPRECATED'; break;
- case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break;
- }
-
- $Object = array('Class'=>get_class($Object),
- 'Message'=>$severity.': '.$Object->getMessage(),
- 'File'=>$this->_escapeTraceFile($Object->getFile()),
- 'Line'=>$Object->getLine(),
- 'Type'=>'trigger',
- 'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
- $skipFinalObjectEncode = true;
- } else {
- $Object = array('Class'=>get_class($Object),
- 'Message'=>$Object->getMessage(),
- 'File'=>$this->_escapeTraceFile($Object->getFile()),
- 'Line'=>$Object->getLine(),
- 'Type'=>'throw',
- 'Trace'=>$this->_escapeTrace($trace));
- $skipFinalObjectEncode = true;
- }
- $Type = self::EXCEPTION;
-
- } else
- if($Type==self::TRACE) {
-
- $trace = debug_backtrace();
- if(!$trace) return false;
- for( $i=0 ; $i_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
- || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
- /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
- } else
- if(isset($trace[$i]['class'])
- && isset($trace[$i+1]['file'])
- && $trace[$i]['class']=='FirePHP'
- && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
- /* Skip fb() */
- } else
- if($trace[$i]['function']=='fb'
- || $trace[$i]['function']=='trace'
- || $trace[$i]['function']=='send') {
- $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
- 'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
- 'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
- 'Message'=>$trace[$i]['args'][0],
- 'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
- 'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
- 'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
- 'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
-
- $skipFinalObjectEncode = true;
- $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
- $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
- break;
- }
- }
-
- } else
- if($Type==self::TABLE) {
-
- if(isset($Object[0]) && is_string($Object[0])) {
- $Object[1] = $this->encodeTable($Object[1]);
- } else {
- $Object = $this->encodeTable($Object);
- }
-
- $skipFinalObjectEncode = true;
-
- } else {
- if($Type===null) {
- $Type = self::LOG;
- }
- }
-
- if($this->options['includeLineNumbers']) {
- if(!isset($meta['file']) || !isset($meta['line'])) {
-
- $trace = debug_backtrace();
- for( $i=0 ; $trace && $i_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
- || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
- /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
- } else
- if(isset($trace[$i]['class'])
- && isset($trace[$i+1]['file'])
- && $trace[$i]['class']=='FirePHP'
- && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
- /* Skip fb() */
- } else
- if(isset($trace[$i]['file'])
- && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
- /* Skip FB::fb() */
- } else {
- $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
- $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
- break;
- }
- }
-
- }
- } else {
- unset($meta['file']);
- unset($meta['line']);
- }
-
- $this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
- $this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
-
- $structure_index = 1;
- if($Type==self::DUMP) {
- $structure_index = 2;
- $this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
- } else {
- $this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
- }
-
- if($Type==self::DUMP) {
- $msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
- } else {
- $msg_meta = array('Type'=>$Type);
- if($Label!==null) {
- $msg_meta['Label'] = $Label;
- }
- if(isset($meta['file'])) {
- $msg_meta['File'] = $meta['file'];
- }
- if(isset($meta['line'])) {
- $msg_meta['Line'] = $meta['line'];
- }
- $msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
- }
-
- $parts = explode("\n",chunk_split($msg, 5000, "\n"));
-
- for( $i=0 ; $i2) {
- // Message needs to be split into multiple parts
- $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
- (($i==0)?strlen($msg):'')
- . '|' . $part . '|'
- . (($isetHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
- strlen($part) . '|' . $part . '|');
- }
-
- $this->messageIndex++;
-
- if ($this->messageIndex > 99999) {
- throw new Exception('Maximum number (99,999) of messages reached!');
- }
- }
- }
-
- $this->setHeader('X-Wf-1-Index',$this->messageIndex-1);
-
- return true;
- }
-
- /**
- * Standardizes path for windows systems.
- *
- * @param string $Path
- * @return string
- */
- protected function _standardizePath($Path) {
- return preg_replace('/\\\\+/','/',$Path);
- }
-
- /**
- * Escape trace path for windows systems
- *
- * @param array $Trace
- * @return array
- */
- protected function _escapeTrace($Trace) {
- if(!$Trace) return $Trace;
- for( $i=0 ; $i_escapeTraceFile($Trace[$i]['file']);
- }
- if(isset($Trace[$i]['args'])) {
- $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
- }
- }
- return $Trace;
- }
-
- /**
- * Escape file information of trace for windows systems
- *
- * @param string $File
- * @return string
- */
- protected function _escapeTraceFile($File) {
- /* Check if we have a windows filepath */
- if(strpos($File,'\\')) {
- /* First strip down to single \ */
-
- $file = preg_replace('/\\\\+/','\\',$File);
-
- return $file;
- }
- return $File;
- }
-
- /**
- * Send header
- *
- * @param string $Name
- * @param string_type $Value
- */
- protected function setHeader($Name, $Value) {
- return header($Name.': '.$Value);
- }
-
- /**
- * Get user agent
- *
- * @return string|false
- */
- protected function getUserAgent() {
- if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
- return $_SERVER['HTTP_USER_AGENT'];
- }
-
- /**
- * Returns a new exception
- *
- * @param string $Message
- * @return Exception
- */
- protected function newException($Message) {
- return new Exception($Message);
- }
-
- /**
- * Encode an object into a JSON string
- *
- * Uses PHP's jeson_encode() if available
- *
- * @param object $Object The object to be encoded
- * @return string The JSON string
- */
- public function jsonEncode($Object, $skipObjectEncode=false)
- {
- if(!$skipObjectEncode) {
- $Object = $this->encodeObject($Object);
- }
-
- if(function_exists('json_encode')
- && $this->options['useNativeJsonEncode']!=false) {
-
- return json_encode($Object);
- } else {
- return $this->json_encode($Object);
- }
- }
-
- /**
- * Encodes a table by encoding each row and column with encodeObject()
- *
- * @param array $Table The table to be encoded
- * @return array
- */
- protected function encodeTable($Table) {
- if(!$Table) return $Table;
- for( $i=0 ; $iencodeObject($Table[$i][$j]);
- }
- }
- }
- return $Table;
- }
-
- /**
- * Encodes an object including members with
- * protected and private visibility
- *
- * @param Object $Object The object to be encoded
- * @param int $Depth The current traversal depth
- * @return array All members of the object
- */
- protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1)
- {
- $return = array();
-
- if (is_resource($Object)) {
-
- return '** '.(string)$Object.' **';
-
- } else
- if (is_object($Object)) {
-
- if ($ObjectDepth > $this->options['maxObjectDepth']) {
- return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
- }
-
- foreach ($this->objectStack as $refVal) {
- if ($refVal === $Object) {
- return '** Recursion ('.get_class($Object).') **';
- }
- }
- array_push($this->objectStack, $Object);
-
- $return['__className'] = $class = get_class($Object);
-
- $reflectionClass = new ReflectionClass($class);
- $properties = array();
- foreach( $reflectionClass->getProperties() as $property) {
- $properties[$property->getName()] = $property;
- }
-
- $members = (array)$Object;
-
- foreach( $properties as $raw_name => $property ) {
-
- $name = $raw_name;
- if($property->isStatic()) {
- $name = 'static:'.$name;
- }
- if($property->isPublic()) {
- $name = 'public:'.$name;
- } else
- if($property->isPrivate()) {
- $name = 'private:'.$name;
- $raw_name = "\0".$class."\0".$raw_name;
- } else
- if($property->isProtected()) {
- $name = 'protected:'.$name;
- $raw_name = "\0".'*'."\0".$raw_name;
- }
-
- if(!(isset($this->objectFilters[$class])
- && is_array($this->objectFilters[$class])
- && in_array($raw_name,$this->objectFilters[$class]))) {
-
- if(array_key_exists($raw_name,$members)
- && !$property->isStatic()) {
-
- $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1);
-
- } else {
- if(method_exists($property,'setAccessible')) {
- $property->setAccessible(true);
- $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
- } else
- if($property->isPublic()) {
- $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
- } else {
- $return[$name] = '** Need PHP 5.3 to get value **';
- }
- }
- } else {
- $return[$name] = '** Excluded by Filter **';
- }
- }
-
- // Include all members that are not defined in the class
- // but exist in the object
- foreach( $members as $raw_name => $value ) {
-
- $name = $raw_name;
-
- if ($name{0} == "\0") {
- $parts = explode("\0", $name);
- $name = $parts[2];
- }
-
- if(!isset($properties[$name])) {
- $name = 'undeclared:'.$name;
-
- if(!(isset($this->objectFilters[$class])
- && is_array($this->objectFilters[$class])
- && in_array($raw_name,$this->objectFilters[$class]))) {
-
- $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1);
- } else {
- $return[$name] = '** Excluded by Filter **';
- }
- }
- }
-
- array_pop($this->objectStack);
-
- } elseif (is_array($Object)) {
-
- if ($ArrayDepth > $this->options['maxArrayDepth']) {
- return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
- }
-
- foreach ($Object as $key => $val) {
-
- // Encoding the $GLOBALS PHP array causes an infinite loop
- // if the recursion is not reset here as it contains
- // a reference to itself. This is the only way I have come up
- // with to stop infinite recursion in this case.
- if($key=='GLOBALS'
- && is_array($val)
- && array_key_exists('GLOBALS',$val)) {
- $val['GLOBALS'] = '** Recursion (GLOBALS) **';
- }
-
- $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1);
- }
- } else {
- if(self::is_utf8($Object)) {
- return $Object;
- } else {
- return utf8_encode($Object);
- }
- }
- return $return;
- }
-
- /**
- * Returns true if $string is valid UTF-8 and false otherwise.
- *
- * @param mixed $str String to be tested
- * @return boolean
- */
- protected static function is_utf8($str) {
- $c=0; $b=0;
- $bits=0;
- $len=strlen($str);
- for($i=0; $i<$len; $i++){
- $c=ord($str[$i]);
- if($c > 128){
- if(($c >= 254)) return false;
- elseif($c >= 252) $bits=6;
- elseif($c >= 248) $bits=5;
- elseif($c >= 240) $bits=4;
- elseif($c >= 224) $bits=3;
- elseif($c >= 192) $bits=2;
- else return false;
- if(($i+$bits) > $len) return false;
- while($bits > 1){
- $i++;
- $b=ord($str[$i]);
- if($b < 128 || $b > 191) return false;
- $bits--;
- }
- }
- }
- return true;
- }
-
- /**
- * Converts to and from JSON format.
- *
- * JSON (JavaScript Object Notation) is a lightweight data-interchange
- * format. It is easy for humans to read and write. It is easy for machines
- * to parse and generate. It is based on a subset of the JavaScript
- * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
- * This feature can also be found in Python. JSON is a text format that is
- * completely language independent but uses conventions that are familiar
- * to programmers of the C-family of languages, including C, C++, C#, Java,
- * JavaScript, Perl, TCL, and many others. These properties make JSON an
- * ideal data-interchange language.
- *
- * This package provides a simple encoder and decoder for JSON notation. It
- * is intended for use with client-side Javascript applications that make
- * use of HTTPRequest to perform server communication functions - data can
- * be encoded into JSON notation for use in a client-side javascript, or
- * decoded from incoming Javascript requests. JSON format is native to
- * Javascript, and can be directly eval()'ed with no further parsing
- * overhead
- *
- * All strings should be in ASCII or UTF-8 format!
- *
- * LICENSE: Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met: Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following
- * disclaimer. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * @category
- * @package Services_JSON
- * @author Michal Migurski
- * @author Matt Knapp
- * @author Brett Stimmerman
- * @author Christoph Dorn
- * @copyright 2005 Michal Migurski
- * @version CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
- * @license http://www.opensource.org/licenses/bsd-license.php
- * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198
- */
-
-
- /**
- * Keep a list of objects as we descend into the array so we can detect recursion.
- */
- private $json_objectStack = array();
-
-
- /**
- * convert a string from one UTF-8 char to one UTF-16 char
- *
- * Normally should be handled by mb_convert_encoding, but
- * provides a slower PHP-only method for installations
- * that lack the multibye string extension.
- *
- * @param string $utf8 UTF-8 character
- * @return string UTF-16 character
- * @access private
- */
- private function json_utf82utf16($utf8)
- {
- // oh please oh please oh please oh please oh please
- if(function_exists('mb_convert_encoding')) {
- return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
- }
-
- switch(strlen($utf8)) {
- case 1:
- // this case should never be reached, because we are in ASCII range
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return $utf8;
-
- case 2:
- // return a UTF-16 character from a 2-byte UTF-8 char
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0x07 & (ord($utf8{0}) >> 2))
- . chr((0xC0 & (ord($utf8{0}) << 6))
- | (0x3F & ord($utf8{1})));
-
- case 3:
- // return a UTF-16 character from a 3-byte UTF-8 char
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr((0xF0 & (ord($utf8{0}) << 4))
- | (0x0F & (ord($utf8{1}) >> 2)))
- . chr((0xC0 & (ord($utf8{1}) << 6))
- | (0x7F & ord($utf8{2})));
- }
-
- // ignoring UTF-32 for now, sorry
- return '';
- }
-
- /**
- * encodes an arbitrary variable into JSON format
- *
- * @param mixed $var any number, boolean, string, array, or object to be encoded.
- * see argument 1 to Services_JSON() above for array-parsing behavior.
- * if var is a strng, note that encode() always expects it
- * to be in ASCII or UTF-8 format!
- *
- * @return mixed JSON string representation of input var or an error if a problem occurs
- * @access public
- */
- private function json_encode($var)
- {
-
- if(is_object($var)) {
- if(in_array($var,$this->json_objectStack)) {
- return '"** Recursion **"';
- }
- }
-
- switch (gettype($var)) {
- case 'boolean':
- return $var ? 'true' : 'false';
-
- case 'NULL':
- return 'null';
-
- case 'integer':
- return (int) $var;
-
- case 'double':
- case 'float':
- return (float) $var;
-
- case 'string':
- // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
- $ascii = '';
- $strlen_var = strlen($var);
-
- /*
- * Iterate over every character in the string,
- * escaping with a slash or encoding to UTF-8 where necessary
- */
- for ($c = 0; $c < $strlen_var; ++$c) {
-
- $ord_var_c = ord($var{$c});
-
- switch (true) {
- case $ord_var_c == 0x08:
- $ascii .= '\b';
- break;
- case $ord_var_c == 0x09:
- $ascii .= '\t';
- break;
- case $ord_var_c == 0x0A:
- $ascii .= '\n';
- break;
- case $ord_var_c == 0x0C:
- $ascii .= '\f';
- break;
- case $ord_var_c == 0x0D:
- $ascii .= '\r';
- break;
-
- case $ord_var_c == 0x22:
- case $ord_var_c == 0x2F:
- case $ord_var_c == 0x5C:
- // double quote, slash, slosh
- $ascii .= '\\'.$var{$c};
- break;
-
- case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
- // characters U-00000000 - U-0000007F (same as ASCII)
- $ascii .= $var{$c};
- break;
-
- case (($ord_var_c & 0xE0) == 0xC0):
- // characters U-00000080 - U-000007FF, mask 110XXXXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
- $c += 1;
- $utf16 = $this->json_utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xF0) == 0xE0):
- // characters U-00000800 - U-0000FFFF, mask 1110XXXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}));
- $c += 2;
- $utf16 = $this->json_utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xF8) == 0xF0):
- // characters U-00010000 - U-001FFFFF, mask 11110XXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}),
- ord($var{$c + 3}));
- $c += 3;
- $utf16 = $this->json_utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xFC) == 0xF8):
- // characters U-00200000 - U-03FFFFFF, mask 111110XX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}),
- ord($var{$c + 3}),
- ord($var{$c + 4}));
- $c += 4;
- $utf16 = $this->json_utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xFE) == 0xFC):
- // characters U-04000000 - U-7FFFFFFF, mask 1111110X
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}),
- ord($var{$c + 3}),
- ord($var{$c + 4}),
- ord($var{$c + 5}));
- $c += 5;
- $utf16 = $this->json_utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
- }
- }
-
- return '"'.$ascii.'"';
-
- case 'array':
- /*
- * As per JSON spec if any array key is not an integer
- * we must treat the the whole array as an object. We
- * also try to catch a sparsely populated associative
- * array with numeric keys here because some JS engines
- * will create an array with empty indexes up to
- * max_index which can cause memory issues and because
- * the keys, which may be relevant, will be remapped
- * otherwise.
- *
- * As per the ECMA and JSON specification an object may
- * have any string as a property. Unfortunately due to
- * a hole in the ECMA specification if the key is a
- * ECMA reserved word or starts with a digit the
- * parameter is only accessible using ECMAScript's
- * bracket notation.
- */
-
- // treat as a JSON object
- if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-
- $this->json_objectStack[] = $var;
-
- $properties = array_map(array($this, 'json_name_value'),
- array_keys($var),
- array_values($var));
-
- array_pop($this->json_objectStack);
-
- foreach($properties as $property) {
- if($property instanceof Exception) {
- return $property;
- }
- }
-
- return '{' . join(',', $properties) . '}';
- }
-
- $this->json_objectStack[] = $var;
-
- // treat it like a regular array
- $elements = array_map(array($this, 'json_encode'), $var);
-
- array_pop($this->json_objectStack);
-
- foreach($elements as $element) {
- if($element instanceof Exception) {
- return $element;
- }
- }
-
- return '[' . join(',', $elements) . ']';
-
- case 'object':
- $vars = self::encodeObject($var);
-
- $this->json_objectStack[] = $var;
-
- $properties = array_map(array($this, 'json_name_value'),
- array_keys($vars),
- array_values($vars));
-
- array_pop($this->json_objectStack);
-
- foreach($properties as $property) {
- if($property instanceof Exception) {
- return $property;
- }
- }
-
- return '{' . join(',', $properties) . '}';
-
- default:
- return null;
- }
- }
-
- /**
- * array-walking function for use in generating JSON-formatted name-value pairs
- *
- * @param string $name name of key to use
- * @param mixed $value reference to an array element to be encoded
- *
- * @return string JSON-formatted name-value pair, like '"name":value'
- * @access private
- */
- private function json_name_value($name, $value)
- {
- // Encoding the $GLOBALS PHP array causes an infinite loop
- // if the recursion is not reset here as it contains
- // a reference to itself. This is the only way I have come up
- // with to stop infinite recursion in this case.
- if($name=='GLOBALS'
- && is_array($value)
- && array_key_exists('GLOBALS',$value)) {
- $value['GLOBALS'] = '** Recursion **';
- }
-
- $encoded_value = $this->json_encode($value);
-
- if($encoded_value instanceof Exception) {
- return $encoded_value;
- }
-
- return $this->json_encode(strval($name)) . ':' . $encoded_value;
- }
-}
diff --git a/classes/kohana/debugtoolbar.php b/classes/kohana/debugtoolbar.php
new file mode 100644
index 0000000..ba49c5f
--- /dev/null
+++ b/classes/kohana/debugtoolbar.php
@@ -0,0 +1,418 @@
+
+ * @author Brotkin Ivan (BIakaVeron)
+ * @author Sergei Gladkovskiy
+ */
+class Kohana_DebugToolbar {
+
+ /**
+ * Queries container
+ *
+ * @var bool|array
+ */
+ protected static $_queries = FALSE;
+
+ /**
+ * Benchmarks container
+ *
+ * @var bool|array
+ */
+ protected static $_benchmarks = FALSE;
+
+ /**
+ * Custom tabs container
+ *
+ * @var array
+ */
+ protected static $_custom_tabs = array();
+
+ /**
+ * Benchmark name
+ *
+ * @var string
+ */
+ public static $benchmark_name = 'debug_toolbar';
+
+ /**
+ * Renders the Debug Toolbar
+ *
+ * @static
+ * @return bool|string
+ */
+ public static function render()
+ {
+ if( ! self::is_enabled())
+ return FALSE;
+
+ $token = Profiler::start('custom', self::$benchmark_name);
+
+ $template = new View('toolbar');
+
+ $config = Kohana::config('debug_toolbar');
+
+ // Database panel
+ if ($config->panels['database'] === TRUE)
+ {
+ $queries = self::get_queries();
+ $template
+ ->set('queries', $queries['data'])
+ ->set('query_count', $queries['count'])
+ ->set('total_time', $queries['time'])
+ ->set('total_memory', $queries['memory']);
+ }
+
+ // Files panel
+ if ($config->panels['files'] === TRUE)
+ {
+ $template->set('files', self::get_files());
+ }
+
+ // Modules panel
+ if ($config->panels['modules'] === TRUE)
+ {
+ $template->set('modules', self::get_modules());
+ }
+
+ // Routes panel
+ if ($config->panels['routes'] === TRUE)
+ {
+ $template->set('routes', self::get_routes());
+ }
+
+ // Custom data
+ if ($config->panels['customs'] === TRUE)
+ {
+ $template->set('customs', self::get_customs());
+ }
+
+ // FirePHP
+ if ($config->firephp_enabled === TRUE)
+ {
+ self::firephp();
+ }
+
+ // Set alignment for toolbar
+ switch ($config->align)
+ {
+ case 'right':
+ case 'center':
+ case 'left':
+ $template->set('align', $config->align);
+ break;
+ default:
+ $template->set('align', 'left');
+ }
+
+ // Javascript for toolbar
+ $template->set('scripts', file_get_contents(Kohana::find_file('views', 'toolbar', 'js')));
+
+ // CSS for toolbar
+ $styles = file_get_contents(Kohana::find_file('views', 'toolbar', 'css'));
+
+ Profiler::stop($token);
+
+ // Benchmarks panel
+ if ($config->panels['benchmarks'] === TRUE)
+ {
+ $template->set('benchmarks', self::get_benchmarks());
+ }
+
+ $template->set('styles', $styles);
+
+ echo $template->render();
+ }
+
+ /**
+ * Adds custom data to render in a separate tab
+ *
+ * @param string $tab_name
+ * @param mixed $data
+ * @return void
+ */
+ public static function add_custom($tab_name, $data)
+ {
+ self::$_custom_tabs[$tab_name] = $data;
+ }
+
+ /**
+ * Get user vars
+ *
+ * @return array
+ */
+ public static function get_customs()
+ {
+ $result = array();
+
+ foreach(self::$_custom_tabs as $tab => $data)
+ {
+ if (is_array($data) OR is_object($data))
+ {
+ $data = Debug::dump($data);
+ }
+
+ $result[$tab] = $data;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Retrieves query benchmarks from Database
+ *
+ * @return array
+ */
+ public static function get_queries()
+ {
+ if (self::$_queries !== FALSE)
+ {
+ return self::$_queries;
+ }
+
+ $result = array();
+ $count = $time = $memory = 0;
+
+ $groups = Profiler::groups();
+ foreach(Database::$instances as $name => $db)
+ {
+ $group_name = 'database (' . strtolower($name) . ')';
+ $group = arr::get($groups, $group_name, FALSE);
+
+ if ($group)
+ {
+ $sub_time = $sub_memory = $sub_count = 0;
+ foreach ($group as $query => $tokens)
+ {
+ $sub_count += count($tokens);
+ foreach ($tokens as $token)
+ {
+ $total = Profiler::total($token);
+ $sub_time += $total[0];
+ $sub_memory += $total[1];
+ $result[$name][] = array('name' => $query, 'time' => $total[0], 'memory' => $total[1]);
+ }
+ }
+ $count += $sub_count;
+ $time += $sub_time;
+ $memory += $sub_memory;
+ $result[$name]['total'] = array($sub_count, $sub_time, $sub_memory);
+ }
+ }
+ self::$_queries = array('count' => $count, 'time' => $time, 'memory' => $memory, 'data' => $result);
+
+ return self::$_queries;
+ }
+
+ /**
+ * Creates a formatted array of all Benchmarks
+ *
+ * @return array formatted benchmarks
+ */
+ public static function get_benchmarks()
+ {
+ if (Kohana::$profiling == FALSE)
+ {
+ return array();
+ }
+
+ if (self::$_benchmarks !== FALSE)
+ {
+ return self::$_benchmarks;
+ }
+
+ $groups = Profiler::groups();
+ $result = array();
+ foreach(array_keys($groups) as $group)
+ {
+ if (strpos($group, 'database (') === FALSE)
+ {
+ foreach($groups[$group] as $name => $marks)
+ {
+ $stats = Profiler::stats($marks);
+ $result[$group][] = array
+ (
+ 'name' => $name,
+ 'count' => count($marks),
+ 'total_time' => $stats['total']['time'],
+ 'avg_time' => $stats['average']['time'],
+ 'total_memory' => $stats['total']['memory'],
+ 'avg_memory' => $stats['average']['memory'],
+ );
+ }
+ }
+ }
+ // add total stats
+ $total = Profiler::application();
+ $result['application'] = array
+ (
+ 'count' => 1,
+ 'total_time' => $total['current']['time'],
+ 'avg_time' => $total['average']['time'],
+ 'total_memory' => $total['current']['memory'],
+ 'avg_memory' => $total['average']['memory'],
+
+ );
+
+ self::$_benchmarks = $result;
+
+ return $result;
+ }
+
+ /**
+ * Get list of included files
+ *
+ * @return array file currently included by php
+ */
+ public static function get_files()
+ {
+ $files = (array)get_included_files();
+ sort($files);
+ return $files;
+ }
+
+ /**
+ * Get module list
+ *
+ * @return array module_name => module_path
+ */
+ public static function get_modules()
+ {
+ return Kohana::modules();
+ }
+
+ /**
+ * Returns all application routes
+ *
+ * @return array
+ */
+ public static function get_routes()
+ {
+ return Route::all();
+ }
+
+ /**
+ * Add toolbar data to FirePHP console
+ *
+ */
+ private static function firephp()
+ {
+ $firephp = FirePHP::getInstance(TRUE);
+ $firephp->fb('KOHANA DEBUG TOOLBAR:');
+
+ // Globals
+ $globals = array(
+ 'Post' => empty($_POST) ? array() : $_POST,
+ 'Get' => empty($_GET) ? array() : $_GET,
+ 'Cookie' => empty($_COOKIE) ? array() : $_COOKIE,
+ 'Session' => empty($_SESSION) ? array() : $_SESSION
+ );
+
+ foreach ($globals as $name => $global)
+ {
+ $table = array();
+ $table[] = array($name,'Value');
+
+ foreach((array)$global as $key => $value)
+ {
+ if (is_object($value))
+ {
+ $value = get_class($value).' [object]';
+ }
+
+ $table[] = array($key, $value);
+ }
+
+ $message = "$name: ".count($global).' variables';
+
+ $firephp->fb(array($message, $table), FirePHP::TABLE);
+ }
+
+ // Database
+ $query_stats = self::get_queries();
+
+ //$total_time = $total_rows = 0;
+ $table = array();
+ $table[] = array('DB profile', 'SQL Statement','Time','Memory');
+
+ foreach ((array)$query_stats['data'] as $db => $queries)
+ {unset($queries['total']);
+ foreach ($queries as $query)
+ {
+ $table[] = array(
+ $db,
+ str_replace("\n",' ',$query['name']),
+ number_format($query['time']*1000, 3),
+ number_format($query['memory']/1024, 3),
+ );
+ }
+ }
+
+ $message = 'Queries: '.$query_stats['count'].' SQL queries took '.
+ number_format($query_stats['time'], 3).' seconds and '.$query_stats['memory'].' b';
+
+ $firephp->fb(array($message, $table), FirePHP::TABLE);
+
+ // Benchmarks
+ $groups = self::get_benchmarks();
+ // application benchmarks
+ $total = array_pop($groups);
+
+ $table = array();
+ $table[] = array('Group', 'Benchmark', 'Count', 'Time', 'Memory');
+
+ foreach ((array)$groups as $group => $benchmarks)
+ {
+ foreach ((array)$benchmarks as $name => $benchmark)
+ {
+ $table[] = array(
+ ucfirst($group),
+ ucwords($benchmark['name']),
+ number_format($benchmark['total_time'], 3). ' s',
+ text::bytes($benchmark['total_memory']),
+ );
+ }
+ }
+
+ $message = 'Application tooks '.number_format($total['total_time'], 3).' seconds and '.text::bytes($total['total_memory']).' memory';
+
+ $firephp->fb(array($message, $table), FirePHP::TABLE);
+ }
+
+ /**
+ * Determines if all the conditions are correct to display the toolbar
+ * (pretty kludgy, I know)
+ *
+ * @static
+ * @return bool
+ */
+ public static function is_enabled()
+ {
+ $config = Kohana::config('debug_toolbar');
+ // Don't auto render toolbar for ajax requests
+ if (Request::initial()->is_ajax())
+ return FALSE;
+
+ // Don't auto render toolbar if $_GET['debug'] = 'false'
+ if (isset($_GET['debug']) and strtolower($_GET['debug']) == 'false')
+ return FALSE;
+
+ // Don't auto render if auto_render config is FALSE
+ if ($config->auto_render !== TRUE)
+ return FALSE;
+
+ // Auto render if secret key isset
+ if ($config->secret_key !== FALSE and isset($_GET[$config->secret_key]))
+ return TRUE;
+
+ // Don't auto render when in PRODUCTION (this can obviously be
+ // overridden by the above secret key)
+ if (Kohana::$environment == Kohana::PRODUCTION)
+ return FALSE;
+
+ return TRUE;
+ }
+}
\ No newline at end of file
diff --git a/config/debug_toolbar.php b/config/debug_toolbar.php
index d4ee35e..84640e9 100644
--- a/config/debug_toolbar.php
+++ b/config/debug_toolbar.php
@@ -5,7 +5,7 @@
* NOTE: if IN_PRODUCTION is set to TRUE, the toolbar will
* not automatically render, even if auto_render is TRUE
*/
-$config['auto_render'] = FALSE;
+$config['auto_render'] = Kohana::$environment > Kohana::PRODUCTION;
/*
* If true, the toolbar will default to the minimized position
diff --git a/init.php b/init.php
new file mode 100644
index 0000000..6a5a0a4
--- /dev/null
+++ b/init.php
@@ -0,0 +1,8 @@
+