dchill42 avatar dchill42 committed c3b94d1

Removed HMVC unrelated feature and cleaned up whitespace

Comments (0)

Files changed (3)

system/core/CodeIgniter.php

 	{
 		require APPPATH.'core/'.$CFG->config['subclass_prefix'].'Controller'.EXT;
 	}
-    else if (isset($CFG->config['alt_core_path']))
-    {
-        // Take a shot in the dark at including from core path
-        @include $CFG->config['alt_core_path'].'/core/'.$CFG->config['subclass_prefix'].'Controller'.EXT;
-    }
 
 	// Load the local application controller
 	// Note: The Router class automatically validates the controller path using the router->_validate_request().
 
 
 /* End of file CodeIgniter.php */
-/* Location: ./system/core/CodeIgniter.php */
+/* Location: ./system/core/CodeIgniter.php */

system/core/Controller.php

 	 */
 	private function __construct()
 	{
-        // Assign single object to static instance
-        self::$instance = $this;
+		// Assign single object to static instance
+		self::$instance = $this;
 		
 		// Prevent autoloaded controller attachment
 		$this->routed = NULL;
 
 	}
 
-    public function __call($name, $arguments)
-    {
-        if (isset($this->routed) && method_exists($this->routed, $name))
-        {
-            return call_user_func_array(array($this->routed, $name), $arguments);
-        }
-    }
+	public function __call($name, $arguments)
+	{
+		if (isset($this->routed) && method_exists($this->routed, $name))
+		{
+			return call_user_func_array(array($this->routed, $name), $arguments);
+		}
+	}
 
 	public static function &get_instance()
 	{
-        if (is_null(self::$instance))
-        {
-            new CI_RootController();
-        }
+		if (is_null(self::$instance))
+		{
+			new CI_RootController();
+		}
 		return self::$instance;
 	}
 }
  */
 class CI_Controller {
 
-    protected $CI = NULL;
+	protected $CI = NULL;
 
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
-        $this->CI = $this->get_instance();
+		$this->CI = $this->get_instance();
 
-        if (!isset($this->CI->routed))
-        {
-            // Must be the primary controller - attach ourselves
-		    $class = strtolower(get_class($this));
-            $this->CI->routed = $this;
-            $this->CI->$class = $this;
-        }
+		if (!isset($this->CI->routed))
+		{
+			// Must be the primary controller - attach ourselves
+			$class = strtolower(get_class($this));
+			$this->CI->routed = $this;
+			$this->CI->$class = $this;
+		}
 
 		log_message('debug', 'Controller Class Initialized');
 
 	}
 
-    /**
-     * Expose root controller members
-     */
-    public function __get($key)
-    {
+	/**
+	 * Expose root controller members
+	 */
+	public function __get($key)
+	{
 		if (isset($this->CI->$key))
 		{
 			return $this->CI->$key;
 		}
-    }
+	}
 
-    /**
-     * Test root controller member existence
-     */
-    public function __isset($key)
-    {
-        return isset($this->CI->$key);
-    }
+	/**
+	 * Test root controller member existence
+	 */
+	public function __isset($key)
+	{
+		return isset($this->CI->$key);
+	}
 
 	public static function &get_instance()
 	{
-        // Return root controller instance
+		// Return root controller instance
 		return CI_RootController::get_instance();
 	}
 }
 // END Controller class
 
 /* End of file Controller.php */
-/* Location: ./system/core/Controller.php */
+/* Location: ./system/core/Controller.php */

system/core/Loader.php

 	var $_ci_ob_level;
 	var $_ci_view_path		= '';
 	var $_ci_library_paths	= array();
-	var $_ci_mvc_paths	    = array();
+	var $_ci_mvc_paths		= array();
 	var $_base_classes		= array(); // Set by the controller class
 	var $_ci_cached_vars	= array();
 	var $_ci_classes		= array();
  		if (isset($CI->$name))
  		{
  			show_error('The controller name you are loading is the name of a resource that is already being used: '.
-                $name);
+				$name);
  		}
  
  		$controller = strtolower($controller);
  	 * @param	string
  	 * @return	string
  	 */
-    function _ci_fix_path($path)
-    {
-        // Assert trailing slash
+	function _ci_fix_path($path)
+	{
+		// Assert trailing slash
 		$path = rtrim($path, '/\\').'/';
 
-        // See if path exists as-is
-        if (file_exists($path))
-        {
-            return $path;
-        }
+		// See if path exists as-is
+		if (file_exists($path))
+		{
+			return $path;
+		}
 
-        // Strip any leading slash and pair with include directories
-        $dir = ltrim($path, '/\\');
-        foreach (explode(PATH_SEPARATOR, get_include_path()) as $include)
-        {
-            $include = rtrim($include, '/\\');
-            if (file_exists($include.'/'.$dir))
-            {
-                // Found include path - clean up and return
-                return $include.'/'.$dir;
-            }
-        }
+		// Strip any leading slash and pair with include directories
+		$dir = ltrim($path, '/\\');
+		foreach (explode(PATH_SEPARATOR, get_include_path()) as $include)
+		{
+			$include = rtrim($include, '/\\');
+			if (file_exists($include.'/'.$dir))
+			{
+				// Found include path - clean up and return
+				return $include.'/'.$dir;
+			}
+		}
 
-        // If we got here, it's not a real path - just return as-is
-        return $path;
-    }
+		// If we got here, it's not a real path - just return as-is
+		return $path;
+	}
  
  	// --------------------------------------------------------------------
  
 				// Does the file exist?
 				if (file_exists($_ci_path))
 				{
-                    break;
+					break;
 				}
-            }
+			}
 		}
 		else
 		{
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.