WebSVN – lars-tiefland.ci – Diff – /system/core/Loader.php

+ *
  * An open source application development framework for PHP
+ *
  * This content is released under the MIT License (MIT)
+ *
- * Copyright (c) 2014 - 2016, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * THE SOFTWARE.
+ *
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
  * @filesource
  */
 	 *				or leave it to the Output class
 	 * @return	object|string
 	 */
 	public function view($view, $vars = array(), $return = FALSE)
+	{
-		return $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_object_to_array($vars), '_ci_return' => $return));
+		return $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_prepare_view_vars($vars), '_ci_return' => $return));
+	}
 	// --------------------------------------------------------------------
 	 * @param 	string	$val	Value to set, only used if $vars is a string
 	 * @return	object
 	 */
 	public function vars($vars, $val = '')
+	{
-		if (is_string($vars))
+		$vars = is_string($vars)
-		{
-			$vars = array($vars => $val);
+			? array($vars => $val)
-		}
-		$vars = $this->_ci_object_to_array($vars);
+			: $this->_ci_prepare_view_vars($vars);
-		if (is_array($vars) && count($vars) > 0)
+		foreach ($vars as $key => $val)
-		{
-			foreach ($vars as $key => $val)
-			{
+		{
-				$this->_ci_cached_vars[$key] = $val;
 			$this->_ci_cached_vars[$key] = $val;
+		}
 	 * @param	string|string[]	$helpers	Helper name(s)
 	 * @return	object
 	 */
 	public function helper($helpers = array())
+	{
-		foreach ($this->_ci_prep_filename($helpers, '_helper') as $helper)
+		is_array($helpers) OR $helpers = array($helpers);
+		foreach ($helpers as &$helper)
+		{
+			$filename = basename($helper);
+			$filepath = ($filename === $helper) ? '' : substr($helper, 0, strlen($helper) - strlen($filename));
+			$filename = strtolower(preg_replace('#(_helper)?(.php)?$#i', '', $filename)).'_helper';
+			$helper   = $filepath.$filename;
 			if (isset($this->_ci_helpers[$helper]))
+			{
 				continue;
+			}
 			// Is this a helper extension request?
-			$ext_helper = config_item('subclass_prefix').$helper;
+			$ext_helper = config_item('subclass_prefix').$filename;
 			$ext_loaded = FALSE;
 			foreach ($this->_ci_helper_paths as $path)
+			{
 				if (file_exists($path.'helpers/'.$ext_helper.'.php'))
 		 * 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))
-		{
-			foreach (array_keys($_ci_vars) as $key)
-			{
-				if (strncmp($key, '_ci_', 4) === 0)
-				{
-					unset($_ci_vars[$key]);
-				}
-			}
-			$this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $_ci_vars);
+		empty($_ci_vars) OR $this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $_ci_vars);
-		}
 		extract($this->_ci_cached_vars);
 		/*
 		 * Buffer the output
+	}
 	// --------------------------------------------------------------------
 	/**
-	 * CI Object to Array translator
+	 * Prepare variables for _ci_vars, to be later extract()-ed inside views
 	 *
-	 * Takes an object as input and converts the class variables to
+	 * Converts objects to associative arrays and filters-out internal
-	 * an associative array with key/value pairs.
+	 * variable names (i.e. keys prexied with '_ci_').
+	 *
-	 * @param	object	$object	Object data to translate
+	 * @param	mixed	$vars
 	 * @return	array
 	 */
+	protected function _ci_prepare_view_vars($vars)
+	{
+		if ( ! is_array($vars))
-	protected function _ci_object_to_array($object)
+		{
+			$vars = is_object($vars)
+				? get_object_vars($object)
+				: array();
+		}
+		foreach (array_keys($vars) as $key)
+		{
+			if (strncmp($key, '_ci_', 4) === 0)
+			{
+				unset($vars[$key]);
+			}
+		}
-		return is_object($object) ? get_object_vars($object) : $object;
+		return $vars;
+	}
 	protected function &_ci_get_component($component)
+	{
 		$CI =& get_instance();
 		return $CI->$component;
+	}
-	// --------------------------------------------------------------------
-	/**
-	 * Prep filename
-	 *
-	 * This function prepares filenames of various items to
-	 * make their loading more reliable.
-	 *
-	 * @param	string|string[]	$filename	Filename(s)
-	 * @param 	string		$extension	Filename extension
-	 * @return	array
-	 */
-	protected function _ci_prep_filename($filename, $extension)
-	{
-		if ( ! is_array($filename))
-		{
-			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
-		}
-		else
-		{
-			foreach ($filename as $key => $val)
-			{
-				$filename[$key] = strtolower(str_replace(array($extension, '.php'), '', $val).$extension);
-			}
-			return $filename;
-		}
-	}
+}

Subversion-Projekte lars-tiefland.ci

(root)/system/core/Loader.php – Revision 68 → 2049