ci-bonfire / Sprint

myth/CIModules/auth/controllers/Auth.php

Indentation +263 added lines, -263 removed lines

@@ -1,34 +1,34 @@ 
 <?php
 /**
- * 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
+	 */
 
 use \Myth\Route as Route;
 use \Myth\Auth\LocalAuthentication as LocalAuthentication;
@@ -36,225 +36,225 @@ 
 class Auth extends \Myth\Controllers\ThemedController
 {
 
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->config->load('auth');
-        $this->lang->load('auth');
-        $this->load->library('session');
-    }
-
-    //--------------------------------------------------------------------
-
-    public function login()
-    {
-        $this->load->helper('form');
-
-        $auth = new LocalAuthentication();
-        $this->load->model('user_model');
-        $auth->useModel($this->user_model);
-
-        $redirect_url = $this->session->userdata('redirect_url');
-
-        // No need to login again if they are already logged in...
-        if ($auth->isLoggedIn())
-        {
-            unset($_SESSION['redirect_url']);
-            redirect($redirect_url);
-        }
-
-        if ($this->input->post())
-        {
-            $post_data = [
-                'email'    => $this->input->post('email'),
-                'password' => $this->input->post('password')
-            ];
-
-            $remember = (bool)$this->input->post('remember');
-
-            if ($auth->login($post_data, $remember))
-            {
-	            // Is the user being forced to reset their password?
-	            if ($auth->user()['force_pass_reset'] == 1)
-	            {
-		            redirect( Route::named('change_pass') );
-	            }
-
-                unset($_SESSION['redirect_url']);
-                $this->setMessage(lang('auth.did_login'), 'success');
-                redirect($redirect_url);
-            }
-
-            $this->setMessage($auth->error(), 'danger');
-        }
-
-        $this->themer->setLayout('login');
-        $this->render();
-    }
-
-    //--------------------------------------------------------------------
-
-    public function logout()
-    {
-        $auth = new LocalAuthentication();
-        $this->load->model('user_model');
-        $auth->useModel($this->user_model);
-
-        if ($auth->isLoggedIn())
-        {
-            $auth->logout();
-
-            $this->setMessage(lang('auth.did_logout'), 'success');
-        }
-
-        redirect('/');
-    }
-
-    //--------------------------------------------------------------------
-
-    public function register()
-    {
-        $this->load->helper('form');
-
-        if ($this->input->post())
-        {
-            $auth = new LocalAuthentication();
-            $this->load->model('user_model');
-            $auth->useModel($this->user_model);
-
-            $post_data = [
-                'first_name'   => $this->input->post('first_name'),
-                'last_name'    => $this->input->post('last_name'),
-                'email'        => $this->input->post('email'),
-                'username'     => $this->input->post('username'),
-                'password'     => $this->input->post('password'),
-                'pass_confirm' => $this->input->post('pass_confirm')
-            ];
-
-            if ($auth->registerUser($post_data))
-            {
-                $this->setMessage(lang('auth.did_register'), 'success');
-                redirect( Route::named('login') );
-            }
-            else
-            {
-                $this->setMessage($auth->error(), 'danger');
-            }
-        }
-
-        $this->addScript('register.js');
-        $this->themer->setLayout('login');
-        $this->render();
-    }
-
-    //--------------------------------------------------------------------
-
-    public function activate_user()
-    {
-        $this->load->helper('form');
-
-        if ($this->input->post())
-        {
-            $auth = new LocalAuthentication();
-            $this->load->model('user_model');
-            $auth->useModel($this->user_model);
-
-            $post_data = [
-                  'email' => $this->input->post('email'),
-                  'code'  => $this->input->post('code')
-            ];
-
-            if ($auth->activateUser($post_data))
-            {
-                $this->setMessage(lang('auth.did_activate'), 'success');
-                redirect( Route::named('login') );
-            }
-            else
-            {
-                $this->setMessage($auth->error(), 'danger');
-            }
-        }
-
-        $data = [
-            'email' => $this->input->get('e'),
-            'code'  => $this->input->get('code')
-        ];
-
-        $this->themer->setLayout('login');
-        $this->render($data);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    public function forgot_password()
-    {
-        $this->load->helper('form');
-
-        if ($this->input->post())
-        {
-            $auth = new LocalAuthentication();
-            $this->load->model('user_model');
-            $auth->useModel($this->user_model);
-
-            if ($auth->remindUser($this->input->post('email')))
-            {
-                $this->setMessage(lang('auth.send_success'), 'success');
-                redirect( Route::named('reset_pass') );
-            }
-            else
-            {
-                $this->setMessage($auth->error(), 'danger');
-            }
-        }
-
-        $this->themer->setLayout('login');
-        $this->render();
-    }
-
-    //--------------------------------------------------------------------
-
-    public function reset_password()
-    {
-        $this->load->helper('form');
-
-        if ($this->input->post())
-        {
-            $auth = new LocalAuthentication();
-            $this->load->model('user_model');
-            $auth->useModel($this->user_model);
-
-            $credentials = [
-                'email' => $this->input->post('email'),
-                'code'  => $this->input->post('code')
-            ];
-
-            $password     = $this->input->post('password');
-            $pass_confirm = $this->input->post('pass_confirm');
-
-            if ($auth->resetPassword($credentials, $password, $pass_confirm))
-            {
-                $this->setMessage(lang('auth.new_password_success'), 'success');
-                redirect( Route::named('login') );
-            }
-            else
-            {
-                $this->setMessage($auth->error(), 'danger');
-            }
-        }
-
-        $data = [
-            'email' => $this->input->get('e'),
-            'code'  => $this->input->get('code')
-        ];
-
-        $this->addScript('register.js');
-        $this->themer->setLayout('login');
-        $this->render($data);
-    }
-
-    //--------------------------------------------------------------------
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->config->load('auth');
+		$this->lang->load('auth');
+		$this->load->library('session');
+	}
+
+	//--------------------------------------------------------------------
+
+	public function login()
+	{
+		$this->load->helper('form');
+
+		$auth = new LocalAuthentication();
+		$this->load->model('user_model');
+		$auth->useModel($this->user_model);
+
+		$redirect_url = $this->session->userdata('redirect_url');
+
+		// No need to login again if they are already logged in...
+		if ($auth->isLoggedIn())
+		{
+			unset($_SESSION['redirect_url']);
+			redirect($redirect_url);
+		}
+
+		if ($this->input->post())
+		{
+			$post_data = [
+				'email'    => $this->input->post('email'),
+				'password' => $this->input->post('password')
+			];
+
+			$remember = (bool)$this->input->post('remember');
+
+			if ($auth->login($post_data, $remember))
+			{
+				// Is the user being forced to reset their password?
+				if ($auth->user()['force_pass_reset'] == 1)
+				{
+					redirect( Route::named('change_pass') );
+				}
+
+				unset($_SESSION['redirect_url']);
+				$this->setMessage(lang('auth.did_login'), 'success');
+				redirect($redirect_url);
+			}
+
+			$this->setMessage($auth->error(), 'danger');
+		}
+
+		$this->themer->setLayout('login');
+		$this->render();
+	}
+
+	//--------------------------------------------------------------------
+
+	public function logout()
+	{
+		$auth = new LocalAuthentication();
+		$this->load->model('user_model');
+		$auth->useModel($this->user_model);
+
+		if ($auth->isLoggedIn())
+		{
+			$auth->logout();
+
+			$this->setMessage(lang('auth.did_logout'), 'success');
+		}
+
+		redirect('/');
+	}
+
+	//--------------------------------------------------------------------
+
+	public function register()
+	{
+		$this->load->helper('form');
+
+		if ($this->input->post())
+		{
+			$auth = new LocalAuthentication();
+			$this->load->model('user_model');
+			$auth->useModel($this->user_model);
+
+			$post_data = [
+				'first_name'   => $this->input->post('first_name'),
+				'last_name'    => $this->input->post('last_name'),
+				'email'        => $this->input->post('email'),
+				'username'     => $this->input->post('username'),
+				'password'     => $this->input->post('password'),
+				'pass_confirm' => $this->input->post('pass_confirm')
+			];
+
+			if ($auth->registerUser($post_data))
+			{
+				$this->setMessage(lang('auth.did_register'), 'success');
+				redirect( Route::named('login') );
+			}
+			else
+			{
+				$this->setMessage($auth->error(), 'danger');
+			}
+		}
+
+		$this->addScript('register.js');
+		$this->themer->setLayout('login');
+		$this->render();
+	}
+
+	//--------------------------------------------------------------------
+
+	public function activate_user()
+	{
+		$this->load->helper('form');
+
+		if ($this->input->post())
+		{
+			$auth = new LocalAuthentication();
+			$this->load->model('user_model');
+			$auth->useModel($this->user_model);
+
+			$post_data = [
+				  'email' => $this->input->post('email'),
+				  'code'  => $this->input->post('code')
+			];
+
+			if ($auth->activateUser($post_data))
+			{
+				$this->setMessage(lang('auth.did_activate'), 'success');
+				redirect( Route::named('login') );
+			}
+			else
+			{
+				$this->setMessage($auth->error(), 'danger');
+			}
+		}
+
+		$data = [
+			'email' => $this->input->get('e'),
+			'code'  => $this->input->get('code')
+		];
+
+		$this->themer->setLayout('login');
+		$this->render($data);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	public function forgot_password()
+	{
+		$this->load->helper('form');
+
+		if ($this->input->post())
+		{
+			$auth = new LocalAuthentication();
+			$this->load->model('user_model');
+			$auth->useModel($this->user_model);
+
+			if ($auth->remindUser($this->input->post('email')))
+			{
+				$this->setMessage(lang('auth.send_success'), 'success');
+				redirect( Route::named('reset_pass') );
+			}
+			else
+			{
+				$this->setMessage($auth->error(), 'danger');
+			}
+		}
+
+		$this->themer->setLayout('login');
+		$this->render();
+	}
+
+	//--------------------------------------------------------------------
+
+	public function reset_password()
+	{
+		$this->load->helper('form');
+
+		if ($this->input->post())
+		{
+			$auth = new LocalAuthentication();
+			$this->load->model('user_model');
+			$auth->useModel($this->user_model);
+
+			$credentials = [
+				'email' => $this->input->post('email'),
+				'code'  => $this->input->post('code')
+			];
+
+			$password     = $this->input->post('password');
+			$pass_confirm = $this->input->post('pass_confirm');
+
+			if ($auth->resetPassword($credentials, $password, $pass_confirm))
+			{
+				$this->setMessage(lang('auth.new_password_success'), 'success');
+				redirect( Route::named('login') );
+			}
+			else
+			{
+				$this->setMessage($auth->error(), 'danger');
+			}
+		}
+
+		$data = [
+			'email' => $this->input->get('e'),
+			'code'  => $this->input->get('code')
+		];
+
+		$this->addScript('register.js');
+		$this->themer->setLayout('login');
+		$this->render($data);
+	}
+
+	//--------------------------------------------------------------------
 
 	/**
 	 * Allows a logged in user to enter their current password
@@ -320,24 +320,24 @@ 
 	//--------------------------------------------------------------------
 
 
-    //--------------------------------------------------------------------
-    // AJAX Methods
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// AJAX Methods
+	//--------------------------------------------------------------------
 
-    /**
-     * Checks the password strength and returns pass/fail.
-     *
-     * @param $str
-     */
-    public function password_check($str)
-    {
-        $this->load->helper('auth/password');
+	/**
+	 * Checks the password strength and returns pass/fail.
+	 *
+	 * @param $str
+	 */
+	public function password_check($str)
+	{
+		$this->load->helper('auth/password');
 
-        $strength = isStrongPassword($str);
+		$strength = isStrongPassword($str);
 
-        $this->renderJSON(['status' => $strength ? 'pass' : 'fail']);
-    }
+		$this->renderJSON(['status' => $strength ? 'pass' : 'fail']);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/CIModules/auth/controllers/Test.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	public function index($target_time = 50)
 	{
 		// Convert the milliseconds to seconds.
-	    $target_time = $target_time / 1000;
+		$target_time = $target_time / 1000;
 
 		CLI::write('Testing for password hash value with a target time of '. $target_time .' seconds...');
 

myth/CIModules/auth/helpers/password_helper.php

Indentation +21 added lines, -21 removed lines

@@ -32,28 +32,28 @@
 
 if (! function_exists('isStrongPassword'))
 {
-    /**
-     * Works with Myth\Auth\Password to enforce a strong password.
-     * Uses settings from the auth config file.
-     *
-     * @param $password
-     */
-    function isStrongPassword($password)
-    {
-        $min_strength = config_item('auth.min_password_strength');
-        $use_dict = config_item('auth.use_dictionary');
+	/**
+	 * Works with Myth\Auth\Password to enforce a strong password.
+	 * Uses settings from the auth config file.
+	 *
+	 * @param $password
+	 */
+	function isStrongPassword($password)
+	{
+		$min_strength = config_item('auth.min_password_strength');
+		$use_dict = config_item('auth.use_dictionary');
 
-        $strong = \Myth\Auth\Password::isStrongPassword($password, $min_strength, $use_dict);
+		$strong = \Myth\Auth\Password::isStrongPassword($password, $min_strength, $use_dict);
 
-        if (! $strong)
-        {
-            if (isset(get_instance()->form_validation))
-            {
-                get_instance()->form_validation->set_message('isStrongPassword', lang('auth.pass_not_strong'));
-            }
-            return false;
-        }
+		if (! $strong)
+		{
+			if (isset(get_instance()->form_validation))
+			{
+				get_instance()->form_validation->set_message('isStrongPassword', lang('auth.pass_not_strong'));
+			}
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 }

myth/CIModules/auth/models/Login_model.php

Indentation +269 added lines, -269 removed lines

@@ -41,274 +41,274 @@
  */
 class Login_model extends \Myth\Models\CIDbModel {
 
-    protected $table_name = 'auth_logins';
-
-    protected $set_created = false;
-    protected $set_modified = false;
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Login Attempts
-    //--------------------------------------------------------------------
-
-    /**
-     * Records a login attempt. This is used to implement
-     * throttling of user login attempts.
-     *
-     * @param $email
-     * @return object
-     */
-    public function recordLoginAttempt($email)
-    {
-        $data = [
-            'email' => $email,
-            'datetime' => date('Y-m-d H:i:s')
-        ];
-
-        return $this->db->insert('auth_login_attempts', $data);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Purges all login attempt records from the database.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function purgeLoginAttempts($email)
-    {
-        return $this->db->where('email', $email)
-                        ->delete('auth_login_attempts');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Checks to see if how many login attempts have been attempted in the
-     * last 60 seconds. If over 100, it is considered to be under a
-     * brute force attempt.
-     *
-     * @param $email
-     * @return bool
-     */
-    public function isBruteForced($email)
-    {
-        $start_time = date('Y-m-d H:i:s', time() - 60);
-
-        $attempts = $this->db->where('email', $email)
-                             ->where('datetime >=', $start_time)
-                             ->count_all_results('auth_login_attempts');
-
-        return $attempts > 100;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Attempts to determine if the system is under a distributed
-     * brute force attack.
-     *
-     * To determine if we are in under a brute force attack, we first
-     * find the average number of bad logins per day that never converted to
-     * successful logins over the last 3 months. Then we compare
-     * that to the the average number of logins in the past 24 hours.
-     *
-     * If the number of attempts in the last 24 hours is more than X (see config)
-     * times the average, then institute additional throttling.
-     *
-     * @return int The time to add to any throttling.
-     */
-    public function distributedBruteForceTime()
-    {
-        if (! $time = $this->cache->get('dbrutetime'))
-        {
-            $time = 0;
-
-            // Compute our daily average over the last 3 months.
-            $avg_start_time = date('Y-m-d 00:00:00', strtotime('-3 months'));
-
-            $query = $this->db->query("SELECT COUNT(*) / COUNT(DISTINCT DATE(`datetime`)) as num_rows FROM `auth_login_attempts` WHERE `datetime` >= ?", $avg_start_time);
-
-            if (! $query->num_rows())
-            {
-                $average = 0;
-            }
-            else
-            {
-                $average = $query->row()->num_rows;
-            }
-
-            // Get the total in the last 24 hours
-            $today_start_time = date('Y-m-d H:i:s', strtotime('-24 hours'));
-
-            $attempts = $this->db->where('datetime >=', $today_start_time)
-                                 ->count_all_results('auth_login_attempts');
-
-            if ($attempts > (config_item('auth.dbrute_multiplier') * $average))
-            {
-                $time = config_item('auth.distributed_brute_add_time');
-            }
-
-            // Cache it for 3 hours.
-            $this->cache->save('dbrutetime', $time, 60*60*3);
-        }
-
-        return $time;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Logins
-    //--------------------------------------------------------------------
-
-    /**
-     * Records a successful login. This stores in a table so that a
-     * history can be pulled up later if needed for security analyses.
-     *
-     * @param $user
-     */
-    public function recordLogin($user)
-    {
-        $data = [
-            'user_id'    => (int)$user['id'],
-            'datetime'   => date('Y-m-d H:i:s'),
-            'ip_address' => $this->input->ip_address()
-        ];
-
-        return $this->db->insert('auth_logins', $data);
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Tokens
-    //--------------------------------------------------------------------
-
-    /**
-     * Generates a new token for the rememberme cookie.
-     *
-     * The token is based on the user's email address (since everyone will have one)
-     * with the '@' turned to a '.', followed by a pipe (|) and a random 128-character
-     * string with letters and numbers.
-     *
-     * @param $user
-     * @return mixed
-     */
-    public function generateRememberToken($user)
-    {
-        $this->load->helper('string');
-
-        return str_replace('@', '.', $user['email']) .'|' . random_string('alnum', 128);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Hashes the token for the Remember Me Functionality.
-     *
-     * @param $token
-     * @return string
-     */
-    public function hashRememberToken($token)
-    {
-        return sha1(config_item('auth.salt') . $token);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes a single token that matches the email/token combo.
-     *
-     * @param $email
-     * @param $token
-     * @return mixed
-     */
-    public function deleteRememberToken($email, $token)
-    {
-        $where = [
-            'email' => $email,
-            'hash'  => $this->hashRememberToken($token)
-        ];
-
-        $this->db->delete('auth_tokens', $where);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes all persistent login tokens (RememberMe) for a single user
-     * across all devices they may have logged in with.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function purgeRememberTokens($email)
-    {
-        return $this->db->delete('auth_tokens', ['email' => $email]);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Purges the 'auth_tokens' table of any records that are too old
-     * to be of any use anymore. This equates to 1 week older than
-     * the remember_length set in the config file.
-     */
-    public function purgeOldRememberTokens()
-    {
-        if (! config_item('auth.allow_remembering'))
-        {
-            return;
-        }
-
-        $date = time() - config_item('auth.remember_length') - 604800; // 1 week
-        $date = date('Y-m-d 00:00:00', $date);
-
-        $this->db->where('created <=', $date)
-                 ->delete('auth_tokens');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Gets the timestamp of the last attempted login for this user.
-     *
-     * @param $email
-     * @return int|null
-     */
-    public function lastLoginAttemptTime($email)
-    {
-        $query = $this->db->where('email', $email)
-                          ->order_by('datetime', 'desc')
-                          ->limit(1)
-                          ->get('auth_login_attempts');
-
-        if (! $query->num_rows())
-        {
-            return 0;
-        }
-
-        return strtotime($query->row()->datetime);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the number of failed login attempts for a single email.
-     *
-     * @param $email
-     * @return int
-     */
-    public function countLoginAttempts($email)
-    {
-        return $this->db->where('email', $email)
-                        ->count_all_results('auth_login_attempts');
-    }
-
-    //--------------------------------------------------------------------
+	protected $table_name = 'auth_logins';
+
+	protected $set_created = false;
+	protected $set_modified = false;
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Login Attempts
+	//--------------------------------------------------------------------
+
+	/**
+	 * Records a login attempt. This is used to implement
+	 * throttling of user login attempts.
+	 *
+	 * @param $email
+	 * @return object
+	 */
+	public function recordLoginAttempt($email)
+	{
+		$data = [
+			'email' => $email,
+			'datetime' => date('Y-m-d H:i:s')
+		];
+
+		return $this->db->insert('auth_login_attempts', $data);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Purges all login attempt records from the database.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function purgeLoginAttempts($email)
+	{
+		return $this->db->where('email', $email)
+						->delete('auth_login_attempts');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks to see if how many login attempts have been attempted in the
+	 * last 60 seconds. If over 100, it is considered to be under a
+	 * brute force attempt.
+	 *
+	 * @param $email
+	 * @return bool
+	 */
+	public function isBruteForced($email)
+	{
+		$start_time = date('Y-m-d H:i:s', time() - 60);
+
+		$attempts = $this->db->where('email', $email)
+							 ->where('datetime >=', $start_time)
+							 ->count_all_results('auth_login_attempts');
+
+		return $attempts > 100;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to determine if the system is under a distributed
+	 * brute force attack.
+	 *
+	 * To determine if we are in under a brute force attack, we first
+	 * find the average number of bad logins per day that never converted to
+	 * successful logins over the last 3 months. Then we compare
+	 * that to the the average number of logins in the past 24 hours.
+	 *
+	 * If the number of attempts in the last 24 hours is more than X (see config)
+	 * times the average, then institute additional throttling.
+	 *
+	 * @return int The time to add to any throttling.
+	 */
+	public function distributedBruteForceTime()
+	{
+		if (! $time = $this->cache->get('dbrutetime'))
+		{
+			$time = 0;
+
+			// Compute our daily average over the last 3 months.
+			$avg_start_time = date('Y-m-d 00:00:00', strtotime('-3 months'));
+
+			$query = $this->db->query("SELECT COUNT(*) / COUNT(DISTINCT DATE(`datetime`)) as num_rows FROM `auth_login_attempts` WHERE `datetime` >= ?", $avg_start_time);
+
+			if (! $query->num_rows())
+			{
+				$average = 0;
+			}
+			else
+			{
+				$average = $query->row()->num_rows;
+			}
+
+			// Get the total in the last 24 hours
+			$today_start_time = date('Y-m-d H:i:s', strtotime('-24 hours'));
+
+			$attempts = $this->db->where('datetime >=', $today_start_time)
+								 ->count_all_results('auth_login_attempts');
+
+			if ($attempts > (config_item('auth.dbrute_multiplier') * $average))
+			{
+				$time = config_item('auth.distributed_brute_add_time');
+			}
+
+			// Cache it for 3 hours.
+			$this->cache->save('dbrutetime', $time, 60*60*3);
+		}
+
+		return $time;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Logins
+	//--------------------------------------------------------------------
+
+	/**
+	 * Records a successful login. This stores in a table so that a
+	 * history can be pulled up later if needed for security analyses.
+	 *
+	 * @param $user
+	 */
+	public function recordLogin($user)
+	{
+		$data = [
+			'user_id'    => (int)$user['id'],
+			'datetime'   => date('Y-m-d H:i:s'),
+			'ip_address' => $this->input->ip_address()
+		];
+
+		return $this->db->insert('auth_logins', $data);
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Tokens
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates a new token for the rememberme cookie.
+	 *
+	 * The token is based on the user's email address (since everyone will have one)
+	 * with the '@' turned to a '.', followed by a pipe (|) and a random 128-character
+	 * string with letters and numbers.
+	 *
+	 * @param $user
+	 * @return mixed
+	 */
+	public function generateRememberToken($user)
+	{
+		$this->load->helper('string');
+
+		return str_replace('@', '.', $user['email']) .'|' . random_string('alnum', 128);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Hashes the token for the Remember Me Functionality.
+	 *
+	 * @param $token
+	 * @return string
+	 */
+	public function hashRememberToken($token)
+	{
+		return sha1(config_item('auth.salt') . $token);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a single token that matches the email/token combo.
+	 *
+	 * @param $email
+	 * @param $token
+	 * @return mixed
+	 */
+	public function deleteRememberToken($email, $token)
+	{
+		$where = [
+			'email' => $email,
+			'hash'  => $this->hashRememberToken($token)
+		];
+
+		$this->db->delete('auth_tokens', $where);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes all persistent login tokens (RememberMe) for a single user
+	 * across all devices they may have logged in with.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function purgeRememberTokens($email)
+	{
+		return $this->db->delete('auth_tokens', ['email' => $email]);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Purges the 'auth_tokens' table of any records that are too old
+	 * to be of any use anymore. This equates to 1 week older than
+	 * the remember_length set in the config file.
+	 */
+	public function purgeOldRememberTokens()
+	{
+		if (! config_item('auth.allow_remembering'))
+		{
+			return;
+		}
+
+		$date = time() - config_item('auth.remember_length') - 604800; // 1 week
+		$date = date('Y-m-d 00:00:00', $date);
+
+		$this->db->where('created <=', $date)
+				 ->delete('auth_tokens');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the timestamp of the last attempted login for this user.
+	 *
+	 * @param $email
+	 * @return int|null
+	 */
+	public function lastLoginAttemptTime($email)
+	{
+		$query = $this->db->where('email', $email)
+						  ->order_by('datetime', 'desc')
+						  ->limit(1)
+						  ->get('auth_login_attempts');
+
+		if (! $query->num_rows())
+		{
+			return 0;
+		}
+
+		return strtotime($query->row()->datetime);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the number of failed login attempts for a single email.
+	 *
+	 * @param $email
+	 * @return int
+	 */
+	public function countLoginAttempts($email)
+	{
+		return $this->db->where('email', $email)
+						->count_all_results('auth_login_attempts');
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/CIModules/cron/controllers/Cron.php

Indentation +304 added lines, -304 removed lines

@@ -37,325 +37,325 @@
 // todo Add ability to log actual cron jobs to database to verify when they ran for sure.
 class Cron extends \Myth\Controllers\CLIController {
 
-    protected $descriptions = [
-        'show'  => ['show [all/<task>]', 'Lists the names one or more tasks, with run times.'],
-        'run'   => ['run [<task>]', 'Runs all scheduled tasks. If <task> is present only runs that task.'],
-        'disable'   => ['disable', 'Disables the cron system and will not run any tasks.'],
-        'enable'    => ['enable', 'Enables the cron system and will run tasks again.'],
-        'suspend'   => ['suspend <task>', 'Stops a single task from running until resumed.'],
-        'resume'    => ['resume <task>', 'Resumes execution of a single suspended task.']
-    ];
-
-    protected $long_descriptions = [
-        'show'  => '',
-        'run'   => '',
-        'disable'   => '',
-        'enable'    => '',
-        'suspend'   => '',
-        'resume'    => ''
-    ];
-
-    //--------------------------------------------------------------------
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        // Load our tasks into the sytem.
-        require APPPATH .'config/cron.php';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs all of the tasks (after checking their time, of course...)
-     *
-     * @param string $alias
-     * @return mixed
-     */
-    public function run($alias=null)
-    {
-        // Has the system been disabled?
-        if (Settings::get('is_disabled', 'cron') == 'y')
-        {
-            return CLI::error('The cron system has been disabled. No tasks were run.');
-        }
-
-        $force_run = false;
-
-        // Run one task or all?
-        if (! empty($alias))
-        {
-            $tasks = \Myth\Cron\CronManager::task($alias);
-
-            if (is_null($tasks))
-            {
-                return CLI::error("Unable to find the task: '{$alias}'.");
-            }
-
-            $tasks = [ $alias => $tasks];
-            $force_run = true;
-        }
-        else
-        {
-            $tasks = \Myth\Cron\CronManager::tasks();
-        }
-
-        if (empty($tasks))
-        {
-            return CLI::write("There are no tasks to run at this time.");
-        }
-
-        // We need to be able to check against suspended tasks.
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (! is_array($suspended))
-        {
-            $suspended = array($suspended);
-        }
-
-        // Loop over all of our tasks, checking them against the
-        // suspended tasks to see if they're okay to run.
-
-        // Collect the output of the actions so that we can make
-        // it available to the event (for sending emails and the like)
-        $output = '';
-
-        echo CLI::write('Starting Tasks...');
-
-        foreach ($tasks as $alias => $task)
-        {
-            if (in_array($alias, $suspended))
-            {
-                echo CLI::write("\t[Suspended] {$alias} will not run until resumed.", 'yellow');
-                $output .= "[Suspended] {$alias} will not run until resumed.";
-                continue;
-            }
-
-            echo CLI::write("\tRunning task: {$alias}...");
-            $output .= \Myth\Cron\CronManager::run($alias, $force_run);
-        }
-
-        // Give other people a chance to respond.
-        echo CLI::write('Done. Firing the event so others can play too...');
-
-        Events::trigger('afterCron', [$output]);
-
-        // And we're out of here boys and girls!
-        echo CLI::write('Done');
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Lists one or more tasks with their scheduled run times.
-     *
-     * @param null $task
-     * @return mixed
-     */
-    public function show($task=null)
-    {
-        if (empty($task))
-        {
-            return $this->listTaskNames();
-        }
-
-        if (trim(strtolower($task)) == 'all')
-        {
-            $tasks = \Myth\Cron\CronManager::listAll();
-        }
-        else
-        {
-            $tasks = \Myth\Cron\CronManager::task($task);
-        }
-
-        if (! is_array($tasks))
-        {
-            $tasks = [ $task => [
-                'next_run'  => $tasks->nextRunDate(),
-                'prev_run'  => $tasks->previousRunDate()
-            ]];
-        }
-
-        if (! count($tasks))
-        {
-            return CLI::found('No tasks found.', 'red');
-        }
-
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (empty($suspended))
-        {
-            $suspended = [];
-        }
-        /*
+	protected $descriptions = [
+		'show'  => ['show [all/<task>]', 'Lists the names one or more tasks, with run times.'],
+		'run'   => ['run [<task>]', 'Runs all scheduled tasks. If <task> is present only runs that task.'],
+		'disable'   => ['disable', 'Disables the cron system and will not run any tasks.'],
+		'enable'    => ['enable', 'Enables the cron system and will run tasks again.'],
+		'suspend'   => ['suspend <task>', 'Stops a single task from running until resumed.'],
+		'resume'    => ['resume <task>', 'Resumes execution of a single suspended task.']
+	];
+
+	protected $long_descriptions = [
+		'show'  => '',
+		'run'   => '',
+		'disable'   => '',
+		'enable'    => '',
+		'suspend'   => '',
+		'resume'    => ''
+	];
+
+	//--------------------------------------------------------------------
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Load our tasks into the sytem.
+		require APPPATH .'config/cron.php';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs all of the tasks (after checking their time, of course...)
+	 *
+	 * @param string $alias
+	 * @return mixed
+	 */
+	public function run($alias=null)
+	{
+		// Has the system been disabled?
+		if (Settings::get('is_disabled', 'cron') == 'y')
+		{
+			return CLI::error('The cron system has been disabled. No tasks were run.');
+		}
+
+		$force_run = false;
+
+		// Run one task or all?
+		if (! empty($alias))
+		{
+			$tasks = \Myth\Cron\CronManager::task($alias);
+
+			if (is_null($tasks))
+			{
+				return CLI::error("Unable to find the task: '{$alias}'.");
+			}
+
+			$tasks = [ $alias => $tasks];
+			$force_run = true;
+		}
+		else
+		{
+			$tasks = \Myth\Cron\CronManager::tasks();
+		}
+
+		if (empty($tasks))
+		{
+			return CLI::write("There are no tasks to run at this time.");
+		}
+
+		// We need to be able to check against suspended tasks.
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (! is_array($suspended))
+		{
+			$suspended = array($suspended);
+		}
+
+		// Loop over all of our tasks, checking them against the
+		// suspended tasks to see if they're okay to run.
+
+		// Collect the output of the actions so that we can make
+		// it available to the event (for sending emails and the like)
+		$output = '';
+
+		echo CLI::write('Starting Tasks...');
+
+		foreach ($tasks as $alias => $task)
+		{
+			if (in_array($alias, $suspended))
+			{
+				echo CLI::write("\t[Suspended] {$alias} will not run until resumed.", 'yellow');
+				$output .= "[Suspended] {$alias} will not run until resumed.";
+				continue;
+			}
+
+			echo CLI::write("\tRunning task: {$alias}...");
+			$output .= \Myth\Cron\CronManager::run($alias, $force_run);
+		}
+
+		// Give other people a chance to respond.
+		echo CLI::write('Done. Firing the event so others can play too...');
+
+		Events::trigger('afterCron', [$output]);
+
+		// And we're out of here boys and girls!
+		echo CLI::write('Done');
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Lists one or more tasks with their scheduled run times.
+	 *
+	 * @param null $task
+	 * @return mixed
+	 */
+	public function show($task=null)
+	{
+		if (empty($task))
+		{
+			return $this->listTaskNames();
+		}
+
+		if (trim(strtolower($task)) == 'all')
+		{
+			$tasks = \Myth\Cron\CronManager::listAll();
+		}
+		else
+		{
+			$tasks = \Myth\Cron\CronManager::task($task);
+		}
+
+		if (! is_array($tasks))
+		{
+			$tasks = [ $task => [
+				'next_run'  => $tasks->nextRunDate(),
+				'prev_run'  => $tasks->previousRunDate()
+			]];
+		}
+
+		if (! count($tasks))
+		{
+			return CLI::found('No tasks found.', 'red');
+		}
+
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (empty($suspended))
+		{
+			$suspended = [];
+		}
+		/*
          * Headers
          */
-        echo CLI::write("Task\t\t\t\tNext Run\t\tPrevious Run");
-        echo CLI::write( str_repeat('-', 80) );
-
-        foreach ($tasks as $alias => $task)
-        {
-            // Suspended?
-            $color = 'yellow';
-            $extra = '';
-
-            if (in_array($alias, $suspended) )
-            {
-                $color = 'blue';
-                $extra = "\t[Suspended]";
-            }
-
-            // Alias can only be 24 chars long.
-            $alias = strlen($alias) >= 32 ? substr($alias, 0, 28) .'... ' : $alias . str_repeat(" ", 32 - strlen($alias));
-
-            $next = date('D Y-m-d H:i', $task['next_run']);
-            $prev = date('D Y-m-d H:i', $task['prev_run']);
-
-            echo CLI::write("{$alias}{$next}\t{$prev}{$extra}", $color);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stops a task from being executed during the normal cron runs.
-     *
-     * @param $alias
-     */
-    public function suspend($alias)
-    {
-        // Verify the task actually exists.
-        $task = \Myth\Cron\CronManager::task($alias);
-
-        if (is_null($task))
-        {
-            return CLI::error("Unable to find the task: {$alias}.");
-        }
-
-        // Update the existing setting.
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (empty($suspended))
-        {
-            $suspended = [];
-        }
-
-        $suspended[] = $alias;
-
-        if (Settings::save('suspended_tasks', $suspended, 'cron') )
-        {
-            return CLI::write('Done');
-        }
-
-        echo CLI::error('Unkown problem saving the settings.');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Allows the execution of a suspended task to continue again
-     * during normal cron execution.
-     *
-     * @param $alias
-     */
-    public function resume($alias)
-    {
-        // Verify the task actually exists.
-        $task = \Myth\Cron\CronManager::task($alias);
-
-        if (is_null($task))
-        {
-            return CLI::error("Unable to find the task: {$alias}.");
-        }
-
-        // Update the existing setting.
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (! empty($suspended))
-        {
-            unset($suspended[ array_search($alias, $suspended) ]);
-
-            if (! Settings::save('suspended_tasks', $suspended, 'cron') )
-            {
-                return CLI::error('Unkown problem saving the settings.');
-            }
-        }
-
-        return CLI::write('Done');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Disables the cron tasks and stops the system from running any tasks.
-     * To start the system allowing it to run again, use the `enable` command.
-     */
-    public function disable()
-    {
-        if (! Settings::save('is_disabled', 'y', 'cron'))
-        {
-            return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will still run!', 'yellow'));
-        }
-
-        CLI::write('Done');
-    }
+		echo CLI::write("Task\t\t\t\tNext Run\t\tPrevious Run");
+		echo CLI::write( str_repeat('-', 80) );
+
+		foreach ($tasks as $alias => $task)
+		{
+			// Suspended?
+			$color = 'yellow';
+			$extra = '';
+
+			if (in_array($alias, $suspended) )
+			{
+				$color = 'blue';
+				$extra = "\t[Suspended]";
+			}
+
+			// Alias can only be 24 chars long.
+			$alias = strlen($alias) >= 32 ? substr($alias, 0, 28) .'... ' : $alias . str_repeat(" ", 32 - strlen($alias));
+
+			$next = date('D Y-m-d H:i', $task['next_run']);
+			$prev = date('D Y-m-d H:i', $task['prev_run']);
+
+			echo CLI::write("{$alias}{$next}\t{$prev}{$extra}", $color);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stops a task from being executed during the normal cron runs.
+	 *
+	 * @param $alias
+	 */
+	public function suspend($alias)
+	{
+		// Verify the task actually exists.
+		$task = \Myth\Cron\CronManager::task($alias);
+
+		if (is_null($task))
+		{
+			return CLI::error("Unable to find the task: {$alias}.");
+		}
+
+		// Update the existing setting.
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (empty($suspended))
+		{
+			$suspended = [];
+		}
+
+		$suspended[] = $alias;
+
+		if (Settings::save('suspended_tasks', $suspended, 'cron') )
+		{
+			return CLI::write('Done');
+		}
+
+		echo CLI::error('Unkown problem saving the settings.');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows the execution of a suspended task to continue again
+	 * during normal cron execution.
+	 *
+	 * @param $alias
+	 */
+	public function resume($alias)
+	{
+		// Verify the task actually exists.
+		$task = \Myth\Cron\CronManager::task($alias);
+
+		if (is_null($task))
+		{
+			return CLI::error("Unable to find the task: {$alias}.");
+		}
+
+		// Update the existing setting.
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (! empty($suspended))
+		{
+			unset($suspended[ array_search($alias, $suspended) ]);
+
+			if (! Settings::save('suspended_tasks', $suspended, 'cron') )
+			{
+				return CLI::error('Unkown problem saving the settings.');
+			}
+		}
+
+		return CLI::write('Done');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Disables the cron tasks and stops the system from running any tasks.
+	 * To start the system allowing it to run again, use the `enable` command.
+	 */
+	public function disable()
+	{
+		if (! Settings::save('is_disabled', 'y', 'cron'))
+		{
+			return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will still run!', 'yellow'));
+		}
+
+		CLI::write('Done');
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Resumes the running of tasks after the system has been disabled
-     * with the `disable` command.
-     */
-    public function enable()
-    {
-        if (! Settings::save('is_disabled', 'n', 'cron'))
-        {
-            return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will NOT run!', 'yellow'));
-        }
+	/**
+	 * Resumes the running of tasks after the system has been disabled
+	 * with the `disable` command.
+	 */
+	public function enable()
+	{
+		if (! Settings::save('is_disabled', 'n', 'cron'))
+		{
+			return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will NOT run!', 'yellow'));
+		}
 
-        CLI::write('Done');
-    }
+		CLI::write('Done');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
 
-    /**
-     * Lists out all available tasks, names only.
-     */
-    private function listTaskNames()
-    {
-        $suspended = Settings::get('suspended_tasks', 'cron');
+	/**
+	 * Lists out all available tasks, names only.
+	 */
+	private function listTaskNames()
+	{
+		$suspended = Settings::get('suspended_tasks', 'cron');
 
-        if (empty($suspended))
-        {
-            $suspended = [];
-        }
+		if (empty($suspended))
+		{
+			$suspended = [];
+		}
 
-        $tasks = \Myth\Cron\CronManager::listAll();
+		$tasks = \Myth\Cron\CronManager::listAll();
 
-        echo CLI::write("\nAvailable Tasks:");
+		echo CLI::write("\nAvailable Tasks:");
 
-        foreach ($tasks as $alias => $task)
-        {
-            $color = 'yellow';
-            $extra = '';
+		foreach ($tasks as $alias => $task)
+		{
+			$color = 'yellow';
+			$extra = '';
 
-            if (in_array($alias, $suspended) )
-            {
-                $color = 'blue';
-                $extra = "[Suspended]";
-            }
+			if (in_array($alias, $suspended) )
+			{
+				$color = 'blue';
+				$extra = "[Suspended]";
+			}
 
-            echo CLI::write("\t{$extra} {$alias}", $color);
-        }
-    }
+			echo CLI::write("\t{$extra} {$alias}", $color);
+		}
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/CIModules/database/controllers/Database.php

Indentation +224 added lines, -224 removed lines

@@ -35,207 +35,207 @@ 
 class Database extends \Myth\Controllers\CLIController
 {
 
-    protected $descriptions = [
-        'migrate'       => ['migrate [$to]',        'Runs the migrations up or down until schema at version \$to'],
-        'quietMigrate'  => ['quiteMigrate [$to]',   'Same as migrate but without any feedback.'],
-        'refresh'       => ['refresh',              'Runs migrations back to version 0 (uninstall) and then back to the most recent migration.'],
-        'newMigration'  => ['newMigration [$name]', 'Creates a new migration file.'],
-        'seed'          => ['seed [$name]',         'Runs the named database seeder.']
-    ];
-
-    protected $long_descriptions = [
-        'migrate'       => '',
-        'quietMigrate'  => '',
-        'refresh'       => '',
-        'newMigration'  => '',
-        'seed'          => ''
-    ];
-
-    //-------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Migration Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Provides a command-line interface to the migration scripts.
-     * If no $to is provided, will migrate to the latest version.
-     *
-     * Example:
-     *      > php index.php database migrate
-     *
-     * @param string $type 'app', 'myth', 'all' or {module_name}
-     * @param null $to
-     * @param bool $silent If TRUE, will NOT display any prompts for verification.
-     * @return bool|void
-     */
-    public function migrate($type=null, $to = null, $silent = false)
-    {
-        $this->load->library('migration');
-
-        if (empty($type))
-        {
-            $type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
-
-            if (empty($type))
-            {
-                return $silent ? false : CLI::error("\tYou must supply a group to refresh.");
-            }
-        }
-
-        // We need to append 'mod:' to properly handle modules, if
-        // the $type is not one of the recognized migration groups.
-        $this->config->load('migration');
-        $groups = config_item('migration_paths');
-        $groups = array_keys($groups);
-
-        // If it's not in the groups list, then assume it's a module.
-        if (! in_array($type, $groups))
-        {
-            if (strpos($type, 'mod:') !== 0)
-            {
-                $type = 'mod:'. $type;
-            }
-        }
-
-        unset($groups);
-
-        // Get our stats on the migrations
-        $latest = $this->migration->get_latest($type);
-        $latest = empty($latest) ? 0 : substr($latest, 0, strpos($latest, '_'));
-
-        if (empty($latest)) {
-            return CLI::write("\tNo migrations found.", 'yellow');
-        }
-
-        $current = $this->migration->get_version($type);
-
-        // Already at the desired version?
-        if ((! is_null($to) && $current == $to) OR (is_null($to) && $current == $latest))
-        {
-            return $silent ? true : CLI::write("\tDatabase is already at the desired version ({$current})", 'yellow');
-        }
-
-        $target = is_null($to) ? $latest : $to;
-
-        // Just to be safe, verify with the user they want to migrate
-        // to the latest version.
-        if (is_null($to)) {
-            // If we're in silent mode, don't prompt, just go to the latest...
-            if (! $silent) {
-                $go_ahead = CLI::prompt('Migrate to the latest available version?', array('y', 'n'));
-
-                if ($go_ahead == 'n') {
-                    return CLI::write('Bailing...', 'yellow');
-                }
-            }
-
-            if (! $this->migration->latest($type)) {
-                return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
-            }
-        } else {
-            if ($this->migration->version($type, $to) === false) {
-                return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
-            }
-        }
-
-        return $silent ? true :
-            CLI::write("\n\tSuccessfully migrated database from version {$current} to {$target}.\n", 'green');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Performs a migration that does not prompt for any information.
-     * Suitable for use within automated scripts that can't be
-     * bothered with answering questions.
-     *
-     * @param string $type 'app', 'myth', 'all' or {module_name}
-     * @param null $to
-     * @return bool|void
-     */
-    public function quietMigrate($type='app', $to = null)
-    {
-        return $this->migrate($type, $to, true);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Migrates the database back to 0, then back up to the latest version.
-     *
-     * @param string $type  The group or module to refresh.
-     * @return mixed
-     */
-    public function refresh($type=null)
-    {
-        $this->load->library('migration');
-
-        if (empty($type))
-        {
-            $type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
-
-            if (empty($type))
-            {
-                return CLI::error("\tYou must supply a group to refresh.");
-            }
-        }
-
-        if ($this->migration->version($type, 0) === false) {
-            return CLI::error("\tERROR: " . $this->migration->error_string());
-        }
-
-        CLI::write(CLI::color("\tCleared the database.", 'green'));
-
-        if ($this->migration->latest($type) === false) {
-            return CLI::error("\tERROR: " . $this->migration->error_string());
-        }
-
-        CLI::write("\tRe-installed the database to the latest migration.", 'green');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a new migration file ready to be used.
-     *
-     * @param $name
-     */
-    public function newMigration($name = null, $type = 'app')
-    {
-        if (empty($name)) {
-            $name = CLI::prompt('Migration name? ');
-
-            if (empty($name)) {
-                return CLI::error("\tYou must provide a migration name.", 'red');
-            }
-        }
-
-        $this->load->library('migration');
-
-        $path = $this->migration->determine_migration_path($type);
-
-        // Does the alias path exist in our config?
-        if (! $path) {
-            return CLI::error("\tThe migration path for '{$type}' does not exist.'");
-        }
-
-        // Does the path really exist?
-        if (! is_dir($path)) {
-            return CLI::error("\tThe path for '{$type}' is not a directory.");
-        }
-
-        // Is the folder writeable?
-        if (! is_writeable($path)) {
-            return CLI::error("\tThe folder for '{$type}' migrations is not writeable.");
-        }
-
-        $file = $this->migration->make_name($name);
-
-        $path = rtrim($path, '/') .'/'. $file;
-
-        $contents = <<<EOT
+	protected $descriptions = [
+		'migrate'       => ['migrate [$to]',        'Runs the migrations up or down until schema at version \$to'],
+		'quietMigrate'  => ['quiteMigrate [$to]',   'Same as migrate but without any feedback.'],
+		'refresh'       => ['refresh',              'Runs migrations back to version 0 (uninstall) and then back to the most recent migration.'],
+		'newMigration'  => ['newMigration [$name]', 'Creates a new migration file.'],
+		'seed'          => ['seed [$name]',         'Runs the named database seeder.']
+	];
+
+	protected $long_descriptions = [
+		'migrate'       => '',
+		'quietMigrate'  => '',
+		'refresh'       => '',
+		'newMigration'  => '',
+		'seed'          => ''
+	];
+
+	//-------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Migration Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a command-line interface to the migration scripts.
+	 * If no $to is provided, will migrate to the latest version.
+	 *
+	 * Example:
+	 *      > php index.php database migrate
+	 *
+	 * @param string $type 'app', 'myth', 'all' or {module_name}
+	 * @param null $to
+	 * @param bool $silent If TRUE, will NOT display any prompts for verification.
+	 * @return bool|void
+	 */
+	public function migrate($type=null, $to = null, $silent = false)
+	{
+		$this->load->library('migration');
+
+		if (empty($type))
+		{
+			$type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
+
+			if (empty($type))
+			{
+				return $silent ? false : CLI::error("\tYou must supply a group to refresh.");
+			}
+		}
+
+		// We need to append 'mod:' to properly handle modules, if
+		// the $type is not one of the recognized migration groups.
+		$this->config->load('migration');
+		$groups = config_item('migration_paths');
+		$groups = array_keys($groups);
+
+		// If it's not in the groups list, then assume it's a module.
+		if (! in_array($type, $groups))
+		{
+			if (strpos($type, 'mod:') !== 0)
+			{
+				$type = 'mod:'. $type;
+			}
+		}
+
+		unset($groups);
+
+		// Get our stats on the migrations
+		$latest = $this->migration->get_latest($type);
+		$latest = empty($latest) ? 0 : substr($latest, 0, strpos($latest, '_'));
+
+		if (empty($latest)) {
+			return CLI::write("\tNo migrations found.", 'yellow');
+		}
+
+		$current = $this->migration->get_version($type);
+
+		// Already at the desired version?
+		if ((! is_null($to) && $current == $to) OR (is_null($to) && $current == $latest))
+		{
+			return $silent ? true : CLI::write("\tDatabase is already at the desired version ({$current})", 'yellow');
+		}
+
+		$target = is_null($to) ? $latest : $to;
+
+		// Just to be safe, verify with the user they want to migrate
+		// to the latest version.
+		if (is_null($to)) {
+			// If we're in silent mode, don't prompt, just go to the latest...
+			if (! $silent) {
+				$go_ahead = CLI::prompt('Migrate to the latest available version?', array('y', 'n'));
+
+				if ($go_ahead == 'n') {
+					return CLI::write('Bailing...', 'yellow');
+				}
+			}
+
+			if (! $this->migration->latest($type)) {
+				return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
+			}
+		} else {
+			if ($this->migration->version($type, $to) === false) {
+				return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
+			}
+		}
+
+		return $silent ? true :
+			CLI::write("\n\tSuccessfully migrated database from version {$current} to {$target}.\n", 'green');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs a migration that does not prompt for any information.
+	 * Suitable for use within automated scripts that can't be
+	 * bothered with answering questions.
+	 *
+	 * @param string $type 'app', 'myth', 'all' or {module_name}
+	 * @param null $to
+	 * @return bool|void
+	 */
+	public function quietMigrate($type='app', $to = null)
+	{
+		return $this->migrate($type, $to, true);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Migrates the database back to 0, then back up to the latest version.
+	 *
+	 * @param string $type  The group or module to refresh.
+	 * @return mixed
+	 */
+	public function refresh($type=null)
+	{
+		$this->load->library('migration');
+
+		if (empty($type))
+		{
+			$type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
+
+			if (empty($type))
+			{
+				return CLI::error("\tYou must supply a group to refresh.");
+			}
+		}
+
+		if ($this->migration->version($type, 0) === false) {
+			return CLI::error("\tERROR: " . $this->migration->error_string());
+		}
+
+		CLI::write(CLI::color("\tCleared the database.", 'green'));
+
+		if ($this->migration->latest($type) === false) {
+			return CLI::error("\tERROR: " . $this->migration->error_string());
+		}
+
+		CLI::write("\tRe-installed the database to the latest migration.", 'green');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a new migration file ready to be used.
+	 *
+	 * @param $name
+	 */
+	public function newMigration($name = null, $type = 'app')
+	{
+		if (empty($name)) {
+			$name = CLI::prompt('Migration name? ');
+
+			if (empty($name)) {
+				return CLI::error("\tYou must provide a migration name.", 'red');
+			}
+		}
+
+		$this->load->library('migration');
+
+		$path = $this->migration->determine_migration_path($type);
+
+		// Does the alias path exist in our config?
+		if (! $path) {
+			return CLI::error("\tThe migration path for '{$type}' does not exist.'");
+		}
+
+		// Does the path really exist?
+		if (! is_dir($path)) {
+			return CLI::error("\tThe path for '{$type}' is not a directory.");
+		}
+
+		// Is the folder writeable?
+		if (! is_writeable($path)) {
+			return CLI::error("\tThe folder for '{$type}' migrations is not writeable.");
+		}
+
+		$file = $this->migration->make_name($name);
+
+		$path = rtrim($path, '/') .'/'. $file;
+
+		$contents = <<<EOT
 <?php
 
 /**
@@ -262,36 +262,36 @@ 
 
 }
 EOT;
-        $contents = str_replace('{name}', $name, $contents);
-        $contents = str_replace('{date}', date('Y-m-d H:i:s a'), $contents);
-        $contents = str_replace('{clean_name}', ucwords(str_replace('_', ' ', $name)), $contents);
+		$contents = str_replace('{name}', $name, $contents);
+		$contents = str_replace('{date}', date('Y-m-d H:i:s a'), $contents);
+		$contents = str_replace('{clean_name}', ucwords(str_replace('_', ' ', $name)), $contents);
 
-        $this->load->helper('file');
+		$this->load->helper('file');
 
-        if (write_file($path, $contents)) {
-            return CLI::write("\tNew migration created: " . CLI::color($file, 'yellow'), 'green');
-        }
+		if (write_file($path, $contents)) {
+			return CLI::write("\tNew migration created: " . CLI::color($file, 'yellow'), 'green');
+		}
 
-        return CLI::error("\tUnkown error trying to create migration: {$file}", 'red');
-    }
+		return CLI::error("\tUnkown error trying to create migration: {$file}", 'red');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    //--------------------------------------------------------------------
-    // Seeding Methods
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Seeding Methods
+	//--------------------------------------------------------------------
 
-    /**
-     * Installs any database seeds stored in database/seeds. Seeds just need to
-     * extend the Seeder class and have a method named run.
-     */
-    public function seed($name = null)
-    {
-        $this->load->library('seeder');
+	/**
+	 * Installs any database seeds stored in database/seeds. Seeds just need to
+	 * extend the Seeder class and have a method named run.
+	 */
+	public function seed($name = null)
+	{
+		$this->load->library('seeder');
 
-        $this->seeder->call($name);
-    }
+		$this->seeder->call($name);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/CIModules/database/libraries/Seeder.php

Indentation +63 added lines, -63 removed lines

@@ -39,92 +39,92 @@
  */
 class Seeder {
 
-    public $error_string    = '';
+	public $error_string    = '';
 
-    protected $ci;
+	protected $ci;
 
-    protected $is_cli = false;
+	protected $is_cli = false;
 
-    protected $db;
-    protected $dbforge;
+	protected $db;
+	protected $dbforge;
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function __construct ()
-    {
-        $this->ci =& get_instance();
+	public function __construct ()
+	{
+		$this->ci =& get_instance();
 
-        $this->is_cli = $this->ci->input->is_cli_request();
+		$this->is_cli = $this->ci->input->is_cli_request();
 
-        if ($this->is_cli)
-        {
-            $cli = new CLI();
-            $cli::_init();
-        }
+		if ($this->is_cli)
+		{
+			$cli = new CLI();
+			$cli::_init();
+		}
 
-        $this->ci->load->dbforge();
+		$this->ci->load->dbforge();
 
-        // Setup some convenience vars.
-        $this->db       =& $this->ci->db;
-        $this->dbforge  =& $this->ci->dbforge;
-    }
+		// Setup some convenience vars.
+		$this->db       =& $this->ci->db;
+		$this->dbforge  =& $this->ci->dbforge;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Run the database seeds. It's where the magic happens.
-     * This method MUST be overridden by child classes.
-     */
-    public function run ()
-    {
+	/**
+	 * Run the database seeds. It's where the magic happens.
+	 * This method MUST be overridden by child classes.
+	 */
+	public function run ()
+	{
 
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Loads the class file and calls the run() method
-     * on the class.
-     *
-     * @param $class
-     */
-    public function call ($class)
-    {
-        if (empty($class))
-        {
-            // Ask the user...
-            $class = trim( CLI::prompt("Seeder name") );
+	/**
+	 * Loads the class file and calls the run() method
+	 * on the class.
+	 *
+	 * @param $class
+	 */
+	public function call ($class)
+	{
+		if (empty($class))
+		{
+			// Ask the user...
+			$class = trim( CLI::prompt("Seeder name") );
 
-            if (empty($class)) {
-                return CLI::error("\tNo Seeder was specified.");
-            }
-        }
+			if (empty($class)) {
+				return CLI::error("\tNo Seeder was specified.");
+			}
+		}
 
-        $path = APPPATH .'database/seeds/'. str_replace('.php', '', $class) .'.php';
+		$path = APPPATH .'database/seeds/'. str_replace('.php', '', $class) .'.php';
 
-        if ( ! is_file($path))
-        {
-            return CLI::error("\tUnable to find seed class: ". $class);
-        }
+		if ( ! is_file($path))
+		{
+			return CLI::error("\tUnable to find seed class: ". $class);
+		}
 
-        try {
-            require $path;
+		try {
+			require $path;
 
-            $seeder = new $class();
+			$seeder = new $class();
 
-            $seeder->run();
+			$seeder->run();
 
-            unset($seeder);
-        }
-        catch (\Exception $e)
-        {
-            show_error($e->getMessage(), $e->getCode());
-        }
+			unset($seeder);
+		}
+		catch (\Exception $e)
+		{
+			show_error($e->getMessage(), $e->getCode());
+		}
 
-        return Cli::write("\tSeeded: $class", 'green');
-    }
+		return Cli::write("\tSeeded: $class", 'green');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/CIModules/docs/config/docs.php

Indentation +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
 | if realpath cannot find/read the folder.
 */
 $config['docs.folders'] = [
-    'application'   => APPPATH .'docs',
-    'developer'     => APPPATH .'../myth/_docs_src'
+	'application'   => APPPATH .'docs',
+	'developer'     => APPPATH .'../myth/_docs_src'
 ];
 
 /*

myth/CIModules/forge/controllers/Forge.php

Indentation +168 added lines, -168 removed lines

@@ -34,133 +34,133 @@ 
 
 class Forge extends \Myth\Controllers\CLIController {
 
-    public function __construct()
-    {
-        parent::__construct();
+	public function __construct()
+	{
+		parent::__construct();
 
-        $this->load->config('forge');
-    }
+		$this->load->config('forge');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    public function _remap($method, $params)
-    {
-        if (method_exists($this, $method))
-        {
-            call_user_func_array( [$this, $method], $params);
-        }
-        else
-        {
-	        $params = array_merge([CLI::cli_string()], $params);
+	public function _remap($method, $params)
+	{
+		if (method_exists($this, $method))
+		{
+			call_user_func_array( [$this, $method], $params);
+		}
+		else
+		{
+			$params = array_merge([CLI::cli_string()], $params);
 
-            call_user_func_array( [$this, 'run'], $params);
-        }
-    }
+			call_user_func_array( [$this, 'run'], $params);
+		}
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Overrides to implement dynamic description building based on
-     * scanning the collections and grabbing the information from
-     * 'forge.php' files.
-     */
-    public function index()
-    {
-        $collections = config_item('forge.collections');
-
-        if (! is_array($collections) || ! count($collections) )
-        {
-            return CLI::error('No generator collections found.');
-        }
-
-        // We loop through each collection scanning
-        // for any generator folders that have a
-        // 'forge.php' file. For each one found
-        // we build out another section in our help commands
-        foreach ($collections as $alias => $path)
-        {
-            $path = rtrim($path, '/ ') .'/';
-            $folders = scandir($path);
-
-            $_descriptions = [];
-
-            foreach ($folders as $dir)
-            {
-                if ($dir == '.' || $dir == '..' || ! is_file($path . $dir .'/forge.php'))
-                {
-                    continue;
-                }
-
-                include $path . $dir .'/forge.php';
-
-                // Don't have valid arrays to work with? Move along...
-                if (! isset($descriptions))
-                {
-                    log_message('debug', '[Forge] Invalid forge.php file at: '. $path . $dir .'/forge.php');
-                    continue;
-                }
-
-                $_descriptions = array_merge($descriptions, $_descriptions);
-            }
-
-	        ksort($_descriptions);
-
-            CLI::new_line();
-            CLI::write(ucwords( str_replace('_', ' ', $alias)) .' Collection');
-            $this->sayDescriptions($_descriptions);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * The primary method that calls the correct generator and
-     * makes it run.
-     */
-    public function run($command)
-    {
-	    $quiet = false;
-
-	    $segments = explode(" ", $command);
-
-	    // Get rid of the 'forge' command
-	    if ($segments[0] == 'forge') {
-		    array_shift( $segments );
-	    }
-
-	    $command = trim(str_ireplace("forge", '', array_shift($segments)));
+	//--------------------------------------------------------------------
+
+	/**
+	 * Overrides to implement dynamic description building based on
+	 * scanning the collections and grabbing the information from
+	 * 'forge.php' files.
+	 */
+	public function index()
+	{
+		$collections = config_item('forge.collections');
+
+		if (! is_array($collections) || ! count($collections) )
+		{
+			return CLI::error('No generator collections found.');
+		}
+
+		// We loop through each collection scanning
+		// for any generator folders that have a
+		// 'forge.php' file. For each one found
+		// we build out another section in our help commands
+		foreach ($collections as $alias => $path)
+		{
+			$path = rtrim($path, '/ ') .'/';
+			$folders = scandir($path);
+
+			$_descriptions = [];
+
+			foreach ($folders as $dir)
+			{
+				if ($dir == '.' || $dir == '..' || ! is_file($path . $dir .'/forge.php'))
+				{
+					continue;
+				}
+
+				include $path . $dir .'/forge.php';
+
+				// Don't have valid arrays to work with? Move along...
+				if (! isset($descriptions))
+				{
+					log_message('debug', '[Forge] Invalid forge.php file at: '. $path . $dir .'/forge.php');
+					continue;
+				}
+
+				$_descriptions = array_merge($descriptions, $_descriptions);
+			}
+
+			ksort($_descriptions);
+
+			CLI::new_line();
+			CLI::write(ucwords( str_replace('_', ' ', $alias)) .' Collection');
+			$this->sayDescriptions($_descriptions);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The primary method that calls the correct generator and
+	 * makes it run.
+	 */
+	public function run($command)
+	{
+		$quiet = false;
+
+		$segments = explode(" ", $command);
+
+		// Get rid of the 'forge' command
+		if ($segments[0] == 'forge') {
+			array_shift( $segments );
+		}
+
+		$command = trim(str_ireplace("forge", '', array_shift($segments)));
 
 		$dir = $this->locateGenerator($command);
 
 		$class_name = ucfirst($command) .'Generator';
 
-	    if (! file_exists($dir . $class_name .'.php'))
-	    {
-		    return CLI::error("Generator file not found for: {$class_name}");
-	    }
+		if (! file_exists($dir . $class_name .'.php'))
+		{
+			return CLI::error("Generator file not found for: {$class_name}");
+		}
 
 		require_once $dir . $class_name .'.php';
 
-	    if (! class_exists($class_name, false))
-	    {
-		    return CLI::error("No class `{$class_name}` found in generator file.");
-	    }
+		if (! class_exists($class_name, false))
+		{
+			return CLI::error("No class `{$class_name}` found in generator file.");
+		}
 
-	    // Should we run the process quietly?
-	    if ( (CLI::option('q') || CLI::option('quiet')))
-	    {
-		    $quiet = true;
-	    }
+		// Should we run the process quietly?
+		if ( (CLI::option('q') || CLI::option('quiet')))
+		{
+			$quiet = true;
+		}
 
-	    CLI::write('Invoked '. CLI::color($class_name, 'yellow'));
+		CLI::write('Invoked '. CLI::color($class_name, 'yellow'));
 
 		$class = new $class_name();
 
-	    $class->run( $segments, $quiet );
-    }
+		$class->run( $segments, $quiet );
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Displays the readme file for a generator if it exists.
@@ -205,67 +205,67 @@ 
 	//--------------------------------------------------------------------
 
 
-    /**
-     * Overrides CLIController's version to support searching our
-     * collections for the help description.
-     *
-     * @param null $method
-     */
-    public function longDescribeMethod($method=null)
-    {
-	    $collections = config_item('forge.collections');
-
-	    if (! is_array($collections) || ! count($collections) )
-	    {
-		    return CLI::error('No generator collections found.');
-	    }
-
-	    // We loop through each collection scanning
-	    // for any generator folders that have a
-	    // 'forge.php' file. For each one found
-	    // we build out another section in our help commands
-	    foreach ($collections as $alias => $path)
-	    {
-
-		    $path = rtrim($path, '/ ') .'/';
-		    $folders = scandir($path);
-
-		    if (! $i = array_search(ucfirst($method), $folders))
-		    {
-			    continue;
-		    }
-
-		    $dir = $path . $folders[$i] .'/';
-
-		    if (! is_file($dir .'/forge.php'))
-		    {
-			    CLI::error("The {$method} command does not have any cli help available.");
-		    }
-
-		    include $dir .'/forge.php';
-
-		    // Don't have valid arrays to work with? Move along...
-		    if (! isset($long_description))
-		    {
-			    log_message('debug', '[Forge] Invalid forge.php file at: '. $dir .'/forge.php');
-			    continue;
-		    }
-
-		    if (empty($long_description))
-		    {
-			    return CLI::error("The {$method} command does not have an cli help available.");
-		    }
-
-		    CLI::new_line();
-		    CLI::write( CLI::color(ucfirst($method) .' Help', 'yellow') );
-		    return CLI::write( CLI::wrap($long_description, CLI::getWidth()) );
-	    }
-
-	    // Still here?
-	    CLI::error("No help found for command: {$method}");
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Overrides CLIController's version to support searching our
+	 * collections for the help description.
+	 *
+	 * @param null $method
+	 */
+	public function longDescribeMethod($method=null)
+	{
+		$collections = config_item('forge.collections');
+
+		if (! is_array($collections) || ! count($collections) )
+		{
+			return CLI::error('No generator collections found.');
+		}
+
+		// We loop through each collection scanning
+		// for any generator folders that have a
+		// 'forge.php' file. For each one found
+		// we build out another section in our help commands
+		foreach ($collections as $alias => $path)
+		{
+
+			$path = rtrim($path, '/ ') .'/';
+			$folders = scandir($path);
+
+			if (! $i = array_search(ucfirst($method), $folders))
+			{
+				continue;
+			}
+
+			$dir = $path . $folders[$i] .'/';
+
+			if (! is_file($dir .'/forge.php'))
+			{
+				CLI::error("The {$method} command does not have any cli help available.");
+			}
+
+			include $dir .'/forge.php';
+
+			// Don't have valid arrays to work with? Move along...
+			if (! isset($long_description))
+			{
+				log_message('debug', '[Forge] Invalid forge.php file at: '. $dir .'/forge.php');
+				continue;
+			}
+
+			if (empty($long_description))
+			{
+				return CLI::error("The {$method} command does not have an cli help available.");
+			}
+
+			CLI::new_line();
+			CLI::write( CLI::color(ucfirst($method) .' Help', 'yellow') );
+			return CLI::write( CLI::wrap($long_description, CLI::getWidth()) );
+		}
+
+		// Still here?
+		CLI::error("No help found for command: {$method}");
+	}
+
+	//--------------------------------------------------------------------
 
 	/**
 	 * Scans through the collections for the folder for this generator.