Changeset 3367

Timestamp:

08/27/2008 05:22:55 PM (3 months ago)

Author:

Shadowhand

Message:

Moved core classes to system/classes, as they should have been originally

Location:

trunk/system/classes

Files:

• benchmark.php (moved) (moved from trunk/system/core/Benchmark.php) (1 prop)
• event.php (moved) (moved from trunk/system/core/Event.php) (1 prop)
• kohana.php (moved) (moved from trunk/system/core/Kohana.php) (14 diffs, 1 prop)
• router.php (modified) (1 diff)
• utf8 (deleted)

trunk/system/classes/kohana.php

@@ -126 +126 @@
                 self::$buffer_level = ob_get_level();
 
+                // Send default text/html UTF-8 header
+                header('Content-Type: text/html; charset=UTF-8');
+
                 // Set autoloader
                 spl_autoload_register(array('Kohana', 'auto_load'));
@@ -135 +138 @@
                 Kohana_PHP_Exception::enable();
 
-                // Send default text/html UTF-8 header
-                header('Content-Type: text/html; charset=UTF-8');
+                if (self::$configuration['core']['log_threshold'] > 0)
+                {
+                        // Set the log directory
+                        self::log_directory(self::$configuration['core']['log_directory']);
+
+                        // Enable log writing at shutdown
+                        register_shutdown_function(array(__CLASS__, 'log_save'));
+                }
 
                 // Load locales
-                $locales = self::config('locale.language');
+                $locales = Kohana::config('locale.language');
 
                 // Make first locale UTF-8
@@ -146 +155 @@
                 // Set locale information
                 self::$locale = setlocale(LC_ALL, $locales);
-
-                if (self::$configuration['core']['log_threshold'] > 0)
-                {
-                        // Set the log directory
-                        self::log_directory(self::$configuration['core']['log_directory']);
-
-                        // Enable log writing at shutdown
-                        register_shutdown_function(array(__CLASS__, 'log_save'));
-                }
 
                 // Enable Kohana routing
@@ -235 +235 @@
                 if (self::$instance === NULL)
                 {
+                        // Routing has been completed
+                        Event::run('system.post_routing');
+
                         Benchmark::start(SYSTEM_BENCHMARK.'_controller_setup');
 
-                        if (Router::$method[0] === '_')
+                        if (Router::$controller === NULL OR Router::$method[0] === '_')
                         {
                                 // Do not allow access to hidden methods
@@ -243 +246 @@
                         }
 
-                        // Include the Controller file
-                        require Router::$controller_path;
-
                         try
                         {
                                 // Start validation of the controller
-                                $class = new ReflectionClass(ucfirst(Router::$controller).'_Controller');
+                                $class = new ReflectionClass('Controller_'.ucfirst(Router::$controller));
                         }
                         catch (ReflectionException $e)
@@ -280 +280 @@
                                 {
                                         // Do not attempt to invoke protected methods
-                                        throw new ReflectionException('protected controller method');
+                                        throw new ReflectionException('invalid router method');
                                 }
 
@@ -325 +325 @@
                 if ($process === TRUE)
                 {
+                        // Get standard PHP include paths
+                        // $php_paths = get_include_path();
+
                         // Add APPPATH as the first path
                         self::$include_paths = array(APPPATH);
@@ -339 +342 @@
                         // Add SYSPATH as the last path
                         self::$include_paths[] = SYSPATH;
+
+                        // New PHP include paths
+                        // $new_paths = array_diff(self::$include_paths, explode(PATH_SEPARATOR, $php_paths));
+
+                        // set_include_path($php_paths.PATH_SEPARATOR.implode(PATH_SEPARATOR, $new_paths));
                 }
 
@@ -820 +828 @@
          * Provides class auto-loading.
          *
-         * @throws  Kohana_Exception
          * @param   string  name of class
          * @return  bool
@@ -829 +836 @@
                         return TRUE;
 
-                if (($suffix = strrpos($class, '_')) > 0)
-                {
-                        // Find the class suffix
-                        $suffix = substr($class, $suffix + 1);
-                }
-                else
-                {
-                        // No suffix
-                        $suffix = FALSE;
-                }
-
-                if ($suffix === 'Core')
-                {
-                        $type = 'libraries';
-                        $file = substr($class, 0, -5);
-                }
-                elseif ($suffix === 'Controller')
-                {
-                        $type = 'controllers';
-                        // Lowercase filename
-                        $file = strtolower(substr($class, 0, -11));
-                }
-                elseif ($suffix === 'Model')
-                {
-                        $type = 'models';
-                        // Lowercase filename
-                        $file = strtolower(substr($class, 0, -6));
-                }
-                elseif ($suffix === 'Driver')
-                {
-                        $type = 'libraries/drivers';
-                        $file = str_replace('_', '/', substr($class, 0, -7));
-                }
-                else
-                {
-                        // This could be either a library or a helper, but libraries must
-                        // always be capitalized, so we check if the first character is
-                        // uppercase. If it is, we are loading a library, not a helper.
-                        $type = ($class[0] < 'a') ? 'libraries' : 'helpers';
-                        $file = $class;
-                }
-
-                if (($filepath = self::find_file($type, $file)) === FALSE)
+                // Determine class filename
+                $filename = str_replace('_', '/', strtolower($class));
+
+                if ( ! ($path = Kohana::find_file('classes', $filename, FALSE)))
                         return FALSE;
 
-                // Load the file
-                require $filepath;
-
-                if ($type === 'libraries' OR $type === 'helpers')
-                {
-                        if ($extension = self::find_file($type, self::$configuration['core']['extension_prefix'].$class))
-                        {
-                                // Load the extension
-                                require $extension;
-                        }
-                        elseif ($suffix !== 'Core' AND class_exists($class.'_Core', FALSE))
+                // Load class
+                require $path;
+
+                if (class_exists($class.'_Core', FALSE))
+                {
+                        if ($path = Kohana::find_file('extensions', $filename, FALSE))
+                        {
+                                // Load class extension
+                                require $path;
+                        }
+                        else
                         {
                                 // Class extension to be evaluated
@@ -1463 +1431 @@
 
                                 $args = array();
-                                foreach ($trace['args'] as $arg)
-                                {
-                                        if (is_string($arg) AND file_exists($arg))
+
+                                if ( ! empty($trace['args']))
+                                {
+                                        foreach ($trace['args'] as $arg)
                                         {
-                                                // Sanitize path
-                                                $arg = Kohana::sanitize_path($arg);
-                                        }
-
-                                        switch (gettype($arg))
-                                        {
-                                                case 'object':
-                                                        $args[] = '&lt;object&gt; '.get_class($arg);
-                                                break;
-                                                case 'array':
-                                                        if (is_callable($arg, FALSE, $call))
-                                                        {
-                                                                $args[] = '&lt;callback&gt; '.$call;
-                                                        }
-                                                        else
-                                                        {
-                                                                $args[] = '&lt;array&gt;';
-                                                        }
-                                                break;
-                                                case 'string':
-                                                        $args[] = "'$arg'";
-                                                break;
-                                                default:
-                                                        $args[] = $arg;
-                                                break;
+                                                if (is_string($arg) AND file_exists($arg))
+                                                {
+                                                        // Sanitize path
+                                                        $arg = Kohana::sanitize_path($arg);
+                                                }
+
+                                                switch (gettype($arg))
+                                                {
+                                                        case 'object':
+                                                                $args[] = '&lt;object&gt; '.get_class($arg);
+                                                        break;
+                                                        case 'array':
+                                                                if (is_callable($arg, FALSE, $call))
+                                                                {
+                                                                        $args[] = '&lt;callback&gt; '.$call;
+                                                                }
+                                                                else
+                                                                {
+                                                                        $args[] = '&lt;array&gt;';
+                                                                }
+                                                        break;
+                                                        case 'string':
+                                                                $args[] = "'$arg'";
+                                                        break;
+                                                        default:
+                                                                $args[] = $arg;
+                                                        break;
+                                                }
                                         }
                                 }
@@ -1601 +1573 @@
                 // An error has been triggered
                 Kohana::$has_error = TRUE;
+
+                if (is_numeric($exception->code))
+                {
+                        $codes = Kohana::lang('errors');
+
+                        if ( ! empty($codes[$exception->code]))
+                        {
+                                list($level, $error) = $codes[$exception->code];
+                        }
+                        else
+                        {
+                                $level = 1;
+                                $error = get_class($exception);
+                        }
+                }
+                else
+                {
+                        // Custom error message, this will never be logged
+                        $level = 5;
+                        $error = $exception->code;
+                }
+
+                if ($level >= Kohana::config('core.log_threshold'))
+                {
+                        // Log the error
+                        Kohana::log('error', Kohana::lang('core.uncaught_exception', $error, $exception->message, $exception->file, $exception->line));
+                }
+
+                if (method_exists($exception, 'sendHeaders') AND ! headers_sent())
+                {
+                        // Send the headers if they have not already been sent
+                        $exception->sendHeaders();
+                }
 
                 echo $exception;
@@ -1835 +1840 @@
                 Kohana::$has_error = TRUE;
 
-                echo new Kohana_PHP_Exception($code, $error, $file, $line, $context);
+                // Create an exception
+                $exception = new Kohana_PHP_Exception($code, $error, $file, $line, $context);
+
+                // Get the error level and name
+                list ($level, $error) = Kohana::lang('errors.'.$exception->code);
+
+                if ($level >= Kohana::config('core.log_threshold'))
+                {
+                        // Log the error
+                        Kohana::log('error', Kohana::lang('core.uncaught_exception', $error, $exception->message, $exception->file, $exception->line));
+                }
+
+                if (method_exists($exception, 'sendHeaders') AND ! headers_sent())
+                {
+                        // Send the headers if they have not already been sent
+                        $exception->sendHeaders();
+                }
+
+                echo $exception;
         }
 
@@ -1853 +1876 @@
         }
 
+        public function sendHeaders()
+        {
+                // Send the 500 header
+                header('HTTP/1.1 500 Internal Server Error');
+        }
+
 } // End Kohana PHP Exception
 

trunk/system/classes/router.php

@@ -24 +24 @@
          * Event by default. 
          *
+         * [ref-esr]: http://docs.kohanaphp.com/events/system.routing
          * @return  boolean
          */