From 9b6663f87a7e679ffba691cf516191fc840cf978 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 24 Nov 2009 19:20:36 -0800
Subject: Update to Kohana r4684 which is now Kohana 2.4 and has substantial
 changes.

---
 system/views/kohana/error.php          | 252 +++++++++++++++++++++++++++++++++
 system/views/kohana/error_disabled.php |  19 +++
 system/views/kohana/template.php       |   6 +-
 system/views/kohana_error_disabled.php |  17 ---
 system/views/kohana_error_page.php     |  27 ----
 system/views/kohana_errors.css         |  21 ---
 system/views/kohana_profiler.php       |  37 -----
 system/views/kohana_profiler_table.css |  53 -------
 system/views/kohana_profiler_table.php |  25 ----
 system/views/profiler/profiler.php     |  37 +++++
 system/views/profiler/table.css        |  53 +++++++
 system/views/profiler/table.php        |  24 ++++
 12 files changed, 388 insertions(+), 183 deletions(-)
 create mode 100644 system/views/kohana/error.php
 create mode 100644 system/views/kohana/error_disabled.php
 delete mode 100644 system/views/kohana_error_disabled.php
 delete mode 100644 system/views/kohana_error_page.php
 delete mode 100644 system/views/kohana_errors.css
 delete mode 100644 system/views/kohana_profiler.php
 delete mode 100644 system/views/kohana_profiler_table.css
 delete mode 100644 system/views/kohana_profiler_table.php
 create mode 100644 system/views/profiler/profiler.php
 create mode 100644 system/views/profiler/table.css
 create mode 100644 system/views/profiler/table.php

(limited to 'system/views')

diff --git a/system/views/kohana/error.php b/system/views/kohana/error.php
new file mode 100644
index 00000000..b40c0f8a
--- /dev/null
+++ b/system/views/kohana/error.php
@@ -0,0 +1,252 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+// Unique error identifier
+$error_id = uniqid('error');
+?>
+<style type="text/css">
+	
+	#kohana_error {
+		background: #CFF292;
+		font-size: 1em;
+		font-family: sans-serif;
+		text-align: left;
+		color: #111;
+	}
+	
+	#kohana_error h1, #kohana_error h2 {
+		margin: 0;
+		padding: 1em;
+		font-size: 1em;
+		font-weight: normal;
+		background: #CFF292;
+		color: #000000;
+	}
+	
+	#kohana_error h1 a, #kohana_error h2 a {
+		color: #000;
+	}
+	
+	#kohana_error h2 {
+		background: #CFF292;
+		border-top: 1px dotted;
+	}
+	
+	#kohana_error h3 {
+		margin: 0;
+		padding: 0.4em 0 0;
+		font-size: 1em;
+		font-weight: normal;
+	}
+	
+	#kohana_error p {
+		margin: 0;
+		padding: 0.2em 0;
+	}
+	
+	#kohana_error a {
+		color: #1b323b;
+	}
+	
+	#kohana_error pre {
+		overflow: auto;
+		white-space: pre-wrap;
+	}
+	
+	#kohana_error table {
+		width: 100%;
+		display: block;
+		margin: 0 0 0.4em;
+		padding: 0;
+		border-collapse: collapse;
+		background: #fff;
+	}
+	
+	#kohana_error table td {
+		border: solid 1px #ddd;
+		text-align: left;
+		vertical-align: top;
+		padding: 0.4em;
+	}
+	
+	#kohana_error div.content {
+		padding: 0.4em 1em 1em;
+		overflow: hidden;
+		border-top: 1px dotted;
+	}
+	
+	#kohana_error pre.source {
+		margin: 0 0 1em;
+		padding: 0.4em;
+		background: #fff;
+		border: dotted 1px #b7c680;
+		line-height: 1.2em;
+	}
+	
+	#kohana_error pre.source span.line {
+		display: block;
+	}
+	
+	#kohana_error pre.source span.highlight {
+		background: #f0eb96;
+	}
+	
+	#kohana_error pre.source span.line span.number {
+		color: #666;
+	}
+	
+	#kohana_error ol.trace {
+		display: block;
+		margin: 0 0 0 2em;
+		padding: 0;
+		list-style: decimal;
+	}
+	
+	#kohana_error ol.trace li {
+		margin: 0;
+		padding: 0;
+	}
+</style>
+<script type="text/javascript">
+	document.write('<style type="text/css"> .collapsed { display: none; } </style>');
+	function koggle(elem)
+	{
+		elem = document.getElementById(elem);
+		
+		if (elem.style && elem.style['display']) 
+			// Only works with the "style" attr
+			var disp = elem.style['display'];
+		else 
+			if (elem.currentStyle) 
+				// For MSIE, naturally
+				var disp = elem.currentStyle['display'];
+			else 
+				if (window.getComputedStyle) 
+					// For most other browsers
+					var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
+		
+		// Toggle the state of the "display" style
+		elem.style.display = disp == 'block' ? 'none' : 'block';
+		return false;
+	}
+</script>
+<div id="kohana_error">
+	<h1>
+		<span class="type">
+<?php echo $type?> [ <?php echo $code?> ]:
+		</span>
+		<span class="message">
+<?php echo $message?>
+		</span>
+	</h1>
+	<div id="<?php echo $error_id ?>" class="content">
+		<p>
+			<span class="file">
+<?php echo Kohana_Exception::debug_path($file)?>[ <?php echo $line?> ]
+			</span>
+		</p>
+
+<?php if (Kohana_Exception::$source_output AND $source_code = Kohana_Exception::debug_source($file, $line)) : ?>
+		<pre class="source"><code><?php foreach ($source_code as $num => $row) : ?><span class="line <?php if ($num == $line) echo 'highlight' ?>"><span class="number"><?php echo $num ?></span><?php echo htmlspecialchars($row, ENT_NOQUOTES, Kohana::CHARSET) ?></span><?php endforeach ?></code></pre>
+<?php endif ?>
+
+<?php if (Kohana_Exception::$trace_output) : ?>
+		<ol class="trace">
+			<?php foreach (Kohana_Exception::trace($trace) as $i=>$step): ?>
+			<li>
+				<p>
+					<span class="file">
+						<?php if ($step['file']): $source_id = $error_id.'source'.$i; ?>
+						<?php if (Kohana_Exception::$source_output AND $step['source']) : ?>
+						<a href="#<?php echo $source_id ?>" onclick="return koggle('<?php echo $source_id ?>')"><?php echo Kohana_Exception::debug_path($step['file'])?>[ <?php echo $step['line']?> ]</a>
+						<?php else : ?>
+						<span class="file"><?php echo Kohana_Exception::debug_path($step['file'])?>[ <?php echo $step['line']?> ]</span>
+						<?php endif ?>
+						<?php else : ?>
+						{<?php echo __('PHP internal call')?>}
+						<?php endif?>
+					</span>
+					&raquo;
+					<?php echo $step['function']?>(<?php if ($step['args']): $args_id = $error_id.'args'.$i; ?><a href="#<?php echo $args_id ?>" onclick="return koggle('<?php echo $args_id ?>')"><?php echo __('arguments')?></a>
+<?php endif?>)
+				</p>
+				<?php if (isset($args_id)): ?>
+				<div id="<?php echo $args_id ?>" class="collapsed">
+					<table cellspacing="0">
+						<?php foreach ($step['args'] as $name=>$arg): ?>
+						<tr>
+							<td>
+								<code>
+<?php echo $name?>
+								</code>
+							</td>
+							<td>
+								<pre><?php echo Kohana_Exception::dump($arg) ?></pre>
+							</td>
+						</tr>
+						<?php endforeach?>
+					</table>
+				</div>
+				<?php endif?>
+				<?php if (Kohana_Exception::$source_output AND $step['source'] AND isset($source_id)): ?>
+				<pre id="<?php echo $source_id ?>" class="source collapsed"><code><?php foreach ($step['source'] as $num => $row) : ?><span class="line <?php if ($num == $step['line']) echo 'highlight' ?>"><span class="number"><?php echo $num ?></span><?php echo htmlspecialchars($row, ENT_NOQUOTES, Kohana::CHARSET) ?></span><?php endforeach ?></code></pre>
+				<?php endif?>
+			</li>
+			<?php unset($args_id, $source_id); ?>
+			<?php endforeach?>
+		</ol>
+<?php endif ?>
+
+	</div>
+	<h2><a href="#<?php echo $env_id = $error_id.'environment' ?>" onclick="return koggle('<?php echo $env_id ?>')"><?php echo __('Environment')?></a></h2>
+	<div id="<?php echo $env_id ?>" class="content collapsed">
+		<?php $included = get_included_files()?>
+		<h3><a href="#<?php echo $env_id = $error_id.'environment_included' ?>" onclick="return koggle('<?php echo $env_id ?>')"><?php echo __('Included files')?></a>(<?php echo count($included)?>)</h3>
+		<div id="<?php echo $env_id ?>" class="collapsed">
+			<table cellspacing="0">
+				<?php foreach ($included as $file): ?>
+				<tr>
+					<td>
+						<code>
+<?php echo Kohana_Exception::debug_path($file)?>
+						</code>
+					</td>
+				</tr>
+				<?php endforeach?>
+			</table>
+		</div>
+		<?php $included = get_loaded_extensions()?>
+		<h3><a href="#<?php echo $env_id = $error_id.'environment_loaded' ?>" onclick="return koggle('<?php echo $env_id ?>')"><?php echo __('Loaded extensions')?></a>(<?php echo count($included)?>)</h3>
+		<div id="<?php echo $env_id ?>" class="collapsed">
+			<table cellspacing="0">
+				<?php foreach ($included as $file): ?>
+				<tr>
+					<td>
+						<code>
+<?php echo Kohana_Exception::debug_path($file)?>
+						</code>
+					</td>
+				</tr>
+				<?php endforeach?>
+			</table>
+		</div>
+		<?php foreach (array('_SESSION', '_GET', '_POST', '_FILES', '_COOKIE', '_SERVER') as $var): ?>
+		<?php if ( empty($GLOBALS[$var]) OR ! is_array($GLOBALS[$var])) continue ?>
+		<h3><a href="#<?php echo $env_id = $error_id.'environment'.strtolower($var) ?>" onclick="return koggle('<?php echo $env_id ?>')">$<?php echo $var?></a></h3>
+		<div id="<?php echo $env_id ?>" class="collapsed">
+			<table cellspacing="0">
+				<?php foreach ($GLOBALS[$var] as $key=>$value): ?>
+				<tr>
+					<td>
+						<code>
+<?php echo $key?>
+						</code>
+					</td>
+					<td>
+						<pre><?php echo Kohana_Exception::dump($value) ?></pre>
+					</td>
+				</tr>
+				<?php endforeach?>
+			</table>
+		</div>
+		<?php endforeach?>
+	</div>
+</div>
diff --git a/system/views/kohana/error_disabled.php b/system/views/kohana/error_disabled.php
new file mode 100644
index 00000000..1024eb1e
--- /dev/null
+++ b/system/views/kohana/error_disabled.php
@@ -0,0 +1,19 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.'); ?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title><?php echo htmlspecialchars(__('Unable to Complete Request'), ENT_QUOTES, Kohana::CHARSET) ?></title>
+	</head>
+	<body>
+		<div id="framework_error" style="width:24em;margin:50px auto;">
+			<h3 style="text-align:center"><?php echo htmlspecialchars(__('Unable to Complete Request'), ENT_QUOTES, Kohana::CHARSET) ?></h3>
+			<p style="text-align:center">
+<?php
+	echo __('You can go to the <a href="%site%">home page</a> or <a href="%uri%">try again</a>.',
+		array('%site%' => htmlspecialchars(url::site(), ENT_QUOTES, Kohana::CHARSET), '%uri%' => htmlspecialchars(url::site(Router::$current_uri), ENT_QUOTES, Kohana::CHARSET)));
+?>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/system/views/kohana/template.php b/system/views/kohana/template.php
index b090fd88..84ddbff5 100644
--- a/system/views/kohana/template.php
+++ b/system/views/kohana/template.php
@@ -5,7 +5,7 @@
 <head>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<title><?php echo html::specialchars($title) ?></title>
+	<title><?php echo html::chars(__($title)) ?></title>
 
 	<style type="text/css">
 	html { background: #83c018 url(<?php echo url::base(FALSE) ?>kohana.png) 50% 0 no-repeat; }
@@ -24,11 +24,11 @@
 </head>
 <body>
 
-	<h1><?php echo html::specialchars($title) ?></h1>
+	<h1><?php echo html::chars(__($title)) ?></h1>
 	<?php echo $content ?>
 
 	<p class="copyright">
-		Rendered in {execution_time} seconds, using {memory_usage} of memory<br />
+		<?php echo __('Rendered in {execution_time} seconds, using {memory_usage} of memory')?><br />
 		Copyright ©2007–2008 Kohana Team
 	</p>
 
diff --git a/system/views/kohana_error_disabled.php b/system/views/kohana_error_disabled.php
deleted file mode 100644
index cd911328..00000000
--- a/system/views/kohana_error_disabled.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.'); ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<style type="text/css">
-<?php include Kohana::find_file('views', 'kohana_errors', FALSE, 'css') ?>
-</style>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title><?php echo $error ?></title>
-</head>
-<body>
-<div id="framework_error" style="width:24em;margin:50px auto;">
-<h3><?php echo html::specialchars($error) ?></h3>
-<p style="text-align:center"><?php echo $message ?></p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/system/views/kohana_error_page.php b/system/views/kohana_error_page.php
deleted file mode 100644
index 944064cc..00000000
--- a/system/views/kohana_error_page.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.'); ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<style type="text/css">
-<?php include Kohana::find_file('views', 'kohana_errors', FALSE, 'css') ?>
-</style>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title><?php echo $error ?></title>
-<base href="http://php.net/" />
-</head>
-<body>
-<div id="framework_error" style="width:42em;margin:20px auto;">
-<h3><?php echo html::specialchars($error) ?></h3>
-<p><?php echo html::specialchars($description) ?></p>
-<?php if ( ! empty($line) AND ! empty($file)): ?>
-<p><?php echo Kohana::lang('core.error_file_line', $file, $line) ?></p>
-<?php endif ?>
-<p><code class="block"><?php echo $message ?></code></p>
-<?php if ( ! empty($trace)): ?>
-<h3><?php echo Kohana::lang('core.stack_trace') ?></h3>
-<?php echo $trace ?>
-<?php endif ?>
-<p class="stats"><?php echo Kohana::lang('core.stats_footer') ?></p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/system/views/kohana_errors.css b/system/views/kohana_errors.css
deleted file mode 100644
index 1341f57d..00000000
--- a/system/views/kohana_errors.css
+++ /dev/null
@@ -1,21 +0,0 @@
-div#framework_error { background:#fff; border:solid 1px #ccc; font-family:sans-serif; color:#111; font-size:14px; line-height:130%; }
-div#framework_error h3 { color:#fff; font-size:16px; padding:8px 6px; margin:0 0 8px; background:#f15a00; text-align:center; }
-div#framework_error a { color:#228; text-decoration:none; }
-div#framework_error a:hover { text-decoration:underline; }
-div#framework_error strong { color:#900; }
-div#framework_error p { margin:0; padding:4px 6px 10px; }
-div#framework_error tt,
-div#framework_error pre,
-div#framework_error code { font-family:monospace; padding:2px 4px; font-size:12px; color:#333;
-	white-space:pre-wrap; /* CSS 2.1 */
-	white-space:-moz-pre-wrap; /* For Mozilla */
-	word-wrap:break-word; /* For IE5.5+ */
-}
-div#framework_error tt { font-style:italic; }
-div#framework_error tt:before { content:">"; color:#aaa; }
-div#framework_error code tt:before { content:""; }
-div#framework_error pre,
-div#framework_error code { background:#eaeee5; border:solid 0 #D6D8D1; border-width:0 1px 1px 0; }
-div#framework_error .block { display:block; text-align:left; }
-div#framework_error .stats { padding:4px; background: #eee; border-top:solid 1px #ccc; text-align:center; font-size:10px; color:#888; }
-div#framework_error .backtrace { margin:0; padding:0 6px; list-style:none; line-height:12px; }
\ No newline at end of file
diff --git a/system/views/kohana_profiler.php b/system/views/kohana_profiler.php
deleted file mode 100644
index da77a669..00000000
--- a/system/views/kohana_profiler.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.'); ?>
-<style type="text/css">
-#kohana-profiler
-{
-	font-family: Monaco, 'Courier New';
-	background-color: #F8FFF8;
-	margin-top: 20px;
-	clear: both;
-	padding: 10px 10px 0;
-	border: 1px solid #E5EFF8;
-	text-align: left;
-}
-#kohana-profiler pre
-{
-	margin: 0;
-	font: inherit;
-}
-#kohana-profiler .kp-meta
-{
-	margin: 0 0 10px;
-	padding: 4px;
-	background: #FFF;
-	border: 1px solid #E5EFF8;
-	color: #A6B0B8;
-	text-align: center;
-}
-<?php echo $styles ?>
-</style>
-<div id="kohana-profiler">
-<?php
-foreach ($profiles as $profile)
-{
-	echo $profile->render();
-}
-?>
-<p class="kp-meta">Profiler executed in <?php echo number_format($execution_time, 3) ?>s</p>
-</div>
\ No newline at end of file
diff --git a/system/views/kohana_profiler_table.css b/system/views/kohana_profiler_table.css
deleted file mode 100644
index 6e7601c9..00000000
--- a/system/views/kohana_profiler_table.css
+++ /dev/null
@@ -1,53 +0,0 @@
-#kohana-profiler .kp-table
-{
-	font-size: 1.0em;
-	color: #4D6171;
-	width: 100%;
-	border-collapse: collapse;
-	border-top: 1px solid #E5EFF8;
-	border-right: 1px solid #E5EFF8;
-	border-left: 1px solid #E5EFF8;
-	margin-bottom: 10px;
-}
-#kohana-profiler .kp-table td
-{
-	background-color: #FFFFFF;
-	border-bottom: 1px solid #E5EFF8;
-	padding: 3px;
-	vertical-align: top;
-}
-#kohana-profiler .kp-table .kp-title td
-{
-	font-weight: bold;
-	background-color: inherit;
-}
-#kohana-profiler .kp-table .kp-altrow td
-{
-	background-color: #F7FBFF;
-}
-#kohana-profiler .kp-table .kp-totalrow td
-{
-	background-color: #FAFAFA;
-	border-top: 1px solid #D2DCE5;
-	font-weight: bold;
-}
-#kohana-profiler .kp-table .kp-column
-{
-	width: 100px;
-	border-left: 1px solid #E5EFF8;
-	text-align: center;
-}
-#kohana-profiler .kp-table .kp-data, #kohana-profiler .kp-table .kp-name
-{
-	background-color: #FAFAFB;
-	vertical-align: top;
-}
-#kohana-profiler .kp-table .kp-name
-{
-	width: 200px;
-	border-right: 1px solid #E5EFF8;
-}
-#kohana-profiler .kp-table .kp-altrow .kp-data, #kohana-profiler .kp-table .kp-altrow .kp-name
-{
-	background-color: #F6F8FB;
-}
\ No newline at end of file
diff --git a/system/views/kohana_profiler_table.php b/system/views/kohana_profiler_table.php
deleted file mode 100644
index b6b46530..00000000
--- a/system/views/kohana_profiler_table.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.'); ?>
-<table class="kp-table">
-<?php
-foreach ($rows as $row):
-
-$class = empty($row['class']) ? '' : ' class="'.$row['class'].'"';
-$style = empty($row['style']) ? '' : ' style="'.$row['style'].'"';
-?>
-	<tr<?php echo $class; echo $style; ?>>
-		<?php
-		foreach ($columns as $index => $column)
-		{
-			$class = empty($column['class']) ? '' : ' class="'.$column['class'].'"';
-			$style = empty($column['style']) ? '' : ' style="'.$column['style'].'"';
-			$value = $row['data'][$index];
-			$value = (is_array($value) OR is_object($value)) ? '<pre>'.html::specialchars(print_r($value, TRUE)).'</pre>' : html::specialchars($value);
-			echo '<td', $style, $class, '>', $value, '</td>';
-		}
-		?>
-	</tr>
-<?php
-
-endforeach;
-?>
-</table>
\ No newline at end of file
diff --git a/system/views/profiler/profiler.php b/system/views/profiler/profiler.php
new file mode 100644
index 00000000..7b9ae951
--- /dev/null
+++ b/system/views/profiler/profiler.php
@@ -0,0 +1,37 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.'); ?>
+<style type="text/css">
+#kohana-profiler
+{
+	font-family: Monaco, 'Courier New';
+	background-color: #F8FFF8;
+	margin-top: 20px;
+	clear: both;
+	padding: 10px 10px 0;
+	border: 1px solid #E5EFF8;
+	text-align: left;
+}
+#kohana-profiler pre
+{
+	margin: 0;
+	font: inherit;
+}
+#kohana-profiler .kp-meta
+{
+	margin: 0 0 10px;
+	padding: 4px;
+	background: #FFF;
+	border: 1px solid #E5EFF8;
+	color: #A6B0B8;
+	text-align: center;
+}
+<?php echo $styles ?>
+</style>
+<div id="kohana-profiler">
+<?php
+foreach ($profiles as $profile)
+{
+	echo $profile->render();
+}
+?>
+<p class="kp-meta"><?php echo __('Profiler executed in :execution_timess', array(':execution_times' => number_format($execution_time, 3))) ?></p>
+</div>
\ No newline at end of file
diff --git a/system/views/profiler/table.css b/system/views/profiler/table.css
new file mode 100644
index 00000000..41a1c9a3
--- /dev/null
+++ b/system/views/profiler/table.css
@@ -0,0 +1,53 @@
+#kohana-profiler .kp-table
+{
+	font-size: 1.0em;
+	color: #4D6171;
+	width: 100%;
+	border-collapse: collapse;
+	border-top: 1px solid #E5EFF8;
+	border-right: 1px solid #E5EFF8;
+	border-left: 1px solid #E5EFF8;
+	margin-bottom: 10px;
+}
+#kohana-profiler .kp-table td
+{
+	background-color: #FFFFFF;
+	border-bottom: 1px solid #E5EFF8;
+	padding: 3px;
+	vertical-align: top;
+}
+#kohana-profiler .kp-table .kp-title td
+{
+	font-weight: bold;
+	background-color: inherit;
+}
+#kohana-profiler .kp-table .kp-altrow td
+{
+	background-color: #F7FBFF;
+}
+#kohana-profiler .kp-table .kp-totalrow td
+{
+	background-color: #FAFAFA;
+	border-top: 1px solid #D2DCE5;
+	font-weight: bold;
+}
+#kohana-profiler .kp-table .kp-column
+{
+	width: 100px;
+	border-left: 1px solid #E5EFF8;
+	text-align: center;
+}
+#kohana-profiler .kp-table .kp-data, #kohana-profiler .kp-table .kp-name
+{
+	background-color: #FAFAFB;
+	vertical-align: top;
+}
+#kohana-profiler .kp-table .kp-name
+{
+	width: 200px;
+	border-right: 1px solid #E5EFF8;
+}
+#kohana-profiler .kp-table .kp-altrow .kp-data, #kohana-profiler .kp-table .kp-altrow .kp-name
+{
+	background-color: #F6F8FB;
+}
\ No newline at end of file
diff --git a/system/views/profiler/table.php b/system/views/profiler/table.php
new file mode 100644
index 00000000..7cdf79dd
--- /dev/null
+++ b/system/views/profiler/table.php
@@ -0,0 +1,24 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.'); ?>
+<table class="kp-table">
+<?php
+foreach ($rows as $row):
+
+$class = empty($row['class']) ? '' : ' class="'.$row['class'].'"';
+$style = empty($row['style']) ? '' : ' style="'.$row['style'].'"';
+?>
+	<tr<?php echo $class; echo $style; ?>>
+		<?php
+		foreach ($columns as $index => $column)
+		{
+			$class = empty($column['class']) ? '' : ' class="'.$column['class'].'"';
+			$style = empty($column['style']) ? '' : ' style="'.$column['style'].'"';
+			$value = $row['data'][$index];
+			$value = (is_array($value) OR is_object($value)) ? '<pre>'.htmlspecialchars(print_r($value, TRUE), ENT_QUOTES, Kohana::CHARSET).'</pre>' : htmlspecialchars($value, ENT_QUOTES, Kohana::CHARSET);
+			echo '<td' . $style . $class . '>' . wordwrap($value, 100, '<br />', true) . '</td>';
+		}
+		?>
+	</tr>
+<?php
+endforeach;
+?>
+</table>
-- 
cgit v1.2.3


From 3e8e13bd2533ff7e3493b27c8a8587dfb65e1b26 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 23 Dec 2009 12:42:57 -0800
Subject: Updated Kohana to r4728

---
 system/core/Kohana.php                 |  7 ++---
 system/core/Kohana_Exception.php       | 26 ++++++++++--------
 system/libraries/Input.php             | 31 +--------------------
 system/messages/core.php               | 37 -------------------------
 system/messages/kohana/core.php        | 37 +++++++++++++++++++++++++
 system/messages/validation/default.php | 42 ++++++++++++++++------------
 system/views/kohana/error.php          | 50 +++++++++++++++++-----------------
 7 files changed, 104 insertions(+), 126 deletions(-)
 delete mode 100644 system/messages/core.php
 create mode 100644 system/messages/kohana/core.php

(limited to 'system/views')

diff --git a/system/core/Kohana.php b/system/core/Kohana.php
index 740adb80..29ca708c 100644
--- a/system/core/Kohana.php
+++ b/system/core/Kohana.php
@@ -2,7 +2,7 @@
 /**
  * Provides Kohana-specific helper functions. This is where the magic happens!
  *
- * $Id: Kohana.php 4724 2009-12-21 16:28:54Z isaiah $
+ * $Id: Kohana.php 4726 2009-12-23 18:58:53Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
@@ -810,11 +810,8 @@ abstract class Kohana_Core {
 		{
 			if ($required === TRUE)
 			{
-				// Directory i18n key
-				$directory = 'core.'.inflector::singular($directory);
-
 				// If the file is required, throw an exception
-				throw new Kohana_Exception('The requested :resource:, :file:, could not be found', array(':resource:' => Kohana::message($directory), ':file:' =>$filename));
+				throw new Kohana_Exception('The requested :resource:, :file:, could not be found', array(':resource:' => __($directory), ':file:' =>$filename));
 			}
 			else
 			{
diff --git a/system/core/Kohana_Exception.php b/system/core/Kohana_Exception.php
index 2eb28f75..0cbc472c 100644
--- a/system/core/Kohana_Exception.php
+++ b/system/core/Kohana_Exception.php
@@ -2,7 +2,7 @@
 /**
  * Kohana Exceptions
  *
- * $Id: Kohana_Exception.php 4692 2009-12-04 15:59:44Z cbandy $
+ * $Id: Kohana_Exception.php 4726 2009-12-23 18:58:53Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
@@ -119,7 +119,7 @@ class Kohana_Exception_Core extends Exception {
 			// Manually save logs after exceptions
 			Kohana_Log::save();
 
-			if (Kohana::config('core.display_errors') === FALSE)
+			if (Kohana::config('kohana/core.display_errors') === FALSE)
 			{
 				// Do not show the details
 				$file = $line = NULL;
@@ -146,7 +146,7 @@ class Kohana_Exception_Core extends Exception {
 				}
 
 				// Use the human-readable error name
-				$code = Kohana::message('core.errors.'.$code);
+				$code = Kohana::message('kohana/core.errors.'.$code);
 			}
 			else
 			{
@@ -160,7 +160,7 @@ class Kohana_Exception_Core extends Exception {
 				if ($e instanceof ErrorException)
 				{
 					// Use the human-readable error name
-					$code = Kohana::message('core.errors.'.$e->getSeverity());
+					$code = Kohana::message('kohana/core.errors.'.$e->getSeverity());
 
 					if (version_compare(PHP_VERSION, '5.3', '<'))
 					{
@@ -233,11 +233,12 @@ class Kohana_Exception_Core extends Exception {
 	 *
 	 * @param   mixed    variable to dump
 	 * @param   integer  maximum length of strings
+	 * @param   integer  maximum levels of recursion
 	 * @return  string
 	 */
-	public static function dump($value, $length = 128)
+	public static function dump($value, $length = 128, $max_level = 5)
 	{
-		return Kohana_Exception::_dump($value, $length);
+		return Kohana_Exception::_dump($value, $length, $max_level);
 	}
 
 	/**
@@ -245,10 +246,11 @@ class Kohana_Exception_Core extends Exception {
 	 *
 	 * @param   mixed    variable to dump
 	 * @param   integer  maximum length of strings
-	 * @param   integer  recursion level (internal)
+	 * @param   integer  maximum levels of recursion
+	 * @param   integer  current recursion level (internal)
 	 * @return  string
 	 */
-	private static function _dump( & $var, $length = 128, $level = 0)
+	private static function _dump( & $var, $length = 128, $max_level = 5, $level = 0)
 	{
 		if ($var === NULL)
 		{
@@ -327,7 +329,7 @@ class Kohana_Exception_Core extends Exception {
 			{
 				$output[] = "(\n$space$s*RECURSION*\n$space)";
 			}
-			elseif ($level < 5)
+			elseif ($level <= $max_level)
 			{
 				$output[] = "<span>(";
 
@@ -340,7 +342,7 @@ class Kohana_Exception_Core extends Exception {
 						$key = '"'.$key.'"';
 					}
 
-					$output[] = "$space$s$key => ".Kohana_Exception::_dump($val, $length, $level + 1);
+					$output[] = "$space$s$key => ".Kohana_Exception::_dump($val, $length, $max_level, $level + 1);
 				}
 				unset($var[$marker]);
 
@@ -377,7 +379,7 @@ class Kohana_Exception_Core extends Exception {
 			{
 				$output[] = "{\n$space$s*RECURSION*\n$space}";
 			}
-			elseif ($level < 5)
+			elseif ($level <= $max_level)
 			{
 				$output[] = "<code>{";
 
@@ -397,7 +399,7 @@ class Kohana_Exception_Core extends Exception {
 						$access = '<small>public</small>';
 					}
 
-					$output[] = "$space$s$access $key => ".Kohana_Exception::_dump($val, $length, $level + 1);
+					$output[] = "$space$s$access $key => ".Kohana_Exception::_dump($val, $length, $max_level, $level + 1);
 				}
 				unset($objects[$hash]);
 
diff --git a/system/libraries/Input.php b/system/libraries/Input.php
index 04403854..7a277317 100644
--- a/system/libraries/Input.php
+++ b/system/libraries/Input.php
@@ -2,7 +2,7 @@
 /**
  * Input library.
  *
- * $Id: Input.php 4720 2009-12-17 21:15:03Z isaiah $
+ * $Id: Input.php 4727 2009-12-23 19:03:05Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
@@ -79,35 +79,6 @@ class Input_Core {
 				Kohana_Log::add('debug', 'Disable magic_quotes_gpc! It is evil and deprecated: http://php.net/magic_quotes');
 			}
 
-			// register_globals is enabled
-			if (ini_get('register_globals'))
-			{
-				if (isset($_REQUEST['GLOBALS']))
-				{
-					// Prevent GLOBALS override attacks
-					exit('Global variable overload attack.');
-				}
-
-				// Destroy the REQUEST global
-				$_REQUEST = array();
-
-				// These globals are standard and should not be removed
-				$preserve = array('GLOBALS', '_REQUEST', '_GET', '_POST', '_FILES', '_COOKIE', '_SERVER', '_ENV', '_SESSION');
-
-				// This loop has the same effect as disabling register_globals
-				foreach (array_diff(array_keys($GLOBALS), $preserve) as $key)
-				{
-					global $$key;
-					$$key = NULL;
-
-					// Unset the global variable
-					unset($GLOBALS[$key], $$key);
-				}
-
-				// Warn the developer about register globals
-				Kohana_Log::add('debug', 'Disable register_globals! It is evil and deprecated: http://php.net/register_globals');
-			}
-
 			if (is_array($_GET))
 			{
 				foreach ($_GET as $key => $val)
diff --git a/system/messages/core.php b/system/messages/core.php
deleted file mode 100644
index 64f897e8..00000000
--- a/system/messages/core.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-$messages = array
-(
-	'errors' => array
-	(
-		E_KOHANA             => __('Framework Error'),   // __('Please check the Kohana documentation for information about the following error.'),
-		E_PAGE_NOT_FOUND     => __('Page Not Found'),    // __('The requested page was not found. It may have moved, been deleted, or archived.'),
-		E_DATABASE_ERROR     => __('Database Error'),    // __('A database error occurred while performing the requested procedure. Please review the database error below for more information.'),
-		E_RECOVERABLE_ERROR  => __('Recoverable Error'), // __('An error was detected which prevented the loading of this page. If this problem persists, please contact the website administrator.'),
-		E_ERROR              => __('Fatal Error'),
-		E_COMPILE_ERROR      => __('Fatal Error'),
-		E_CORE_ERROR         => __('Fatal Error'),
-		E_USER_ERROR         => __('Fatal Error'),
-		E_PARSE              => __('Syntax Error'),
-		E_WARNING            => __('Warning Message'),
-		E_COMPILE_WARNING    => __('Warning Message'),
-		E_CORE_WARNING       => __('Warning Message'),
-		E_USER_WARNING       => __('Warning Message'),
-		E_STRICT             => __('Strict Mode Error'),
-		E_NOTICE             => __('Runtime Message'),
-		E_USER_NOTICE        => __('Runtime Message'),
-	),
-	'config'             => 'config file',
-	'controller'         => 'controller',
-	'helper'             => 'helper',
-	'library'            => 'library',
-	'driver'             => 'driver',
-	'model'              => 'model',
-	'view'               => 'view',
-);
-
-// E_DEPRECATED is only defined in PHP >= 5.3.0
-if (defined('E_DEPRECATED'))
-{
-	$messages['errors'][E_DEPRECATED] = __('Deprecated');
-}
\ No newline at end of file
diff --git a/system/messages/kohana/core.php b/system/messages/kohana/core.php
new file mode 100644
index 00000000..1361809b
--- /dev/null
+++ b/system/messages/kohana/core.php
@@ -0,0 +1,37 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+/**
+ * Core Kohana messages
+ *
+ * @package    Core
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+$messages = array
+(
+	'errors' => array
+	(
+		E_KOHANA             => 'Framework Error',
+		E_PAGE_NOT_FOUND     => 'Page Not Found',
+		E_DATABASE_ERROR     => 'Database Error',
+		E_RECOVERABLE_ERROR  => 'Recoverable Error',
+		E_ERROR              => 'Fatal Error',
+		E_COMPILE_ERROR      => 'Fatal Error',
+		E_CORE_ERROR         => 'Fatal Error',
+		E_USER_ERROR         => 'Fatal Error',
+		E_PARSE              => 'Syntax Error',
+		E_WARNING            => 'Warning Message',
+		E_COMPILE_WARNING    => 'Warning Message',
+		E_CORE_WARNING       => 'Warning Message',
+		E_USER_WARNING       => 'Warning Message',
+		E_STRICT             => 'Strict Mode Error',
+		E_NOTICE             => 'Runtime Message',
+		E_USER_NOTICE        => 'Runtime Message',
+	),
+);
+
+// E_DEPRECATED is only defined in PHP >= 5.3.0
+if (defined('E_DEPRECATED'))
+{
+	$messages['errors'][E_DEPRECATED] = 'Deprecated';
+}
\ No newline at end of file
diff --git a/system/messages/validation/default.php b/system/messages/validation/default.php
index 2c59fa06..88580a6b 100644
--- a/system/messages/validation/default.php
+++ b/system/messages/validation/default.php
@@ -1,17 +1,25 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-$messages = array(
-	'required'      => 'The :field field is required',
-	'length'        => 'The :field field must be between :param1 and :param2 characters long',
-	'depends_on'    => 'The :field field requires the :param1 field',
-	'matches'       => 'The :field field must be the same as :param1',
-	'email'         => 'The :field field must be a valid email address',
-	'decimal'       => 'The :field field must be a decimal with :param1 places',
-	'digit'         => 'The :field field must be a digit',
-	'in_array'      => 'The :field field must be one of the available options',
-	'alpha_numeric' => 'The :field field must consist only of alphabetical or numeric characters',
-	'alpha_dash '   => 'The :field field must consist only of alphabetical, numeric, underscore and dash characters',
-	'numeric '      => 'The :field field must be a valid number',
-	'url'           => 'The :field field must be a valid url',
-	'phone'         => 'The :field field must be a valid phone number',
-);
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Default validation messages
+ *
+ * @package    Validation
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+
+$messages = array(
+	'required'      => 'The :field field is required',
+	'length'        => 'The :field field must be between :param1 and :param2 characters long',
+	'depends_on'    => 'The :field field requires the :param1 field',
+	'matches'       => 'The :field field must be the same as :param1',
+	'email'         => 'The :field field must be a valid email address',
+	'decimal'       => 'The :field field must be a decimal with :param1 places',
+	'digit'         => 'The :field field must be a digit',
+	'in_array'      => 'The :field field must be one of the available options',
+	'alpha_numeric' => 'The :field field must consist only of alphabetical or numeric characters',
+	'alpha_dash '   => 'The :field field must consist only of alphabetical, numeric, underscore and dash characters',
+	'numeric '      => 'The :field field must be a valid number',
+	'url'           => 'The :field field must be a valid url',
+	'phone'         => 'The :field field must be a valid phone number',
+);
diff --git a/system/views/kohana/error.php b/system/views/kohana/error.php
index b40c0f8a..aa6770c4 100644
--- a/system/views/kohana/error.php
+++ b/system/views/kohana/error.php
@@ -3,7 +3,7 @@
 $error_id = uniqid('error');
 ?>
 <style type="text/css">
-	
+
 	#kohana_error {
 		background: #CFF292;
 		font-size: 1em;
@@ -11,7 +11,7 @@ $error_id = uniqid('error');
 		text-align: left;
 		color: #111;
 	}
-	
+
 	#kohana_error h1, #kohana_error h2 {
 		margin: 0;
 		padding: 1em;
@@ -20,37 +20,37 @@ $error_id = uniqid('error');
 		background: #CFF292;
 		color: #000000;
 	}
-	
+
 	#kohana_error h1 a, #kohana_error h2 a {
 		color: #000;
 	}
-	
+
 	#kohana_error h2 {
 		background: #CFF292;
 		border-top: 1px dotted;
 	}
-	
+
 	#kohana_error h3 {
 		margin: 0;
 		padding: 0.4em 0 0;
 		font-size: 1em;
 		font-weight: normal;
 	}
-	
+
 	#kohana_error p {
 		margin: 0;
 		padding: 0.2em 0;
 	}
-	
+
 	#kohana_error a {
 		color: #1b323b;
 	}
-	
+
 	#kohana_error pre {
 		overflow: auto;
 		white-space: pre-wrap;
 	}
-	
+
 	#kohana_error table {
 		width: 100%;
 		display: block;
@@ -59,20 +59,20 @@ $error_id = uniqid('error');
 		border-collapse: collapse;
 		background: #fff;
 	}
-	
+
 	#kohana_error table td {
 		border: solid 1px #ddd;
 		text-align: left;
 		vertical-align: top;
 		padding: 0.4em;
 	}
-	
+
 	#kohana_error div.content {
 		padding: 0.4em 1em 1em;
 		overflow: hidden;
 		border-top: 1px dotted;
 	}
-	
+
 	#kohana_error pre.source {
 		margin: 0 0 1em;
 		padding: 0.4em;
@@ -80,26 +80,26 @@ $error_id = uniqid('error');
 		border: dotted 1px #b7c680;
 		line-height: 1.2em;
 	}
-	
+
 	#kohana_error pre.source span.line {
 		display: block;
 	}
-	
+
 	#kohana_error pre.source span.highlight {
 		background: #f0eb96;
 	}
-	
+
 	#kohana_error pre.source span.line span.number {
 		color: #666;
 	}
-	
+
 	#kohana_error ol.trace {
 		display: block;
 		margin: 0 0 0 2em;
 		padding: 0;
 		list-style: decimal;
 	}
-	
+
 	#kohana_error ol.trace li {
 		margin: 0;
 		padding: 0;
@@ -110,19 +110,19 @@ $error_id = uniqid('error');
 	function koggle(elem)
 	{
 		elem = document.getElementById(elem);
-		
-		if (elem.style && elem.style['display']) 
+
+		if (elem.style && elem.style['display'])
 			// Only works with the "style" attr
 			var disp = elem.style['display'];
-		else 
-			if (elem.currentStyle) 
+		else
+			if (elem.currentStyle)
 				// For MSIE, naturally
 				var disp = elem.currentStyle['display'];
-			else 
-				if (window.getComputedStyle) 
+			else
+				if (window.getComputedStyle)
 					// For most other browsers
 					var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
-		
+
 		// Toggle the state of the "display" style
 		elem.style.display = disp == 'block' ? 'none' : 'block';
 		return false;
@@ -131,7 +131,7 @@ $error_id = uniqid('error');
 <div id="kohana_error">
 	<h1>
 		<span class="type">
-<?php echo $type?> [ <?php echo $code?> ]:
+<?php echo $type?> [ <?php echo __($code)?> ]:
 		</span>
 		<span class="message">
 <?php echo $message?>
-- 
cgit v1.2.3