Changeset 2249 for trunk/index.php

Timestamp:

03/09/2008 03:09:43 PM (9 months ago)

Author:

Shadowhand

Message:

Changes to Kohana exception/error handling:

• Added KOHANA_ERROR_CSS to index.php
  
• Updated error pages to use new KOHANA_ERROR_CSS constant
  
• Reflected changes in Kohana and i18n/core.php
  
• Kohana::exeception_handler will no longer include the backtrace when IN_PRODUCTION is enabled, for a small security benefit
  
• Changed index.php directory checks to only execute when IN_PRODUCTION is enabled, for a small performance benefit
  
• Small cleanups in index.php comments
  

Files:

• trunk/index.php (modified) (5 diffs)

trunk/index.php

@@ -5 +5 @@
  * PHP error_reporting level may also be changed.
  *
- * @package    Core
- * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @see http://kohanaphp.com
  */
 
@@ -45 +42 @@
 $kohana_system = 'system';
 
+/**
+ * Test to make sure that Kohana is running on PHP 5.2 or newer. Once you are
+ * sure that your environment is compatible with Kohana, you can comment this
+ * line out. When running an application on a new server, uncomment this line
+ * to check the PHP version quickly.
+ */
+version_compare(PHP_VERSION, '5.2', '<') and exit('Kohana requires PHP 5.2 or newer.');
 
 /**
@@ -59 +63 @@
 
 /**
+ * Define the Kohana-generated error message style.
+ */
+define('KOHANA_ERROR_CSS',
+        // Any of these styles can be changed to affect all error messages.
+        'div#kohana_error { background: #fff; border:solid 1px #ccc; font-family:sans-serif; color:#111; font-size: 14px; line-height: 130%; vertical-align: baseline; }'.
+        'div#kohana_error h3 { color:#fff; font-size:16px; padding:8px 6px; margin:0 0 8px; background: #f15a00; text-align: center; }'.
+        'div#kohana_error a { color:#228; text-decoration:none; }'.
+        'div#kohana_error a:hover { text-decoration:underline; }'.
+        'div#kohana_error strong { color:#900; }'.
+        'div#kohana_error p { margin:0; padding:4px 6px 10px; }'.
+        'div#kohana_error tt,'.
+        'div#kohana_error pre,'.
+        'div#kohana_error code { font-family:monospace; padding:2px 4px; white-space:pre; font-size:12px; color:#333; }'.
+        'div#kohana_error tt { font-style:italic; }'.
+        'div#kohana_error tt:before { content:">"; color:#aaa; }'.
+        'div#kohana_error code tt:before { content:""; }'.
+        'div#kohana_error pre,'.
+        'div#kohana_error code { background:#eaeee5; border:solid 0 #D6D8D1; border-width:0 1px 1px 0; }'.
+        'div#kohana_error .block { display:block; text-align:left; }'.
+        'div#kohana_error .stats { padding: 4px; background: #eee; border-top:solid 1px #ccc; text-align:center; font-size:10px; color: #888; }'.
+        'div#kohana_error .backtrace { margin:0; padding:0 6px; list-style:none; line-height:12px; }'
+);
+
+/**
  * If you rename all of your .php files to a different extension, set the new
  * extension here. This option can left to .php, even if this file is has a
@@ -64 +92 @@
  */
 define('EXT', '.php');
-
-/**
- * Test to make sure that Kohana is running on PHP 5.2 or newer. Once you are
- * sure that your environment is compatible with Kohana, you can disable this.
- */
-version_compare(PHP_VERSION, '5.2', '<') and exit('Kohana requires PHP 5.2 or newer.');
 
 //
@@ -92 +114 @@
 unset($kohana_application, $kohana_modules, $kohana_system);
 
-(is_dir(APPPATH) AND is_dir(APPPATH.'/config')) or die
-(
-        'Your <code>$kohana_application</code> directory does not exist. '.
-        'Set a valid <code>$kohana_application</code> in <tt>'.KOHANA.'</tt> and refresh the page.'
-);
+if ( ! IN_PRODUCTION)
+{
+        // Check APPPATH
+        if ( ! (is_dir(APPPATH) AND file_exists(APPPATH.'/config/config'.EXT)))
+        {
+                die
+                (
+                        '<style type="text/css">'.KOHANA_ERROR_CSS.'</style>'.
+                        '<div id="kohana_error" style="width:26em;margin:50px auto;text-align:center;">'.
+                                '<h3>Application Directory Not Found</h3>'.
+                                '<p>The <code>$kohana_application</code> directory does not exist.</p>'.
+                                '<p>Set <code>$kohana_application</code> in <tt>'.KOHANA.'</tt> to a valid directory and refresh the page.</p>'.
+                        '</div>'
+                );
+        }
 
-(is_dir(SYSPATH) AND file_exists(SYSPATH.'/core/'.'Bootstrap'.EXT)) or die
-(
-        'Your <code>$kohana_system</code> directory does not exist. '.
-        'Set a valid <code>$kohana_system</code> in <tt>'.KOHANA.'</tt> and refresh the page.'
-);
+        // Check SYSPATH
+        if ( ! (is_dir(SYSPATH) AND file_exists(SYSPATH.'/core/Bootstrap'.EXT)))
+        {
+                die
+                (
+                        '<style type="text/css">'.KOHANA_ERROR_CSS.'</style>'.
+                        '<div id="kohana_error" style="width:26em;margin:50px auto;text-align:center;">'.
+                                '<h3>System Directory Not Found</h3>'.
+                                '<p>The <code>$kohana_system</code> directory does not exist.</p>'.
+                                '<p>Set <code>$kohana_system</code> in <tt>'.KOHANA.'</tt> to a valid directory and refresh the page.</p>'.
+                        '</div>'
+                );
+        }
+}
 
+// Initialize.
 require SYSPATH.'core/Bootstrap'.EXT;