ci-bonfire / Sprint

index.php

Indentation +27 added lines, -27 removed lines

@@ -57,29 +57,29 @@ 
  */
 	$domain = ! empty($_SERVER['HTTP_HOST']) ? strtolower($_SERVER['HTTP_HOST']) : 'cli';
 
-    /**
-     * A simple method to automatically determine the environment that
-     * the script is running on. Modify to support your needs.
-     *
-     * To handle Travis-ci testing, we check for an environment
-     * variable called TRAVIS which is set in the .travis.yml file.
-     * This allows a database-specific setup for Travis testing.
-     */
-    if (isset($_ENV['TRAVIS']))
-    {
-        define('ENVIRONMENT', 'travis');
-    }
-    else if (isset($_ENV['TESTING']))
-    {
-	    define('ENVIRONMENT', 'testing');
-    }
-    else if (strpos($domain, '.dev') !== false || $domain == 'cli')
-    {
-        define('ENVIRONMENT', 'development');
-    }
-    else {
-        define('ENVIRONMENT', 'production');
-    }
+	/**
+	 * A simple method to automatically determine the environment that
+	 * the script is running on. Modify to support your needs.
+	 *
+	 * To handle Travis-ci testing, we check for an environment
+	 * variable called TRAVIS which is set in the .travis.yml file.
+	 * This allows a database-specific setup for Travis testing.
+	 */
+	if (isset($_ENV['TRAVIS']))
+	{
+		define('ENVIRONMENT', 'travis');
+	}
+	else if (isset($_ENV['TESTING']))
+	{
+		define('ENVIRONMENT', 'testing');
+	}
+	else if (strpos($domain, '.dev') !== false || $domain == 'cli')
+	{
+		define('ENVIRONMENT', 'development');
+	}
+	else {
+		define('ENVIRONMENT', 'production');
+	}
 
 /*
  *---------------------------------------------------------------
@@ -92,7 +92,7 @@ 
 switch (ENVIRONMENT)
 {
 	case 'development':
-    case 'travis':
+	case 'travis':
 	case 'testing':
 		error_reporting(-1);
 		ini_set('display_errors', 1);
@@ -150,7 +150,7 @@ 
  * Include the path if the folder is not in the same directory
  * as this file.
  */
-    $myth_folder = 'myth';
+	$myth_folder = 'myth';
 
 /*
  *---------------------------------------------------------------
@@ -267,8 +267,8 @@ 
 	// Name of the "system folder"
 	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
 
-    // Path to the myth folder
-    define('MYTHPATH', rtrim( str_replace('\\', '/', $myth_folder), '/ ') .'/' );
+	// Path to the myth folder
+	define('MYTHPATH', rtrim( str_replace('\\', '/', $myth_folder), '/ ') .'/' );
 
 	// The path to the "application" folder
 	if (is_dir($application_folder))

myth/Api/Auth/APIAuthentication.php

Indentation +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 	 */
 	public function setRealm($realm)
 	{
-	    $this->realm = $realm;
+		$this->realm = $realm;
 		return $this;
 	}
 
@@ -116,7 +116,7 @@ 
 			'password'  => $password
 		];
 
-	    $user = $this->validate($data, true);
+		$user = $this->validate($data, true);
 
 		$this->user = $user;
 
@@ -272,7 +272,7 @@ 
 	 */
 	public function checkIPBlacklist()
 	{
-	    $blacklist = explode(',', config_item('api.ip_blacklist'));
+		$blacklist = explode(',', config_item('api.ip_blacklist'));
 
 		array_walk($blacklist, function (&$item, $key) {
 			$item = trim($item);

myth/Api/Server/ApiController.php

Indentation +39 added lines, -39 removed lines

@@ -141,8 +141,8 @@ 
 	 * @var array
 	 */
 	protected $codes = array(
-        'created'                   => 201,
-        'deleted'                   => 200,
+		'created'                   => 201,
+		'deleted'                   => 200,
 		'invalid_request'           => 400,
 		'unsupported_response_type' => 400,
 		'invalid_scope'             => 400,
@@ -166,32 +166,32 @@ 
 		'not_implemented'           => 501
 	);
 
-    /**
-     * Convert common browser-sent langauge
-     * strings to a folder name in the languages folder
-     * that we want to use.
-     *
-     * Primarily used for converting to english when
-     * viewing the API in a browser.
-     *
-     * @var array
-     */
-    protected $lang_map = [
-        'en-us' => 'english',
-        'en'    => 'english',
-        'eng'   => 'english',
-        'en-au' => 'english',
-        'en-nz' => 'english',
-        'en-za' => 'english',
-        'en-tt' => 'english',
-        'en-gb' => 'english',
-        'en-ca' => 'english',
-        'en-ie' => 'english',
-        'en-jm' => 'english',
-        'en-bz' => 'english',
-    ];
-
-    /**
+	/**
+	 * Convert common browser-sent langauge
+	 * strings to a folder name in the languages folder
+	 * that we want to use.
+	 *
+	 * Primarily used for converting to english when
+	 * viewing the API in a browser.
+	 *
+	 * @var array
+	 */
+	protected $lang_map = [
+		'en-us' => 'english',
+		'en'    => 'english',
+		'eng'   => 'english',
+		'en-au' => 'english',
+		'en-nz' => 'english',
+		'en-za' => 'english',
+		'en-tt' => 'english',
+		'en-gb' => 'english',
+		'en-ca' => 'english',
+		'en-ie' => 'english',
+		'en-jm' => 'english',
+		'en-bz' => 'english',
+	];
+
+	/**
 	 * If you wish to override the default authentication
 	 * library used for authentication, set this to the
 	 * fully namespaced class name.
@@ -544,7 +544,7 @@ 
 	 */
 	public function grabVar($name)
 	{
-	    return array_key_exists($name, $this->vars) ? $this->vars[$name] : false;
+		return array_key_exists($name, $this->vars) ? $this->vars[$name] : false;
 	}
 
 	//--------------------------------------------------------------------
@@ -757,12 +757,12 @@ 
 				// Remove weight and strip space
 				list($lang) = explode(';', $lang);
 
-                $lang = strtolower(trim($lang));
+				$lang = strtolower(trim($lang));
 
-                if (array_key_exists($lang, $this->lang_map))
-                {
-                    $lang = $this->lang_map[$lang];
-                }
+				if (array_key_exists($lang, $this->lang_map))
+				{
+					$lang = $this->lang_map[$lang];
+				}
 
 				$return_langs[] = $lang;
 			}
@@ -782,10 +782,10 @@ 
 	 */
 	public function detectFields()
 	{
-	    if (! array_key_exists('fields', $_GET))
-	    {
-		    return;
-	    }
+		if (! array_key_exists('fields', $_GET))
+		{
+			return;
+		}
 
 		$fields = explode(',', $_GET['fields']);
 
@@ -814,7 +814,7 @@ 
 			return;
 		}
 
-	    $model = new LogModel();
+		$model = new LogModel();
 
 		$data = [
 			'duration' => microtime(true) - $this->start_time,

myth/Auth/AuthTrait.php

Indentation +32 added lines, -32 removed lines

@@ -1,34 +1,34 @@ 
 <?php namespace Myth\Auth;
 /**
- * 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
+	 */
 
 trait AuthTrait {
 
@@ -58,7 +58,7 @@ 
 	 */
 	public function restrict($uri=null, $return_only=false)
 	{
-	    $this->setupAuthClasses();
+		$this->setupAuthClasses();
 
 		if ($this->authenticate->isLoggedIn())
 		{
@@ -108,7 +108,7 @@ 
 	 */
 	public function restrictToGroups($groups, $uri='')
 	{
-	    $this->setupAuthClasses();
+		$this->setupAuthClasses();
 
 		if ($this->authenticate->isLoggedIn())
 		{
@@ -149,7 +149,7 @@ 
 	 */
 	public function restrictWithPermissions($permissions, $uri='')
 	{
-	    $this->setupAuthClasses();
+		$this->setupAuthClasses();
 
 		if ($this->authenticate->isLoggedIn())
 		{

myth/Auth/Flat/FlatGroupsModel.php

Indentation +22 added lines, -22 removed lines

@@ -85,10 +85,10 @@ 
 	 */
 	public function addUserToGroup($user_id, $group_id)
 	{
-	    $data = [
-		    'user_id'   => (int)$user_id,
-		    'group_id'  => (int)$group_id
-	    ];
+		$data = [
+			'user_id'   => (int)$user_id,
+			'group_id'  => (int)$group_id
+		];
 
 		return $this->db->insert('auth_groups_users', $data);
 	}
@@ -105,10 +105,10 @@ 
 	 */
 	public function removeUserFromGroup($user_id, $group_id)
 	{
-	    return $this->where([
-		    'user_id' => (int)$user_id,
-		    'group_id' => (int)$group_id
-	    ])->delete('auth_groups_users');
+		return $this->where([
+			'user_id' => (int)$user_id,
+			'group_id' => (int)$group_id
+		])->delete('auth_groups_users');
 	}
 
 	//--------------------------------------------------------------------
@@ -122,8 +122,8 @@ 
 	 */
 	public function removeUserFromAllGroups($user_id)
 	{
-	    return $this->db->where('user_id', (int)$user_id)
-		                ->delete('auth_groups_users');
+		return $this->db->where('user_id', (int)$user_id)
+						->delete('auth_groups_users');
 	}
 
 	//--------------------------------------------------------------------
@@ -137,11 +137,11 @@ 
 	 */
 	public function getGroupsForUser($user_id)
 	{
-	    return $this->select('auth_groups_users.*, auth_groups.name, auth_groups.description')
-		            ->join('auth_groups_users', 'auth_groups_users.group_id = auth_groups.id', 'left')
-		            ->where('user_id', $user_id)
-		            ->as_array()
-		            ->find_all();
+		return $this->select('auth_groups_users.*, auth_groups.name, auth_groups.description')
+					->join('auth_groups_users', 'auth_groups_users.group_id = auth_groups.id', 'left')
+					->where('user_id', $user_id)
+					->as_array()
+					->find_all();
 	}
 
 	//--------------------------------------------------------------------
@@ -160,7 +160,7 @@ 
 			'group_id'      => (int)$group_id
 		];
 
-	    return $this->db->insert('auth_groups_permissions', $data);
+		return $this->db->insert('auth_groups_permissions', $data);
 	}
 
 	//--------------------------------------------------------------------
@@ -176,10 +176,10 @@ 
 	 */
 	public function removePermissionFromGroup($permission_id, $group_id)
 	{
-	    return $this->db->where([
-		    'permission_id' => $permission_id,
-		    'group_id'      => $group_id
-	    ])->delete('auth_groups_permissions');
+		return $this->db->where([
+			'permission_id' => $permission_id,
+			'group_id'      => $group_id
+		])->delete('auth_groups_permissions');
 	}
 
 	//--------------------------------------------------------------------
@@ -193,8 +193,8 @@ 
 	 */
 	public function removePermissionFromAllGroups($permission_id)
 	{
-	    return $this->db->where('permission_id', $permission_id)
-		                ->delete('auth_groups_permissions');
+		return $this->db->where('permission_id', $permission_id)
+						->delete('auth_groups_permissions');
 	}
 
 	//--------------------------------------------------------------------

myth/Auth/Password.php

Indentation +321 added lines, -321 removed lines

@@ -51,325 +51,325 @@
  */
 class Password {
 
-    /**
-     * A standardized method for hasing a password before storing
-     * in the database.
-     *
-     * @param $password
-     * @return bool|mixed|string
-     */
-    public static function hashPassword($password)
-    {
-        if (! config_item('auth.hash_cost'))
-        {
-            get_instance()->load->config('auth');
-        }
-
-        return password_hash($password, PASSWORD_DEFAULT, ['cost' => config_item('auth.hash_cost')]);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines the number of entropy bits a password has based on
-     *
-     *
-     * @param $password
-     * @param bool $repeatcalc
-     * @return int
-     */
-    public static function getNISTNumBits($password, $repeatcalc = false)
-    {
-        $y = strlen($password);
-        if ($repeatcalc)
-        {
-            // Variant on NIST rules to reduce long sequences of repeated characters.
-            $result = 0;
-            $charmult = array_fill(0, 256, 1);
-            for ($x = 0; $x < $y; $x++)
-            {
-                $tempchr = ord(substr($password, $x, 1));
-                if ($x > 19)  $result += $charmult[$tempchr];
-                else if ($x > 7)  $result += $charmult[$tempchr] * 1.5;
-                else if ($x > 0)  $result += $charmult[$tempchr] * 2;
-                else  $result += 4;
-
-                $charmult[$tempchr] *= 0.75;
-            }
-
-            return $result;
-        }
-        else
-        {
-            if ($y > 20)  return 4 + (7 * 2) + (12 * 1.5) + $y - 20;
-            if ($y > 8)  return 4 + (7 * 2) + (($y - 8) * 1.5);
-            if ($y > 1)  return 4 + (($y - 1) * 2);
-
-            return ($y == 1 ? 4 : 0);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines whether a password is strong enough to use. You should check
-     * the password against this method and reject it if the password is not
-     * strong enough.
-     *
-     * The following guidelines come from the author's tests against 10.4 million actual passwords
-     * ( see post: http://cubicspot.blogspot.com/2012/01/how-to-calculate-password-strength-part.html )
-     * and represents the suggested minimum entropy bits for different types of sites:
-     *
-     *      - 18 bits of entropy = minimum for ANY website.
-     *      - 25 bits of entropy = minimum for a general purpose web service used relatively widely (e.g. Hotmail).
-     *      - 30 bits of entropy = minimum for a web service with business critical applications (e.g. SAAS).
-     *      - 40 bits of entropy = minimum for a bank or other financial service.
-     *
-     * The algorithm is based upon a modified version of the NIST rules which suggest the following:
-     *
-     *      - The first byte counts as 4 bits.
-     *      - The next 7 bytes count as 2 bits each.
-     *      - The next 12 bytes count as 1.5 bits each.
-     *      - Anything beyond that counts as 1 bit each.
-     *      - Mixed case + non-alphanumeric = up to 6 extra bits.
-     *
-     * @param string    $password   - The password to check
-     * @param int       $minbits    - Minimum "entropy bits" that is allowed
-     * @param bool      $usedict    - Should we check the password against a 300,000 word English dictionary?
-     * @param int       $minwordlen -
-     * @return bool
-     */
-    public static function isStrongPassword($password, $minbits = 18, $usedict = false, $minwordlen = 4)
-    {
-        // NIST password strength rules allow up to 6 extra bits for mixed case and non-alphabetic.
-        $upper = false;
-        $lower = false;
-        $numeric = false;
-        $other = false;
-        $space = false;
-        $y = strlen($password);
-        for ($x = 0; $x < $y; $x++)
-        {
-            $tempchr = ord(substr($password, $x, 1));
-            if ($tempchr >= ord("A") && $tempchr <= ord("Z"))  $upper = true;
-            else if ($tempchr >= ord("a") && $tempchr <= ord("z"))  $lower = true;
-            else if ($tempchr >= ord("0") && $tempchr <= ord("9"))  $numeric = true;
-            else if ($tempchr == ord(" "))  $space = true;
-            else  $other = true;
-        }
-        $extrabits = ($upper && $lower && $other ? ($numeric ? 6 : 5) : ($numeric && !$upper && !$lower ? ($other ? -2 : -6) : 0));
-        if (!$space)  $extrabits -= 2;
-        else if (count(explode(" ", preg_replace('/\s+/', " ", $password))) > 3)  $extrabits++;
-        $result = self::getNISTNumBits($password, true) + $extrabits;
-
-        $password = strtolower($password);
-        $revpassword = strrev($password);
-        $numbits = self::getNISTNumBits($password) + $extrabits;
-        if ($result > $numbits)  $result = $numbits;
-
-        // Remove QWERTY strings.
-        $qwertystrs = array(
-            "1234567890-qwertyuiopasdfghjkl;zxcvbnm,./",
-            "1qaz2wsx3edc4rfv5tgb6yhn7ujm8ik,9ol.0p;/-['=]:?_{\"+}",
-            "1qaz2wsx3edc4rfv5tgb6yhn7ujm8ik9ol0p",
-            "qazwsxedcrfvtgbyhnujmik,ol.p;/-['=]:?_{\"+}",
-            "qazwsxedcrfvtgbyhnujmikolp",
-            "]\"/=[;.-pl,0okm9ijn8uhb7ygv6tfc5rdx4esz3wa2q1",
-            "pl0okm9ijn8uhb7ygv6tfc5rdx4esz3wa2q1",
-            "]\"/[;.pl,okmijnuhbygvtfcrdxeszwaq",
-            "plokmijnuhbygvtfcrdxeszwaq",
-            "014725836914702583697894561230258/369*+-*/",
-            "abcdefghijklmnopqrstuvwxyz"
-        );
-        foreach ($qwertystrs as $qwertystr)
-        {
-            $qpassword = $password;
-            $qrevpassword = $revpassword;
-            $z = 6;
-            do
-            {
-                $y = strlen($qwertystr) - $z;
-                for ($x = 0; $x < $y; $x++)
-                {
-                    $str = substr($qwertystr, $x, $z);
-                    $qpassword = str_replace($str, "*", $qpassword);
-                    $qrevpassword = str_replace($str, "*", $qrevpassword);
-                }
-
-                $z--;
-            } while ($z > 2);
-
-            $numbits = self::getNISTNumBits($qpassword) + $extrabits;
-            if ($result > $numbits)  $result = $numbits;
-            $numbits = self::getNISTNumBits($qrevpassword) + $extrabits;
-            if ($result > $numbits)  $result = $numbits;
-
-            if ($result < $minbits)  return false;
-        }
-
-        if ($usedict && $result >= $minbits)
-        {
-            $passwords = array();
-
-            // Add keyboard shifting password variants.
-            $keyboardmap_down_noshift = array(
-                "z" => "", "x" => "", "c" => "", "v" => "", "b" => "", "n" => "", "m" => "", "," => "", "." => "", "/" => "", "<" => "", ">" => "", "?" => ""
-            );
-            if ($password == str_replace(array_keys($keyboardmap_down_noshift), array_values($keyboardmap_down_noshift), $password))
-            {
-                $keyboardmap_downright = array(
-                    "a" => "z",
-                    "q" => "a",
-                    "1" => "q",
-                    "s" => "x",
-                    "w" => "s",
-                    "2" => "w",
-                    "d" => "c",
-                    "e" => "d",
-                    "3" => "e",
-                    "f" => "v",
-                    "r" => "f",
-                    "4" => "r",
-                    "g" => "b",
-                    "t" => "g",
-                    "5" => "t",
-                    "h" => "n",
-                    "y" => "h",
-                    "6" => "y",
-                    "j" => "m",
-                    "u" => "j",
-                    "7" => "u",
-                    "i" => "k",
-                    "8" => "i",
-                    "o" => "l",
-                    "9" => "o",
-                    "0" => "p",
-                );
-
-                $keyboardmap_downleft = array(
-                    "2" => "q",
-                    "w" => "a",
-                    "3" => "w",
-                    "s" => "z",
-                    "e" => "s",
-                    "4" => "e",
-                    "d" => "x",
-                    "r" => "d",
-                    "5" => "r",
-                    "f" => "c",
-                    "t" => "f",
-                    "6" => "t",
-                    "g" => "v",
-                    "y" => "g",
-                    "7" => "y",
-                    "h" => "b",
-                    "u" => "h",
-                    "8" => "u",
-                    "j" => "n",
-                    "i" => "j",
-                    "9" => "i",
-                    "k" => "m",
-                    "o" => "k",
-                    "0" => "o",
-                    "p" => "l",
-                    "-" => "p",
-                );
-
-                $password2 = str_replace(array_keys($keyboardmap_downright), array_values($keyboardmap_downright), $password);
-                $passwords[] = $password2;
-                $passwords[] = strrev($password2);
-
-                $password2 = str_replace(array_keys($keyboardmap_downleft), array_values($keyboardmap_downleft), $password);
-                $passwords[] = $password2;
-                $passwords[] = strrev($password2);
-            }
-
-            // Deal with LEET-Speak substitutions.
-            $leetspeakmap = array(
-                "@" => "a",
-                "!" => "i",
-                "$" => "s",
-                "1" => "i",
-                "2" => "z",
-                "3" => "e",
-                "4" => "a",
-                "5" => "s",
-                "6" => "g",
-                "7" => "t",
-                "8" => "b",
-                "9" => "g",
-                "0" => "o"
-            );
-
-            $password2 = str_replace(array_keys($leetspeakmap), array_values($leetspeakmap), $password);
-            $passwords[] = $password2;
-            $passwords[] = strrev($password2);
-
-            $leetspeakmap["1"] = "l";
-            $password3 = str_replace(array_keys($leetspeakmap), array_values($leetspeakmap), $password);
-            if ($password3 != $password2)
-            {
-                $passwords[] = $password3;
-                $passwords[] = strrev($password3);
-            }
-
-            // Process the password, while looking for words in the dictionary.
-            $a = ord("a");
-            $z = ord("z");
-            $data = file_get_contents(DICTIONARY_PATH);
-            foreach ($passwords as $num => $password)
-            {
-                $y = strlen($password);
-                for ($x = 0; $x < $y; $x++)
-                {
-                    $tempchr = ord(substr($password, $x, 1));
-                    if ($tempchr >= $a && $tempchr <= $z)
-                    {
-                        for ($x2 = $x + 1; $x2 < $y; $x2++)
-                        {
-                            $tempchr = ord(substr($password, $x2, 1));
-                            if ($tempchr < $a || $tempchr > $z)  break;
-                        }
-
-                        $found = false;
-                        while (!$found && $x2 - $x >= $minwordlen)
-                        {
-                            $word = "/\\n" . substr($password, $x, $minwordlen);
-                            for ($x3 = $x + $minwordlen; $x3 < $x2; $x3++)  $word .= "(" . $password{$x3};
-                            for ($x3 = $x + $minwordlen; $x3 < $x2; $x3++)  $word .= ")?";
-                            $word .= "\\n/";
-
-                            preg_match_all($word, $data, $matches);
-                            if (!count($matches[0]))
-                            {
-                                $password{$x} = "*";
-                                $x++;
-                                $numbits = self::getNISTNumBits(substr($password, 0, $x)) + $extrabits;
-                                if ($numbits >= $minbits)  $found = true;
-                            }
-                            else
-                            {
-                                foreach ($matches[0] as $match)
-                                {
-                                    $password2 = str_replace(trim($match), "*", $password);
-                                    $numbits = self::getNISTNumBits($password2) + $extrabits;
-                                    if ($result > $numbits)  $result = $numbits;
-
-                                    if ($result < $minbits)  return false;
-                                }
-
-                                $found = true;
-                            }
-                        }
-
-                        if ($found)  break;
-
-                        $x = $x2 - 1;
-                    }
-                }
-            }
-        }
-
-        return $result >= $minbits;
-    }
+	/**
+	 * A standardized method for hasing a password before storing
+	 * in the database.
+	 *
+	 * @param $password
+	 * @return bool|mixed|string
+	 */
+	public static function hashPassword($password)
+	{
+		if (! config_item('auth.hash_cost'))
+		{
+			get_instance()->load->config('auth');
+		}
+
+		return password_hash($password, PASSWORD_DEFAULT, ['cost' => config_item('auth.hash_cost')]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the number of entropy bits a password has based on
+	 *
+	 *
+	 * @param $password
+	 * @param bool $repeatcalc
+	 * @return int
+	 */
+	public static function getNISTNumBits($password, $repeatcalc = false)
+	{
+		$y = strlen($password);
+		if ($repeatcalc)
+		{
+			// Variant on NIST rules to reduce long sequences of repeated characters.
+			$result = 0;
+			$charmult = array_fill(0, 256, 1);
+			for ($x = 0; $x < $y; $x++)
+			{
+				$tempchr = ord(substr($password, $x, 1));
+				if ($x > 19)  $result += $charmult[$tempchr];
+				else if ($x > 7)  $result += $charmult[$tempchr] * 1.5;
+				else if ($x > 0)  $result += $charmult[$tempchr] * 2;
+				else  $result += 4;
+
+				$charmult[$tempchr] *= 0.75;
+			}
+
+			return $result;
+		}
+		else
+		{
+			if ($y > 20)  return 4 + (7 * 2) + (12 * 1.5) + $y - 20;
+			if ($y > 8)  return 4 + (7 * 2) + (($y - 8) * 1.5);
+			if ($y > 1)  return 4 + (($y - 1) * 2);
+
+			return ($y == 1 ? 4 : 0);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines whether a password is strong enough to use. You should check
+	 * the password against this method and reject it if the password is not
+	 * strong enough.
+	 *
+	 * The following guidelines come from the author's tests against 10.4 million actual passwords
+	 * ( see post: http://cubicspot.blogspot.com/2012/01/how-to-calculate-password-strength-part.html )
+	 * and represents the suggested minimum entropy bits for different types of sites:
+	 *
+	 *      - 18 bits of entropy = minimum for ANY website.
+	 *      - 25 bits of entropy = minimum for a general purpose web service used relatively widely (e.g. Hotmail).
+	 *      - 30 bits of entropy = minimum for a web service with business critical applications (e.g. SAAS).
+	 *      - 40 bits of entropy = minimum for a bank or other financial service.
+	 *
+	 * The algorithm is based upon a modified version of the NIST rules which suggest the following:
+	 *
+	 *      - The first byte counts as 4 bits.
+	 *      - The next 7 bytes count as 2 bits each.
+	 *      - The next 12 bytes count as 1.5 bits each.
+	 *      - Anything beyond that counts as 1 bit each.
+	 *      - Mixed case + non-alphanumeric = up to 6 extra bits.
+	 *
+	 * @param string    $password   - The password to check
+	 * @param int       $minbits    - Minimum "entropy bits" that is allowed
+	 * @param bool      $usedict    - Should we check the password against a 300,000 word English dictionary?
+	 * @param int       $minwordlen -
+	 * @return bool
+	 */
+	public static function isStrongPassword($password, $minbits = 18, $usedict = false, $minwordlen = 4)
+	{
+		// NIST password strength rules allow up to 6 extra bits for mixed case and non-alphabetic.
+		$upper = false;
+		$lower = false;
+		$numeric = false;
+		$other = false;
+		$space = false;
+		$y = strlen($password);
+		for ($x = 0; $x < $y; $x++)
+		{
+			$tempchr = ord(substr($password, $x, 1));
+			if ($tempchr >= ord("A") && $tempchr <= ord("Z"))  $upper = true;
+			else if ($tempchr >= ord("a") && $tempchr <= ord("z"))  $lower = true;
+			else if ($tempchr >= ord("0") && $tempchr <= ord("9"))  $numeric = true;
+			else if ($tempchr == ord(" "))  $space = true;
+			else  $other = true;
+		}
+		$extrabits = ($upper && $lower && $other ? ($numeric ? 6 : 5) : ($numeric && !$upper && !$lower ? ($other ? -2 : -6) : 0));
+		if (!$space)  $extrabits -= 2;
+		else if (count(explode(" ", preg_replace('/\s+/', " ", $password))) > 3)  $extrabits++;
+		$result = self::getNISTNumBits($password, true) + $extrabits;
+
+		$password = strtolower($password);
+		$revpassword = strrev($password);
+		$numbits = self::getNISTNumBits($password) + $extrabits;
+		if ($result > $numbits)  $result = $numbits;
+
+		// Remove QWERTY strings.
+		$qwertystrs = array(
+			"1234567890-qwertyuiopasdfghjkl;zxcvbnm,./",
+			"1qaz2wsx3edc4rfv5tgb6yhn7ujm8ik,9ol.0p;/-['=]:?_{\"+}",
+			"1qaz2wsx3edc4rfv5tgb6yhn7ujm8ik9ol0p",
+			"qazwsxedcrfvtgbyhnujmik,ol.p;/-['=]:?_{\"+}",
+			"qazwsxedcrfvtgbyhnujmikolp",
+			"]\"/=[;.-pl,0okm9ijn8uhb7ygv6tfc5rdx4esz3wa2q1",
+			"pl0okm9ijn8uhb7ygv6tfc5rdx4esz3wa2q1",
+			"]\"/[;.pl,okmijnuhbygvtfcrdxeszwaq",
+			"plokmijnuhbygvtfcrdxeszwaq",
+			"014725836914702583697894561230258/369*+-*/",
+			"abcdefghijklmnopqrstuvwxyz"
+		);
+		foreach ($qwertystrs as $qwertystr)
+		{
+			$qpassword = $password;
+			$qrevpassword = $revpassword;
+			$z = 6;
+			do
+			{
+				$y = strlen($qwertystr) - $z;
+				for ($x = 0; $x < $y; $x++)
+				{
+					$str = substr($qwertystr, $x, $z);
+					$qpassword = str_replace($str, "*", $qpassword);
+					$qrevpassword = str_replace($str, "*", $qrevpassword);
+				}
+
+				$z--;
+			} while ($z > 2);
+
+			$numbits = self::getNISTNumBits($qpassword) + $extrabits;
+			if ($result > $numbits)  $result = $numbits;
+			$numbits = self::getNISTNumBits($qrevpassword) + $extrabits;
+			if ($result > $numbits)  $result = $numbits;
+
+			if ($result < $minbits)  return false;
+		}
+
+		if ($usedict && $result >= $minbits)
+		{
+			$passwords = array();
+
+			// Add keyboard shifting password variants.
+			$keyboardmap_down_noshift = array(
+				"z" => "", "x" => "", "c" => "", "v" => "", "b" => "", "n" => "", "m" => "", "," => "", "." => "", "/" => "", "<" => "", ">" => "", "?" => ""
+			);
+			if ($password == str_replace(array_keys($keyboardmap_down_noshift), array_values($keyboardmap_down_noshift), $password))
+			{
+				$keyboardmap_downright = array(
+					"a" => "z",
+					"q" => "a",
+					"1" => "q",
+					"s" => "x",
+					"w" => "s",
+					"2" => "w",
+					"d" => "c",
+					"e" => "d",
+					"3" => "e",
+					"f" => "v",
+					"r" => "f",
+					"4" => "r",
+					"g" => "b",
+					"t" => "g",
+					"5" => "t",
+					"h" => "n",
+					"y" => "h",
+					"6" => "y",
+					"j" => "m",
+					"u" => "j",
+					"7" => "u",
+					"i" => "k",
+					"8" => "i",
+					"o" => "l",
+					"9" => "o",
+					"0" => "p",
+				);
+
+				$keyboardmap_downleft = array(
+					"2" => "q",
+					"w" => "a",
+					"3" => "w",
+					"s" => "z",
+					"e" => "s",
+					"4" => "e",
+					"d" => "x",
+					"r" => "d",
+					"5" => "r",
+					"f" => "c",
+					"t" => "f",
+					"6" => "t",
+					"g" => "v",
+					"y" => "g",
+					"7" => "y",
+					"h" => "b",
+					"u" => "h",
+					"8" => "u",
+					"j" => "n",
+					"i" => "j",
+					"9" => "i",
+					"k" => "m",
+					"o" => "k",
+					"0" => "o",
+					"p" => "l",
+					"-" => "p",
+				);
+
+				$password2 = str_replace(array_keys($keyboardmap_downright), array_values($keyboardmap_downright), $password);
+				$passwords[] = $password2;
+				$passwords[] = strrev($password2);
+
+				$password2 = str_replace(array_keys($keyboardmap_downleft), array_values($keyboardmap_downleft), $password);
+				$passwords[] = $password2;
+				$passwords[] = strrev($password2);
+			}
+
+			// Deal with LEET-Speak substitutions.
+			$leetspeakmap = array(
+				"@" => "a",
+				"!" => "i",
+				"$" => "s",
+				"1" => "i",
+				"2" => "z",
+				"3" => "e",
+				"4" => "a",
+				"5" => "s",
+				"6" => "g",
+				"7" => "t",
+				"8" => "b",
+				"9" => "g",
+				"0" => "o"
+			);
+
+			$password2 = str_replace(array_keys($leetspeakmap), array_values($leetspeakmap), $password);
+			$passwords[] = $password2;
+			$passwords[] = strrev($password2);
+
+			$leetspeakmap["1"] = "l";
+			$password3 = str_replace(array_keys($leetspeakmap), array_values($leetspeakmap), $password);
+			if ($password3 != $password2)
+			{
+				$passwords[] = $password3;
+				$passwords[] = strrev($password3);
+			}
+
+			// Process the password, while looking for words in the dictionary.
+			$a = ord("a");
+			$z = ord("z");
+			$data = file_get_contents(DICTIONARY_PATH);
+			foreach ($passwords as $num => $password)
+			{
+				$y = strlen($password);
+				for ($x = 0; $x < $y; $x++)
+				{
+					$tempchr = ord(substr($password, $x, 1));
+					if ($tempchr >= $a && $tempchr <= $z)
+					{
+						for ($x2 = $x + 1; $x2 < $y; $x2++)
+						{
+							$tempchr = ord(substr($password, $x2, 1));
+							if ($tempchr < $a || $tempchr > $z)  break;
+						}
+
+						$found = false;
+						while (!$found && $x2 - $x >= $minwordlen)
+						{
+							$word = "/\\n" . substr($password, $x, $minwordlen);
+							for ($x3 = $x + $minwordlen; $x3 < $x2; $x3++)  $word .= "(" . $password{$x3};
+							for ($x3 = $x + $minwordlen; $x3 < $x2; $x3++)  $word .= ")?";
+							$word .= "\\n/";
+
+							preg_match_all($word, $data, $matches);
+							if (!count($matches[0]))
+							{
+								$password{$x} = "*";
+								$x++;
+								$numbits = self::getNISTNumBits(substr($password, 0, $x)) + $extrabits;
+								if ($numbits >= $minbits)  $found = true;
+							}
+							else
+							{
+								foreach ($matches[0] as $match)
+								{
+									$password2 = str_replace(trim($match), "*", $password);
+									$numbits = self::getNISTNumBits($password2) + $extrabits;
+									if ($result > $numbits)  $result = $numbits;
+
+									if ($result < $minbits)  return false;
+								}
+
+								$found = true;
+							}
+						}
+
+						if ($found)  break;
+
+						$x = $x2 - 1;
+					}
+				}
+			}
+		}
+
+		return $result >= $minbits;
+	}
 }

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;
+	}
 }