Changeset 3171

Timestamp:

07/20/2008 09:27:11 PM (4 months ago)

Author:

Shadowhand

Message:

Optimizations to Input, URI, View, and Controller

Location:

trunk/system/libraries

Files:

• Controller.php (modified) (1 diff)
• Input.php (modified) (3 diffs)
• URI.php (modified) (1 diff)
• View.php (modified) (3 diffs)

trunk/system/libraries/Controller.php

@@ -23 +23 @@
         public function __construct()
         {
-                if (Kohana::$instance === NULL)
+                if (Kohana::$instance == NULL)
                 {
                         // Set the instance to the first controller loaded
                         Kohana::$instance = $this;
+                }
 
-                        // URI should always be available
-                        $this->uri = new URI;
+                // URI should always be available
+                $this->uri = URI::instance();
 
-                        // Input should always be available
-                        $this->input = new Input;
-                }
-                else
-                {
-                        // URI should always be available
-                        $this->uri = Kohana::$instance->uri;
-
-                        // Input should always be available
-                        $this->input = Kohana::$instance->input;
-                }
+                // Input should always be available
+                $this->input = Input::instance();
         }
 

trunk/system/libraries/Input.php

@@ -12 +12 @@
 class Input_Core {
 
-        // Singleton instance
-        protected static $instance;
-
         // Enable or disable automatic XSS cleaning
         protected $use_xss_clean = FALSE;
@@ -29 +26 @@
         public static function instance()
         {
-                // Create an instance if none exists
-                empty(self::$instance) and new Input;
-
-                return self::$instance;
+                static $instance;
+
+                if ($instance == NULL)
+                {
+                        // Create a new instance
+                        $instance = new Input;
+                }
+
+                return $instance;
         }
 
@@ -268 +270 @@
 
                 // Do not clean empty strings
-                if (trim($string) === '')
+                if (trim($string) == '')
                         return $string;
 
-                if ( ! is_string($tool))
-                {
-                        // Fetch the configured tool
-                        if (is_bool($tool = Kohana::config('core.global_xss_filtering')))
-                        {
-                                // Make sure that the default tool is used
-                                $tool = 'default';
-                        }
+                if ($tool === NULL)
+                {
+                        // Use the default tool
+                        $tool = Kohana::config('core.global_xss_filtering');
                 }
 

trunk/system/libraries/URI.php

@@ -21 +21 @@
                 static $instance;
 
-                // Initialize the URI instance
-                empty($instance) and $instance = new URI;
+                if ($instance == NULL)
+                {
+                        // Initialize the URI instance
+                        $instance = new URI;
+                }
 
                 return $instance;

trunk/system/libraries/View.php

@@ -68 +68 @@
         public function set_filename($name, $type = NULL)
         {
-                if (empty($type))
+                if ($type == NULL)
                 {
                         // Load the filename and set the content type
@@ -83 +83 @@
                         $this->kohana_filename = Kohana::find_file('views', $name, TRUE, $type);
                         $this->kohana_filetype = Kohana::config('mimes.'.$type);
-                        $this->kohana_filetype = empty($this->kohana_filetype) ? $type : $this->kohana_filetype;
+
+                        if ($this->kohana_filetype == NULL)
+                        {
+                                // Use the specified type
+                                $this->kohana_filetype = $type;
+                        }
                 }
 
@@ -232 +237 @@
                 {
                         // Set the content type and size
-                        header('Content-Type: '.$this->kohana_filetype[0]);
+                        header('Content-type: '.$this->kohana_filetype[0]);
 
                         if ($print === TRUE)