fixing a very nasty bug - file_exists() doesn't work with ../../ in path names

htdocs/application/core/MY_Loader.php

@@ -4,6 +4,7 @@
  * Function list:
  * - __construct()
  * - view()
+ * - _ci_load()
  * Classes list:
  * - MY_Loader extends CI_Loader
  */
@@ -37,9 +38,167 @@ class MY_Loader extends CI_Loader
 
 		//return
 		return $this->_ci_load(array(
-			'_ci_view' => '../../' . $view_path,
+			'_ci_view' => $view_path,
 			'_ci_vars' => $this->_ci_object_to_array($vars) ,
 			'_ci_return' => $return
 		));
 	}
+	/**
+	 * Loader
+	 *
+	 * This function is used to load views and files.
+	 * Variables are prefixed with _ci_ to avoid symbol collision with
+	 * variables made available to view files
+	 *
+	 * @param	array
+	 * @return	void
+	 */
+	protected 
+	function _ci_load($_ci_data) 
+	{
+
+		// Set the default data variables
+		foreach (array(
+			'_ci_view',
+			'_ci_vars',
+			'_ci_path',
+			'_ci_return'
+		) as $_ci_val) 
+		{
+			$$_ci_val = (!isset($_ci_data[$_ci_val])) ? FALSE : $_ci_data[$_ci_val];
+		}
+		$file_exists = FALSE;
+
+		// Set the path to the requested file
+		
+		if ($_ci_path != '') 
+		{
+			$_ci_x = explode('/', $_ci_path);
+			$_ci_file = end($_ci_x);
+		}
+		else
+		{
+			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
+			$_ci_file = ($_ci_ext == '') ? $_ci_view . '.php' : $_ci_view;
+			foreach ($this->_ci_view_paths as $view_file => $cascade) 
+			{
+
+				/* *** modification for stikked themes ***
+				 *
+				 * we are by default in the htdocs/application/views folder, which is bad.
+                 * for security reasons, themes folder should be outside the application dir.
+				 * but file_exists() doesn't work with ../../ in filenames :-(
+				 * so, applying the full FrontControllerPATH here, making ../../ superfluous.
+				 *
+				*/
+				
+				if (file_exists(FCPATH . $_ci_file)) 
+				{
+					$_ci_path = FCPATH . $_ci_file;
+					$file_exists = TRUE;
+					break;
+				}
+				
+				if (!$cascade) 
+				{
+					break;
+				}
+			}
+		}
+		
+		if (!$file_exists && !file_exists($_ci_path)) 
+		{
+			show_error('Unable to load the requested file: ' . $_ci_file);
+		}
+
+		// This allows anything loaded using $this->load (views, files, etc.)
+		// to become accessible from within the Controller and Model functions.
+
+		$_ci_CI = & get_instance();
+		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var) 
+		{
+			
+			if (!isset($this->$_ci_key)) 
+			{
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
+			}
+		}
+
+		/*
+		 * Extract and cache variables
+		 *
+		 * You can either set variables using the dedicated $this->load_vars()
+		 * function or via the second parameter of this function. We'll merge
+		 * the two types and cache them so that views that are embedded within
+		 * other views can have access to these variables.
+		*/
+		
+		if (is_array($_ci_vars)) 
+		{
+			$this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $_ci_vars);
+		}
+		extract($this->_ci_cached_vars);
+
+		/*
+		 * Buffer the output
+		 *
+		 * We buffer the output for two reasons:
+		 * 1. Speed. You get a significant speed boost.
+		 * 2. So that the final rendered template can be
+		 * post-processed by the output class.  Why do we
+		 * need post processing?  For one thing, in order to
+		 * show the elapsed page load time.  Unless we
+		 * can intercept the content right before it's sent to
+		 * the browser and then stop the timer it won't be accurate.
+		*/
+		ob_start();
+
+		// If the PHP installation does not support short tags we'll
+		// do a little string replacement, changing the short tags
+
+		// to standard PHP echo statements.
+
+		
+		if ((bool)@ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE) 
+		{
+			echo eval('?>' . preg_replace("/;*\s*\?>/", "; ?>", str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
+		}
+		else
+		{
+			include ($_ci_path); // include() vs include_once() allows for multiple views with the same name
+
+			
+		}
+		log_message('debug', 'File loaded: ' . $_ci_path);
+
+		// Return the file data if requested
+		
+		if ($_ci_return === TRUE) 
+		{
+			$buffer = ob_get_contents();
+			@ob_end_clean();
+			return $buffer;
+		}
+
+		/*
+		 * Flush the buffer... or buff the flusher?
+		 *
+		 * In order to permit views to be nested within
+		 * other views, we need to flush the content back out whenever
+		 * we are beyond the first level of output buffering so that
+		 * it can be seen and included properly by the first included
+		 * template and any subsequent ones. Oy!
+		 *
+		*/
+		
+		if (ob_get_level() > $this->_ci_ob_level + 1) 
+		{
+			ob_end_flush();
+		}
+		else
+		{
+			$_ci_CI->output->append_output(ob_get_contents());
+			@ob_end_clean();
+		}
+	}
 }