ci-bonfire / Sprint

myth/Route.php

Indentation +639 added lines, -639 removed lines

@@ -43,644 +43,644 @@
 class Route
 {
 
-    // Our routes, ripe for the picking.
-    public $routes = array();
-
-    // Holds key/value pairs of named routes
-    public static $names = array();
-
-    // Used for grouping routes together.
-    public $group = null;
-
-    // Holds the 'areas' of the site.
-    public static $areas = array();
-
-    // The default controller to use in case
-    // 'default_controller' is not in the routes file.
-    protected $default_home = 'home';
-
-    // The default constraint to use in route building
-    protected $default_constraint = 'any';
-
-    protected $constraints = [
-        'any'  => '(:any)',
-        'num'  => '(:num)',
-        'id'   => '(:num)',
-        'name' => "([a-zA-Z']+)"
-    ];
-
-    protected $current_subdomain = null;
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Combines the routes that we've defined with the Route class with the
-     * routes passed in. This is intended to be used  after all routes have been
-     * defined to merge CI's default $route array with our routes.
-     *
-     * Example:
-     *     $route['default_controller'] = 'home';
-     *     Route::resource('posts');
-     *     $route = Route::map($route);
-     *
-     * @param array $routes
-     * @internal param array $route The array to merge
-     * @return array         The merge route array.
-     */
-    public function map($routes = array())
-    {
-        $controller = isset($routes['default_controller']) ? $routes['default_controller'] : $this->default_home;
-
-        $routes = array_merge($routes, $this->routes);
-
-        foreach ($routes as $from => $to) {
-            $routes[$from] = str_ireplace('{default_controller}', $controller, $to);
-        }
-
-        return $routes;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * A single point to the basic routing. Can be used in place of CI's $route
-     * array if desired. Used internally by many of the methods.
-     *
-     * Available options are currently:
-     *      'as'        - remembers the route via a name that can be called outside of it.
-     *      'offset'    - Offsets and parameters ($1, $2, etc) in routes by the specified amount.
-     *                    Useful while doing versioning of API's, etc.
-     *
-     * Example:
-     *      $route->any('news', 'posts/index');
-     *
-     * @param string $from
-     * @param string $to
-     * @param array  $options
-     * @return void
-     */
-    public function any($from, $to, $options = array())
-    {
-        $this->create($from, $to, $options);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the default constraint to be used in the system. Typically
-     * for use with the 'resources' method.
-     *
-     * @param $constraint
-     */
-    public function setDefaultConstraint($constraint)
-    {
-        if (array_key_exists($constraint, $this->constraints)) {
-            $this->default_constraint = $constraint;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Registers a new constraint to be used internally. Useful for creating
-     * very specific regex patterns, or simply to allow your routes to be
-     * a tad more readable.
-     *
-     * Example:
-     *      $route->registerConstraint('hero', '(^.*)');
-     *
-     *      $route->any('home/{hero}', 'heroes/journey');
-     *
-     *      // Route then looks like:
-     *      $route['home/(^.*)'] = 'heroes/journey';
-     *
-     * @param      $name
-     * @param      $pattern
-     * @param bool $overwrite
-     */
-    public function registerConstraint($name, $pattern, $overwrite = false)
-    {
-        // Ensure consistency
-        $name    = trim($name, '{} ');
-        $pattern = '(' . trim($pattern, '() ') . ')';
-
-        // Not here? Add it and leave...
-        if (! array_key_exists($name, $this->constraints)) {
-            $this->constraints[$name] = $pattern;
-
-            return;
-        }
-
-        // Here? Then it exists. Should we overwrite it?
-        if ($overwrite) {
-            $this->constraints[$name] = $pattern;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Named Routes
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the value of a named route. Useful for getting named
-     * routes for use while building with site_url() or in templates
-     * where you don't need to instantiate the route class.
-     *
-     * Example:
-     *      $route->any('news', 'posts/index', ['as' => 'blog']);
-     *
-     *      // Returns http://mysite.com/news
-     *      site_url( Route::named('blog') );
-     *
-     * @param  [type] $name [description]
-     * @return [type]       [description]
-     */
-    public static function named($name)
-    {
-        if (isset(self::$names[$name])) {
-            return self::$names[$name];
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Grouping Routes
-    //--------------------------------------------------------------------
-
-    /**
-     * Group a series of routes under a single URL segment. This is handy
-     * for grouping items into an admin area, like:
-     *
-     * Example:
-     *     $route->group('admin', function() {
-     *            $route->resources('users');
-     *     });
-     *
-     * @param  string   $name     The name to group/prefix the routes with.
-     * @param  \Closure $callback An anonymous function that allows you route inside of this group.
-     * @return void
-     */
-    public function group($name, \Closure $callback)
-    {
-        $old_group = $this->group;
-
-        // To register a route, we'll set a flag so that our router
-        // so it will see the groupname.
-        $this->group = ltrim($old_group . '/' . $name, '/');
-
-        call_user_func($callback);
-
-        // Make sure to clear the group name so we don't accidentally
-        // group any ones we didn't want to.
-        $this->group = $old_group;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // HTTP Verb-based routing
-    //--------------------------------------------------------------------
-    // Routing works here because, as the routes config file is read in,
-    // the various HTTP verb-based routes will only be added to the in-memory
-    // routes if it is a call that should respond to that verb.
-    //
-    // The options array is typically used to pass in an 'as' or var, but may
-    // be expanded in the future. See the docblock for 'any' method above for
-    // current list of globally available options.
-    //
-
-    /**
-     * Specifies a single route to match for multiple HTTP Verbs.
-     *
-     * Example:
-     *  $route->match( ['get', 'post'], 'users/(:num)', 'users/$1);
-     *
-     * @param array $verbs
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function match($verbs = [], $from, $to, $options = [])
-    {
-        foreach ($verbs as $verb) {
-            $verb = strtolower($verb);
-
-            $this->{$verb}($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to GET requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function get($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to POST requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function post($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to PUT requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function put($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'PUT') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to DELETE requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function delete($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'DELETE') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to HEAD requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function head($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'HEAD') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to PATCH requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function patch($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'PATCH') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to OPTIONS requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function options($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a collections of HTTP-verb based routes for a controller.
-     *
-     * Possible Options:
-     *      'controller'    - Customize the name of the controller used in the 'to' route
-     *      'module'        - Prepend a module name to the generate 'to' routes
-     *      'constraint'    - The regex used by the Router. Defaults to '(:any)'
-     *
-     * Example:
-     *      $route->resources('photos');
-     *
-     *      // Generates the following routes:
-     *      HTTP Verb | Path        | Action        | Used for...
-     *      ----------+-------------+---------------+-----------------
-     *      GET         /photos             index           display a list of photos
-     *      GET         /photos/new         creation_form   return an HTML form for creating a new photo
-     *      GET         /photos/{id}        show            display a specific photo
-     *      GET         /photos/{id}/edit   editing_form    return an HTML form for editing the photo
-     *      POST        /photos             create          create a new photo
-     *      PUT         /photos/{id}        update          update an existing photo
-     *      DELETE      /photos/{id}/delete delete          delete an existing photo
-     *
-     * @param  string $name    The name of the controller to route to.
-     * @param  array  $options An list of possible ways to customize the routing.
-     */
-    public function resources($name, $options = [])
-    {
-        // In order to allow customization of the route the
-        // resources are sent to, we need to have a new name
-        // to store the values in.
-        $new_name = $name;
-
-        // If a new controller is specified, then we replace the
-        // $name value with the name of the new controller.
-        if (isset($options['controller'])) {
-            $new_name = $options['controller'];
-        }
-
-        // If a new module was specified, simply put that path
-        // in front of the controller.
-        if (isset($options['module'])) {
-            $new_name = $options['module'] . '/' . $new_name;
-        }
-
-        // In order to allow customization of allowed id values
-        // we need someplace to store them.
-        $id = isset($this->constraints[$this->default_constraint]) ? $this->constraints[$this->default_constraint] :
-            '(:any)';
-
-        if (isset($options['constraint'])) {
-            $id = $options['constraint'];
-        }
-
-        $this->get($name, $new_name . '/list_all', $options);
-        $this->get($name . '/' . $id, $new_name . '/show/$1', $options);
-        $this->post($name, $new_name . '/create', $options);
-        $this->put($name . '/' . $id, $new_name . '/update/$1', $options);
-        $this->delete($name . '/' . $id, $new_name . '/delete/$1', $options);
-        $this->options($name, $new_name . '/index', $options);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Lets the system know about different 'areas' within the site, like
-     * the admin area, that maps to certain controllers.
-     *
-     * @param  string $area       The name of the area.
-     * @param  string $controller The controller name to look for.
-     * @param         $options
-     */
-    public function area($area, $controller = null, $options = [])
-    {
-        // No controller? Match the area name.
-        $controller = is_null($controller) ? $area : $controller;
-
-        // Save the area so we can recognize it later.
-        self::$areas[$area] = $controller;
-
-        // Create routes for this area.
-        $this->create($area . '/(:any)/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4/$5', $options);
-        $this->create($area . '/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4', $options);
-        $this->create($area . '/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3', $options);
-        $this->create($area . '/(:any)/(:any)', '$1/' . $controller . '/$2', $options);
-        $this->create($area . '/(:any)', '$1/' . $controller, $options);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the name of the area based on the controller name.
-     *
-     * @param  string $controller The name of the controller
-     * @return string             The name of the corresponding area
-     */
-    public static function getAreaName($controller)
-    {
-        foreach (self::$areas as $area => $cont) {
-            if ($controller == $cont) {
-                return $area;
-            }
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Limits the routes to a specified ENVIRONMENT or they won't run.
-     *
-     * @param $env
-     * @param callable $callback
-     *
-     * @return bool|null
-     */
-    public function environment($env, \Closure $callback)
-    {
-        if (ENVIRONMENT == $env)
-        {
-            call_user_func($callback);
-            return true;
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    /**
-     * Allows you to easily block access to any number of routes by setting
-     * that route to an empty path ('').
-     *
-     * Example:
-     *     Route::block('posts', 'photos/(:num)');
-     *
-     *     // Same as...
-     *     $route['posts']          = '';
-     *     $route['photos/(:num)']  = '';
-     */
-    public function block()
-    {
-        $paths = func_get_args();
-
-        if (! is_array($paths) || ! count($paths)) {
-            return;
-        }
-
-        foreach ($paths as $path) {
-            $this->create($path, '');
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Empties all named and un-named routes from the system.
-     *
-     * @return void
-     */
-    public function reset()
-    {
-        $this->routes = array();
-        $this->names  = array();
-        $this->group  = null;
-        self::$areas  = array();
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Does the heavy lifting of creating an actual route. You must specify
-     * the request method(s) that this route will work for. They can be separated
-     * by a pipe character "|" if there is more than one.
-     *
-     * @param  string $from
-     * @param  array  $to
-     * @param array   $options
-     *
-     * @return array          The built route.
-     */
-    private function create($from, $to, $options = array())
-    {
-        $prefix = is_null($this->group) ? '' : $this->group . '/';
-
-        $from = $prefix . $from;
-
-        // Are we saving the name for this one?
-        if (isset($options['as']) && !empty($options['as'])) {
-            self::$names[$options['as']] = $from;
-        }
-
-        // Limiting to subdomains?
-        if (isset($options['subdomain']) && !empty($options['subdomain'])) {
-            // If we don't match the current subdomain, then
-            // we don't need to add the route.
-            if (!$this->checkSubdomains($options['subdomain'])) {
-                return;
-            }
-        }
-
-        // Are we offsetting the parameters?
-        // If so, take care of them here in one
-        // fell swoop.
-        if (isset($options['offset'])) {
-            // Get a constant string to work with.
-            $to = preg_replace('/(\$\d+)/', '$X', $to);
-
-            for ($i = (int)$options['offset'] + 1; $i < (int)$options['offset'] + 7; $i ++) {
-                $to = preg_replace_callback(
-                    '/\$X/',
-                    function ($m) use ($i) {
-                        return '$' . $i;
-                    },
-                    $to,
-                    1
-                );
-            }
-        }
-
-        // Convert any custom constraints to the CI/pattern equivalent
-        foreach ($this->constraints as $name => $pattern) {
-            $from = str_replace('{' . $name . '}', $pattern, $from);
-        }
-
-        $this->routes[$from] = $to;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Compares the subdomain(s) passed in against the current subdomain
-     * on this page request.
-     *
-     * @param $subdomains
-     * @return bool
-     */
-    private function checkSubdomains($subdomains)
-    {
-        if (is_null($this->current_subdomain)) {
-            $this->determineCurrentSubdomain();
-        }
-
-        if (!is_array($subdomains)) {
-            $subdomains = array($subdomains);
-        }
-
-        $matched = false;
-
-        array_walk(
-            $subdomains,
-            function ($subdomain) use (&$matched) {
-                if ($subdomain == $this->current_subdomain || $subdomain == '*') {
-                    $matched = true;
-                }
-            }
-        );
-
-        return $matched;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Examines the HTTP_HOST to get a best match for the subdomain. It
-     * won't be perfect, but should work for our needs.
-     */
-    private function determineCurrentSubdomain()
-    {
-        $parsedUrl = parse_url($_SERVER['HTTP_HOST']);
-
-        $host = explode('.', $parsedUrl['host']);
-
-        // If we only have 2 parts, then we don't have a subdomain.
-        // This won't be totally accurate, since URL's like example.co.uk
-        // would still pass, but it helps to separate the chaff...
-        if (!is_array($host) || count($host) == 2) {
-            // Set it to false so we don't make it back here again.
-            $this->current_subdomain = false;
-            return;
-        }
-
-        // Now, we'll simply take the first element of the array. This should
-        // be fine even in cases like example.co.uk, since they won't be looking
-        // for 'example' when they try to match the subdomain, in most all cases.
-        $this->current_subdomain = array_shift($host);
-    }
-    //--------------------------------------------------------------------
+	// Our routes, ripe for the picking.
+	public $routes = array();
+
+	// Holds key/value pairs of named routes
+	public static $names = array();
+
+	// Used for grouping routes together.
+	public $group = null;
+
+	// Holds the 'areas' of the site.
+	public static $areas = array();
+
+	// The default controller to use in case
+	// 'default_controller' is not in the routes file.
+	protected $default_home = 'home';
+
+	// The default constraint to use in route building
+	protected $default_constraint = 'any';
+
+	protected $constraints = [
+		'any'  => '(:any)',
+		'num'  => '(:num)',
+		'id'   => '(:num)',
+		'name' => "([a-zA-Z']+)"
+	];
+
+	protected $current_subdomain = null;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Combines the routes that we've defined with the Route class with the
+	 * routes passed in. This is intended to be used  after all routes have been
+	 * defined to merge CI's default $route array with our routes.
+	 *
+	 * Example:
+	 *     $route['default_controller'] = 'home';
+	 *     Route::resource('posts');
+	 *     $route = Route::map($route);
+	 *
+	 * @param array $routes
+	 * @internal param array $route The array to merge
+	 * @return array         The merge route array.
+	 */
+	public function map($routes = array())
+	{
+		$controller = isset($routes['default_controller']) ? $routes['default_controller'] : $this->default_home;
+
+		$routes = array_merge($routes, $this->routes);
+
+		foreach ($routes as $from => $to) {
+			$routes[$from] = str_ireplace('{default_controller}', $controller, $to);
+		}
+
+		return $routes;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A single point to the basic routing. Can be used in place of CI's $route
+	 * array if desired. Used internally by many of the methods.
+	 *
+	 * Available options are currently:
+	 *      'as'        - remembers the route via a name that can be called outside of it.
+	 *      'offset'    - Offsets and parameters ($1, $2, etc) in routes by the specified amount.
+	 *                    Useful while doing versioning of API's, etc.
+	 *
+	 * Example:
+	 *      $route->any('news', 'posts/index');
+	 *
+	 * @param string $from
+	 * @param string $to
+	 * @param array  $options
+	 * @return void
+	 */
+	public function any($from, $to, $options = array())
+	{
+		$this->create($from, $to, $options);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default constraint to be used in the system. Typically
+	 * for use with the 'resources' method.
+	 *
+	 * @param $constraint
+	 */
+	public function setDefaultConstraint($constraint)
+	{
+		if (array_key_exists($constraint, $this->constraints)) {
+			$this->default_constraint = $constraint;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Registers a new constraint to be used internally. Useful for creating
+	 * very specific regex patterns, or simply to allow your routes to be
+	 * a tad more readable.
+	 *
+	 * Example:
+	 *      $route->registerConstraint('hero', '(^.*)');
+	 *
+	 *      $route->any('home/{hero}', 'heroes/journey');
+	 *
+	 *      // Route then looks like:
+	 *      $route['home/(^.*)'] = 'heroes/journey';
+	 *
+	 * @param      $name
+	 * @param      $pattern
+	 * @param bool $overwrite
+	 */
+	public function registerConstraint($name, $pattern, $overwrite = false)
+	{
+		// Ensure consistency
+		$name    = trim($name, '{} ');
+		$pattern = '(' . trim($pattern, '() ') . ')';
+
+		// Not here? Add it and leave...
+		if (! array_key_exists($name, $this->constraints)) {
+			$this->constraints[$name] = $pattern;
+
+			return;
+		}
+
+		// Here? Then it exists. Should we overwrite it?
+		if ($overwrite) {
+			$this->constraints[$name] = $pattern;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Named Routes
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the value of a named route. Useful for getting named
+	 * routes for use while building with site_url() or in templates
+	 * where you don't need to instantiate the route class.
+	 *
+	 * Example:
+	 *      $route->any('news', 'posts/index', ['as' => 'blog']);
+	 *
+	 *      // Returns http://mysite.com/news
+	 *      site_url( Route::named('blog') );
+	 *
+	 * @param  [type] $name [description]
+	 * @return [type]       [description]
+	 */
+	public static function named($name)
+	{
+		if (isset(self::$names[$name])) {
+			return self::$names[$name];
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Grouping Routes
+	//--------------------------------------------------------------------
+
+	/**
+	 * Group a series of routes under a single URL segment. This is handy
+	 * for grouping items into an admin area, like:
+	 *
+	 * Example:
+	 *     $route->group('admin', function() {
+	 *            $route->resources('users');
+	 *     });
+	 *
+	 * @param  string   $name     The name to group/prefix the routes with.
+	 * @param  \Closure $callback An anonymous function that allows you route inside of this group.
+	 * @return void
+	 */
+	public function group($name, \Closure $callback)
+	{
+		$old_group = $this->group;
+
+		// To register a route, we'll set a flag so that our router
+		// so it will see the groupname.
+		$this->group = ltrim($old_group . '/' . $name, '/');
+
+		call_user_func($callback);
+
+		// Make sure to clear the group name so we don't accidentally
+		// group any ones we didn't want to.
+		$this->group = $old_group;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// HTTP Verb-based routing
+	//--------------------------------------------------------------------
+	// Routing works here because, as the routes config file is read in,
+	// the various HTTP verb-based routes will only be added to the in-memory
+	// routes if it is a call that should respond to that verb.
+	//
+	// The options array is typically used to pass in an 'as' or var, but may
+	// be expanded in the future. See the docblock for 'any' method above for
+	// current list of globally available options.
+	//
+
+	/**
+	 * Specifies a single route to match for multiple HTTP Verbs.
+	 *
+	 * Example:
+	 *  $route->match( ['get', 'post'], 'users/(:num)', 'users/$1);
+	 *
+	 * @param array $verbs
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function match($verbs = [], $from, $to, $options = [])
+	{
+		foreach ($verbs as $verb) {
+			$verb = strtolower($verb);
+
+			$this->{$verb}($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to GET requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function get($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to POST requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function post($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'POST') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to PUT requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function put($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'PUT') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to DELETE requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function delete($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'DELETE') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to HEAD requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function head($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to PATCH requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function patch($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'PATCH') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to OPTIONS requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function options($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a collections of HTTP-verb based routes for a controller.
+	 *
+	 * Possible Options:
+	 *      'controller'    - Customize the name of the controller used in the 'to' route
+	 *      'module'        - Prepend a module name to the generate 'to' routes
+	 *      'constraint'    - The regex used by the Router. Defaults to '(:any)'
+	 *
+	 * Example:
+	 *      $route->resources('photos');
+	 *
+	 *      // Generates the following routes:
+	 *      HTTP Verb | Path        | Action        | Used for...
+	 *      ----------+-------------+---------------+-----------------
+	 *      GET         /photos             index           display a list of photos
+	 *      GET         /photos/new         creation_form   return an HTML form for creating a new photo
+	 *      GET         /photos/{id}        show            display a specific photo
+	 *      GET         /photos/{id}/edit   editing_form    return an HTML form for editing the photo
+	 *      POST        /photos             create          create a new photo
+	 *      PUT         /photos/{id}        update          update an existing photo
+	 *      DELETE      /photos/{id}/delete delete          delete an existing photo
+	 *
+	 * @param  string $name    The name of the controller to route to.
+	 * @param  array  $options An list of possible ways to customize the routing.
+	 */
+	public function resources($name, $options = [])
+	{
+		// In order to allow customization of the route the
+		// resources are sent to, we need to have a new name
+		// to store the values in.
+		$new_name = $name;
+
+		// If a new controller is specified, then we replace the
+		// $name value with the name of the new controller.
+		if (isset($options['controller'])) {
+			$new_name = $options['controller'];
+		}
+
+		// If a new module was specified, simply put that path
+		// in front of the controller.
+		if (isset($options['module'])) {
+			$new_name = $options['module'] . '/' . $new_name;
+		}
+
+		// In order to allow customization of allowed id values
+		// we need someplace to store them.
+		$id = isset($this->constraints[$this->default_constraint]) ? $this->constraints[$this->default_constraint] :
+			'(:any)';
+
+		if (isset($options['constraint'])) {
+			$id = $options['constraint'];
+		}
+
+		$this->get($name, $new_name . '/list_all', $options);
+		$this->get($name . '/' . $id, $new_name . '/show/$1', $options);
+		$this->post($name, $new_name . '/create', $options);
+		$this->put($name . '/' . $id, $new_name . '/update/$1', $options);
+		$this->delete($name . '/' . $id, $new_name . '/delete/$1', $options);
+		$this->options($name, $new_name . '/index', $options);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Lets the system know about different 'areas' within the site, like
+	 * the admin area, that maps to certain controllers.
+	 *
+	 * @param  string $area       The name of the area.
+	 * @param  string $controller The controller name to look for.
+	 * @param         $options
+	 */
+	public function area($area, $controller = null, $options = [])
+	{
+		// No controller? Match the area name.
+		$controller = is_null($controller) ? $area : $controller;
+
+		// Save the area so we can recognize it later.
+		self::$areas[$area] = $controller;
+
+		// Create routes for this area.
+		$this->create($area . '/(:any)/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4/$5', $options);
+		$this->create($area . '/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4', $options);
+		$this->create($area . '/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3', $options);
+		$this->create($area . '/(:any)/(:any)', '$1/' . $controller . '/$2', $options);
+		$this->create($area . '/(:any)', '$1/' . $controller, $options);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the area based on the controller name.
+	 *
+	 * @param  string $controller The name of the controller
+	 * @return string             The name of the corresponding area
+	 */
+	public static function getAreaName($controller)
+	{
+		foreach (self::$areas as $area => $cont) {
+			if ($controller == $cont) {
+				return $area;
+			}
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Limits the routes to a specified ENVIRONMENT or they won't run.
+	 *
+	 * @param $env
+	 * @param callable $callback
+	 *
+	 * @return bool|null
+	 */
+	public function environment($env, \Closure $callback)
+	{
+		if (ENVIRONMENT == $env)
+		{
+			call_user_func($callback);
+			return true;
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	/**
+	 * Allows you to easily block access to any number of routes by setting
+	 * that route to an empty path ('').
+	 *
+	 * Example:
+	 *     Route::block('posts', 'photos/(:num)');
+	 *
+	 *     // Same as...
+	 *     $route['posts']          = '';
+	 *     $route['photos/(:num)']  = '';
+	 */
+	public function block()
+	{
+		$paths = func_get_args();
+
+		if (! is_array($paths) || ! count($paths)) {
+			return;
+		}
+
+		foreach ($paths as $path) {
+			$this->create($path, '');
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Empties all named and un-named routes from the system.
+	 *
+	 * @return void
+	 */
+	public function reset()
+	{
+		$this->routes = array();
+		$this->names  = array();
+		$this->group  = null;
+		self::$areas  = array();
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does the heavy lifting of creating an actual route. You must specify
+	 * the request method(s) that this route will work for. They can be separated
+	 * by a pipe character "|" if there is more than one.
+	 *
+	 * @param  string $from
+	 * @param  array  $to
+	 * @param array   $options
+	 *
+	 * @return array          The built route.
+	 */
+	private function create($from, $to, $options = array())
+	{
+		$prefix = is_null($this->group) ? '' : $this->group . '/';
+
+		$from = $prefix . $from;
+
+		// Are we saving the name for this one?
+		if (isset($options['as']) && !empty($options['as'])) {
+			self::$names[$options['as']] = $from;
+		}
+
+		// Limiting to subdomains?
+		if (isset($options['subdomain']) && !empty($options['subdomain'])) {
+			// If we don't match the current subdomain, then
+			// we don't need to add the route.
+			if (!$this->checkSubdomains($options['subdomain'])) {
+				return;
+			}
+		}
+
+		// Are we offsetting the parameters?
+		// If so, take care of them here in one
+		// fell swoop.
+		if (isset($options['offset'])) {
+			// Get a constant string to work with.
+			$to = preg_replace('/(\$\d+)/', '$X', $to);
+
+			for ($i = (int)$options['offset'] + 1; $i < (int)$options['offset'] + 7; $i ++) {
+				$to = preg_replace_callback(
+					'/\$X/',
+					function ($m) use ($i) {
+						return '$' . $i;
+					},
+					$to,
+					1
+				);
+			}
+		}
+
+		// Convert any custom constraints to the CI/pattern equivalent
+		foreach ($this->constraints as $name => $pattern) {
+			$from = str_replace('{' . $name . '}', $pattern, $from);
+		}
+
+		$this->routes[$from] = $to;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compares the subdomain(s) passed in against the current subdomain
+	 * on this page request.
+	 *
+	 * @param $subdomains
+	 * @return bool
+	 */
+	private function checkSubdomains($subdomains)
+	{
+		if (is_null($this->current_subdomain)) {
+			$this->determineCurrentSubdomain();
+		}
+
+		if (!is_array($subdomains)) {
+			$subdomains = array($subdomains);
+		}
+
+		$matched = false;
+
+		array_walk(
+			$subdomains,
+			function ($subdomain) use (&$matched) {
+				if ($subdomain == $this->current_subdomain || $subdomain == '*') {
+					$matched = true;
+				}
+			}
+		);
+
+		return $matched;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Examines the HTTP_HOST to get a best match for the subdomain. It
+	 * won't be perfect, but should work for our needs.
+	 */
+	private function determineCurrentSubdomain()
+	{
+		$parsedUrl = parse_url($_SERVER['HTTP_HOST']);
+
+		$host = explode('.', $parsedUrl['host']);
+
+		// If we only have 2 parts, then we don't have a subdomain.
+		// This won't be totally accurate, since URL's like example.co.uk
+		// would still pass, but it helps to separate the chaff...
+		if (!is_array($host) || count($host) == 2) {
+			// Set it to false so we don't make it back here again.
+			$this->current_subdomain = false;
+			return;
+		}
+
+		// Now, we'll simply take the first element of the array. This should
+		// be fine even in cases like example.co.uk, since they won't be looking
+		// for 'example' when they try to match the subdomain, in most all cases.
+		$this->current_subdomain = array_shift($host);
+	}
+	//--------------------------------------------------------------------
 
 }

myth/Settings/ConfigStore.php

Indentation +138 added lines, -138 removed lines

@@ -49,143 +49,143 @@
  */
 class ConfigStore implements SettingsStoreInterface {
 
-    protected $ci;
-
-    //--------------------------------------------------------------------
-
-    public function __construct( $ci=null )
-    {
-        if (is_object($ci))
-        {
-            $this->ci =& $ci;
-        }
-        else {
-            $this->ci =& get_instance();
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts/Replaces a single setting item.
-     *
-     * @param $key
-     * @param null $value
-     * @param string $group
-     */
-    public function save($key, $value=null, $group='app')
-    {
-        // Treat the 'app' group as our primary, un-sectioned
-        // config files.
-        if ($group != 'app')
-        {
-            return $this->ci->config->set_item($key, $value);
-        }
-
-        // Otherwise, we'll need to ensure a section exists
-        if (! isset($this->ci->config->config[$group]))
-        {
-            $this->ci->config->config[$group] = [];
-        }
-
-        $this->ci->config->config[$group][$key] = $value;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves a single item. If the config system doesn't have the
-     * value loaded, yet, it will attempt to load a config file matching
-     * the 'group' name and grab the value from that.
-     *
-     * @param $key
-     * @param string $group
-     * @return mixed
-     */
-    public function get($key, $group='application')
-    {
-        // First, see if CI already has this key loaded.
-        $result = $this->ci->config->item($key);
-
-        // This bit will fail when the actual value is NULL
-        // but should result in false hits infrequently.
-        if ($result !== null)
-        {
-            return $result;
-        }
-
-        // Try to load the 'group' file, then try to load a
-        // config file that matches the group name
-        $this->ci->load->config($group, false, true);
+	protected $ci;
+
+	//--------------------------------------------------------------------
+
+	public function __construct( $ci=null )
+	{
+		if (is_object($ci))
+		{
+			$this->ci =& $ci;
+		}
+		else {
+			$this->ci =& get_instance();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts/Replaces a single setting item.
+	 *
+	 * @param $key
+	 * @param null $value
+	 * @param string $group
+	 */
+	public function save($key, $value=null, $group='app')
+	{
+		// Treat the 'app' group as our primary, un-sectioned
+		// config files.
+		if ($group != 'app')
+		{
+			return $this->ci->config->set_item($key, $value);
+		}
+
+		// Otherwise, we'll need to ensure a section exists
+		if (! isset($this->ci->config->config[$group]))
+		{
+			$this->ci->config->config[$group] = [];
+		}
+
+		$this->ci->config->config[$group][$key] = $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a single item. If the config system doesn't have the
+	 * value loaded, yet, it will attempt to load a config file matching
+	 * the 'group' name and grab the value from that.
+	 *
+	 * @param $key
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function get($key, $group='application')
+	{
+		// First, see if CI already has this key loaded.
+		$result = $this->ci->config->item($key);
+
+		// This bit will fail when the actual value is NULL
+		// but should result in false hits infrequently.
+		if ($result !== null)
+		{
+			return $result;
+		}
+
+		// Try to load the 'group' file, then try to load a
+		// config file that matches the group name
+		$this->ci->load->config($group, false, true);
         
-        $result = $this->ci->config->item($key);
-
-        return $result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes a single item.
-     *
-     * NOT supported by this store.
-     *
-     * @param $key
-     * @param $group
-     * @return mixed
-     */
-    public function delete($key, $group='app')
-    {
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Searches the store for any items with $field = $value.
-     *
-     * Does not work.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function findBy($field, $value)
-    {
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves all items in the store either globally or for a single group.
-     *
-     * @param string $group
-     * @return mixed
-     */
-    public function all($group=null)
-    {
-        if (empty($group))
-        {
-            return $this->ci->config->config;
-        }
-
-        // If we're a group, does the group already exists
-        // as a 'section' in the config array?
-        if (isset($this->ci->config->config[$group]))
-        {
-            return $this->ci->config->config[$group];
-        }
-
-        // Still here? Attempt to load the file into a section
-        // and try one last time.
-        if ($this->ci->load->config($group))
-        {
-            return $this->ci->config->config($group);
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
+		$result = $this->ci->config->item($key);
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a single item.
+	 *
+	 * NOT supported by this store.
+	 *
+	 * @param $key
+	 * @param $group
+	 * @return mixed
+	 */
+	public function delete($key, $group='app')
+	{
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Searches the store for any items with $field = $value.
+	 *
+	 * Does not work.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function findBy($field, $value)
+	{
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves all items in the store either globally or for a single group.
+	 *
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function all($group=null)
+	{
+		if (empty($group))
+		{
+			return $this->ci->config->config;
+		}
+
+		// If we're a group, does the group already exists
+		// as a 'section' in the config array?
+		if (isset($this->ci->config->config[$group]))
+		{
+			return $this->ci->config->config[$group];
+		}
+
+		// Still here? Attempt to load the file into a section
+		// and try one last time.
+		if ($this->ci->load->config($group))
+		{
+			return $this->ci->config->config($group);
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
 }

myth/Settings/DatabaseStore.php

Indentation +208 added lines, -208 removed lines

@@ -1,214 +1,214 @@
 <?php namespace Myth\Settings;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * 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
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * 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
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 class DatabaseStore implements SettingsStoreInterface {
 
-    protected $ci;
-
-    protected $db;
-
-    //--------------------------------------------------------------------
-
-    public function __construct( $ci=null )
-    {
-        if (is_object($ci))
-        {
-            $this->ci =& $ci;
-        }
-        else {
-            $this->ci =& get_instance();
-        }
-
-        // Ensure that the database is loaded.
-        if (empty($this->ci->db))
-        {
-            $this->ci->load->database();
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts or Replaces an setting value.
-     *
-     * @param $key
-     * @param null $value
-     * @param string $group
-     * @return bool
-     */
-    public function save($key, $value=null, $group='app')
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $where = [
-            'name'  => $key,
-            'group' => $group
-        ];
-        $this->ci->db->delete('settings', $where);
-
-        if (is_array($value) || is_object($value))
-        {
-            $value = serialize($value);
-        }
-
-        $data = [
-            'name'  => $key,
-            'value' => $value,
-            'group' => $group
-        ];
-        return $this->ci->db->insert('settings', $data);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves a single item.
-     *
-     * @param $key
-     * @param string $group
-     * @return mixed
-     */
-    public function get($key, $group='app')
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $where = [
-            'name'  => $key,
-            'group' => $group
-        ];
-
-        $query = $this->ci->db->where($where)
-                              ->get('settings');
-
-        if (! $query->num_rows())
-        {
-            return false;
-        }
-
-        $value = $query->row()->value;
-
-        // Check to see if it needs to be unserialized
-        $data = @unserialize($value);   // We don't need to issue an E_NOTICE here...
-
-        // Check for a value of false or
-        if ($value === 'b:0;' || $data !== false)
-        {
-            $value = $data;
-        }
-
-        return $value;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes a single item.
-     *
-     * @param $key
-     * @param $group
-     * @return mixed
-     */
-    public function delete($key, $group='app')
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $where = [
-            'name'  => $key,
-            'group' => $group
-        ];
-
-        return $this->ci->db->delete('settings', $where);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Searches the store for any items with $field = $value.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function findBy($field, $value)
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $query = $this->ci->db->where($field, $value)
-                              ->get('settings');
-
-        if (! $query->num_rows())
-        {
-            return false;
-        }
-
-        return $query->result_array();
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves all items in the store either globally or for a single group.
-     *
-     * @param string $group
-     * @return mixed
-     */
-    public function all($group=null)
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $query = $this->ci->db->get('settings');
-
-        if (! $query->num_rows())
-        {
-            return false;
-        }
-
-        return $query->result_array();
-    }
-
-    //--------------------------------------------------------------------
+	protected $ci;
+
+	protected $db;
+
+	//--------------------------------------------------------------------
+
+	public function __construct( $ci=null )
+	{
+		if (is_object($ci))
+		{
+			$this->ci =& $ci;
+		}
+		else {
+			$this->ci =& get_instance();
+		}
+
+		// Ensure that the database is loaded.
+		if (empty($this->ci->db))
+		{
+			$this->ci->load->database();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts or Replaces an setting value.
+	 *
+	 * @param $key
+	 * @param null $value
+	 * @param string $group
+	 * @return bool
+	 */
+	public function save($key, $value=null, $group='app')
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$where = [
+			'name'  => $key,
+			'group' => $group
+		];
+		$this->ci->db->delete('settings', $where);
+
+		if (is_array($value) || is_object($value))
+		{
+			$value = serialize($value);
+		}
+
+		$data = [
+			'name'  => $key,
+			'value' => $value,
+			'group' => $group
+		];
+		return $this->ci->db->insert('settings', $data);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a single item.
+	 *
+	 * @param $key
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function get($key, $group='app')
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$where = [
+			'name'  => $key,
+			'group' => $group
+		];
+
+		$query = $this->ci->db->where($where)
+							  ->get('settings');
+
+		if (! $query->num_rows())
+		{
+			return false;
+		}
+
+		$value = $query->row()->value;
+
+		// Check to see if it needs to be unserialized
+		$data = @unserialize($value);   // We don't need to issue an E_NOTICE here...
+
+		// Check for a value of false or
+		if ($value === 'b:0;' || $data !== false)
+		{
+			$value = $data;
+		}
+
+		return $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a single item.
+	 *
+	 * @param $key
+	 * @param $group
+	 * @return mixed
+	 */
+	public function delete($key, $group='app')
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$where = [
+			'name'  => $key,
+			'group' => $group
+		];
+
+		return $this->ci->db->delete('settings', $where);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Searches the store for any items with $field = $value.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function findBy($field, $value)
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$query = $this->ci->db->where($field, $value)
+							  ->get('settings');
+
+		if (! $query->num_rows())
+		{
+			return false;
+		}
+
+		return $query->result_array();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves all items in the store either globally or for a single group.
+	 *
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function all($group=null)
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$query = $this->ci->db->get('settings');
+
+		if (! $query->num_rows())
+		{
+			return false;
+		}
+
+		return $query->result_array();
+	}
+
+	//--------------------------------------------------------------------
 }

myth/Settings/Settings.php

Indentation +277 added lines, -277 removed lines

@@ -1,34 +1,34 @@ 
 <?php namespace Myth\Settings;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * 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
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * 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
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 /**
  * Class Settings
@@ -40,253 +40,253 @@ 
  */
 class Settings {
 
-    /**
-     * Holds instantiated data stores.
-     *
-     * @var array
-     */
-    protected static $stores = [];
-
-    protected static $default_store = '';
-
-    protected static $initialized = false;
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Fires up instances of the datastores and gets us ready to roll.
-     */
-    public static function init()
-    {
-        if (self::$initialized === true)
-        {
-            return;
-        }
-
-        // Load up and instantiate our setting stores.
-        $user_stores = config_item('settings.stores');
-
-        if (is_array($user_stores))
-        {
-            foreach ($user_stores as $alias => $class)
-            {
-                self::$stores[ strtolower($alias) ] = new $class();
-            }
-        }
-
-        self::$default_store = config_item('settings.default_store');
-
-        if (empty(self::$stores[ self::$default_store ]))
-        {
-            show_error( lang('settings.bad_default') );
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts/Replaces a single setting item.
-     *
-     * @param $key
-     * @param null $value
-     * @param string $group
-     * @param string $store
-     */
-    public static function save($key, $value=null, $group='app', $store=null)
-    {
-        self::init();
-
-        if (empty($store) || empty(self::$stores[$store]))
-        {
-            // we've already determined that the default store exists
-            // in the init() method.
-            $store = self::$default_store;
-        }
-
-        return self::$stores[ $store ]->save($key, $value, $group);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves a single item. If not $store is specified, will loop
-     * through the stores in order until it finds it. If $store is
-     * specified, will only look within that store for it.
-     *
-     * @param $key
-     * @param string $group
-     * @param string $store
-     * @return mixed
-     */
-    public static function get($key, $group='app', $store=null)
-    {
-        self::init();
-
-        $group = strtolower($group);
-
-        // If the store is specified but doesn't exist, crap out
-        // so that they developer has a chance to fix it.
-        if (! is_null($store) && empty(self::$stores[$store]))
-        {
-            show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
-        }
-
-        // If $store is set, get the value from that store only.
-        if (! empty($store))
-        {
-            return self::$stores[$store]->get($key, $group);
-        }
-
-        // Otherwise loop through each store until we find it
-        foreach (self::$stores as $s)
-        {
-            if ($found = $s->get($key, $group))
-            {
-                return $found;
-            }
-        }
-
-        // Still here... guess we didn't find anything, then...
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes a single item.
-     *
-     * @param $key
-     * @param $group
-     * @param $store
-     * @return mixed
-     */
-    public static function delete($key, $group='app', $store=null)
-    {
-        self::init();
-
-        $group = strtolower($group);
-
-        // If the store is specified but doesn't exist, crap out
-        // so that they developer has a chance to fix it.
-        if (! is_null($store) && empty(self::$stores[$store]))
-        {
-            show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
-        }
-
-        // If $store is set, get the value from that store only.
-        if (! empty($store))
-        {
-            return self::$stores[$store]->delete($key, $group);
-        }
-
-        // Otherwise delete from the default store
-        return self::$stores[ self::$default_store ]->delete($key, $group);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Searches the store for any items with $field = $value.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public static function findBy($field, $value)
-    {
-        self::init();
-
-        foreach (self::$stores as $s)
-        {
-            if ($found = $s->findBy($field, $value))
-            {
-                return $found;
-            }
-        }
-
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves all items in the store either globally or for a single group.
-     *
-     * @param string $group
-     * @return mixed
-     */
-    public static function all($group=null, $store=null)
-    {
-        self::init();
-
-        $group = strtolower($group);
-
-        if (! empty($store))
-        {
-            return self::$stores[ $store ]->all($group);
-        }
-
-        // Otherwise combine the results from all stores
-        $results = [];
-
-        foreach (self::$stores as $s)
-        {
-            $found = $s->all($group);
-            if ($found)
-            {
-                $results = array_merge($results, (array)$found);
-            }
-        }
-
-        return $results;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Appends a new datastore the end of the curent stores.
-     *
-     * @param $alias
-     * @param $class
-     * @return bool
-     */
-    public static function addStore($alias, $class)
-    {
-        self::init();
-
-        if (class_exists($class))
-        {
-            self::$stores[ strtolower($alias) ] = new $class();
-            return true;
-        }
-
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a datastore from the list of stores currently available.
-     *
-     * @param $alias
-     * @return bool
-     */
-    public static function removeStore($alias)
-    {
-        self::init();
-
-        $alias = strtolower($alias);
-
-        if (empty(self::$stores[$alias]))
-        {
-            return false;
-        }
-
-        unset(self::$stores[$alias]);
-
-        return true;
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Holds instantiated data stores.
+	 *
+	 * @var array
+	 */
+	protected static $stores = [];
+
+	protected static $default_store = '';
+
+	protected static $initialized = false;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fires up instances of the datastores and gets us ready to roll.
+	 */
+	public static function init()
+	{
+		if (self::$initialized === true)
+		{
+			return;
+		}
+
+		// Load up and instantiate our setting stores.
+		$user_stores = config_item('settings.stores');
+
+		if (is_array($user_stores))
+		{
+			foreach ($user_stores as $alias => $class)
+			{
+				self::$stores[ strtolower($alias) ] = new $class();
+			}
+		}
+
+		self::$default_store = config_item('settings.default_store');
+
+		if (empty(self::$stores[ self::$default_store ]))
+		{
+			show_error( lang('settings.bad_default') );
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts/Replaces a single setting item.
+	 *
+	 * @param $key
+	 * @param null $value
+	 * @param string $group
+	 * @param string $store
+	 */
+	public static function save($key, $value=null, $group='app', $store=null)
+	{
+		self::init();
+
+		if (empty($store) || empty(self::$stores[$store]))
+		{
+			// we've already determined that the default store exists
+			// in the init() method.
+			$store = self::$default_store;
+		}
+
+		return self::$stores[ $store ]->save($key, $value, $group);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a single item. If not $store is specified, will loop
+	 * through the stores in order until it finds it. If $store is
+	 * specified, will only look within that store for it.
+	 *
+	 * @param $key
+	 * @param string $group
+	 * @param string $store
+	 * @return mixed
+	 */
+	public static function get($key, $group='app', $store=null)
+	{
+		self::init();
+
+		$group = strtolower($group);
+
+		// If the store is specified but doesn't exist, crap out
+		// so that they developer has a chance to fix it.
+		if (! is_null($store) && empty(self::$stores[$store]))
+		{
+			show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
+		}
+
+		// If $store is set, get the value from that store only.
+		if (! empty($store))
+		{
+			return self::$stores[$store]->get($key, $group);
+		}
+
+		// Otherwise loop through each store until we find it
+		foreach (self::$stores as $s)
+		{
+			if ($found = $s->get($key, $group))
+			{
+				return $found;
+			}
+		}
+
+		// Still here... guess we didn't find anything, then...
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a single item.
+	 *
+	 * @param $key
+	 * @param $group
+	 * @param $store
+	 * @return mixed
+	 */
+	public static function delete($key, $group='app', $store=null)
+	{
+		self::init();
+
+		$group = strtolower($group);
+
+		// If the store is specified but doesn't exist, crap out
+		// so that they developer has a chance to fix it.
+		if (! is_null($store) && empty(self::$stores[$store]))
+		{
+			show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
+		}
+
+		// If $store is set, get the value from that store only.
+		if (! empty($store))
+		{
+			return self::$stores[$store]->delete($key, $group);
+		}
+
+		// Otherwise delete from the default store
+		return self::$stores[ self::$default_store ]->delete($key, $group);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Searches the store for any items with $field = $value.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public static function findBy($field, $value)
+	{
+		self::init();
+
+		foreach (self::$stores as $s)
+		{
+			if ($found = $s->findBy($field, $value))
+			{
+				return $found;
+			}
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves all items in the store either globally or for a single group.
+	 *
+	 * @param string $group
+	 * @return mixed
+	 */
+	public static function all($group=null, $store=null)
+	{
+		self::init();
+
+		$group = strtolower($group);
+
+		if (! empty($store))
+		{
+			return self::$stores[ $store ]->all($group);
+		}
+
+		// Otherwise combine the results from all stores
+		$results = [];
+
+		foreach (self::$stores as $s)
+		{
+			$found = $s->all($group);
+			if ($found)
+			{
+				$results = array_merge($results, (array)$found);
+			}
+		}
+
+		return $results;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Appends a new datastore the end of the curent stores.
+	 *
+	 * @param $alias
+	 * @param $class
+	 * @return bool
+	 */
+	public static function addStore($alias, $class)
+	{
+		self::init();
+
+		if (class_exists($class))
+		{
+			self::$stores[ strtolower($alias) ] = new $class();
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a datastore from the list of stores currently available.
+	 *
+	 * @param $alias
+	 * @return bool
+	 */
+	public static function removeStore($alias)
+	{
+		self::init();
+
+		$alias = strtolower($alias);
+
+		if (empty(self::$stores[$alias]))
+		{
+			return false;
+		}
+
+		unset(self::$stores[$alias]);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/Settings/SettingsStoreInterface.php

Indentation +44 added lines, -44 removed lines

@@ -40,58 +40,58 @@
  */
 interface SettingsStoreInterface {
 
-    /**
-     * Inserts/Replaces a single setting item.
-     *
-     * @param $key
-     * @param null $value
-     * @param string $group
-     */
-    public function save($key, $value=null, $group='app');
+	/**
+	 * Inserts/Replaces a single setting item.
+	 *
+	 * @param $key
+	 * @param null $value
+	 * @param string $group
+	 */
+	public function save($key, $value=null, $group='app');
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Retrieves a single item.
-     *
-     * @param $key
-     * @param string $group
-     * @return mixed
-     */
-    public function get($key, $group='app');
+	/**
+	 * Retrieves a single item.
+	 *
+	 * @param $key
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function get($key, $group='app');
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Deletes a single item.
-     *
-     * @param $key
-     * @param $group
-     * @return mixed
-     */
-    public function delete($key, $group='app');
+	/**
+	 * Deletes a single item.
+	 *
+	 * @param $key
+	 * @param $group
+	 * @return mixed
+	 */
+	public function delete($key, $group='app');
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Searches the store for any items with $field = $value.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function findBy($field, $value);
+	/**
+	 * Searches the store for any items with $field = $value.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function findBy($field, $value);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Retrieves all items in the store either globally or for a single group.
-     *
-     * @param string $group
-     * @return mixed
-     */
-    public function all($group=null);
+	/**
+	 * Retrieves all items in the store either globally or for a single group.
+	 *
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function all($group=null);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/Themers/MetaCollection.php

Indentation +213 added lines, -213 removed lines

@@ -35,219 +35,219 @@
 
 class MetaCollection implements MetaInterface {
 
-    /**
-     * Stores the meta values the user has set.
-     *
-     * @var array
-     */
-    protected $meta = [];
-
-    /**
-     * Stores the standard meta-value names
-     * Mostly here for reference, I guess.
-     *
-     * @var array
-     */
-    protected $std_meta = [
-        'application-name',
-        'author',
-        'copyright',
-        'description',
-        'generator',
-        'keywords',
-        'robots',
-        'googlebot'
-    ];
-
-    /**
-     * Stores the HTTP-Equiv meta tags
-     * since they need to be rendered differently.
-     *
-     * @var array
-     */
-    protected $http_equiv_meta = [
-        'cache-control',
-        'content-language',
-        'content-type',
-        'default-style',
-        'expires',
-        'pragma',
-        'refresh',
-        'set-cookie'
-    ];
-
-    /**
-     * Stores the document's character encoding.
-     *
-     * @var string
-     */
-    public $charset = 'utf-8';
-
-    //--------------------------------------------------------------------
-
-    public function __construct($ci)
-    {
-        $ci->config->load('html_meta', true);
-
-        $config = $ci->config->item('html_meta');
-
-        $this->meta = $config['meta'];
-
-        $this->http_equiv_meta = array_merge($this->http_equiv_meta, $config['http-equiv']);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Sets a single meta item.
-     * $alias can also be an array of key/value pairs to set.
-     *
-     * @param string|array $alias
-     * @param null $value
-     *
-     * @return mixed
-     */
-    public function set($alias, $value=null, $escape=true)
-    {
-        if (is_array($alias))
-        {
-            foreach ($alias as $key => $val)
-            {
-                $this->set($key, $val);
-            }
-
-            return $this;
-        }
-
-        // Charset
-        if (strtolower($alias) == 'charset')
-        {
-            $this->charset = $value;
-
-            return $this;
-        }
-
-        $this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a single meta item.
-     *
-     * @param $alias
-     *
-     * @return mixed
-     */
-    public function get($alias)
-    {
-        $alias = strtolower($alias);
-
-        return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Renders out all defined meta tags.
-     *
-     * @return mixed
-     */
-    public function renderTags()
-    {
-        if (! count($this->meta))
-        {
-            return null;
-        }
-
-        $output = '';
-
-        // Character Encoding
-        $output .= "\t<meta charset=\"{$this->charset}\" >";
-
-        // Everything else
-        foreach ($this->meta as $name => $content)
-        {
-            if (is_array($content))
-            {
-                $content = implode(',', $content);
-            }
-
-            if (empty($content))
-            {
-                continue;
-            }
-
-            // Http Equivalent meta tags.
-            if (in_array($name, $this->http_equiv_meta))
-            {
-                $output .= "\t<meta http-equiv=\"{$name}\" content=\"{$content}\">\n";
-            }
-            // Standard Meta Tag
-            else {
-                $output .= "\t<meta name=\"{$name}\" content=\"{$content}\">\n";
-            }
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Registers a new HTTP Equivalent meta tag so it can be
-     * rendered out properly.
-     *
-     * @param $name
-     *
-     * @return $this
-     */
-    public function registerHTTPEquivTag($name)
-    {
-        if (is_null($name))
-        {
-            return $this;
-        }
-
-        $this->http_equiv_meta[] = strtolower($name);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Convenience implementation to set a value
-     * as if it was a property of the class.
-     *
-     * @param $alias
-     * @param null $value
-     */
-    public function __set($alias, $value=null)
-    {
-        $this->set($alias, $value);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Convenience method to access a value
-     * as if it was a property of the class.
-     *
-     * @param $alias
-     *
-     * @return mixed
-     */
-    public function __get($alias)
-    {
-        return $this->get($alias);
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Stores the meta values the user has set.
+	 *
+	 * @var array
+	 */
+	protected $meta = [];
+
+	/**
+	 * Stores the standard meta-value names
+	 * Mostly here for reference, I guess.
+	 *
+	 * @var array
+	 */
+	protected $std_meta = [
+		'application-name',
+		'author',
+		'copyright',
+		'description',
+		'generator',
+		'keywords',
+		'robots',
+		'googlebot'
+	];
+
+	/**
+	 * Stores the HTTP-Equiv meta tags
+	 * since they need to be rendered differently.
+	 *
+	 * @var array
+	 */
+	protected $http_equiv_meta = [
+		'cache-control',
+		'content-language',
+		'content-type',
+		'default-style',
+		'expires',
+		'pragma',
+		'refresh',
+		'set-cookie'
+	];
+
+	/**
+	 * Stores the document's character encoding.
+	 *
+	 * @var string
+	 */
+	public $charset = 'utf-8';
+
+	//--------------------------------------------------------------------
+
+	public function __construct($ci)
+	{
+		$ci->config->load('html_meta', true);
+
+		$config = $ci->config->item('html_meta');
+
+		$this->meta = $config['meta'];
+
+		$this->http_equiv_meta = array_merge($this->http_equiv_meta, $config['http-equiv']);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Sets a single meta item.
+	 * $alias can also be an array of key/value pairs to set.
+	 *
+	 * @param string|array $alias
+	 * @param null $value
+	 *
+	 * @return mixed
+	 */
+	public function set($alias, $value=null, $escape=true)
+	{
+		if (is_array($alias))
+		{
+			foreach ($alias as $key => $val)
+			{
+				$this->set($key, $val);
+			}
+
+			return $this;
+		}
+
+		// Charset
+		if (strtolower($alias) == 'charset')
+		{
+			$this->charset = $value;
+
+			return $this;
+		}
+
+		$this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a single meta item.
+	 *
+	 * @param $alias
+	 *
+	 * @return mixed
+	 */
+	public function get($alias)
+	{
+		$alias = strtolower($alias);
+
+		return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Renders out all defined meta tags.
+	 *
+	 * @return mixed
+	 */
+	public function renderTags()
+	{
+		if (! count($this->meta))
+		{
+			return null;
+		}
+
+		$output = '';
+
+		// Character Encoding
+		$output .= "\t<meta charset=\"{$this->charset}\" >";
+
+		// Everything else
+		foreach ($this->meta as $name => $content)
+		{
+			if (is_array($content))
+			{
+				$content = implode(',', $content);
+			}
+
+			if (empty($content))
+			{
+				continue;
+			}
+
+			// Http Equivalent meta tags.
+			if (in_array($name, $this->http_equiv_meta))
+			{
+				$output .= "\t<meta http-equiv=\"{$name}\" content=\"{$content}\">\n";
+			}
+			// Standard Meta Tag
+			else {
+				$output .= "\t<meta name=\"{$name}\" content=\"{$content}\">\n";
+			}
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Registers a new HTTP Equivalent meta tag so it can be
+	 * rendered out properly.
+	 *
+	 * @param $name
+	 *
+	 * @return $this
+	 */
+	public function registerHTTPEquivTag($name)
+	{
+		if (is_null($name))
+		{
+			return $this;
+		}
+
+		$this->http_equiv_meta[] = strtolower($name);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Convenience implementation to set a value
+	 * as if it was a property of the class.
+	 *
+	 * @param $alias
+	 * @param null $value
+	 */
+	public function __set($alias, $value=null)
+	{
+		$this->set($alias, $value);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Convenience method to access a value
+	 * as if it was a property of the class.
+	 *
+	 * @param $alias
+	 *
+	 * @return mixed
+	 */
+	public function __get($alias)
+	{
+		return $this->get($alias);
+	}
+
+	//--------------------------------------------------------------------
 
 
 

myth/Themers/MetaInterface.php

Indentation +38 added lines, -38 removed lines

@@ -33,50 +33,50 @@
 
 interface MetaInterface {
 
-    /**
-     * Sets a single meta item.
-     *
-     * @param $alias
-     * @param null $value
-     *
-     * @return mixed
-     */
-    public function set($alias, $value=null);
+	/**
+	 * Sets a single meta item.
+	 *
+	 * @param $alias
+	 * @param null $value
+	 *
+	 * @return mixed
+	 */
+	public function set($alias, $value=null);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Returns a single meta item.
-     *
-     * @param $alias
-     *
-     * @return mixed
-     */
-    public function get($alias);
+	/**
+	 * Returns a single meta item.
+	 *
+	 * @param $alias
+	 *
+	 * @return mixed
+	 */
+	public function get($alias);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Renders out all defined meta tags.
-     *
-     * @param array $show_tags
-     *
-     * @return mixed
-     */
-    public function renderTags();
+	/**
+	 * Renders out all defined meta tags.
+	 *
+	 * @param array $show_tags
+	 *
+	 * @return mixed
+	 */
+	public function renderTags();
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Registers a new HTTP Equivalent meta tag so it can be
-     * rendered out properly.
-     *
-     * @param $name
-     *
-     * @return $this
-     */
-    public function registerHTTPEquivTag($name);
+	/**
+	 * Registers a new HTTP Equivalent meta tag so it can be
+	 * rendered out properly.
+	 *
+	 * @param $name
+	 *
+	 * @return $this
+	 */
+	public function registerHTTPEquivTag($name);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }
\ No newline at end of file

myth/Themers/ThemerInterface.php

Indentation +214 added lines, -214 removed lines

@@ -38,219 +38,219 @@
  */
 interface ThemerInterface
 {
-    /**
-     * The main entryway into rendering a view. This is called from the
-     * controller and is generally the last method called.
-     *
-     * @param string $layout If provided, will override the default layout.
-     */
-    public function render($layout = null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Used within the template layout file to render the current content.
-     * This content is typically used to display the current view.
-     */
-    public function content();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the active theme to use. This theme should be
-     * relative to one of the 'theme_paths' folders.
-     *
-     * @param $theme
-     */
-    public function setTheme($theme);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current theme.
-     *
-     * @return mixed|string
-     */
-    public function theme();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the default theme to use.
-     *
-     * @param $theme
-     * @return mixed
-     */
-    public function setDefaultTheme($theme);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the current view file to render.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setView($file);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current view.
-     *
-     * @return mixed|string
-     */
-    public function view();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the current layout to be used. MUST be the name of one of
-     * the layout files within the current theme. Case-sensitive.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setLayout($file);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the active layout.
-     *
-     * @return mixed
-     */
-    public function layout();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stores one or more pieces of data to be passed to the views when
-     * they are rendered out.
-     *
-     * If both $key and $value are ! empty, then it will treat it as a
-     * key/value pair. If $key is an array of key/value pairs, then $value
-     * is ignored and each element of the array are made available to the
-     * view as if it was a single $key/$value pair.
-     *
-     * @param string|array $key
-     * @param mixed        $value
-     */
-    public function set($key, $value = null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a value that has been previously set().
-     *
-     * @param $key
-     * @return mixed
-     */
-    public function get($key);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines whether or not the view should be parsed with the
-     * CodeIgniter's parser.
-     *
-     * @param bool $parse
-     * @return mixed
-     */
-    public function parseViews($parse = false);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Theme paths allow you to have multiple locations for themes to be
-     * stored. This might be used for separating themes for different sub-
-     * applications, or a core theme and user-submitted themes.
-     *
-     * @param $alias The name the theme can be referenced by
-     * @param $path  A new path where themes can be found.
-     *
-     * @return mixed
-     */
-    public function addThemePath($alias, $path);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a single theme path.
-     *
-     * @param $alias
-     */
-    public function removeThemePath($alias);
-    //--------------------------------------------------------------------
-
-    /**
-     * Loads a view file. Useful to control caching. Intended for use
-     * from within view files.
-     *
-     * You can specify that a view should belong to a theme by prefixing
-     * the name of the theme and a colon to the view name. For example,
-     * "admin:header" would try to display the "header.php" file within
-     * the "admin" theme.
-     *
-     * @param string    $view
-     * @param array     $data
-     * @param int       $cache_time  The number of MINUTES to cache the output
-     * @return mixed
-     */
-    public function display($view, $data = array(), $cache_time = 0);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the variant used when creating view names. These variants can
-     * be anything, but by default are used to render specific templates
-     * for desktop, tablet, and phone. The name of the variant is added
-     * to the view name, joined by a "+" symbol.
-     *
-     * Example:
-     *      $this->setVariant('phone');
-     *      $this->display('header');
-     *
-     *      Tries to display "views/header+phone.php"
-     *
-     * @param $variant
-     * @return mixed
-     */
-    public function setVariant($variant);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a new variant to the system.
-     *
-     * @param $name
-     * @param $postfix
-     * @return mixed
-     */
-    public function addVariant($name, $postfix);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a variant from the system.
-     *
-     * @param $name
-     * @param $postfix
-     * @return mixed
-     */
-    public function removeVariant($name);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs a callback method and returns the contents to the view.
-     *
-     * @param $command
-     * @param int $cache_minutes
-     * @return mixed
-     */
-    public function call($command, $cache_minutes=0);
-
-    //--------------------------------------------------------------------
+	/**
+	 * The main entryway into rendering a view. This is called from the
+	 * controller and is generally the last method called.
+	 *
+	 * @param string $layout If provided, will override the default layout.
+	 */
+	public function render($layout = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used within the template layout file to render the current content.
+	 * This content is typically used to display the current view.
+	 */
+	public function content();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the active theme to use. This theme should be
+	 * relative to one of the 'theme_paths' folders.
+	 *
+	 * @param $theme
+	 */
+	public function setTheme($theme);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current theme.
+	 *
+	 * @return mixed|string
+	 */
+	public function theme();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default theme to use.
+	 *
+	 * @param $theme
+	 * @return mixed
+	 */
+	public function setDefaultTheme($theme);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current view file to render.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setView($file);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current view.
+	 *
+	 * @return mixed|string
+	 */
+	public function view();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current layout to be used. MUST be the name of one of
+	 * the layout files within the current theme. Case-sensitive.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setLayout($file);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the active layout.
+	 *
+	 * @return mixed
+	 */
+	public function layout();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores one or more pieces of data to be passed to the views when
+	 * they are rendered out.
+	 *
+	 * If both $key and $value are ! empty, then it will treat it as a
+	 * key/value pair. If $key is an array of key/value pairs, then $value
+	 * is ignored and each element of the array are made available to the
+	 * view as if it was a single $key/$value pair.
+	 *
+	 * @param string|array $key
+	 * @param mixed        $value
+	 */
+	public function set($key, $value = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a value that has been previously set().
+	 *
+	 * @param $key
+	 * @return mixed
+	 */
+	public function get($key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines whether or not the view should be parsed with the
+	 * CodeIgniter's parser.
+	 *
+	 * @param bool $parse
+	 * @return mixed
+	 */
+	public function parseViews($parse = false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Theme paths allow you to have multiple locations for themes to be
+	 * stored. This might be used for separating themes for different sub-
+	 * applications, or a core theme and user-submitted themes.
+	 *
+	 * @param $alias The name the theme can be referenced by
+	 * @param $path  A new path where themes can be found.
+	 *
+	 * @return mixed
+	 */
+	public function addThemePath($alias, $path);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single theme path.
+	 *
+	 * @param $alias
+	 */
+	public function removeThemePath($alias);
+	//--------------------------------------------------------------------
+
+	/**
+	 * Loads a view file. Useful to control caching. Intended for use
+	 * from within view files.
+	 *
+	 * You can specify that a view should belong to a theme by prefixing
+	 * the name of the theme and a colon to the view name. For example,
+	 * "admin:header" would try to display the "header.php" file within
+	 * the "admin" theme.
+	 *
+	 * @param string    $view
+	 * @param array     $data
+	 * @param int       $cache_time  The number of MINUTES to cache the output
+	 * @return mixed
+	 */
+	public function display($view, $data = array(), $cache_time = 0);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the variant used when creating view names. These variants can
+	 * be anything, but by default are used to render specific templates
+	 * for desktop, tablet, and phone. The name of the variant is added
+	 * to the view name, joined by a "+" symbol.
+	 *
+	 * Example:
+	 *      $this->setVariant('phone');
+	 *      $this->display('header');
+	 *
+	 *      Tries to display "views/header+phone.php"
+	 *
+	 * @param $variant
+	 * @return mixed
+	 */
+	public function setVariant($variant);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a new variant to the system.
+	 *
+	 * @param $name
+	 * @param $postfix
+	 * @return mixed
+	 */
+	public function addVariant($name, $postfix);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a variant from the system.
+	 *
+	 * @param $name
+	 * @param $postfix
+	 * @return mixed
+	 */
+	public function removeVariant($name);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs a callback method and returns the contents to the view.
+	 *
+	 * @param $command
+	 * @param int $cache_minutes
+	 * @return mixed
+	 */
+	public function call($command, $cache_minutes=0);
+
+	//--------------------------------------------------------------------
 
 }

myth/Themers/ViewThemer.php

Indentation +522 added lines, -522 removed lines

@@ -35,70 +35,70 @@ 
 class ViewThemer implements ThemerInterface
 {
 
-    protected $theme = '';
+	protected $theme = '';
 
-    protected $default_theme = null;
+	protected $default_theme = null;
 
 	protected $active_theme = null;
 
-    protected $layout = 'index';
+	protected $layout = 'index';
 
-    protected $view = '';
+	protected $view = '';
 
-    protected $vars = [];
+	protected $vars = [];
 
-    protected $folders = [];
+	protected $folders = [];
 
-    protected $variants = [];
+	protected $variants = [];
 
-    protected $current_variant = '';
+	protected $current_variant = '';
 
 	protected $parse_views = false;
 
-    protected $ci;
+	protected $ci;
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function __construct($ci)
-    {
-        $this->ci = $ci;
+	public function __construct($ci)
+	{
+		$this->ci = $ci;
 
-	    $this->parse_views = config_item('theme.parse_views');
-    }
+		$this->parse_views = config_item('theme.parse_views');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * The main entryway into rendering a view. This is called from the
-     * controller and is generally the last method called.
-     *
-     * @param string $layout        If provided, will override the default layout.
-     * @param int    $cache_time    The number of seconds to cache the output for.
-     * @return mixed
-     */
-    public function render($layout = null)
-    {
-        // Make the template engine available within the views.
-        $this->vars['themer'] = $this;
+	/**
+	 * The main entryway into rendering a view. This is called from the
+	 * controller and is generally the last method called.
+	 *
+	 * @param string $layout        If provided, will override the default layout.
+	 * @param int    $cache_time    The number of seconds to cache the output for.
+	 * @return mixed
+	 */
+	public function render($layout = null)
+	{
+		// Make the template engine available within the views.
+		$this->vars['themer'] = $this;
 
-        // Render our current view content
-        $this->vars['view_content'] = $this->content();
+		// Render our current view content
+		$this->vars['view_content'] = $this->content();
 
-        $theme = empty($this->theme) ? $this->default_theme : $this->theme;
+		$theme = empty($this->theme) ? $this->default_theme : $this->theme;
 
-        if (! isset($this->folders[$theme])) {
-            throw new \LogicException( sprintf( lang('theme.bad_folder'), $theme ) );
-        }
+		if (! isset($this->folders[$theme])) {
+			throw new \LogicException( sprintf( lang('theme.bad_folder'), $theme ) );
+		}
 
-	    $this->active_theme = $theme;
+		$this->active_theme = $theme;
 
-        // Make the path available within views.
-        $this->vars['theme_path'] = $this->folders[$theme];
+		// Make the path available within views.
+		$this->vars['theme_path'] = $this->folders[$theme];
 
-        return $this->display($this->folders[$theme] . '/' . $this->layout);
-    }
+		return $this->display($this->folders[$theme] . '/' . $this->layout);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Used within the template layout file to render the current content.
@@ -108,490 +108,490 @@ 
 	 *
 	 * @return mixed
 	 */
-    public function content()
-    {
-        // Calc our view name based on current method/controller
-        $dir = $this->ci->router->fetch_directory();
+	public function content()
+	{
+		// Calc our view name based on current method/controller
+		$dir = $this->ci->router->fetch_directory();
 
-        foreach (Modules::$locations as $key => $offset) {
+		foreach (Modules::$locations as $key => $offset) {
 
-            if (stripos($dir, 'module') !== false) {
+			if (stripos($dir, 'module') !== false) {
 //                $dir = str_replace($offset, '', $dir);
-                $dir = str_replace('controllers/', '', $dir);
-            }
-        }
-
-        $module = $this->ci->router->fetch_module();
-
-        if (! empty($module) && substr($dir, -strlen($module .'/')) == $module . '/') {
-            $dir = '';
-        }
-
-        $view = ! empty($this->view) ? $this->view :
-            $dir . $this->ci->router->fetch_class() . '/' . $this->ci->router->fetch_method();
-
-        return $this->display($view);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Loads a view file. Useful to control caching. Intended for use
-     * from within view files.
-     *
-     * You can specify that a view should belong to a theme by prefixing
-     * the name of the theme and a colon to the view name. For example,
-     * "admin:header" would try to display the "header.php" file within
-     * the "admin" theme.
-     *
-     * If a variant has been specified, it will be added to the end
-     * of the view name before looking for the file.
-     *
-     * @param string $view
-     * @param array  $data
-     * @param int    $cache_time Number of minutes to cache the page for
-     * @param string $cache_name A custom name for the cached file.
-     * @return mixed
-     */
-    public function display($view, $data = array(), $cache_time = 0, $cache_name=null)
-    {
-	    if (empty($cache_name))
-	    {
-		    $cache_name = 'theme_view_' . $view . '_' . $this->ci->router->fetch_class() . '_' . $this->ci->router->fetch_method();
-		    $cache_name = str_replace( '/', '_', $cache_name );
-	    }
-
-	    if ($cache_time == 0 || ! $output = $this->ci->cache->get($cache_name))
-	    {
-		    $theme        = NULL;
-		    $variant_view = NULL;
-
-		    // Pull out the theme from the view, if given.
-		    if ( strpos( $view, ':' ) !== FALSE )
-		    {
-			    list( $theme, $view ) = explode( ':', $view );
-
-			    $theme = str_replace('{theme}', $this->active_theme, $theme);
-		    }
-
-		    if ( ! empty( $theme ) && isset( $this->folders[ $theme ] ) )
-		    {
-			    $view = rtrim( $this->folders[ $theme ], '/' ) . '/' . $view;
-		    }
-
-		    if (! is_array($data))
-		    {
-			    $data = [];
-		    }
-
-		    $data = array_merge( $this->vars, $data );
-
-		    // if using a variant, add it to the view name.
-		    if ( ! empty( $this->current_variant ) )
-		    {
-			    $variant_view = $view . $this->variants[ $this->current_variant ];
-
-			    $output = $this->loadView($variant_view, $data);
-		    }
-
-		    // If that didn't find anything, then try it without a variant
-		    if ( empty( $output ) )
-		    {
-			    $output = $this->loadView($view, $data);
-		    }
-
-		    // Cache it
-		    if ((int)$cache_time > 0)
-		    {
-			    $this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
-		    }
-	    }
-
-	    // Parse views?
-	    if ($this->parse_views)
-	    {
-		    $this->ci->load->library('parser');
-
-		    // Any class objects will cause failure
-		    // so get rid of those bad boys....
-		    unset($data['uikit'], $data['themer']);
-
-		    $output = $this->ci->parser->parse_string($output, $data, true);
-	    }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs a callback method and returns the contents to the view.
-     *
-     * @param $command
-     * @param int $cache_time
-     * @param string $cache_name    // Number of MINUTES to cache output
-     * @return mixed|void
-     */
-    public function call($command, $cache_time=0, $cache_name=null)
-    {
-	    if (empty($cache_name))
-	    {
-		    $cache_name = 'theme_call_' . md5( $command );
-	    }
-
-        if (! $output = $this->ci->cache->get($cache_name)) {
-            $parts = explode(' ', $command);
-
-            list($class, $method) = explode(':', array_shift($parts));
-
-            // Prepare our parameter list to send to the callback
-            // by splitting $parts on equal signs.
-            $params = array();
-
-            foreach ($parts as $part) {
-                $p = explode('=', $part);
-
-                if (empty($p[0]) || empty($p[1]))
-                {
-                    continue;
-                }
-
-                $params[ $p[0] ] = $p[1];
-            }
-
-            // Let PHP try to autoload it through any available autoloaders
-            // (including Composer and user's custom autoloaders). If we
-            // don't find it, then assume it's a CI library that we can reach.
-            if (class_exists($class)) {
-                $class = new $class();
-            } else {
-                $this->ci->load->library($class);
-                $class =& $this->ci->$class;
-            }
-
-            if (! method_exists($class, $method)) {
-                throw new \RuntimeException( sprintf( lang('themer.bad_callback'), $class, $method ) );
-            }
-
-            // Call the class with our parameters
-            $output = $class->{$method}($params);
-
-            // Cache it
-            if ((int)$cache_time > 0)
-            {
-                $this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
-            }
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the active theme to use. This theme should be
-     * relative to one of the 'theme_paths' folders.
-     *
-     * @param $theme
-     */
-    public function setTheme($theme)
-    {
-        $this->theme = $theme;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current theme.
-     *
-     * @return mixed|string
-     */
-    public function theme()
-    {
-        return $this->theme;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the default theme to use if another isn't specified.
-     *
-     * @param $theme
-     * @return mixed|void
-     */
-    public function setDefaultTheme($theme)
-    {
-        $this->default_theme = $theme;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Sets the current view file to render.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setView($file)
-    {
-        $this->view = $file;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current view.
-     *
-     * @return mixed|string
-     */
-    public function view()
-    {
-        return $this->view;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the current layout to be used. MUST be the name of one of
-     * the layout files within the current theme. Case-sensitive.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setLayout($file)
-    {
-        if (empty($file)) return;
-
-        $this->layout = $file;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current layout.
-     *
-     * @return mixed|string
-     */
-    public function layout()
-    {
-        return $this->layout;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stores one or more pieces of data to be passed to the views when
-     * they are rendered out.
-     *
-     * If both $key and $value are ! empty, then it will treat it as a
-     * key/value pair. If $key is an array of key/value pairs, then $value
-     * is ignored and each element of the array are made available to the
-     * view as if it was a single $key/$value pair.
-     *
-     * @param string|array $key
-     * @param mixed $value
-     * @return $this
-     */
-    public function set($key, $value = null)
-    {
-        if (is_array($key)) {
-            $this->vars = array_merge($this->vars, $key);
-            return;
-        }
-
-        $this->vars[$key] = $value;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a value that has been previously set().
-     *
-     * @param $key
-     * @return mixed
-     */
-    public function get($key)
-    {
-        return isset($this->vars[$key]) ? $this->vars[$key] : null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines whether or not the view should be parsed with the
-     * CodeIgniter's parser.
-     *
-     * @param bool $parse
-     * @return mixed
-     */
-    public function parseViews($parse = false)
-    {
-	    $this->parse_views = $parse;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Theme paths allow you to have multiple locations for themes to be
-     * stored. This might be used for separating themes for different sub-
-     * applications, or a core theme and user-submitted themes.
-     *
-     * @param $alias The name the theme can be referenced by
-     * @param $path  A new path where themes can be found.
-     *
-     * @return mixed
-     */
-    public function addThemePath($alias, $path)
-    {
-        $this->folders[$alias] = $path;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a single theme path.
-     *
-     * @param $alias
-     * @return $this
-     */
-    public function removeThemePath($alias)
-    {
-        unset($this->folders[$alias]);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the path to the active/default theme's folder.
-     *
-     * @return string|null
-     */
-    public function getThemePath()
-    {
-        $theme = empty($this->theme) ? $this->default_theme : $this->theme;
-
-        if (! isset($this->folders[ $theme ]))
-        {
-            return null;
-        }
-
-        return $this->folders[$theme];
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    //--------------------------------------------------------------------
-    // Variants
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the variant used when creating view names. These variants can
-     * be anything, but by default are used to render specific templates
-     * for desktop, tablet, and phone. The name of the variant is added
-     * to the view name, joined by a "+" symbol.
-     *
-     * Example:
-     *      $this->setVariant('phone');
-     *      $this->display('header');
-     *
-     *      Tries to display "views/header+phone.php"
-     *
-     * @param $variant
-     * @return $this
-     */
-    public function setVariant($variant)
-    {
-        if (isset($this->variants[$variant])) {
-            $this->current_variant = $variant;
-        }
-
-        return $this;
-    }
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a new variant to the system.
-     *
-     * @param $name
-     * @param $postfix
-     * @return $this|mixed
-     */
-    public function addVariant($name, $postfix)
-    {
-        $this->variants[$name] = $postfix;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a variant from the system.
-     *
-     * @param $name
-     * @return $this|mixed
-     */
-    public function removeVariant($name)
-    {
-        if (isset($this->variants[$name])) {
-            unset($this->variants[$name]);
-        }
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Handles the actual loading of a view file, and checks for any
-     * overrides in themes, etc.
-     *
-     * @param $view
-     * @param $data
-     *
-     * @return string
-     */
-    private function loadView($view, $data)
-    {
-        // First - does it exist in the current theme?
-        $theme = ! empty($this->active_theme) ? $this->active_theme : $this->default_theme;
-        $theme = ! empty($this->folders[$theme]) ? $this->folders[$theme] : $theme;
-        $theme = rtrim($theme, '/ ') .'/';
-
-        if (file_exists($theme ."{$view}.php"))
-        {
-            $output = $this->ci->load->view_path( $theme . $view, $data, TRUE );
-        }
-
-        // Next, if it's a real file with path, then load it
-        elseif ( realpath( $view . '.php' ) )
-        {
-            $output = $this->ci->load->view_path( $view, $data, TRUE );
-        }
-
-        // Otherwise, treat it as a standard view, which means
-        // application/views will override any modules. (See HMVC/Loader)
-        else
-        {
-            $output = $this->ci->load->view( $view, $data, TRUE );
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
+				$dir = str_replace('controllers/', '', $dir);
+			}
+		}
+
+		$module = $this->ci->router->fetch_module();
+
+		if (! empty($module) && substr($dir, -strlen($module .'/')) == $module . '/') {
+			$dir = '';
+		}
+
+		$view = ! empty($this->view) ? $this->view :
+			$dir . $this->ci->router->fetch_class() . '/' . $this->ci->router->fetch_method();
+
+		return $this->display($view);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Loads a view file. Useful to control caching. Intended for use
+	 * from within view files.
+	 *
+	 * You can specify that a view should belong to a theme by prefixing
+	 * the name of the theme and a colon to the view name. For example,
+	 * "admin:header" would try to display the "header.php" file within
+	 * the "admin" theme.
+	 *
+	 * If a variant has been specified, it will be added to the end
+	 * of the view name before looking for the file.
+	 *
+	 * @param string $view
+	 * @param array  $data
+	 * @param int    $cache_time Number of minutes to cache the page for
+	 * @param string $cache_name A custom name for the cached file.
+	 * @return mixed
+	 */
+	public function display($view, $data = array(), $cache_time = 0, $cache_name=null)
+	{
+		if (empty($cache_name))
+		{
+			$cache_name = 'theme_view_' . $view . '_' . $this->ci->router->fetch_class() . '_' . $this->ci->router->fetch_method();
+			$cache_name = str_replace( '/', '_', $cache_name );
+		}
+
+		if ($cache_time == 0 || ! $output = $this->ci->cache->get($cache_name))
+		{
+			$theme        = NULL;
+			$variant_view = NULL;
+
+			// Pull out the theme from the view, if given.
+			if ( strpos( $view, ':' ) !== FALSE )
+			{
+				list( $theme, $view ) = explode( ':', $view );
+
+				$theme = str_replace('{theme}', $this->active_theme, $theme);
+			}
+
+			if ( ! empty( $theme ) && isset( $this->folders[ $theme ] ) )
+			{
+				$view = rtrim( $this->folders[ $theme ], '/' ) . '/' . $view;
+			}
+
+			if (! is_array($data))
+			{
+				$data = [];
+			}
+
+			$data = array_merge( $this->vars, $data );
+
+			// if using a variant, add it to the view name.
+			if ( ! empty( $this->current_variant ) )
+			{
+				$variant_view = $view . $this->variants[ $this->current_variant ];
+
+				$output = $this->loadView($variant_view, $data);
+			}
+
+			// If that didn't find anything, then try it without a variant
+			if ( empty( $output ) )
+			{
+				$output = $this->loadView($view, $data);
+			}
+
+			// Cache it
+			if ((int)$cache_time > 0)
+			{
+				$this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
+			}
+		}
+
+		// Parse views?
+		if ($this->parse_views)
+		{
+			$this->ci->load->library('parser');
+
+			// Any class objects will cause failure
+			// so get rid of those bad boys....
+			unset($data['uikit'], $data['themer']);
+
+			$output = $this->ci->parser->parse_string($output, $data, true);
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs a callback method and returns the contents to the view.
+	 *
+	 * @param $command
+	 * @param int $cache_time
+	 * @param string $cache_name    // Number of MINUTES to cache output
+	 * @return mixed|void
+	 */
+	public function call($command, $cache_time=0, $cache_name=null)
+	{
+		if (empty($cache_name))
+		{
+			$cache_name = 'theme_call_' . md5( $command );
+		}
+
+		if (! $output = $this->ci->cache->get($cache_name)) {
+			$parts = explode(' ', $command);
+
+			list($class, $method) = explode(':', array_shift($parts));
+
+			// Prepare our parameter list to send to the callback
+			// by splitting $parts on equal signs.
+			$params = array();
+
+			foreach ($parts as $part) {
+				$p = explode('=', $part);
+
+				if (empty($p[0]) || empty($p[1]))
+				{
+					continue;
+				}
+
+				$params[ $p[0] ] = $p[1];
+			}
+
+			// Let PHP try to autoload it through any available autoloaders
+			// (including Composer and user's custom autoloaders). If we
+			// don't find it, then assume it's a CI library that we can reach.
+			if (class_exists($class)) {
+				$class = new $class();
+			} else {
+				$this->ci->load->library($class);
+				$class =& $this->ci->$class;
+			}
+
+			if (! method_exists($class, $method)) {
+				throw new \RuntimeException( sprintf( lang('themer.bad_callback'), $class, $method ) );
+			}
+
+			// Call the class with our parameters
+			$output = $class->{$method}($params);
+
+			// Cache it
+			if ((int)$cache_time > 0)
+			{
+				$this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
+			}
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the active theme to use. This theme should be
+	 * relative to one of the 'theme_paths' folders.
+	 *
+	 * @param $theme
+	 */
+	public function setTheme($theme)
+	{
+		$this->theme = $theme;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current theme.
+	 *
+	 * @return mixed|string
+	 */
+	public function theme()
+	{
+		return $this->theme;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default theme to use if another isn't specified.
+	 *
+	 * @param $theme
+	 * @return mixed|void
+	 */
+	public function setDefaultTheme($theme)
+	{
+		$this->default_theme = $theme;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Sets the current view file to render.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setView($file)
+	{
+		$this->view = $file;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current view.
+	 *
+	 * @return mixed|string
+	 */
+	public function view()
+	{
+		return $this->view;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current layout to be used. MUST be the name of one of
+	 * the layout files within the current theme. Case-sensitive.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setLayout($file)
+	{
+		if (empty($file)) return;
+
+		$this->layout = $file;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current layout.
+	 *
+	 * @return mixed|string
+	 */
+	public function layout()
+	{
+		return $this->layout;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores one or more pieces of data to be passed to the views when
+	 * they are rendered out.
+	 *
+	 * If both $key and $value are ! empty, then it will treat it as a
+	 * key/value pair. If $key is an array of key/value pairs, then $value
+	 * is ignored and each element of the array are made available to the
+	 * view as if it was a single $key/$value pair.
+	 *
+	 * @param string|array $key
+	 * @param mixed $value
+	 * @return $this
+	 */
+	public function set($key, $value = null)
+	{
+		if (is_array($key)) {
+			$this->vars = array_merge($this->vars, $key);
+			return;
+		}
+
+		$this->vars[$key] = $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a value that has been previously set().
+	 *
+	 * @param $key
+	 * @return mixed
+	 */
+	public function get($key)
+	{
+		return isset($this->vars[$key]) ? $this->vars[$key] : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines whether or not the view should be parsed with the
+	 * CodeIgniter's parser.
+	 *
+	 * @param bool $parse
+	 * @return mixed
+	 */
+	public function parseViews($parse = false)
+	{
+		$this->parse_views = $parse;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Theme paths allow you to have multiple locations for themes to be
+	 * stored. This might be used for separating themes for different sub-
+	 * applications, or a core theme and user-submitted themes.
+	 *
+	 * @param $alias The name the theme can be referenced by
+	 * @param $path  A new path where themes can be found.
+	 *
+	 * @return mixed
+	 */
+	public function addThemePath($alias, $path)
+	{
+		$this->folders[$alias] = $path;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single theme path.
+	 *
+	 * @param $alias
+	 * @return $this
+	 */
+	public function removeThemePath($alias)
+	{
+		unset($this->folders[$alias]);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the path to the active/default theme's folder.
+	 *
+	 * @return string|null
+	 */
+	public function getThemePath()
+	{
+		$theme = empty($this->theme) ? $this->default_theme : $this->theme;
+
+		if (! isset($this->folders[ $theme ]))
+		{
+			return null;
+		}
+
+		return $this->folders[$theme];
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	//--------------------------------------------------------------------
+	// Variants
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the variant used when creating view names. These variants can
+	 * be anything, but by default are used to render specific templates
+	 * for desktop, tablet, and phone. The name of the variant is added
+	 * to the view name, joined by a "+" symbol.
+	 *
+	 * Example:
+	 *      $this->setVariant('phone');
+	 *      $this->display('header');
+	 *
+	 *      Tries to display "views/header+phone.php"
+	 *
+	 * @param $variant
+	 * @return $this
+	 */
+	public function setVariant($variant)
+	{
+		if (isset($this->variants[$variant])) {
+			$this->current_variant = $variant;
+		}
+
+		return $this;
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a new variant to the system.
+	 *
+	 * @param $name
+	 * @param $postfix
+	 * @return $this|mixed
+	 */
+	public function addVariant($name, $postfix)
+	{
+		$this->variants[$name] = $postfix;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a variant from the system.
+	 *
+	 * @param $name
+	 * @return $this|mixed
+	 */
+	public function removeVariant($name)
+	{
+		if (isset($this->variants[$name])) {
+			unset($this->variants[$name]);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles the actual loading of a view file, and checks for any
+	 * overrides in themes, etc.
+	 *
+	 * @param $view
+	 * @param $data
+	 *
+	 * @return string
+	 */
+	private function loadView($view, $data)
+	{
+		// First - does it exist in the current theme?
+		$theme = ! empty($this->active_theme) ? $this->active_theme : $this->default_theme;
+		$theme = ! empty($this->folders[$theme]) ? $this->folders[$theme] : $theme;
+		$theme = rtrim($theme, '/ ') .'/';
+
+		if (file_exists($theme ."{$view}.php"))
+		{
+			$output = $this->ci->load->view_path( $theme . $view, $data, TRUE );
+		}
+
+		// Next, if it's a real file with path, then load it
+		elseif ( realpath( $view . '.php' ) )
+		{
+			$output = $this->ci->load->view_path( $view, $data, TRUE );
+		}
+
+		// Otherwise, treat it as a standard view, which means
+		// application/views will override any modules. (See HMVC/Loader)
+		else
+		{
+			$output = $this->ci->load->view( $view, $data, TRUE );
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
 
 }