ci-bonfire / Sprint

application/database/seeds/FlatAuthorizationSeeder.php

Indentation +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 	public function run()
 	{
-	    $flat = new \Myth\Auth\FlatAuthorization();
+		$flat = new \Myth\Auth\FlatAuthorization();
 
 		$flat->createPermission('viewPosts', 'View the blog posts.');
 		$flat->createPermission('managePosts', 'Manage the blog posts.');

application/database/seeds/TestSeeder.php

Indentation +5 added lines, -5 removed lines

@@ -8,9 +8,9 @@ 
  */
 class TestSeeder extends Seeder {
     
-    public function run()
-    {
-        /*
+	public function run()
+	{
+		/*
             Here, you can do anything you need to do to get your
             database in the desired state. The following tools are ready for you:
 
@@ -23,8 +23,8 @@ 
 
                 $this->call('UserSeeder');
          */
-    }
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
     
 }

application/libraries/MY_Form_validation.php

Indentation +112 added lines, -112 removed lines

@@ -3,117 +3,117 @@
 if (! class_exists('MY_Form_validation'))
 {
 
-    class MY_Form_validation extends CI_Form_validation {
-        /**
-         * @var object The CodeIgniter core object.
-         */
-        public $CI;
-
-        //--------------------------------------------------------------------
-
-        /**
-         * Check if the field has an error associated with it.
-         *
-         * @param string $field The name of the field
-         *
-         * @return bool
-         */
-        public function has_error( $field = NULL )
-        {
-            if ( empty( $field ) )
-            {
-                return FALSE;
-            }
-
-            return ! empty( $this->_field_data[ $field ]['error'] );
-        }
-
-        //--------------------------------------------------------------------
-
-        /**
-         * Performs the actual form validation
-         *
-         * @param string $module Name of the module
-         * @param string $group Name of the group array containing the rules
-         *
-         * @return bool Success or Failure
-         */
-        public function run($group = '', $module = '')
-        {
-            is_object($module) && $this->CI =& $module;
-            return parent::run($group);
-        }
-
-        //--------------------------------------------------------------------
-
-        //--------------------------------------------------------------------
-        // Validation Rules
-        //--------------------------------------------------------------------
-
-        /**
-         * Checks that a value is unique in the database.
-         *
-         * i.e. '…|required|unique[users.name,users.id]|trim…'
-         *
-         * <code>
-         * "unique[tablename.fieldname,tablename.(primaryKey-used-for-updates)]"
-         * </code>
-         *
-         * @author Adapted from Burak Guzel <http://net.tutsplus.com/tutorials/php/6-codeigniter-hacks-for-the-masters/>
-         *
-         * @param mixed $value The value to be checked.
-         * @param mixed $params The table and field to check against, if a second
-         * field is passed in this is used as "AND NOT EQUAL".
-         *
-         * @return bool True if the value is unique for that field, else false.
-         */
-        public function is_unique( $value, $params )
-        {
-            if ( empty( $this->CI->db ) )
-            {
-                $this->CI->load->database();
-            }
-
-            // Allow for more than 1 parameter.
-            $fields = explode( ",", $params );
-
-            // Extract the table and field from the first parameter.
-            list( $table, $field ) = explode( '.', $fields[0], 2 );
-
-            // Setup the db request.
-            $this->CI->db->select( $field )
-                         ->from( $table )
-                         ->where( $field, $value )
-                         ->limit( 1 );
-
-            // Check whether a second parameter was passed to be used as an
-            // "AND NOT EQUAL" where clause
-            // eg "select * from users where users.name='test' AND users.id != 4
-            if ( isset( $fields[1] ) )
-            {
-                // Extract the table and field from the second parameter
-                list( $where_table, $where_field ) = explode( '.', $fields[1], 2 );
-
-                // Get the value from the post's $where_field. If the value is set,
-                // add "AND NOT EQUAL" where clause.
-                $where_value = $this->CI->input->post( $where_field );
-                if ( isset( $where_value ) )
-                {
-                    $this->CI->db->where( "{$where_table}.{$where_field} !=", $where_value );
-                }
-            }
-
-            // If any rows are returned from the database, validation fails
-            $query = $this->CI->db->get();
-            if ( $query->row() )
-            {
-                $this->CI->form_validation->set_message( 'unique', 'The %s field is already in use.' );
-
-                return FALSE;
-            }
-
-            return TRUE;
-        }
-    }
+	class MY_Form_validation extends CI_Form_validation {
+		/**
+		 * @var object The CodeIgniter core object.
+		 */
+		public $CI;
+
+		//--------------------------------------------------------------------
+
+		/**
+		 * Check if the field has an error associated with it.
+		 *
+		 * @param string $field The name of the field
+		 *
+		 * @return bool
+		 */
+		public function has_error( $field = NULL )
+		{
+			if ( empty( $field ) )
+			{
+				return FALSE;
+			}
+
+			return ! empty( $this->_field_data[ $field ]['error'] );
+		}
+
+		//--------------------------------------------------------------------
+
+		/**
+		 * Performs the actual form validation
+		 *
+		 * @param string $module Name of the module
+		 * @param string $group Name of the group array containing the rules
+		 *
+		 * @return bool Success or Failure
+		 */
+		public function run($group = '', $module = '')
+		{
+			is_object($module) && $this->CI =& $module;
+			return parent::run($group);
+		}
+
+		//--------------------------------------------------------------------
+
+		//--------------------------------------------------------------------
+		// Validation Rules
+		//--------------------------------------------------------------------
+
+		/**
+		 * Checks that a value is unique in the database.
+		 *
+		 * i.e. '…|required|unique[users.name,users.id]|trim…'
+		 *
+		 * <code>
+		 * "unique[tablename.fieldname,tablename.(primaryKey-used-for-updates)]"
+		 * </code>
+		 *
+		 * @author Adapted from Burak Guzel <http://net.tutsplus.com/tutorials/php/6-codeigniter-hacks-for-the-masters/>
+		 *
+		 * @param mixed $value The value to be checked.
+		 * @param mixed $params The table and field to check against, if a second
+		 * field is passed in this is used as "AND NOT EQUAL".
+		 *
+		 * @return bool True if the value is unique for that field, else false.
+		 */
+		public function is_unique( $value, $params )
+		{
+			if ( empty( $this->CI->db ) )
+			{
+				$this->CI->load->database();
+			}
+
+			// Allow for more than 1 parameter.
+			$fields = explode( ",", $params );
+
+			// Extract the table and field from the first parameter.
+			list( $table, $field ) = explode( '.', $fields[0], 2 );
+
+			// Setup the db request.
+			$this->CI->db->select( $field )
+						 ->from( $table )
+						 ->where( $field, $value )
+						 ->limit( 1 );
+
+			// Check whether a second parameter was passed to be used as an
+			// "AND NOT EQUAL" where clause
+			// eg "select * from users where users.name='test' AND users.id != 4
+			if ( isset( $fields[1] ) )
+			{
+				// Extract the table and field from the second parameter
+				list( $where_table, $where_field ) = explode( '.', $fields[1], 2 );
+
+				// Get the value from the post's $where_field. If the value is set,
+				// add "AND NOT EQUAL" where clause.
+				$where_value = $this->CI->input->post( $where_field );
+				if ( isset( $where_value ) )
+				{
+					$this->CI->db->where( "{$where_table}.{$where_field} !=", $where_value );
+				}
+			}
+
+			// If any rows are returned from the database, validation fails
+			$query = $this->CI->db->get();
+			if ( $query->row() )
+			{
+				$this->CI->form_validation->set_message( 'unique', 'The %s field is already in use.' );
+
+				return FALSE;
+			}
+
+			return TRUE;
+		}
+	}
 
 }

application/libraries/Migration.php

Indentation +508 added lines, -508 removed lines

@@ -51,415 +51,415 @@ 
  */
 class CI_Migration {
 
-    /**
-     * Whether the library is enabled
-     *
-     * @var bool
-     */
-    protected $_migration_enabled = FALSE;
-
-    /**
-     * Migration numbering type
-     *
-     * @var	bool
-     */
-    protected $_migration_type = 'sequential';
-
-    /**
-     * Path to migration classes
-     *
-     * @var string
-     */
-    protected  $_migration_paths = NULL;
-
-    /**
-     * Current migration version
-     *
-     * @var mixed
-     */
-    protected $_migration_version = 0;
-
-    /**
-     * Database table with migration info
-     *
-     * @var string
-     */
-    protected $_migration_table = 'migrations';
-
-    /**
-     * Whether to automatically run migrations
-     *
-     * @var	bool
-     */
-    protected $_migration_auto_latest = FALSE;
-
-    /**
-     * Migration basename regex
-     *
-     * @var bool
-     */
-    protected $_migration_regex = NULL;
-
-    /**
-     * Error message
-     *
-     * @var string
-     */
-    protected $_error_string = '';
-
-    /**
-     * Initialize Migration Class
-     *
-     * @param	array	$config
-     * @return	void
-     */
-    public function __construct($config = array())
-    {
-        // Only run this constructor on main library load
-        if ( ! in_array(get_class($this), array('CI_Migration', config_item('subclass_prefix').'Migration'), TRUE))
-        {
-            return;
-        }
-
-        foreach ($config as $key => $val)
-        {
-            $this->{'_'.$key} = $val;
-        }
-
-        log_message('debug', 'Migrations class initialized');
-
-        // Are they trying to use migrations while it is disabled?
-        if ($this->_migration_enabled !== TRUE)
-        {
-            show_error('Migrations has been loaded but is disabled or set up incorrectly.');
-        }
-
-        // If not set, set it
-        count($this->_migration_paths) OR $this->_migration_paths = array(APPPATH.'database/migrations/');
-
-        // Add trailing slash if not set
-        foreach ($this->_migration_paths as $alias => $path) {
-            $this->_migration_paths[$alias] = rtrim($this->_migration_paths[$alias], '/') . '/';
-        }
-
-        // Load migration language
-        $this->lang->load('migration');
-
-        // They'll probably be using dbforge
-        $this->load->dbforge();
-
-        // Make sure the migration table name was set.
-        if (empty($this->_migration_table))
-        {
-            show_error('Migrations configuration file (migration.php) must have "migration_table" set.');
-        }
-
-        // Migration basename regex
-        $this->_migration_regex = ($this->_migration_type === 'timestamp')
-            ? '/^\d{14}_(\w+)$/'
-            : '/^\d{3}_(\w+)$/';
-
-        // Make sure a valid migration numbering type was set.
-        if ( ! in_array($this->_migration_type, array('sequential', 'timestamp')))
-        {
-            show_error('An invalid migration numbering type was specified: '.$this->_migration_type);
-        }
-
-        // If the migrations table is missing, make it
-        if ( ! $this->db->table_exists($this->_migration_table))
-        {
-            $this->dbforge->add_field(array(
-                'version' => array('type' => 'BIGINT', 'constraint' => 20),
-                'alias' => array('type' => 'VARCHAR', 'constraint' => 255),
-                'ondate'  => array('type' => 'DATETIME')
-            ));
-
-            $this->dbforge->add_key('alias');
-
-            $this->dbforge->create_table($this->_migration_table, TRUE);
-        }
-
-        // Do we auto migrate to the latest migration?
-        if ($this->_migration_auto_latest === TRUE && ! $this->latest())
-        {
-            show_error($this->error_string());
-        }
-
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Migrate to a schema version
-     *
-     * Calls each migration step required to get to the schema version of
-     * choice
-     *
-     * @param string $type  Any key from _migration_paths, or {module_name}
-     * @param	string	$target_version	Target schema version
-     *
-     * @return	mixed	TRUE if already latest, FALSE if failed, string if upgraded
-     */
-    public function version($type='all', $target_version)
-    {
-        // Note: We use strings, so that timestamp versions work on 32-bit systems
-        $current_version = $this->get_version($type);
-
-        if ($this->_migration_type === 'sequential')
-        {
-            $target_version = sprintf('%03d', $target_version);
-        }
-        else
-        {
-            $target_version = (string) $target_version;
-        }
-
-        $migrations = $this->find_migrations($type);
-
-        if ($target_version > 0 && ! isset($migrations[$target_version]))
-        {
-            $this->_error_string = sprintf($this->lang->line('migration_not_found'), $target_version);
-            return FALSE;
-        }
-
-        if ($target_version > $current_version)
-        {
-            // Moving Up
-            $method = 'up';
-        }
-        else
-        {
-            // Moving Down, apply in reverse order
-            $method = 'down';
-            krsort($migrations);
-        }
-
-        if (empty($migrations))
-        {
-            return TRUE;
-        }
-
-        $previous = FALSE;
-
-        // Validate all available migrations, and run the ones within our target range
-        foreach ($migrations as $number => $file)
-        {
-            // Check for sequence gaps
-            if ($this->_migration_type === 'sequential' && $previous !== FALSE && abs($number - $previous) > 1)
-            {
-                $this->_error_string = sprintf($this->lang->line('migration_sequence_gap'), $number);
-                return FALSE;
-            }
-
-            include_once($file);
-            $class = 'Migration_'.ucfirst(strtolower($this->_get_migration_name(basename($file, '.php'))));
-
-            // Validate the migration file structure
-            if ( ! class_exists($class, FALSE))
-            {
-                $this->_error_string = sprintf($this->lang->line('migration_class_doesnt_exist'), $class);
-                return FALSE;
-            }
-
-            $previous = $number;
-
-            // Run migrations that are inside the target range
-            if (
-                ($method === 'up'   && $number > $current_version && $number <= $target_version) OR
-                ($method === 'down' && $number <= $current_version && $number > $target_version)
-            )
-            {
-                $instance = new $class();
-                if ( ! is_callable(array($instance, $method)))
-                {
-                    $this->_error_string = sprintf($this->lang->line('migration_missing_'.$method.'_method'), $class);
-                    return FALSE;
-                }
-
-                log_message('debug', 'Migrating '.$method.' from version '.$current_version.' to version '.$number);
-                call_user_func(array($instance, $method));
-                $current_version = $number;
-                $this->_update_version($type, $current_version);
-            }
-        }
-
-        // This is necessary when moving down, since the the last migration applied
-        // will be the down() method for the next migration up from the target
-        if ($current_version <> $target_version)
-        {
-            $current_version = $target_version;
-            $this->_update_version($type, $current_version);
-        }
-
-        log_message('debug', 'Finished migrating to '.$current_version);
-
-        return $current_version;
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Sets the schema to the latest migration
-     *
-     * @param string $type  Any key from _migration_paths, or {module_name}
-     *
-     * @return	mixed	TRUE if already latest, FALSE if failed, string if upgraded
-     */
-    public function latest($type='app')
-    {
-        $last_migration = $this->get_latest($type);
-
-        // Calculate the last migration step from existing migration
-        // filenames and proceed to the standard version migration
-        return $this->version($type, $this->_get_migration_number($last_migration));
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Retrieves the latest migration version available.
-     *
-     * @param string $type  Any key from _migration_paths, or {module_name}
-     *
-     * @return bool|string
-     */
-    public function get_latest($type='app')
-    {
-        $migrations = $this->find_migrations($type);
-
-        if (empty($migrations))
-        {
-            $this->_error_string = $this->lang->line('migration_none_found');
-            return FALSE;
-        }
-
-        return basename(end($migrations));
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    /**
-     * Sets the schema to the migration version set in config
-     *
-     * @return	mixed	TRUE if already current, FALSE if failed, string if upgraded
-     */
-    public function current()
-    {
-        return $this->version($this->_migration_version);
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Error string
-     *
-     * @return	string	Error message returned as a string
-     */
-    public function error_string()
-    {
-        return $this->_error_string;
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Retrieves list of available migration scripts
-     *
-     * @return	array	list of migration file paths sorted by version
-     */
-    public function find_migrations($type='app')
-    {
-        $migrations = array();
-
-        $path = $this->determine_migration_path($type);
-
-        // Load all *_*.php files in the migrations path
-        foreach (glob($path.'*_*.php') as $file)
-        {
-            $name = basename($file, '.php');
-
-            // Filter out non-migration files
-            if (preg_match($this->_migration_regex, $name))
-            {
-                $number = $this->_get_migration_number($name);
-
-                // There cannot be duplicate migration numbers
-                if (isset($migrations[$number]))
-                {
-                    $this->_error_string = sprintf($this->lang->line('migration_multiple_version'), $number);
-                    show_error($this->_error_string);
-                }
-
-                $migrations[$number] = $file;
-            }
-        }
-
-        ksort($migrations);
-        return $migrations;
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Retrieves current schema version
-     *
-     * @return	string	Current migration version
-     */
-    public function get_version($type='app')
-    {
-        $row = $this->db->select('version')
-                        ->where('alias', $type)
-                        ->get($this->_migration_table)
-                        ->row();
-
-        return $row ? $row->version : '0';
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Given the string for the name of the file, will
-     * generate the rest of the filename based on the current
-     * $config['migration_type'] setting.
-     *
-     * @param $name
-     * @return string The final name (with extension)
-     */
-    public function make_name($name)
-    {
-        if (empty($name))
-        {
-            return null;
-        }
-
-        if ($this->_migration_type == 'timestamp')
-        {
-            $prefix = date('YmdHis');
-        }
-        else
-        {
-            $prefix = str_pad($this->get_version() + 1, 3, '0', STR_PAD_LEFT);
-        }
-
-        return $prefix .'_'. ucfirst(strtolower($name)) .'.php';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Enable the use of CI super-global
-     *
-     * @param	string	$var
-     * @return	mixed
-     */
-    public function __get($var)
-    {
-        return get_instance()->$var;
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Whether the library is enabled
+	 *
+	 * @var bool
+	 */
+	protected $_migration_enabled = FALSE;
+
+	/**
+	 * Migration numbering type
+	 *
+	 * @var	bool
+	 */
+	protected $_migration_type = 'sequential';
+
+	/**
+	 * Path to migration classes
+	 *
+	 * @var string
+	 */
+	protected  $_migration_paths = NULL;
+
+	/**
+	 * Current migration version
+	 *
+	 * @var mixed
+	 */
+	protected $_migration_version = 0;
+
+	/**
+	 * Database table with migration info
+	 *
+	 * @var string
+	 */
+	protected $_migration_table = 'migrations';
+
+	/**
+	 * Whether to automatically run migrations
+	 *
+	 * @var	bool
+	 */
+	protected $_migration_auto_latest = FALSE;
+
+	/**
+	 * Migration basename regex
+	 *
+	 * @var bool
+	 */
+	protected $_migration_regex = NULL;
+
+	/**
+	 * Error message
+	 *
+	 * @var string
+	 */
+	protected $_error_string = '';
+
+	/**
+	 * Initialize Migration Class
+	 *
+	 * @param	array	$config
+	 * @return	void
+	 */
+	public function __construct($config = array())
+	{
+		// Only run this constructor on main library load
+		if ( ! in_array(get_class($this), array('CI_Migration', config_item('subclass_prefix').'Migration'), TRUE))
+		{
+			return;
+		}
+
+		foreach ($config as $key => $val)
+		{
+			$this->{'_'.$key} = $val;
+		}
+
+		log_message('debug', 'Migrations class initialized');
+
+		// Are they trying to use migrations while it is disabled?
+		if ($this->_migration_enabled !== TRUE)
+		{
+			show_error('Migrations has been loaded but is disabled or set up incorrectly.');
+		}
+
+		// If not set, set it
+		count($this->_migration_paths) OR $this->_migration_paths = array(APPPATH.'database/migrations/');
+
+		// Add trailing slash if not set
+		foreach ($this->_migration_paths as $alias => $path) {
+			$this->_migration_paths[$alias] = rtrim($this->_migration_paths[$alias], '/') . '/';
+		}
+
+		// Load migration language
+		$this->lang->load('migration');
+
+		// They'll probably be using dbforge
+		$this->load->dbforge();
+
+		// Make sure the migration table name was set.
+		if (empty($this->_migration_table))
+		{
+			show_error('Migrations configuration file (migration.php) must have "migration_table" set.');
+		}
+
+		// Migration basename regex
+		$this->_migration_regex = ($this->_migration_type === 'timestamp')
+			? '/^\d{14}_(\w+)$/'
+			: '/^\d{3}_(\w+)$/';
+
+		// Make sure a valid migration numbering type was set.
+		if ( ! in_array($this->_migration_type, array('sequential', 'timestamp')))
+		{
+			show_error('An invalid migration numbering type was specified: '.$this->_migration_type);
+		}
+
+		// If the migrations table is missing, make it
+		if ( ! $this->db->table_exists($this->_migration_table))
+		{
+			$this->dbforge->add_field(array(
+				'version' => array('type' => 'BIGINT', 'constraint' => 20),
+				'alias' => array('type' => 'VARCHAR', 'constraint' => 255),
+				'ondate'  => array('type' => 'DATETIME')
+			));
+
+			$this->dbforge->add_key('alias');
+
+			$this->dbforge->create_table($this->_migration_table, TRUE);
+		}
+
+		// Do we auto migrate to the latest migration?
+		if ($this->_migration_auto_latest === TRUE && ! $this->latest())
+		{
+			show_error($this->error_string());
+		}
+
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Migrate to a schema version
+	 *
+	 * Calls each migration step required to get to the schema version of
+	 * choice
+	 *
+	 * @param string $type  Any key from _migration_paths, or {module_name}
+	 * @param	string	$target_version	Target schema version
+	 *
+	 * @return	mixed	TRUE if already latest, FALSE if failed, string if upgraded
+	 */
+	public function version($type='all', $target_version)
+	{
+		// Note: We use strings, so that timestamp versions work on 32-bit systems
+		$current_version = $this->get_version($type);
+
+		if ($this->_migration_type === 'sequential')
+		{
+			$target_version = sprintf('%03d', $target_version);
+		}
+		else
+		{
+			$target_version = (string) $target_version;
+		}
+
+		$migrations = $this->find_migrations($type);
+
+		if ($target_version > 0 && ! isset($migrations[$target_version]))
+		{
+			$this->_error_string = sprintf($this->lang->line('migration_not_found'), $target_version);
+			return FALSE;
+		}
+
+		if ($target_version > $current_version)
+		{
+			// Moving Up
+			$method = 'up';
+		}
+		else
+		{
+			// Moving Down, apply in reverse order
+			$method = 'down';
+			krsort($migrations);
+		}
+
+		if (empty($migrations))
+		{
+			return TRUE;
+		}
+
+		$previous = FALSE;
+
+		// Validate all available migrations, and run the ones within our target range
+		foreach ($migrations as $number => $file)
+		{
+			// Check for sequence gaps
+			if ($this->_migration_type === 'sequential' && $previous !== FALSE && abs($number - $previous) > 1)
+			{
+				$this->_error_string = sprintf($this->lang->line('migration_sequence_gap'), $number);
+				return FALSE;
+			}
+
+			include_once($file);
+			$class = 'Migration_'.ucfirst(strtolower($this->_get_migration_name(basename($file, '.php'))));
+
+			// Validate the migration file structure
+			if ( ! class_exists($class, FALSE))
+			{
+				$this->_error_string = sprintf($this->lang->line('migration_class_doesnt_exist'), $class);
+				return FALSE;
+			}
+
+			$previous = $number;
+
+			// Run migrations that are inside the target range
+			if (
+				($method === 'up'   && $number > $current_version && $number <= $target_version) OR
+				($method === 'down' && $number <= $current_version && $number > $target_version)
+			)
+			{
+				$instance = new $class();
+				if ( ! is_callable(array($instance, $method)))
+				{
+					$this->_error_string = sprintf($this->lang->line('migration_missing_'.$method.'_method'), $class);
+					return FALSE;
+				}
+
+				log_message('debug', 'Migrating '.$method.' from version '.$current_version.' to version '.$number);
+				call_user_func(array($instance, $method));
+				$current_version = $number;
+				$this->_update_version($type, $current_version);
+			}
+		}
+
+		// This is necessary when moving down, since the the last migration applied
+		// will be the down() method for the next migration up from the target
+		if ($current_version <> $target_version)
+		{
+			$current_version = $target_version;
+			$this->_update_version($type, $current_version);
+		}
+
+		log_message('debug', 'Finished migrating to '.$current_version);
+
+		return $current_version;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Sets the schema to the latest migration
+	 *
+	 * @param string $type  Any key from _migration_paths, or {module_name}
+	 *
+	 * @return	mixed	TRUE if already latest, FALSE if failed, string if upgraded
+	 */
+	public function latest($type='app')
+	{
+		$last_migration = $this->get_latest($type);
+
+		// Calculate the last migration step from existing migration
+		// filenames and proceed to the standard version migration
+		return $this->version($type, $this->_get_migration_number($last_migration));
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Retrieves the latest migration version available.
+	 *
+	 * @param string $type  Any key from _migration_paths, or {module_name}
+	 *
+	 * @return bool|string
+	 */
+	public function get_latest($type='app')
+	{
+		$migrations = $this->find_migrations($type);
+
+		if (empty($migrations))
+		{
+			$this->_error_string = $this->lang->line('migration_none_found');
+			return FALSE;
+		}
+
+		return basename(end($migrations));
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	/**
+	 * Sets the schema to the migration version set in config
+	 *
+	 * @return	mixed	TRUE if already current, FALSE if failed, string if upgraded
+	 */
+	public function current()
+	{
+		return $this->version($this->_migration_version);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Error string
+	 *
+	 * @return	string	Error message returned as a string
+	 */
+	public function error_string()
+	{
+		return $this->_error_string;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Retrieves list of available migration scripts
+	 *
+	 * @return	array	list of migration file paths sorted by version
+	 */
+	public function find_migrations($type='app')
+	{
+		$migrations = array();
+
+		$path = $this->determine_migration_path($type);
+
+		// Load all *_*.php files in the migrations path
+		foreach (glob($path.'*_*.php') as $file)
+		{
+			$name = basename($file, '.php');
+
+			// Filter out non-migration files
+			if (preg_match($this->_migration_regex, $name))
+			{
+				$number = $this->_get_migration_number($name);
+
+				// There cannot be duplicate migration numbers
+				if (isset($migrations[$number]))
+				{
+					$this->_error_string = sprintf($this->lang->line('migration_multiple_version'), $number);
+					show_error($this->_error_string);
+				}
+
+				$migrations[$number] = $file;
+			}
+		}
+
+		ksort($migrations);
+		return $migrations;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Retrieves current schema version
+	 *
+	 * @return	string	Current migration version
+	 */
+	public function get_version($type='app')
+	{
+		$row = $this->db->select('version')
+						->where('alias', $type)
+						->get($this->_migration_table)
+						->row();
+
+		return $row ? $row->version : '0';
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Given the string for the name of the file, will
+	 * generate the rest of the filename based on the current
+	 * $config['migration_type'] setting.
+	 *
+	 * @param $name
+	 * @return string The final name (with extension)
+	 */
+	public function make_name($name)
+	{
+		if (empty($name))
+		{
+			return null;
+		}
+
+		if ($this->_migration_type == 'timestamp')
+		{
+			$prefix = date('YmdHis');
+		}
+		else
+		{
+			$prefix = str_pad($this->get_version() + 1, 3, '0', STR_PAD_LEFT);
+		}
+
+		return $prefix .'_'. ucfirst(strtolower($name)) .'.php';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Enable the use of CI super-global
+	 *
+	 * @param	string	$var
+	 * @return	mixed
+	 */
+	public function __get($var)
+	{
+		return get_instance()->$var;
+	}
+
+	//--------------------------------------------------------------------
 
 
 	/**
@@ -470,109 +470,109 @@ 
 	 *
 	 * @return null|string
 	 */
-    public function determine_migration_path($type, $create=false)
-    {
-        $type = strtolower($type);
+	public function determine_migration_path($type, $create=false)
+	{
+		$type = strtolower($type);
 
-        // Is it a module?
-        if (strpos($type, 'mod:') === 0)
-        {
-            $module = str_replace('mod:', '', $type);
+		// Is it a module?
+		if (strpos($type, 'mod:') === 0)
+		{
+			$module = str_replace('mod:', '', $type);
 
-            $path = \Myth\Modules::path($module, 'migrations');
+			$path = \Myth\Modules::path($module, 'migrations');
 
-	        // Should we return a 'created' module?
-	        // Use the first module path.
-	        if (empty($path) && $create === true)
-	        {
+			// Should we return a 'created' module?
+			// Use the first module path.
+			if (empty($path) && $create === true)
+			{
 				$folders = config_item('modules_locations');
 
-		        if (is_array($folders) && count($folders))
-		        {
-			        $path = $folders[0] . $module .'/migrations';
-		        }
-	        }
-
-            return rtrim($path, '/') .'/';
-        }
-
-        // Look in our predefined groups.
-        if (! empty($this->_migration_paths[$type]))
-        {
-            return rtrim($this->_migration_paths[$type], '/') .'/';
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the default migration path. This is basically the first
-     * path in the migration_paths array.
-     *
-     * @return string
-     */
-    public function default_migration_path()
-    {
-        return key($this->_migration_paths);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    //--------------------------------------------------------------------
-    // Protected Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Extracts the migration number from a filename
-     *
-     * @param	string	$migration
-     * @return	string	Numeric portion of a migration filename
-     */
-    protected function _get_migration_number($migration)
-    {
-        return sscanf($migration, '%[0-9]+', $number)
-            ? $number : '0';
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Extracts the migration class name from a filename
-     *
-     * @param	string	$migration
-     * @return	string	text portion of a migration filename
-     */
-    protected function _get_migration_name($migration)
-    {
-        $parts = explode('_', $migration);
-        array_shift($parts);
-        return implode('_', $parts);
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Stores the current schema version
-     *
-     * @param   string  $type  Any key from _migration_paths, or {module_name}
-     * @param	string	$migration	Migration reached
-     * @return	mixed	Outputs a report of the migration
-     */
-    protected function _update_version($type='all', $migration)
-    {
-        $this->db->where('alias', $type)
-                 ->delete($this->_migration_table);
-
-        return $this->db->insert($this->_migration_table, array(
-            'version'   => $migration,
-            'alias'     => $type,
-            'ondate'    => date('Y-m-d H:i:s')
-        ));
-    }
-
-    // --------------------------------------------------------------------
+				if (is_array($folders) && count($folders))
+				{
+					$path = $folders[0] . $module .'/migrations';
+				}
+			}
+
+			return rtrim($path, '/') .'/';
+		}
+
+		// Look in our predefined groups.
+		if (! empty($this->_migration_paths[$type]))
+		{
+			return rtrim($this->_migration_paths[$type], '/') .'/';
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the default migration path. This is basically the first
+	 * path in the migration_paths array.
+	 *
+	 * @return string
+	 */
+	public function default_migration_path()
+	{
+		return key($this->_migration_paths);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	//--------------------------------------------------------------------
+	// Protected Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Extracts the migration number from a filename
+	 *
+	 * @param	string	$migration
+	 * @return	string	Numeric portion of a migration filename
+	 */
+	protected function _get_migration_number($migration)
+	{
+		return sscanf($migration, '%[0-9]+', $number)
+			? $number : '0';
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Extracts the migration class name from a filename
+	 *
+	 * @param	string	$migration
+	 * @return	string	text portion of a migration filename
+	 */
+	protected function _get_migration_name($migration)
+	{
+		$parts = explode('_', $migration);
+		array_shift($parts);
+		return implode('_', $parts);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Stores the current schema version
+	 *
+	 * @param   string  $type  Any key from _migration_paths, or {module_name}
+	 * @param	string	$migration	Migration reached
+	 * @return	mixed	Outputs a report of the migration
+	 */
+	protected function _update_version($type='all', $migration)
+	{
+		$this->db->where('alias', $type)
+				 ->delete($this->_migration_table);
+
+		return $this->db->insert($this->_migration_table, array(
+			'version'   => $migration,
+			'alias'     => $type,
+			'ondate'    => date('Y-m-d H:i:s')
+		));
+	}
+
+	// --------------------------------------------------------------------
 
 }

application/mailers/CronMailer.php

Indentation +28 added lines, -28 removed lines

@@ -2,33 +2,33 @@
 
 class CronMailer extends \Myth\Mail\BaseMailer {
 
-    protected $from     = null;
-    protected $to       = null;
-
-    public function __construct()
-    {
-        $this->from = [ config_item('site.auth_email'), config_item('site.name') ];
-        $this->to   = config_item('site.auth_email');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sends the output from the cronjob to the admin.
-     *
-     * @param $output
-     */
-    public function results($output=null)
-    {
-        $data = [
-            'output' => $output,
-            'site_name' => config_item('site.name')
-        ];
-
-        // Send it immediately - don't queue.
-        return $this->send($this->to, "Cron Results from ". config_item('site.name'), $data);
-    }
-
-    //--------------------------------------------------------------------
+	protected $from     = null;
+	protected $to       = null;
+
+	public function __construct()
+	{
+		$this->from = [ config_item('site.auth_email'), config_item('site.name') ];
+		$this->to   = config_item('site.auth_email');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sends the output from the cronjob to the admin.
+	 *
+	 * @param $output
+	 */
+	public function results($output=null)
+	{
+		$data = [
+			'output' => $output,
+			'site_name' => config_item('site.name')
+		];
+
+		// Send it immediately - don't queue.
+		return $this->send($this->to, "Cron Results from ". config_item('site.name'), $data);
+	}
+
+	//--------------------------------------------------------------------
 
 }

application/mailers/UserMailer.php

Indentation +70 added lines, -70 removed lines

@@ -2,85 +2,85 @@
 
 class UserMailer extends \Myth\Mail\BaseMailer {
 
-    protected $from     = null;
-    protected $to       = null;
+	protected $from     = null;
+	protected $to       = null;
 
-    public function __construct()
-    {
-        $this->from = [ config_item('site.auth_email'), config_item('site.name') ];
-    }
+	public function __construct()
+	{
+		$this->from = [ config_item('site.auth_email'), config_item('site.name') ];
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Sends the output from the cronjob to the admin.
-     *
-     * The params array contains:
-     *  - user_id
-     *  - email
-     *  - token
-     *
-     * @param $params
-     * @return bool
-     */
-    public function didRegister($params=null)
-    {
-        $data = [
-            'user_id'   => $params['user_id'],
-            'email'     => $params['email'],
-            'link'      => site_url( \Myth\Route::named('activate_user') ),
-            'token'     => $params['token'],
-            'site_name' => config_item('site.name'),
-            'site_link' => site_url()
-        ];
+	/**
+	 * Sends the output from the cronjob to the admin.
+	 *
+	 * The params array contains:
+	 *  - user_id
+	 *  - email
+	 *  - token
+	 *
+	 * @param $params
+	 * @return bool
+	 */
+	public function didRegister($params=null)
+	{
+		$data = [
+			'user_id'   => $params['user_id'],
+			'email'     => $params['email'],
+			'link'      => site_url( \Myth\Route::named('activate_user') ),
+			'token'     => $params['token'],
+			'site_name' => config_item('site.name'),
+			'site_link' => site_url()
+		];
 
-        // Send it immediately - don't queue.
-        return $this->send($params['email'], lang('auth.register_subject'), $data);
-    }
+		// Send it immediately - don't queue.
+		return $this->send($params['email'], lang('auth.register_subject'), $data);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Sends the Password Reset Instructions email.
-     *
-     * @param array  $user
-     * @param string $token
-     * @return bool
-     */
-    public function remindUser($user, $token)
-    {
-        $data = [
-            'email' => $user['email'],
-            'code'  => $token,
-            'link'  => site_url( \Myth\Route::named('reset_pass') ),
-            'site_name' => config_item('site.name'),
-            'site_link' => site_url()
-        ];
+	/**
+	 * Sends the Password Reset Instructions email.
+	 *
+	 * @param array  $user
+	 * @param string $token
+	 * @return bool
+	 */
+	public function remindUser($user, $token)
+	{
+		$data = [
+			'email' => $user['email'],
+			'code'  => $token,
+			'link'  => site_url( \Myth\Route::named('reset_pass') ),
+			'site_name' => config_item('site.name'),
+			'site_link' => site_url()
+		];
 
-        // Send it immediately - don't queue.
-        return $this->send($user['email'], lang('auth.remind_subject'), $data);
-    }
+		// Send it immediately - don't queue.
+		return $this->send($user['email'], lang('auth.remind_subject'), $data);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Sends the Password Reset Confirmation email.
-     *
-     * @param array  $user
-     * @return bool
-     */
-    public function resetPassword($user)
-    {
-        $data = [
-            'email' => $user['email'],
-            'link'  => site_url( \Myth\Route::named('forgot_pass') ),
-            'site_name' => config_item('site.name'),
-            'site_link' => site_url()
-        ];
+	/**
+	 * Sends the Password Reset Confirmation email.
+	 *
+	 * @param array  $user
+	 * @return bool
+	 */
+	public function resetPassword($user)
+	{
+		$data = [
+			'email' => $user['email'],
+			'link'  => site_url( \Myth\Route::named('forgot_pass') ),
+			'site_name' => config_item('site.name'),
+			'site_link' => site_url()
+		];
 
-        // Send it immediately - don't queue.
-        return $this->send($user['email'], lang('auth.reset_subject'), $data);
-    }
+		// Send it immediately - don't queue.
+		return $this->send($user['email'], lang('auth.reset_subject'), $data);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 }

application/models/User_model.php

Indentation +356 added lines, -356 removed lines

@@ -4,363 +4,363 @@
 
 class User_model extends \Myth\Models\CIDbModel {
 
-    protected $table_name = 'users';
-
-    protected $soft_deletes = true;
-
-    protected $set_created = true;
-
-    protected $set_modified = false;
-
-    protected $protected_attributes = ['id', 'submit'];
-
-    protected $validation_rules = [
-        [
-            'field' => 'first_name',
-            'label' => 'lang:auth.first_name',
-            'rules' => 'trim|alpha|max_length[255]'
-        ],
-        [
-            'field' => 'last_name',
-            'label' => 'lang:auth.last_name',
-            'rules' => 'trim|alpha|max_length[255]'
-        ],
-        [
-            'field' => 'email',
-            'label' => 'lang:auth.email',
-            'rules' => 'trim|valid_email|max_length[255]'
-        ],
-        [
-            'field' => 'username',
-            'label' => 'lang:auth.username',
-            'rules' => 'trim|alpha_numeric|max_length[255]'
-        ],
-        [
-            'field' => 'password',
-            'label' => 'lang:auth.password',
-            'rules' => 'trim|max_length[255]|isStrongPassword'
-        ],
-        [
-            'field' => 'pass_confirm',
-            'label' => 'lang:auth.pass_confirm',
-            'rules' => 'trim|matches[password]'
-        ],
-    ];
-
-    protected $insert_validate_rules = [
-        'email'        => 'required|is_unique[users.email]',
-        'username'     => 'required|is_unique[users.username]',
-        'password'     => 'required',
-        'pass_confirm' => 'required'
-    ];
-
-    protected $before_insert = ['hashPassword'];
-    protected $before_update = ['hashPassword'];
-    protected $after_insert  = ['updateMeta'];
-    protected $after_update  = ['updateMeta'];
-
-    // The columns in the 'users_meta' table - for auto updating of profile information.
-    protected $meta_fields = ['first_name', 'last_name'];
-
-    protected $fields = ['id', 'email', 'username', 'password_hash', 'reset_hash', 'activate_hash', 'created_on', 'status', 'status_message', 'active', 'deleted', 'force_pass_reset'];
-
-    //--------------------------------------------------------------------
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->load->helper('auth/password');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Works with any find queries to return user_meta information.
-     *
-     * @return $this
-     */
-    public function withMeta()
-    {
-        $this->after_find[] = 'grabMeta';
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * If exists, will take our password out of the data array, and
-     * create a new hash for it, which is inserted back into the
-     * data array to be saved to the database.
-     *
-     * @param array $data
-     *
-     * @return array
-     */
-    protected function hashPassword($data)
-    {
-        if (isset($data['fields']))
-        {
-            $data = $data['fields'];
-        }
-
-        if (isset($data['password']))
-        {
-            $data['password_hash'] = \Myth\Auth\Password::hashPassword($data['password']);
-
-            unset($data['password'], $data['pass_confirm']);
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * A callback designed to work with Digest Authentication to create
-     * and store the $A1 value since we'll never have access to the
-     * password except during inserts or updates.
-     *
-     * This assumes that this is working as part of an API and that
-     * the api config file is already loaded into memory.
-     *
-     * @param $data
-     *
-     * @return $data
-     */
-    public function createDigestKey($data)
-    {
-        $field = config_item('api.auth_field');
-        $value = null;
-
-        // If it's an update, we probably won't have the username/email
-        // so grab it so that we can use it.
-        if (! empty($data[ $this->primary_key ]))
-        {
-            if (! isset($data[$field]) )
-            {
-                $value = $this->get_field( $data['id'], $field );
-            }
-        }
-        // However, if it's an insert, then we should have it, If we don't, leave.
-        else
-        {
-            if (empty($data[$field]))
-            {
-                return $data;
-            }
-
-            $value = $data[$field];
-        }
-
-        // Still here? then create the hash based on the current realm.
-        if (! empty($data['password']) )
-        {
-            $key = md5($value .':'. config_item('api.realm') .':'. $data['password']);
-            $data['api_key'] = $key;
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * A callback method intended to hook into the after_insert and after_udpate
-     * methods.
-     *
-     * NOTE: Will only work for insert and update methods.
-     *
-     * @param array $data
-     * @return mixed
-     */
-    public function updateMeta($data)
-    {
-        // If no 'id' is in the $data array, then
-        // we don't have successful insert, get out of here
-        if (empty($data['id']) || ($data['method'] != 'insert' && $data['method'] != 'update'))
-        {
-            return $data;
-        }
-
-        // Collect any meta fields
-        foreach ($data['fields'] as $key => $value)
-        {
-            if (in_array($key, $this->meta_fields))
-            {
-                $this->db->where('user_id', $data['id']);
-                $this->db->where('meta_key', $key);
-                $query = $this->db->get('user_meta');
-
-                $obj = [
-                    'user_id'    => $data['id'],
-                    'meta_key'   => $key,
-                    'meta_value' => $value
-                ];
-
-                if ($query->num_rows() == 0)
-                {
-                    $this->db->insert('user_meta', $obj);
-                }
-                else if ($query->num_rows() > 0)
-                {
-                    $this->db->where('user_id', $data['id'])
-                             ->where('meta_key', $key)
-                             ->set('meta_value', $value)
-                             ->update('user_meta', $obj);
-                }
-            }
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a single piece of meta information to a user.
-     *
-     * @param $user_id
-     * @param $key
-     * @param null $value
-     *
-     * @return object
-     */
-    public function saveMetaToUser($user_id, $key, $value=null)
-    {
-        if (! Events::trigger('beforeAddMetaToUser', [$user_id, $key]))
-        {
-            return false;
-        }
-
-        $user_id = (int)$user_id;
-
-        // Does this key already exist?
-        $test = $this->db->where([ 'user_id' => $user_id, 'meta_key' => $key ])->get('user_meta');
-
-        // Doesn't exist, so insert it.
-        if (! $test->num_rows())
-        {
-            $data = [
-                'user_id'       => $user_id,
-                'meta_key'      => $key,
-                'meta_value'    => $value
-            ];
-
-            return $this->db->insert('user_meta', $data);
-        }
-
-        // Otherwise, we need to update the existing.
-        return $this->db->where('user_id', $user_id)
-                        ->where('meta_key', $key)
-                        ->set('meta_value', $value)
-                        ->update('user_meta');
-    }
+	protected $table_name = 'users';
+
+	protected $soft_deletes = true;
+
+	protected $set_created = true;
+
+	protected $set_modified = false;
+
+	protected $protected_attributes = ['id', 'submit'];
+
+	protected $validation_rules = [
+		[
+			'field' => 'first_name',
+			'label' => 'lang:auth.first_name',
+			'rules' => 'trim|alpha|max_length[255]'
+		],
+		[
+			'field' => 'last_name',
+			'label' => 'lang:auth.last_name',
+			'rules' => 'trim|alpha|max_length[255]'
+		],
+		[
+			'field' => 'email',
+			'label' => 'lang:auth.email',
+			'rules' => 'trim|valid_email|max_length[255]'
+		],
+		[
+			'field' => 'username',
+			'label' => 'lang:auth.username',
+			'rules' => 'trim|alpha_numeric|max_length[255]'
+		],
+		[
+			'field' => 'password',
+			'label' => 'lang:auth.password',
+			'rules' => 'trim|max_length[255]|isStrongPassword'
+		],
+		[
+			'field' => 'pass_confirm',
+			'label' => 'lang:auth.pass_confirm',
+			'rules' => 'trim|matches[password]'
+		],
+	];
+
+	protected $insert_validate_rules = [
+		'email'        => 'required|is_unique[users.email]',
+		'username'     => 'required|is_unique[users.username]',
+		'password'     => 'required',
+		'pass_confirm' => 'required'
+	];
+
+	protected $before_insert = ['hashPassword'];
+	protected $before_update = ['hashPassword'];
+	protected $after_insert  = ['updateMeta'];
+	protected $after_update  = ['updateMeta'];
+
+	// The columns in the 'users_meta' table - for auto updating of profile information.
+	protected $meta_fields = ['first_name', 'last_name'];
+
+	protected $fields = ['id', 'email', 'username', 'password_hash', 'reset_hash', 'activate_hash', 'created_on', 'status', 'status_message', 'active', 'deleted', 'force_pass_reset'];
+
+	//--------------------------------------------------------------------
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->helper('auth/password');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Works with any find queries to return user_meta information.
+	 *
+	 * @return $this
+	 */
+	public function withMeta()
+	{
+		$this->after_find[] = 'grabMeta';
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * If exists, will take our password out of the data array, and
+	 * create a new hash for it, which is inserted back into the
+	 * data array to be saved to the database.
+	 *
+	 * @param array $data
+	 *
+	 * @return array
+	 */
+	protected function hashPassword($data)
+	{
+		if (isset($data['fields']))
+		{
+			$data = $data['fields'];
+		}
+
+		if (isset($data['password']))
+		{
+			$data['password_hash'] = \Myth\Auth\Password::hashPassword($data['password']);
+
+			unset($data['password'], $data['pass_confirm']);
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A callback designed to work with Digest Authentication to create
+	 * and store the $A1 value since we'll never have access to the
+	 * password except during inserts or updates.
+	 *
+	 * This assumes that this is working as part of an API and that
+	 * the api config file is already loaded into memory.
+	 *
+	 * @param $data
+	 *
+	 * @return $data
+	 */
+	public function createDigestKey($data)
+	{
+		$field = config_item('api.auth_field');
+		$value = null;
+
+		// If it's an update, we probably won't have the username/email
+		// so grab it so that we can use it.
+		if (! empty($data[ $this->primary_key ]))
+		{
+			if (! isset($data[$field]) )
+			{
+				$value = $this->get_field( $data['id'], $field );
+			}
+		}
+		// However, if it's an insert, then we should have it, If we don't, leave.
+		else
+		{
+			if (empty($data[$field]))
+			{
+				return $data;
+			}
+
+			$value = $data[$field];
+		}
+
+		// Still here? then create the hash based on the current realm.
+		if (! empty($data['password']) )
+		{
+			$key = md5($value .':'. config_item('api.realm') .':'. $data['password']);
+			$data['api_key'] = $key;
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * A callback method intended to hook into the after_insert and after_udpate
+	 * methods.
+	 *
+	 * NOTE: Will only work for insert and update methods.
+	 *
+	 * @param array $data
+	 * @return mixed
+	 */
+	public function updateMeta($data)
+	{
+		// If no 'id' is in the $data array, then
+		// we don't have successful insert, get out of here
+		if (empty($data['id']) || ($data['method'] != 'insert' && $data['method'] != 'update'))
+		{
+			return $data;
+		}
+
+		// Collect any meta fields
+		foreach ($data['fields'] as $key => $value)
+		{
+			if (in_array($key, $this->meta_fields))
+			{
+				$this->db->where('user_id', $data['id']);
+				$this->db->where('meta_key', $key);
+				$query = $this->db->get('user_meta');
+
+				$obj = [
+					'user_id'    => $data['id'],
+					'meta_key'   => $key,
+					'meta_value' => $value
+				];
+
+				if ($query->num_rows() == 0)
+				{
+					$this->db->insert('user_meta', $obj);
+				}
+				else if ($query->num_rows() > 0)
+				{
+					$this->db->where('user_id', $data['id'])
+							 ->where('meta_key', $key)
+							 ->set('meta_value', $value)
+							 ->update('user_meta', $obj);
+				}
+			}
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a single piece of meta information to a user.
+	 *
+	 * @param $user_id
+	 * @param $key
+	 * @param null $value
+	 *
+	 * @return object
+	 */
+	public function saveMetaToUser($user_id, $key, $value=null)
+	{
+		if (! Events::trigger('beforeAddMetaToUser', [$user_id, $key]))
+		{
+			return false;
+		}
+
+		$user_id = (int)$user_id;
+
+		// Does this key already exist?
+		$test = $this->db->where([ 'user_id' => $user_id, 'meta_key' => $key ])->get('user_meta');
+
+		// Doesn't exist, so insert it.
+		if (! $test->num_rows())
+		{
+			$data = [
+				'user_id'       => $user_id,
+				'meta_key'      => $key,
+				'meta_value'    => $value
+			];
+
+			return $this->db->insert('user_meta', $data);
+		}
+
+		// Otherwise, we need to update the existing.
+		return $this->db->where('user_id', $user_id)
+						->where('meta_key', $key)
+						->set('meta_value', $value)
+						->update('user_meta');
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Gets the value of a single Meta item from a user.
-     *
-     * @param $user_id
-     * @param $key
-     *
-     * @return mixed
-     */
-    public function getMetaItem($user_id, $key)
-    {
-        $query = $this->db->where('user_id', (int)$user_id)
-                          ->where('meta_key', $key)
-                          ->select('meta_value')
-                          ->get('user_meta');
-
-        if (! $query->num_rows())
-        {
-            return null;
-        }
-
-        return $query->row()->meta_value;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes one or more meta values from a user.
-     *
-     * @param $user_id
-     * @param $key
-     *
-     * @return bool
-     */
-    public function removeMetaFromUser($user_id, $key)
-    {
-        if (! Events::trigger('beforeRemoveMetaFromUser', [$user_id, $key]))
-        {
-            return false;
-        }
-
-	    if (is_array($key))
-	    {
-		    $this->db->where_in('meta_key', $key);
-	    }
-	    else
-	    {
-		    $this->db->where('meta_key', $key);
-	    }
-
-        $this->db->where('user_id', (int)$user_id)
-                 ->delete('user_meta');
-    }
-
-    //--------------------------------------------------------------------
-
-    public function getMetaForUser($user_id)
-    {
-        $query = $this->db->where('user_id', (int)$user_id)
-                          ->select('meta_key, meta_value')
-                          ->get('user_meta');
-
-        $rows = $query->result();
-
-        $meta = [];
-
-        if (count($rows))
-        {
-            array_walk( $rows, function ( $row ) use ( &$meta )
-            {
-                $meta[ $row->meta_key ] = $row->meta_value;
-            } );
-        }
-
-        return $meta;
-    }
-
-    //--------------------------------------------------------------------
-
-    protected function grabMeta($data)
-    {
-        if (strpos($data['method'], 'find') === false)
-        {
-            return $data;
-        }
-
-        $meta = $this->getMetaForUser($data['fields']->id);
-
-        if (is_object($data['fields']))
-        {
-            $data['fields']->meta = (object)$meta;
-        }
-        else
-        {
-            $data['fields']['meta']= $meta;
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the value of a single Meta item from a user.
+	 *
+	 * @param $user_id
+	 * @param $key
+	 *
+	 * @return mixed
+	 */
+	public function getMetaItem($user_id, $key)
+	{
+		$query = $this->db->where('user_id', (int)$user_id)
+						  ->where('meta_key', $key)
+						  ->select('meta_value')
+						  ->get('user_meta');
+
+		if (! $query->num_rows())
+		{
+			return null;
+		}
+
+		return $query->row()->meta_value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes one or more meta values from a user.
+	 *
+	 * @param $user_id
+	 * @param $key
+	 *
+	 * @return bool
+	 */
+	public function removeMetaFromUser($user_id, $key)
+	{
+		if (! Events::trigger('beforeRemoveMetaFromUser', [$user_id, $key]))
+		{
+			return false;
+		}
+
+		if (is_array($key))
+		{
+			$this->db->where_in('meta_key', $key);
+		}
+		else
+		{
+			$this->db->where('meta_key', $key);
+		}
+
+		$this->db->where('user_id', (int)$user_id)
+				 ->delete('user_meta');
+	}
+
+	//--------------------------------------------------------------------
+
+	public function getMetaForUser($user_id)
+	{
+		$query = $this->db->where('user_id', (int)$user_id)
+						  ->select('meta_key, meta_value')
+						  ->get('user_meta');
+
+		$rows = $query->result();
+
+		$meta = [];
+
+		if (count($rows))
+		{
+			array_walk( $rows, function ( $row ) use ( &$meta )
+			{
+				$meta[ $row->meta_key ] = $row->meta_value;
+			} );
+		}
+
+		return $meta;
+	}
+
+	//--------------------------------------------------------------------
+
+	protected function grabMeta($data)
+	{
+		if (strpos($data['method'], 'find') === false)
+		{
+			return $data;
+		}
+
+		$meta = $this->getMetaForUser($data['fields']->id);
+
+		if (is_object($data['fields']))
+		{
+			$data['fields']->meta = (object)$meta;
+		}
+		else
+		{
+			$data['fields']['meta']= $meta;
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
 
 
 }

application/third_party/HMVC/Loader.php

Indentation +499 added lines, -499 removed lines

@@ -30,506 +30,506 @@
  */
 
 if (!defined("BASEPATH"))
-    exit("No direct script access allowed");
+	exit("No direct script access allowed");
 
 class HMVC_Loader extends CI_Loader {
 
-    /**
-     * List of loaded modules
-     *
-     * @var array
-     * @access protected
-     */
-    protected $_ci_modules = array();
-
-    /**
-     * List of loaded controllers
-     *
-     * @var array
-     * @access protected
-     */
-    protected $_ci_controllers = array();
-
-    /**
-     * Constructor
-     *
-     * Add the current module to all paths permanently
-     */
-    public function __construct() {
-        parent::__construct();
-
-        // Get current module from the router
-        $router = & $this->_ci_get_component('router');
-        if ($router->module) {
-            $this->add_module($router->module);
-        }
-    }
-
-    /**
-     * Controller Loader
-     *
-     * This function lets users load and hierarchical controllers to enable HMVC support
-     *
-     * @param	string	the uri to the controller
-     * @param	array	parameters for the requested method
-     * @param	boolean return the result instead of showing it
-     * @return	void
-     */
-    public function controller($uri, $params = array(), $return = FALSE) {
-        // No valid module detected, add current module to uri
-        list($module) = $this->detect_module($uri);
-        if (!isset($module)) {
-            $router = & $this->_ci_get_component('router');
-            if ($router->module) {
-                $module = $router->module;
-                $uri = $module . '/' . $uri;
-            }
-        }
-
-        // Add module
-        $this->add_module($module);
-
-        // Execute the controller method and capture output
-        $void = $this->_load_controller($uri, $params, $return);
-
-        // Remove module
-        $this->remove_module();
-
-        return $void;
-    }
-
-    /**
-     * Class Loader
-     *
-     * This function lets users load and instantiate classes.
-     * It is designed to be called from a user's app controllers.
-     *
-     * @param	string	the name of the class
-     * @param	mixed	the optional parameters
-     * @param	string	an optional object name
-     * @return	void
-     */
-    public function library($library = '', $params = NULL, $object_name = NULL) {
-        if (is_array($library)) {
-            foreach ($library as $class) {
-                $this->library($class, $params);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($library)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::library($class, $params, $object_name);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::library($class, $params, $object_name);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::library($library, $params, $object_name);
-        }
-    }
-
-    /**
-     * Model Loader
-     *
-     * This function lets users load and instantiate models.
-     *
-     * @param	string	the name of the class
-     * @param	string	name for the model
-     * @param	bool	database connection
-     * @return	void
-     */
-    public function model($model, $name = '', $db_conn = FALSE) {
-        if (is_array($model)) {
-            foreach ($model as $babe) {
-                $this->model($babe);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($model)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::model($class, $name, $db_conn);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::model($class, $name, $db_conn);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::model($model, $name, $db_conn);
-        }
-    }
-
-    /**
-     * Load View
-     *
-     * This function is used to load a "view" file.  It has three parameters:
-     *
-     * 1. The name of the "view" file to be included.
-     * 2. An associative array of data to be extracted for use in the view.
-     * 3. TRUE/FALSE - whether to return the data or load it.  In
-     * some cases it's advantageous to be able to return data so that
-     * a developer can process it in some way.
-     *
-     * @param	string
-     * @param	array
-     * @param	bool
-     * @return	void
-     */
-    public function view($view, $vars = array(), $return = FALSE)
-    {
-        // Allow application/views/* to override any module
-        // views for easier app customization.
-        if (file_exists(APPPATH .'views/'. $view .'.php'))
-        {
-            return parent::view($view, $vars, $return);
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($view)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::view($class, $vars, $return);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::view($class, $vars, $return);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::view($view, $vars, $return);
-        }
-    }
-
-    /**
-     * Loads a config file
-     *
-     * @param	string
-     * @param	bool
-     * @param 	bool
-     * @return	void
-     */
-    public function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) {
-        // Detect module
-        if (list($module, $class) = $this->detect_module($file)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::config($class, $use_sections, $fail_gracefully);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::config($class, $use_sections, $fail_gracefully);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            parent::config($file, $use_sections, $fail_gracefully);
-        }
-    }
-
-    /**
-     * Load Helper
-     *
-     * This function loads the specified helper file.
-     *
-     * @param	mixed
-     * @return	void
-     */
-    public function helper($helper = array()) {
-        if (is_array($helper)) {
-            foreach ($helper as $help) {
-                $this->helper($help);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($helper)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::helper($class);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::helper($class);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::helper($helper);
-        }
-    }
-
-    /**
-     * Loads a language file
-     *
-     * @param	array
-     * @param	string
-     * @return	void
-     */
-    public function language($file = array(), $lang = '') {
-        if (is_array($file)) {
-            foreach ($file as $langfile) {
-                $this->language($langfile, $lang);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($file)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::language($class, $lang);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::language($class, $lang);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::language($file, $lang);
-        }
-    }
-
-    /**
-     * Load Widget
-     *
-     * This function provides support to Jens Segers Template Library for loading
-     * widget controllers within modules (place in module/widgets folder).
-     * @author  hArpanet - 23-Jun-2014
-     *
-     * @param   string $widget  Must contain Module name if widget within a module
-     *                          (eg. test/nav  where module name is 'test')
-     * @return  array|false
-     */
-    public function widget($widget) {
-
-        // Detect module
-        if (list($module, $widget) = $this->detect_module($widget)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return array($module, $widget);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Look again now we've added new module path
-            $void = $this->widget($module.'/'.$widget);
-
-            // Remove module if widget not found within it
-            if (!$void) {
-                $this->remove_module();
-            }
-
-            return $void;
-
-        } else {
-            // widget not found in module
-            return FALSE;
-        }
-    }
-
-    /**
-     * Add Module
-     *
-     * Allow resources to be loaded from this module path
-     *
-     * @param	string
-     * @param 	boolean
-     */
-    public function add_module($module, $view_cascade = TRUE) {
-        if ($path = $this->find_module($module)) {
-            // Mark module as loaded
-            array_unshift($this->_ci_modules, $module);
-
-            // Add package path
-            parent::add_package_path($path, $view_cascade);
-        }
-    }
-
-    /**
-     * Remove Module
-     *
-     * Remove a module from the allowed module paths
-     *
-     * @param	type
-     * @param 	bool
-     */
-    public function remove_module($module = '', $remove_config = TRUE) {
-        if ($module == '') {
-            // Mark module as not loaded
-            array_shift($this->_ci_modules);
-
-            // Remove package path
-            parent::remove_package_path('', $remove_config);
-        } else if (($key = array_search($module, $this->_ci_modules)) !== FALSE) {
-            if ($path = $this->find_module($module)) {
-                // Mark module as not loaded
-                unset($this->_ci_modules[$key]);
-
-                // Remove package path
-                parent::remove_package_path($path, $remove_config);
-            }
-        }
-    }
-
-    /**
-     * Controller loader
-     *
-     * This function is used to load and instantiate controllers
-     *
-     * @param	string
-     * @param	array
-     * @param	boolean
-     * @return	object
-     */
-    private function _load_controller($uri = '', $params = array(), $return = FALSE) {
-        $router = & $this->_ci_get_component('router');
-
-        // Back up current router values (before loading new controller)
-        $backup = array();
-        foreach (array('directory', 'class', 'method', 'module') as $prop) {
-            $backup[$prop] = $router->{$prop};
-        }
-
-        // Locate the controller
-        $segments = $router->locate(explode('/', $uri));
-        $class = isset($segments[0]) ? $segments[0] : FALSE;
-        $method = isset($segments[1]) ? $segments[1] : "index";
-
-        // Controller not found
-        if (!$class) {
-            return;
-        }
-
-        if (!array_key_exists(strtolower($class), $this->_ci_controllers)) {
-            // Determine filepath
-            $filepath = APPPATH . 'controllers/' . $router->fetch_directory() . $class . '.php';
-
-            // Load the controller file
-            if (file_exists($filepath)) {
-                include_once ($filepath);
-            }
-
-            // Controller class not found, show 404
-            if (!class_exists($class)) {
-                show_404("{$class}/{$method}");
-            }
-
-            // Create a controller object
-            $this->_ci_controllers[strtolower($class)] = new $class();
-        }
-
-        $controller = $this->_ci_controllers[strtolower($class)];
-
-        // Method does not exists
-        if (!method_exists($controller, $method)) {
-            show_404("{$class}/{$method}");
-        }
-
-        // Restore router state
-        foreach ($backup as $prop => $value) {
-            $router->{$prop} = $value;
-        }
-
-        // Capture output and return
-        ob_start();
-        $result = call_user_func_array(array($controller, $method), $params);
-
-        // Return the buffered output
-        if ($return === TRUE) {
-            $buffer = ob_get_contents();
-            @ob_end_clean();
-            return $buffer;
-        }
-
-        // Close buffer and flush output to screen
-        ob_end_flush();
-
-        // Return controller return value
-        return $result;
-    }
-
-    /**
-     * Detects the module from a string. Returns the module name and class if found.
-     *
-     * @param	string
-     * @return	array|boolean
-     */
-    private function detect_module($class) {
-        $class = str_replace('.php', '', trim($class, '/'));
-        if (($first_slash = strpos($class, '/')) !== FALSE) {
-            $module = substr($class, 0, $first_slash);
-            $class = substr($class, $first_slash + 1);
-
-            // Check if module exists
-            if ($this->find_module($module)) {
-                return array($module, $class);
-            }
-        }
-
-        return FALSE;
-    }
-
-    /**
-     * Searches a given module name. Returns the path if found, FALSE otherwise
-     *
-     * @param string $module
-     * @return string|boolean
-     */
-    private function find_module($module) {
-        $config = & $this->_ci_get_component('config');
-
-        // Check all locations for this module
-        foreach ($config->item('modules_locations') as $location) {
-            $path = $location . rtrim($module, '/') . '/';
-            if (is_dir($path)) {
-                return $path;
-            }
-        }
-
-        return FALSE;
-    }
+	/**
+	 * List of loaded modules
+	 *
+	 * @var array
+	 * @access protected
+	 */
+	protected $_ci_modules = array();
+
+	/**
+	 * List of loaded controllers
+	 *
+	 * @var array
+	 * @access protected
+	 */
+	protected $_ci_controllers = array();
+
+	/**
+	 * Constructor
+	 *
+	 * Add the current module to all paths permanently
+	 */
+	public function __construct() {
+		parent::__construct();
+
+		// Get current module from the router
+		$router = & $this->_ci_get_component('router');
+		if ($router->module) {
+			$this->add_module($router->module);
+		}
+	}
+
+	/**
+	 * Controller Loader
+	 *
+	 * This function lets users load and hierarchical controllers to enable HMVC support
+	 *
+	 * @param	string	the uri to the controller
+	 * @param	array	parameters for the requested method
+	 * @param	boolean return the result instead of showing it
+	 * @return	void
+	 */
+	public function controller($uri, $params = array(), $return = FALSE) {
+		// No valid module detected, add current module to uri
+		list($module) = $this->detect_module($uri);
+		if (!isset($module)) {
+			$router = & $this->_ci_get_component('router');
+			if ($router->module) {
+				$module = $router->module;
+				$uri = $module . '/' . $uri;
+			}
+		}
+
+		// Add module
+		$this->add_module($module);
+
+		// Execute the controller method and capture output
+		$void = $this->_load_controller($uri, $params, $return);
+
+		// Remove module
+		$this->remove_module();
+
+		return $void;
+	}
+
+	/**
+	 * Class Loader
+	 *
+	 * This function lets users load and instantiate classes.
+	 * It is designed to be called from a user's app controllers.
+	 *
+	 * @param	string	the name of the class
+	 * @param	mixed	the optional parameters
+	 * @param	string	an optional object name
+	 * @return	void
+	 */
+	public function library($library = '', $params = NULL, $object_name = NULL) {
+		if (is_array($library)) {
+			foreach ($library as $class) {
+				$this->library($class, $params);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($library)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::library($class, $params, $object_name);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::library($class, $params, $object_name);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::library($library, $params, $object_name);
+		}
+	}
+
+	/**
+	 * Model Loader
+	 *
+	 * This function lets users load and instantiate models.
+	 *
+	 * @param	string	the name of the class
+	 * @param	string	name for the model
+	 * @param	bool	database connection
+	 * @return	void
+	 */
+	public function model($model, $name = '', $db_conn = FALSE) {
+		if (is_array($model)) {
+			foreach ($model as $babe) {
+				$this->model($babe);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($model)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::model($class, $name, $db_conn);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::model($class, $name, $db_conn);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::model($model, $name, $db_conn);
+		}
+	}
+
+	/**
+	 * Load View
+	 *
+	 * This function is used to load a "view" file.  It has three parameters:
+	 *
+	 * 1. The name of the "view" file to be included.
+	 * 2. An associative array of data to be extracted for use in the view.
+	 * 3. TRUE/FALSE - whether to return the data or load it.  In
+	 * some cases it's advantageous to be able to return data so that
+	 * a developer can process it in some way.
+	 *
+	 * @param	string
+	 * @param	array
+	 * @param	bool
+	 * @return	void
+	 */
+	public function view($view, $vars = array(), $return = FALSE)
+	{
+		// Allow application/views/* to override any module
+		// views for easier app customization.
+		if (file_exists(APPPATH .'views/'. $view .'.php'))
+		{
+			return parent::view($view, $vars, $return);
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($view)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::view($class, $vars, $return);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::view($class, $vars, $return);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::view($view, $vars, $return);
+		}
+	}
+
+	/**
+	 * Loads a config file
+	 *
+	 * @param	string
+	 * @param	bool
+	 * @param 	bool
+	 * @return	void
+	 */
+	public function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) {
+		// Detect module
+		if (list($module, $class) = $this->detect_module($file)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::config($class, $use_sections, $fail_gracefully);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::config($class, $use_sections, $fail_gracefully);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			parent::config($file, $use_sections, $fail_gracefully);
+		}
+	}
+
+	/**
+	 * Load Helper
+	 *
+	 * This function loads the specified helper file.
+	 *
+	 * @param	mixed
+	 * @return	void
+	 */
+	public function helper($helper = array()) {
+		if (is_array($helper)) {
+			foreach ($helper as $help) {
+				$this->helper($help);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($helper)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::helper($class);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::helper($class);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::helper($helper);
+		}
+	}
+
+	/**
+	 * Loads a language file
+	 *
+	 * @param	array
+	 * @param	string
+	 * @return	void
+	 */
+	public function language($file = array(), $lang = '') {
+		if (is_array($file)) {
+			foreach ($file as $langfile) {
+				$this->language($langfile, $lang);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($file)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::language($class, $lang);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::language($class, $lang);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::language($file, $lang);
+		}
+	}
+
+	/**
+	 * Load Widget
+	 *
+	 * This function provides support to Jens Segers Template Library for loading
+	 * widget controllers within modules (place in module/widgets folder).
+	 * @author  hArpanet - 23-Jun-2014
+	 *
+	 * @param   string $widget  Must contain Module name if widget within a module
+	 *                          (eg. test/nav  where module name is 'test')
+	 * @return  array|false
+	 */
+	public function widget($widget) {
+
+		// Detect module
+		if (list($module, $widget) = $this->detect_module($widget)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return array($module, $widget);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Look again now we've added new module path
+			$void = $this->widget($module.'/'.$widget);
+
+			// Remove module if widget not found within it
+			if (!$void) {
+				$this->remove_module();
+			}
+
+			return $void;
+
+		} else {
+			// widget not found in module
+			return FALSE;
+		}
+	}
+
+	/**
+	 * Add Module
+	 *
+	 * Allow resources to be loaded from this module path
+	 *
+	 * @param	string
+	 * @param 	boolean
+	 */
+	public function add_module($module, $view_cascade = TRUE) {
+		if ($path = $this->find_module($module)) {
+			// Mark module as loaded
+			array_unshift($this->_ci_modules, $module);
+
+			// Add package path
+			parent::add_package_path($path, $view_cascade);
+		}
+	}
+
+	/**
+	 * Remove Module
+	 *
+	 * Remove a module from the allowed module paths
+	 *
+	 * @param	type
+	 * @param 	bool
+	 */
+	public function remove_module($module = '', $remove_config = TRUE) {
+		if ($module == '') {
+			// Mark module as not loaded
+			array_shift($this->_ci_modules);
+
+			// Remove package path
+			parent::remove_package_path('', $remove_config);
+		} else if (($key = array_search($module, $this->_ci_modules)) !== FALSE) {
+			if ($path = $this->find_module($module)) {
+				// Mark module as not loaded
+				unset($this->_ci_modules[$key]);
+
+				// Remove package path
+				parent::remove_package_path($path, $remove_config);
+			}
+		}
+	}
+
+	/**
+	 * Controller loader
+	 *
+	 * This function is used to load and instantiate controllers
+	 *
+	 * @param	string
+	 * @param	array
+	 * @param	boolean
+	 * @return	object
+	 */
+	private function _load_controller($uri = '', $params = array(), $return = FALSE) {
+		$router = & $this->_ci_get_component('router');
+
+		// Back up current router values (before loading new controller)
+		$backup = array();
+		foreach (array('directory', 'class', 'method', 'module') as $prop) {
+			$backup[$prop] = $router->{$prop};
+		}
+
+		// Locate the controller
+		$segments = $router->locate(explode('/', $uri));
+		$class = isset($segments[0]) ? $segments[0] : FALSE;
+		$method = isset($segments[1]) ? $segments[1] : "index";
+
+		// Controller not found
+		if (!$class) {
+			return;
+		}
+
+		if (!array_key_exists(strtolower($class), $this->_ci_controllers)) {
+			// Determine filepath
+			$filepath = APPPATH . 'controllers/' . $router->fetch_directory() . $class . '.php';
+
+			// Load the controller file
+			if (file_exists($filepath)) {
+				include_once ($filepath);
+			}
+
+			// Controller class not found, show 404
+			if (!class_exists($class)) {
+				show_404("{$class}/{$method}");
+			}
+
+			// Create a controller object
+			$this->_ci_controllers[strtolower($class)] = new $class();
+		}
+
+		$controller = $this->_ci_controllers[strtolower($class)];
+
+		// Method does not exists
+		if (!method_exists($controller, $method)) {
+			show_404("{$class}/{$method}");
+		}
+
+		// Restore router state
+		foreach ($backup as $prop => $value) {
+			$router->{$prop} = $value;
+		}
+
+		// Capture output and return
+		ob_start();
+		$result = call_user_func_array(array($controller, $method), $params);
+
+		// Return the buffered output
+		if ($return === TRUE) {
+			$buffer = ob_get_contents();
+			@ob_end_clean();
+			return $buffer;
+		}
+
+		// Close buffer and flush output to screen
+		ob_end_flush();
+
+		// Return controller return value
+		return $result;
+	}
+
+	/**
+	 * Detects the module from a string. Returns the module name and class if found.
+	 *
+	 * @param	string
+	 * @return	array|boolean
+	 */
+	private function detect_module($class) {
+		$class = str_replace('.php', '', trim($class, '/'));
+		if (($first_slash = strpos($class, '/')) !== FALSE) {
+			$module = substr($class, 0, $first_slash);
+			$class = substr($class, $first_slash + 1);
+
+			// Check if module exists
+			if ($this->find_module($module)) {
+				return array($module, $class);
+			}
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Searches a given module name. Returns the path if found, FALSE otherwise
+	 *
+	 * @param string $module
+	 * @return string|boolean
+	 */
+	private function find_module($module) {
+		$config = & $this->_ci_get_component('config');
+
+		// Check all locations for this module
+		foreach ($config->item('modules_locations') as $location) {
+			$path = $location . rtrim($module, '/') . '/';
+			if (is_dir($path)) {
+				return $path;
+			}
+		}
+
+		return FALSE;
+	}
 }

application/views/errors/cli/error_php.php

Indentation +7 added lines, -7 removed lines

@@ -10,15 +10,15 @@
 <?php echo \Myth\CLI::write("\tLine Number: {$line}"); ?>
 
 <?php
-    if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE) {
+	if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE) {
 
-        echo \Myth\CLI::write("\n\tBacktrace");
+		echo \Myth\CLI::write("\n\tBacktrace");
 
-        foreach (debug_backtrace() as $error) {
-            if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0) {
-                echo \Myth\CLI::write("\t\t- {$error['function']}() - Line {$error['line']} in {$error['file']}");
-            }
-        }
+		foreach (debug_backtrace() as $error) {
+			if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0) {
+				echo \Myth\CLI::write("\t\t- {$error['function']}() - Line {$error['line']} in {$error['file']}");
+			}
+		}
 }
 
 echo \Myth\CLI::new_line();