Changeset 1250

Timestamp:

11/23/2007 05:10:56 PM (11 months ago)

Author:

Shadowhand

Message:

More changes to core:

• Added a kohana_loading benchmark, for timing loading the core files
  
• Split controller_execution benchmark into controller_setup and controller_execution
  
• Created a new core config option, enable_utf8, to enable utf8 support to be turned off
  
• Modified other core libraries and helpers to be aware of utf8 being disabled
  

Location:

trunk

Files:

• application/config/config.php (modified) (4 diffs)
• system/core/Benchmark.php (modified) (1 diff)
• system/core/Bootstrap.php (modified) (2 diffs)
• system/core/Kohana.php (modified) (6 diffs)
• system/helpers/text.php (modified) (2 diffs)
• system/helpers/url.php (modified) (1 diff)
• system/libraries/Router.php (modified) (1 diff)
• system/libraries/Validation.php (modified) (3 diffs)

trunk/application/config/config.php

@@ -1 +1 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 /**
- * File: config.php
- *  This configuration file is unique to every application.
+ * Site-specific application configuration is done here. This configuration file
+ * does not extend any other configuration file. All of the items here are prefixed
+ * with "core", eg: core.index_page would fetch the index_page variable from the
+ * configuration array.
  *
  * Options:
@@ -9 +11 @@
  *  index_page           - name of the front controller, can be removed with URL rewriting
  *  url_suffix           - an extension that will be added to all generated URLs
+ *  enable_utf8          - enable or disable internal utf8 support
+ *  global_xss_filtering - enable or disable XSS attack filtering on all user input
  *  allow_config_set     - enable or disable setting of Config items
- *  global_xss_filtering - enable or disable XSS attack filtering on all user input
  *  extension_prefix     - filename prefix for library extensions
- *  include_paths        - extra Kohana resource paths, see <Kohana.find_file>
+ *  include_paths        - "module" support, additional resource paths that will be searched
  *  autoload             - libraries and models to be loaded with the controller
  */
@@ -21 +24 @@
         'index_page'           => 'index.php',
         'url_suffix'           => '',
-        'allow_config_set'     => TRUE,
+        'enable_utf8'          => TRUE,
         'global_xss_filtering' => FALSE,
+        'allow_config_set'     => FALSE,
         'extension_prefix'     => 'MY_',
         'include_paths'        => array
         (
-                // 'modules/auth',
-                // 'modules/ikeafans',
-                // 'modules/user_guide',
-                // 'modules/orm',
-                'modules/kodoc',
-                // 'modules/mixnotify'
+                // To enable the demo module, uncomment the following line
+                // 'modules/demo',
         ),
         'autoload'             => array
@@ -37 +37 @@
                 'libraries' => '',
                 'models'    => ''
-        )
+        ),
 );

trunk/system/core/Benchmark.php

@@ -1 +1 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 /**
+ * Kohana
+ *
+ * copyright - (c) 2007 Kohana Team
+ * license   - <http://kohanaphp.com/license.html>
+ * revision  - $Id$
+ */
+
+/**
  * Simple benchmarking.
- *
- * Kohana Source Code:
- *  author    - Kohana Team
- *  copyright - (c) 2007 Kohana Team
- *  license   - <http://kohanaphp.com/license.html>
  */
 final class Benchmark {

trunk/system/core/Bootstrap.php

@@ -18 +18 @@
 Benchmark::start(SYSTEM_BENCHMARK.'_total_execution_time');
 
-Benchmark::start(SYSTEM_BENCHMARK.'_environment_setup');
-require SYSPATH.'core/utf8'.EXT;
+Benchmark::start(SYSTEM_BENCHMARK.'_kohana_loading');
 require SYSPATH.'core/Config'.EXT;
 require SYSPATH.'core/Log'.EXT;
 require SYSPATH.'core/Event'.EXT;
 require SYSPATH.'core/Kohana'.EXT;
+Benchmark::stop(SYSTEM_BENCHMARK.'_kohana_loading');
 
 Event::run('system.setup');
-Benchmark::stop(SYSTEM_BENCHMARK.'_environment_setup');
 
 Benchmark::start(SYSTEM_BENCHMARK.'_system_initialization');
@@ -33 +32 @@
 Benchmark::stop(SYSTEM_BENCHMARK.'_system_initialization');
 
-Benchmark::start(SYSTEM_BENCHMARK.'_controller_execution');
 Event::run('system.execute');
-Benchmark::stop(SYSTEM_BENCHMARK.'_controller_execution');
 
 Event::run('system.shutdown');

trunk/system/core/Kohana.php

@@ -83 +83 @@
                         return;
 
+                // Start the environment setup benchmark
+                Benchmark::start(SYSTEM_BENCHMARK.'_environment_setup');
+
                 if (function_exists('date_default_timezone_set'))
                 {
@@ -112 +115 @@
                 set_magic_quotes_runtime(0);
 
+                // Only include utf8 support if it's enabled
+                Config::item('core.enable_utf8') and require SYSPATH.'core/utf8'.EXT;
+
                 // Send default text/html UTF-8 header
                 header('Content-type: text/html; charset=UTF-8');
@@ -154 +160 @@
                 // Setup is complete, prevent it from being run again
                 $run = TRUE;
+
+                // Stop the environment setup routine
+                Benchmark::start(SYSTEM_BENCHMARK.'_environment_setup');
         }
 
@@ -164 +173 @@
                 if (self::$instance == FALSE)
                 {
+                        Benchmark::start(SYSTEM_BENCHMARK.'_controller_setup');
+
                         // Include the Controller file
                         require Router::$directory.Router::$controller.EXT;
@@ -217 +228 @@
                         // Run system.post_controller_constructor
                         Event::run('system.post_controller_constructor');
+
+                        // Stop the controller setup benchmark
+                        Benchmark::stop(SYSTEM_BENCHMARK.'_controller_setup');
+
+                        // Start the controller execution benchmark
+                        Benchmark::start(SYSTEM_BENCHMARK.'_controller_execution');
 
                         // Controller method name, used for calling
@@ -253 +270 @@
                         // Run system.post_controller
                         Event::run('system.post_controller');
+
+                        Benchmark::stop(SYSTEM_BENCHMARK.'_controller_execution');
                 }
 

trunk/system/helpers/text.php

@@ -53 +53 @@
          *  A character-limited string with the end character attached.
          */
-        public static function limit_chars($str, $limit = 100, $end_char = '…', $preserve_words = FALSE)
-        {
+        public static function limit_chars($str, $limit = 100, $end_char = NULL, $preserve_words = FALSE)
+        {
+                $end_char = ($end_char === NULL) ? '…' : $end_char;
+
                 $limit = (int) $limit;
 
-                if (trim($str) == '' OR utf8::strlen($str) <= $limit)
+                if (trim($str) == '' OR (class_exists('utf8', FALSE) AND utf8::strlen($str) <= $limit) OR strlen($str) <= $limit)
                         return $str;
 
@@ -63 +65 @@
                         return $end_char;
 
-                if ( ! $preserve_words)
-                        return rtrim(utf8::substr($str, 0, $limit)).$end_char;
+                if ($preserve_words == FALSE)
+                {
+                        return rtrim(class_exists('utf8', FALSE) ? utf8::substr($str, 0, $limit) : substr($str, 0, $limit)).$end_char;
+                }
 
                 preg_match('/^.{'.($limit - 1).'}\S*/us', $str, $matches);

trunk/system/helpers/url.php

@@ -102 +102 @@
                 $title = preg_replace('/[-_\s]+/', $separator, $title);
 
-                // Replace accented characters by their unaccented equivalents
-                $title = utf8::transliterate_to_ascii($title);
+                if (class_exists('utf8', FALSE))
+                {
+                        // Replace accented characters by their unaccented equivalents
+                        $title = utf8::transliterate_to_ascii($title);
+                }
 
                 // Remove all characters that are not a-z, 0-9, or the separator

trunk/system/libraries/Router.php

@@ -207 +207 @@
                                                 list ($key, $val) = array_pad(explode('=', $pair), 1, '');
 
-                                                $_GET[utf8::clean($key)] = utf8::clean($val);
+                                                if (class_exists('utf8', FALSE))
+                                                {
+                                                        $_GET[utf8::clean($key)] = utf8::clean($val);
+                                                }
+                                                else
+                                                {
+                                                        $_GET[$key] = $val;
+                                                }
                                         }
                                 }

trunk/system/libraries/Validation.php

@@ -773 +773 @@
                 if (ctype_digit($val))
                 {
-                        if (utf8::strlen($str) >= $val)
-                                return TRUE;
+                        if (class_exists('utf8', FALSE))
+                        {
+                                if (utf8::strlen($str) >= $val)
+                                        return TRUE;
+                        }
+                        else
+                        {
+                                if (strlen($str) >= $val)
+                                        return TRUE;
+                        }
                 }
 
@@ -798 +806 @@
                 if (ctype_digit($val))
                 {
-                        if (utf8::strlen($str) <= $val)
-                                return TRUE;
+                        if (class_exists('utf8', FALSE))
+                        {
+                                if (utf8::strlen($str) <= $val)
+                                        return TRUE;
+                        }
+                        else
+                        {
+                                if (strlen($str) <= $val)
+                                        return TRUE;
+                        }
                 }
 
@@ -823 +839 @@
                 if (ctype_digit($val))
                 {
-                        if (utf8::strlen($str) == $val)
-                                return TRUE;
+                        if (class_exists('utf8', FALSE))
+                        {
+                                if (utf8::strlen($str) == $val)
+                                        return TRUE;
+                        }
+                        else
+                        {
+                                if (strlen($str) == $val)
+                                        return TRUE;
+                        }
                 }