DakuTree / manga-tracker

application/core/MY_Config.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 class MY_Config extends CI_Config {
 	public function __construct() {

application/models/Tracker/Sites/WorldThree.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
 
 class WorldThree extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'http://www.slide.world-three.org';

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
 
 class WorldThree extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'http://www.slide.world-three.org';

application/models/Tracker/Sites/WhiteCloudPavillion.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
 
 class WhiteCloudPavillion extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'https://archangelscans.com/free';

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
 
 class WhiteCloudPavillion extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'https://archangelscans.com/free';

application/models/Tracker/Sites/HotChocolateScans.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
 
 class HotChocolateScans extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'http://hotchocolatescans.com/fs';

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
 
 class HotChocolateScans extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'http://hotchocolatescans.com/fs';

application/views/User/Dashboard.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 						|
 						<a href="#" class="set-mal-id" data-mal-id="<?=$row['mal_id']?>" data-mal-type="<?=$row['mal_type']?>">Set MAL ID</a> <?php if(!is_null($row['mal_id']) && $row['mal_type'] == 'chapter') { ?><span>(<small><?=($row['mal_id'] !== '0' ? $row['mal_id'] : 'none')?></small>)</span><?php } ?>
 						|
-						Tags (<a href="#" class="edit-tags small">Edit</a>): <span class="text-lowercase tag-list"><?=($row['has_tags'] ? implode("", array_map(function ($str) { return "<i class='tag'>{$str}</i>"; }, explode(",", $row['tag_list']))) : "none")?></span>
+						Tags (<a href="#" class="edit-tags small">Edit</a>): <span class="text-lowercase tag-list"><?=($row['has_tags'] ? implode("", array_map(function($str) { return "<i class='tag'>{$str}</i>"; }, explode(",", $row['tag_list']))) : "none")?></span>
 						<div class="input-group hidden tag-edit">
 							<input type="text" class="form-control" placeholder="tag1,tag2,tag3" maxlength="255" pattern='[a-z0-9-_,]{0,255}' value="<?=$row['tag_list']?>">
 							<span class="input-group-btn">

application/models/Tracker/Sites/YummyGummyScans.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
 
 class YummyGummyScans extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'http://reader.ygscans.com';

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
 
 class YummyGummyScans extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'http://reader.ygscans.com';

application/models/Tracker/Sites/MerakiScans.php

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
 
 class MerakiScans extends Base_Site_Model {
 	public $titleFormat   = '/^[a-zA-Z0-9_-]+$/';
@@ -15,7 +15,7 @@ 
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$fullURL = $this->getFullTitleURL($title_url);
@@ -36,7 +36,7 @@ 
 
 			$titleData['latest_chapter'] = preg_replace('/^.*\/([0-9\.]+)\/$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) substr($data['nodes_latest']->getAttribute('title'), 13)));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) substr($data['nodes_latest']->getAttribute('title'), 13)));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
 
 class MerakiScans extends Base_Site_Model {
 	public $titleFormat   = '/^[a-zA-Z0-9_-]+$/';

application/third_party/Ion-Auth/libraries/Ion_auth.php

Doc Comments +1 added lines, -1 removed lines

@@ -379,7 +379,7 @@
 	/**
 	 * logout
 	 *
-	 * @return void
+	 * @return boolean
 	 * @author Mathew
 	 **/
 	public function logout()

Indentation +12 added lines, -12 removed lines

@@ -133,8 +133,8 @@ 
 		if ( $this->ion_auth_model->forgotten_password($identity) )   //changed
 		{
 			// Get user information
-      $identifier = $this->ion_auth_model->identity_column; // use model identity column, so it can be overridden in a controller
-      $user = $this->where($identifier, $identity)->where('active', 1)->users()->row();  // changed to get_user_by_identity from email
+	  $identifier = $this->ion_auth_model->identity_column; // use model identity column, so it can be overridden in a controller
+	  $user = $this->where($identifier, $identity)->where('active', 1)->users()->row();  // changed to get_user_by_identity from email
 
 			if ($user)
 			{
@@ -388,14 +388,14 @@ 
 
 		$identity = $this->config->item('identity', 'ion_auth');
 
-                if (substr(CI_VERSION, 0, 1) == '2')
+				if (substr(CI_VERSION, 0, 1) == '2')
 		{
 			$this->session->unset_userdata( array($identity => '', 'id' => '', 'user_id' => '') );
-                }
-                else
-                {
-                	$this->session->unset_userdata( array($identity, 'id', 'user_id') );
-                }
+				}
+				else
+				{
+					$this->session->unset_userdata( array($identity, 'id', 'user_id') );
+				}
 
 		// delete the remember me cookies if they exist
 		if (get_cookie($this->config->item('identity_cookie_name', 'ion_auth')))
@@ -437,15 +437,15 @@ 
 	{
 		$this->ion_auth_model->trigger_events('logged_in');
                 
-                $recheck= $this->ion_auth_model->recheck_session();
+				$recheck= $this->ion_auth_model->recheck_session();
         
-                //auto-login the user if they are remembered
-                if ( ! $recheck && get_cookie($this->config->item('identity_cookie_name', 'ion_auth')) && get_cookie($this->config->item('remember_cookie_name', 'ion_auth')))
+				//auto-login the user if they are remembered
+				if ( ! $recheck && get_cookie($this->config->item('identity_cookie_name', 'ion_auth')) && get_cookie($this->config->item('remember_cookie_name', 'ion_auth')))
 		{
 			$recheck = $this->ion_auth_model->login_remembered_user();
 		}
                 
-                return $recheck;
+				return $recheck;
 	}
 
 	/**

Spacing +43 added lines, -43 removed lines

@@ -1,4 +1,4 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if(!defined('BASEPATH')) exit('No direct script access allowed');
 /**
 * Name:  Ion Auth
 *
@@ -59,17 +59,17 @@ 
 		$this->config->load('ion_auth', TRUE);
 		$this->load->library(array('email'));
 		$this->lang->load('ion_auth');
-		$this->load->helper(array('cookie', 'language','url'));
+		$this->load->helper(array('cookie', 'language', 'url'));
 
 		$this->load->library('session');
 
 		$this->load->model('ion_auth_model');
 
-		$this->_cache_user_in_group =& $this->ion_auth_model->_cache_user_in_group;
+		$this->_cache_user_in_group = & $this->ion_auth_model->_cache_user_in_group;
 	
 		$email_config = $this->config->item('email_config', 'ion_auth');
 
-		if ($this->config->item('use_ci_email', 'ion_auth') && isset($email_config) && is_array($email_config))
+		if($this->config->item('use_ci_email', 'ion_auth') && isset($email_config) && is_array($email_config))
 		{
 			$this->email->initialize($email_config);
 		}
@@ -89,19 +89,19 @@ 
 	 */
 	public function __call($method, $arguments)
 	{
-		if (!method_exists( $this->ion_auth_model, $method) )
+		if(!method_exists($this->ion_auth_model, $method))
 		{
-			throw new Exception('Undefined method Ion_auth::' . $method . '() called');
+			throw new Exception('Undefined method Ion_auth::'.$method.'() called');
 		}
 		if($method == 'create_user')
 		{
 			return call_user_func_array(array($this, 'register'), $arguments);
 		}
-		if($method=='update_user')
+		if($method == 'update_user')
 		{
 			return call_user_func_array(array($this, 'update'), $arguments);
 		}
-		return call_user_func_array( array($this->ion_auth_model, $method), $arguments);
+		return call_user_func_array(array($this->ion_auth_model, $method), $arguments);
 	}
 
 	/**
@@ -130,13 +130,13 @@ 
 	 */
 	public function forgotten_password($identity)    //changed $email to $identity
 	{
-		if ( $this->ion_auth_model->forgotten_password($identity) )   //changed
+		if($this->ion_auth_model->forgotten_password($identity))   //changed
 		{
 			// Get user information
       $identifier = $this->ion_auth_model->identity_column; // use model identity column, so it can be overridden in a controller
-      $user = $this->where($identifier, $identity)->where('active', 1)->users()->row();  // changed to get_user_by_identity from email
+      $user = $this->where($identifier, $identity)->where('active', 1)->users()->row(); // changed to get_user_by_identity from email
 
-			if ($user)
+			if($user)
 			{
 				$data = array(
 					'identity'		=> $user->{$this->config->item('identity', 'ion_auth')},
@@ -154,10 +154,10 @@ 
 					$this->email->clear();
 					$this->email->from($this->config->item('admin_email', 'ion_auth'), $this->config->item('site_title', 'ion_auth'));
 					$this->email->to($user->email);
-					$this->email->subject($this->config->item('site_title', 'ion_auth') . ' - ' . $this->lang->line('email_forgotten_password_subject'));
+					$this->email->subject($this->config->item('site_title', 'ion_auth').' - '.$this->lang->line('email_forgotten_password_subject'));
 					$this->email->message($message);
 
-					if ($this->email->send())
+					if($this->email->send())
 					{
 						$this->set_message('forgot_password_successful');
 						return TRUE;
@@ -196,7 +196,7 @@ 
 		$identity = $this->config->item('identity', 'ion_auth');
 		$profile  = $this->where('forgotten_password_code', $code)->users()->row(); //pass the code to profile
 
-		if (!$profile)
+		if(!$profile)
 		{
 			$this->ion_auth_model->trigger_events(array('post_password_change', 'password_change_unsuccessful'));
 			$this->set_error('password_change_unsuccessful');
@@ -205,7 +205,7 @@ 
 
 		$new_password = $this->ion_auth_model->forgotten_password_complete($code, $profile->salt);
 
-		if ($new_password)
+		if($new_password)
 		{
 			$data = array(
 				'identity'     => $profile->{$identity},
@@ -224,10 +224,10 @@ 
 				$this->email->clear();
 				$this->email->from($this->config->item('admin_email', 'ion_auth'), $this->config->item('site_title', 'ion_auth'));
 				$this->email->to($profile->email);
-				$this->email->subject($this->config->item('site_title', 'ion_auth') . ' - ' . $this->lang->line('email_new_password_subject'));
+				$this->email->subject($this->config->item('site_title', 'ion_auth').' - '.$this->lang->line('email_new_password_subject'));
 				$this->email->message($message);
 
-				if ($this->email->send())
+				if($this->email->send())
 				{
 					$this->set_message('password_change_successful');
 					$this->ion_auth_model->trigger_events(array('post_password_change', 'password_change_successful'));
@@ -258,17 +258,17 @@ 
 	{
 		$profile = $this->where('forgotten_password_code', $code)->users()->row(); //pass the code to profile
 
-		if (!is_object($profile))
+		if(!is_object($profile))
 		{
 			$this->set_error('password_change_unsuccessful');
 			return FALSE;
 		}
 		else
 		{
-			if ($this->config->item('forgot_password_expiration', 'ion_auth') > 0) {
+			if($this->config->item('forgot_password_expiration', 'ion_auth') > 0) {
 				//Make sure it isn't expired
 				$expiration = $this->config->item('forgot_password_expiration', 'ion_auth');
-				if (time() - $profile->forgotten_password_time > $expiration) {
+				if(time() - $profile->forgotten_password_time > $expiration) {
 					//it has expired
 					$this->clear_forgotten_password_code($code);
 					$this->set_error('password_change_unsuccessful');
@@ -298,9 +298,9 @@ 
 
 		$id = $this->ion_auth_model->register($identity, $password, $email, $additional_data, $group_ids);
 
-		if (!$email_activation)
+		if(!$email_activation)
 		{
-			if ($id !== FALSE)
+			if($id !== FALSE)
 			{
 				$this->set_message('account_creation_successful');
 				$this->ion_auth_model->trigger_events(array('post_account_creation', 'post_account_creation_successful'));
@@ -315,7 +315,7 @@ 
 		}
 		else
 		{
-			if (!$id)
+			if(!$id)
 			{
 				$this->set_error('account_creation_unsuccessful');
 				return FALSE;
@@ -328,7 +328,7 @@ 
 			$this->ion_auth_model->clear_messages();
 
 
-			if (!$deactivate)
+			if(!$deactivate)
 			{
 				$this->set_error('deactivate_unsuccessful');
 				$this->ion_auth_model->trigger_events(array('post_account_creation', 'post_account_creation_unsuccessful'));
@@ -358,10 +358,10 @@ 
 				$this->email->clear();
 				$this->email->from($this->config->item('admin_email', 'ion_auth'), $this->config->item('site_title', 'ion_auth'));
 				$this->email->to($email);
-				$this->email->subject($this->config->item('site_title', 'ion_auth') . ' - ' . $this->lang->line('email_activation_subject'));
+				$this->email->subject($this->config->item('site_title', 'ion_auth').' - '.$this->lang->line('email_activation_subject'));
 				$this->email->message($message);
 
-				if ($this->email->send() == TRUE)
+				if($this->email->send() == TRUE)
 				{
 					$this->ion_auth_model->trigger_events(array('post_account_creation', 'post_account_creation_successful', 'activation_email_successful'));
 					$this->set_message('activation_email_successful');
@@ -388,21 +388,21 @@ 
 
 		$identity = $this->config->item('identity', 'ion_auth');
 
-                if (substr(CI_VERSION, 0, 1) == '2')
+                if(substr(CI_VERSION, 0, 1) == '2')
 		{
-			$this->session->unset_userdata( array($identity => '', 'id' => '', 'user_id' => '') );
+			$this->session->unset_userdata(array($identity => '', 'id' => '', 'user_id' => ''));
                 }
                 else
                 {
-                	$this->session->unset_userdata( array($identity, 'id', 'user_id') );
+                	$this->session->unset_userdata(array($identity, 'id', 'user_id'));
                 }
 
 		// delete the remember me cookies if they exist
-		if (get_cookie($this->config->item('identity_cookie_name', 'ion_auth')))
+		if(get_cookie($this->config->item('identity_cookie_name', 'ion_auth')))
 		{
 			delete_cookie($this->config->item('identity_cookie_name', 'ion_auth'));
 		}
-		if (get_cookie($this->config->item('remember_cookie_name', 'ion_auth')))
+		if(get_cookie($this->config->item('remember_cookie_name', 'ion_auth')))
 		{
 			delete_cookie($this->config->item('remember_cookie_name', 'ion_auth'));
 		}
@@ -411,13 +411,13 @@ 
 		$this->session->sess_destroy();
 
 		//Recreate the session
-		if (substr(CI_VERSION, 0, 1) == '2')
+		if(substr(CI_VERSION, 0, 1) == '2')
 		{
 			$this->session->sess_create();
 		}
 		else
 		{
-			if (version_compare(PHP_VERSION, '7.0.0') >= 0) {
+			if(version_compare(PHP_VERSION, '7.0.0') >= 0) {
 				session_start();
 			}
 			$this->session->sess_regenerate(TRUE);
@@ -437,10 +437,10 @@ 
 	{
 		$this->ion_auth_model->trigger_events('logged_in');
                 
-                $recheck= $this->ion_auth_model->recheck_session();
+                $recheck = $this->ion_auth_model->recheck_session();
         
                 //auto-login the user if they are remembered
-                if ( ! $recheck && get_cookie($this->config->item('identity_cookie_name', 'ion_auth')) && get_cookie($this->config->item('remember_cookie_name', 'ion_auth')))
+                if(!$recheck && get_cookie($this->config->item('identity_cookie_name', 'ion_auth')) && get_cookie($this->config->item('remember_cookie_name', 'ion_auth')))
 		{
 			$recheck = $this->ion_auth_model->login_remembered_user();
 		}
@@ -457,7 +457,7 @@ 
 	public function get_user_id()
 	{
 		$user_id = $this->session->userdata('user_id');
-		if (!empty($user_id))
+		if(!empty($user_id))
 		{
 			return $user_id;
 		}
@@ -471,7 +471,7 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function is_admin($id=false)
+	public function is_admin($id = false)
 	{
 		$this->ion_auth_model->trigger_events('is_admin');
 
@@ -490,18 +490,18 @@ 
 	 * @return bool
 	 * @author Phil Sturgeon
 	 **/
-	public function in_group($check_group, $id=false, $check_all = false)
+	public function in_group($check_group, $id = false, $check_all = false)
 	{
 		$this->ion_auth_model->trigger_events('in_group');
 
 		$id || $id = $this->session->userdata('user_id');
 
-		if (!is_array($check_group))
+		if(!is_array($check_group))
 		{
 			$check_group = array($check_group);
 		}
 
-		if (isset($this->_cache_user_in_group[$id]))
+		if(isset($this->_cache_user_in_group[$id]))
 		{
 			$groups_array = $this->_cache_user_in_group[$id];
 		}
@@ -509,13 +509,13 @@ 
 		{
 			$users_groups = $this->ion_auth_model->get_users_groups($id)->result();
 			$groups_array = array();
-			foreach ($users_groups as $group)
+			foreach($users_groups as $group)
 			{
 				$groups_array[$group->id] = $group->name;
 			}
 			$this->_cache_user_in_group[$id] = $groups_array;
 		}
-		foreach ($check_group as $key => $value)
+		foreach($check_group as $key => $value)
 		{
 			$groups = (is_string($value)) ? $groups_array : array_keys($groups_array);
 
@@ -523,7 +523,7 @@ 
 			 * if !all (default), in_array
 			 * if all, !in_array
 			 */
-			if (in_array($value, $groups) xor $check_all)
+			if(in_array($value, $groups) xor $check_all)
 			{
 				/**
 				 * if !all (default), true

Braces +61 added lines, -122 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
 * Name:  Ion Auth
 *
@@ -19,8 +21,7 @@ 
 *
 */
 
-class Ion_auth
-{
+class Ion_auth {
 	/**
 	 * account status ('not_activated', etc ...)
 	 *
@@ -54,8 +55,7 @@ 
 	 *
 	 * @author Ben
 	 */
-	public function __construct()
-	{
+	public function __construct() {
 		$this->config->load('ion_auth', TRUE);
 		$this->load->library(array('email'));
 		$this->lang->load('ion_auth');
@@ -69,8 +69,7 @@ 
 	
 		$email_config = $this->config->item('email_config', 'ion_auth');
 
-		if ($this->config->item('use_ci_email', 'ion_auth') && isset($email_config) && is_array($email_config))
-		{
+		if ($this->config->item('use_ci_email', 'ion_auth') && isset($email_config) && is_array($email_config)) {
 			$this->email->initialize($email_config);
 		}
 
@@ -87,18 +86,14 @@ 
 	 * @return mixed
 	 * @throws Exception
 	 */
-	public function __call($method, $arguments)
-	{
-		if (!method_exists( $this->ion_auth_model, $method) )
-		{
+	public function __call($method, $arguments) {
+		if (!method_exists( $this->ion_auth_model, $method) ) {
 			throw new Exception('Undefined method Ion_auth::' . $method . '() called');
 		}
-		if($method == 'create_user')
-		{
+		if($method == 'create_user') {
 			return call_user_func_array(array($this, 'register'), $arguments);
 		}
-		if($method=='update_user')
-		{
+		if($method=='update_user') {
 			return call_user_func_array(array($this, 'update'), $arguments);
 		}
 		return call_user_func_array( array($this->ion_auth_model, $method), $arguments);
@@ -115,8 +110,7 @@ 
 	 * @param	$var
 	 * @return	mixed
 	 */
-	public function __get($var)
-	{
+	public function __get($var) {
 		return get_instance()->$var;
 	}
 
@@ -130,26 +124,25 @@ 
 	 */
 	public function forgotten_password($identity)    //changed $email to $identity
 	{
-		if ( $this->ion_auth_model->forgotten_password($identity) )   //changed
+		if ( $this->ion_auth_model->forgotten_password($identity) ) {
+			//changed
 		{
 			// Get user information
-      $identifier = $this->ion_auth_model->identity_column; // use model identity column, so it can be overridden in a controller
+      $identifier = $this->ion_auth_model->identity_column;
+		}
+		// use model identity column, so it can be overridden in a controller
       $user = $this->where($identifier, $identity)->where('active', 1)->users()->row();  // changed to get_user_by_identity from email
 
-			if ($user)
-			{
+			if ($user) {
 				$data = array(
 					'identity'		=> $user->{$this->config->item('identity', 'ion_auth')},
 					'forgotten_password_code' => $user->forgotten_password_code
 				);
 
-				if(!$this->config->item('use_ci_email', 'ion_auth'))
-				{
+				if(!$this->config->item('use_ci_email', 'ion_auth')) {
 					$this->set_message('forgot_password_successful');
 					return $data;
-				}
-				else
-				{
+				} else {
 					$message = $this->load->view($this->config->item('email_templates', 'ion_auth').$this->config->item('email_forgot_password', 'ion_auth'), $data, true);
 					$this->email->clear();
 					$this->email->from($this->config->item('admin_email', 'ion_auth'), $this->config->item('site_title', 'ion_auth'));
@@ -157,26 +150,19 @@ 
 					$this->email->subject($this->config->item('site_title', 'ion_auth') . ' - ' . $this->lang->line('email_forgotten_password_subject'));
 					$this->email->message($message);
 
-					if ($this->email->send())
-					{
+					if ($this->email->send()) {
 						$this->set_message('forgot_password_successful');
 						return TRUE;
-					}
-					else
-					{
+					} else {
 						$this->set_error('forgot_password_unsuccessful');
 						return FALSE;
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->set_error('forgot_password_unsuccessful');
 				return FALSE;
 			}
-		}
-		else
-		{
+		} else {
 			$this->set_error('forgot_password_unsuccessful');
 			return FALSE;
 		}
@@ -189,15 +175,13 @@ 
 	 * @author Mathew
 	 * @return bool
 	 */
-	public function forgotten_password_complete($code)
-	{
+	public function forgotten_password_complete($code) {
 		$this->ion_auth_model->trigger_events('pre_password_change');
 
 		$identity = $this->config->item('identity', 'ion_auth');
 		$profile  = $this->where('forgotten_password_code', $code)->users()->row(); //pass the code to profile
 
-		if (!$profile)
-		{
+		if (!$profile) {
 			$this->ion_auth_model->trigger_events(array('post_password_change', 'password_change_unsuccessful'));
 			$this->set_error('password_change_unsuccessful');
 			return FALSE;
@@ -205,20 +189,16 @@ 
 
 		$new_password = $this->ion_auth_model->forgotten_password_complete($code, $profile->salt);
 
-		if ($new_password)
-		{
+		if ($new_password) {
 			$data = array(
 				'identity'     => $profile->{$identity},
 				'new_password' => $new_password
 			);
-			if(!$this->config->item('use_ci_email', 'ion_auth'))
-			{
+			if(!$this->config->item('use_ci_email', 'ion_auth')) {
 				$this->set_message('password_change_successful');
 				$this->ion_auth_model->trigger_events(array('post_password_change', 'password_change_successful'));
 					return $data;
-			}
-			else
-			{
+			} else {
 				$message = $this->load->view($this->config->item('email_templates', 'ion_auth').$this->config->item('email_forgot_password_complete', 'ion_auth'), $data, true);
 
 				$this->email->clear();
@@ -227,14 +207,11 @@ 
 				$this->email->subject($this->config->item('site_title', 'ion_auth') . ' - ' . $this->lang->line('email_new_password_subject'));
 				$this->email->message($message);
 
-				if ($this->email->send())
-				{
+				if ($this->email->send()) {
 					$this->set_message('password_change_successful');
 					$this->ion_auth_model->trigger_events(array('post_password_change', 'password_change_successful'));
 					return TRUE;
-				}
-				else
-				{
+				} else {
 					$this->set_error('password_change_unsuccessful');
 					$this->ion_auth_model->trigger_events(array('post_password_change', 'password_change_unsuccessful'));
 					return FALSE;
@@ -254,17 +231,13 @@ 
 	 * @author Michael
 	 * @return bool
 	 */
-	public function forgotten_password_check($code)
-	{
+	public function forgotten_password_check($code) {
 		$profile = $this->where('forgotten_password_code', $code)->users()->row(); //pass the code to profile
 
-		if (!is_object($profile))
-		{
+		if (!is_object($profile)) {
 			$this->set_error('password_change_unsuccessful');
 			return FALSE;
-		}
-		else
-		{
+		} else {
 			if ($this->config->item('forgot_password_expiration', 'ion_auth') > 0) {
 				//Make sure it isn't expired
 				$expiration = $this->config->item('forgot_password_expiration', 'ion_auth');
@@ -298,25 +271,18 @@ 
 
 		$id = $this->ion_auth_model->register($identity, $password, $email, $additional_data, $group_ids);
 
-		if (!$email_activation)
-		{
-			if ($id !== FALSE)
-			{
+		if (!$email_activation) {
+			if ($id !== FALSE) {
 				$this->set_message('account_creation_successful');
 				$this->ion_auth_model->trigger_events(array('post_account_creation', 'post_account_creation_successful'));
 				return $id;
-			}
-			else
-			{
+			} else {
 				$this->set_error('account_creation_unsuccessful');
 				$this->ion_auth_model->trigger_events(array('post_account_creation', 'post_account_creation_unsuccessful'));
 				return FALSE;
 			}
-		}
-		else
-		{
-			if (!$id)
-			{
+		} else {
+			if (!$id) {
 				$this->set_error('account_creation_unsuccessful');
 				return FALSE;
 			}
@@ -328,8 +294,7 @@ 
 			$this->ion_auth_model->clear_messages();
 
 
-			if (!$deactivate)
-			{
+			if (!$deactivate) {
 				$this->set_error('deactivate_unsuccessful');
 				$this->ion_auth_model->trigger_events(array('post_account_creation', 'post_account_creation_unsuccessful'));
 				return FALSE;
@@ -345,14 +310,11 @@ 
 				'email'      => $email,
 				'activation' => $activation_code,
 			);
-			if(!$this->config->item('use_ci_email', 'ion_auth'))
-			{
+			if(!$this->config->item('use_ci_email', 'ion_auth')) {
 				$this->ion_auth_model->trigger_events(array('post_account_creation', 'post_account_creation_successful', 'activation_email_successful'));
 				$this->set_message('activation_email_successful');
 				return $data;
-			}
-			else
-			{
+			} else {
 				$message = $this->load->view($this->config->item('email_templates', 'ion_auth').$this->config->item('email_activate', 'ion_auth'), $data, true);
 
 				$this->email->clear();
@@ -361,8 +323,7 @@ 
 				$this->email->subject($this->config->item('site_title', 'ion_auth') . ' - ' . $this->lang->line('email_activation_subject'));
 				$this->email->message($message);
 
-				if ($this->email->send() == TRUE)
-				{
+				if ($this->email->send() == TRUE) {
 					$this->ion_auth_model->trigger_events(array('post_account_creation', 'post_account_creation_successful', 'activation_email_successful'));
 					$this->set_message('activation_email_successful');
 					return $id;
@@ -382,28 +343,22 @@ 
 	 * @return void
 	 * @author Mathew
 	 **/
-	public function logout()
-	{
+	public function logout() {
 		$this->ion_auth_model->trigger_events('logout');
 
 		$identity = $this->config->item('identity', 'ion_auth');
 
-                if (substr(CI_VERSION, 0, 1) == '2')
-		{
+                if (substr(CI_VERSION, 0, 1) == '2') {
 			$this->session->unset_userdata( array($identity => '', 'id' => '', 'user_id' => '') );
-                }
-                else
-                {
+                } else {
                 	$this->session->unset_userdata( array($identity, 'id', 'user_id') );
                 }
 
 		// delete the remember me cookies if they exist
-		if (get_cookie($this->config->item('identity_cookie_name', 'ion_auth')))
-		{
+		if (get_cookie($this->config->item('identity_cookie_name', 'ion_auth'))) {
 			delete_cookie($this->config->item('identity_cookie_name', 'ion_auth'));
 		}
-		if (get_cookie($this->config->item('remember_cookie_name', 'ion_auth')))
-		{
+		if (get_cookie($this->config->item('remember_cookie_name', 'ion_auth'))) {
 			delete_cookie($this->config->item('remember_cookie_name', 'ion_auth'));
 		}
 
@@ -411,12 +366,9 @@ 
 		$this->session->sess_destroy();
 
 		//Recreate the session
-		if (substr(CI_VERSION, 0, 1) == '2')
-		{
+		if (substr(CI_VERSION, 0, 1) == '2') {
 			$this->session->sess_create();
-		}
-		else
-		{
+		} else {
 			if (version_compare(PHP_VERSION, '7.0.0') >= 0) {
 				session_start();
 			}
@@ -433,15 +385,13 @@ 
 	 * @return bool
 	 * @author Mathew
 	 **/
-	public function logged_in()
-	{
+	public function logged_in() {
 		$this->ion_auth_model->trigger_events('logged_in');
                 
                 $recheck= $this->ion_auth_model->recheck_session();
         
                 //auto-login the user if they are remembered
-                if ( ! $recheck && get_cookie($this->config->item('identity_cookie_name', 'ion_auth')) && get_cookie($this->config->item('remember_cookie_name', 'ion_auth')))
-		{
+                if ( ! $recheck && get_cookie($this->config->item('identity_cookie_name', 'ion_auth')) && get_cookie($this->config->item('remember_cookie_name', 'ion_auth'))) {
 			$recheck = $this->ion_auth_model->login_remembered_user();
 		}
                 
@@ -454,11 +404,9 @@ 
 	 * @return integer
 	 * @author jrmadsen67
 	 **/
-	public function get_user_id()
-	{
+	public function get_user_id() {
 		$user_id = $this->session->userdata('user_id');
-		if (!empty($user_id))
-		{
+		if (!empty($user_id)) {
 			return $user_id;
 		}
 		return null;
@@ -471,8 +419,7 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function is_admin($id=false)
-	{
+	public function is_admin($id=false) {
 		$this->ion_auth_model->trigger_events('is_admin');
 
 		$admin_group = $this->config->item('admin_group', 'ion_auth');
@@ -490,41 +437,33 @@ 
 	 * @return bool
 	 * @author Phil Sturgeon
 	 **/
-	public function in_group($check_group, $id=false, $check_all = false)
-	{
+	public function in_group($check_group, $id=false, $check_all = false) {
 		$this->ion_auth_model->trigger_events('in_group');
 
 		$id || $id = $this->session->userdata('user_id');
 
-		if (!is_array($check_group))
-		{
+		if (!is_array($check_group)) {
 			$check_group = array($check_group);
 		}
 
-		if (isset($this->_cache_user_in_group[$id]))
-		{
+		if (isset($this->_cache_user_in_group[$id])) {
 			$groups_array = $this->_cache_user_in_group[$id];
-		}
-		else
-		{
+		} else {
 			$users_groups = $this->ion_auth_model->get_users_groups($id)->result();
 			$groups_array = array();
-			foreach ($users_groups as $group)
-			{
+			foreach ($users_groups as $group) {
 				$groups_array[$group->id] = $group->name;
 			}
 			$this->_cache_user_in_group[$id] = $groups_array;
 		}
-		foreach ($check_group as $key => $value)
-		{
+		foreach ($check_group as $key => $value) {
 			$groups = (is_string($value)) ? $groups_array : array_keys($groups_array);
 
 			/**
 			 * if !all (default), in_array
 			 * if all, !in_array
 			 */
-			if (in_array($value, $groups) xor $check_all)
-			{
+			if (in_array($value, $groups) xor $check_all) {
 				/**
 				 * if !all (default), true
 				 * if all, false

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -150,7 +150,7 @@ 
 				}
 				else
 				{
-					$message = $this->load->view($this->config->item('email_templates', 'ion_auth').$this->config->item('email_forgot_password', 'ion_auth'), $data, true);
+					$message = $this->load->view($this->config->item('email_templates', 'ion_auth').$this->config->item('email_forgot_password', 'ion_auth'), $data, TRUE);
 					$this->email->clear();
 					$this->email->from($this->config->item('admin_email', 'ion_auth'), $this->config->item('site_title', 'ion_auth'));
 					$this->email->to($user->email);
@@ -219,7 +219,7 @@ 
 			}
 			else
 			{
-				$message = $this->load->view($this->config->item('email_templates', 'ion_auth').$this->config->item('email_forgot_password_complete', 'ion_auth'), $data, true);
+				$message = $this->load->view($this->config->item('email_templates', 'ion_auth').$this->config->item('email_forgot_password_complete', 'ion_auth'), $data, TRUE);
 
 				$this->email->clear();
 				$this->email->from($this->config->item('admin_email', 'ion_auth'), $this->config->item('site_title', 'ion_auth'));
@@ -353,7 +353,7 @@ 
 			}
 			else
 			{
-				$message = $this->load->view($this->config->item('email_templates', 'ion_auth').$this->config->item('email_activate', 'ion_auth'), $data, true);
+				$message = $this->load->view($this->config->item('email_templates', 'ion_auth').$this->config->item('email_activate', 'ion_auth'), $data, TRUE);
 
 				$this->email->clear();
 				$this->email->from($this->config->item('admin_email', 'ion_auth'), $this->config->item('site_title', 'ion_auth'));
@@ -461,7 +461,7 @@ 
 		{
 			return $user_id;
 		}
-		return null;
+		return NULL;
 	}
 
 
@@ -471,7 +471,7 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function is_admin($id=false)
+	public function is_admin($id=FALSE)
 	{
 		$this->ion_auth_model->trigger_events('is_admin');
 
@@ -490,7 +490,7 @@ 
 	 * @return bool
 	 * @author Phil Sturgeon
 	 **/
-	public function in_group($check_group, $id=false, $check_all = false)
+	public function in_group($check_group, $id=FALSE, $check_all = FALSE)
 	{
 		$this->ion_auth_model->trigger_events('in_group');
 

application/third_party/Ion-Auth/models/Ion_auth_model.php

Doc Comments +33 added lines, -18 removed lines

@@ -257,7 +257,7 @@ 
 	/**
 	 * Hashes the password to be stored in the database.
 	 *
-	 * @return void
+	 * @return false|string
 	 * @author Mathew
 	 **/
 	public function hash_password($password, $salt=false, $use_sha1_override=FALSE)
@@ -289,7 +289,7 @@ 
 	 * This function takes a password and validates it
 	 * against an entry in the users table.
 	 *
-	 * @return void
+	 * @return boolean
 	 * @author Mathew
 	 **/
 	public function hash_password_db($id, $password, $use_sha1_override=FALSE)
@@ -350,7 +350,8 @@ 
 	/**
 	 * Generates a random salt value for forgotten passwords or any other keys. Uses SHA1.
 	 *
-	 * @return void
+	 * @param string $password
+	 * @return false|string
 	 * @author Mathew
 	 **/
 	public function hash_code($password)
@@ -363,7 +364,7 @@ 
 	 *
 	 * Salt generation code taken from https://github.com/ircmaxell/password_compat/blob/master/lib/password.php
 	 *
-	 * @return void
+	 * @return string
 	 * @author Anthony Ferrera
 	 **/
 	public function salt()
@@ -446,7 +447,7 @@ 
 	/**
 	 * activate
 	 *
-	 * @return void
+	 * @return boolean
 	 * @author Mathew
 	 **/
 	public function activate($id, $code = false)
@@ -512,7 +513,7 @@ 
 	/**
 	 * Deactivate
 	 *
-	 * @return void
+	 * @return boolean
 	 * @author Mathew
 	 **/
 	public function deactivate($id = NULL)
@@ -1257,6 +1258,9 @@ 
 		return FALSE;
 	}
 
+	/**
+	 * @param integer $limit
+	 */
 	public function limit($limit)
 	{
 		$this->trigger_events('limit');
@@ -1273,6 +1277,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $where
+	 */
 	public function where($where, $value = NULL)
 	{
 		$this->trigger_events('where');
@@ -1309,6 +1316,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $by
+	 */
 	public function order_by($by, $order='desc')
 	{
 		$this->trigger_events('order_by');
@@ -1367,7 +1377,7 @@ 
 	/**
 	 * users
 	 *
-	 * @return object Users
+	 * @return Ion_auth_model Users
 	 * @author Ben Edmunds
 	 **/
 	public function users($groups = NULL)
@@ -1488,7 +1498,7 @@ 
 	/**
 	 * user
 	 *
-	 * @return object
+	 * @return Ion_auth_model
 	 * @author Ben Edmunds
 	 **/
 	public function user($id = NULL)
@@ -1510,7 +1520,7 @@ 
 	/**
 	 * get_users_groups
 	 *
-	 * @return array
+	 * @return CI_DB_result
 	 * @author Ben Edmunds
 	 **/
 	public function get_users_groups($id=FALSE)
@@ -1529,7 +1539,7 @@ 
 	/**
 	 * add_to_group
 	 *
-	 * @return bool
+	 * @return integer
 	 * @author Ben Edmunds
 	 **/
 	public function add_to_group($group_ids, $user_id=false)
@@ -1617,7 +1627,7 @@ 
 	/**
 	 * groups
 	 *
-	 * @return object
+	 * @return Ion_auth_model
 	 * @author Ben Edmunds
 	 **/
 	public function groups()
@@ -1662,7 +1672,7 @@ 
 	/**
 	 * group
 	 *
-	 * @return object
+	 * @return Ion_auth_model
 	 * @author Ben Edmunds
 	 **/
 	public function group($id = NULL)
@@ -2160,7 +2170,7 @@ 
 	 *
 	 * Set the message delimiters
 	 *
-	 * @return void
+	 * @return boolean
 	 * @author Ben Edmunds
 	 **/
 	public function set_message_delimiters($start_delimiter, $end_delimiter)
@@ -2176,7 +2186,7 @@ 
 	 *
 	 * Set the error delimiters
 	 *
-	 * @return void
+	 * @return boolean
 	 * @author Ben Edmunds
 	 **/
 	public function set_error_delimiters($start_delimiter, $end_delimiter)
@@ -2192,6 +2202,7 @@ 
 	 *
 	 * Set a message
 	 *
+	 * @param string $message
 	 * @return void
 	 * @author Ben Edmunds
 	 **/
@@ -2209,7 +2220,7 @@ 
 	 *
 	 * Get the messages
 	 *
-	 * @return void
+	 * @return string
 	 * @author Ben Edmunds
 	 **/
 	public function messages()
@@ -2256,7 +2267,7 @@ 
 	 *
 	 * Clear messages
 	 *
-	 * @return void
+	 * @return boolean
 	 * @author Ben Edmunds
 	 **/
 	public function clear_messages()
@@ -2272,6 +2283,7 @@ 
 	 *
 	 * Set an error message
 	 *
+	 * @param string $error
 	 * @return void
 	 * @author Ben Edmunds
 	 **/
@@ -2287,7 +2299,7 @@ 
 	 *
 	 * Get the error message
 	 *
-	 * @return void
+	 * @return string
 	 * @author Ben Edmunds
 	 **/
 	public function errors()
@@ -2334,7 +2346,7 @@ 
 	 *
 	 * Clear Errors
 	 *
-	 * @return void
+	 * @return boolean
 	 * @author Ben Edmunds
 	 **/
 	public function clear_errors()
@@ -2363,6 +2375,9 @@ 
 		return $filtered_data;
 	}
 
+	/**
+	 * @param string $ip_address
+	 */
 	protected function _prepare_ip($ip_address) {
 		// just return the string IP address now for better compatibility
 		return $ip_address;

Indentation +208 added lines, -208 removed lines

@@ -302,10 +302,10 @@ 
 		$this->trigger_events('extra_where');
 
 		$query = $this->db->select('password, salt')
-		                  ->where('id', $id)
-		                  ->limit(1)
-		                  ->order_by('id', 'desc')
-		                  ->get($this->tables['users']);
+						  ->where('id', $id)
+						  ->limit(1)
+						  ->order_by('id', 'desc')
+						  ->get($this->tables['users']);
 
 		$hash_password_db = $query->row();
 
@@ -372,62 +372,62 @@ 
 		$raw_salt_len = 16;
 
  		$buffer = '';
-        $buffer_valid = false;
+		$buffer_valid = false;
 
-        if (function_exists('random_bytes')) {
+		if (function_exists('random_bytes')) {
 		  $buffer = random_bytes($raw_salt_len);
 		  if ($buffer) {
-		    $buffer_valid = true;
+			$buffer_valid = true;
 		  }
 		}
 
 		if (!$buffer_valid && function_exists('mcrypt_create_iv') && !defined('PHALANGER')) {
-		     $buffer = mcrypt_create_iv($raw_salt_len, MCRYPT_DEV_URANDOM);
-		    if ($buffer) {
-		        $buffer_valid = true;
-		    }
-		}
-
-        if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) {
-            $buffer = openssl_random_pseudo_bytes($raw_salt_len);
-            if ($buffer) {
-                $buffer_valid = true;
-            }
-        }
-
-        if (!$buffer_valid && @is_readable('/dev/urandom')) {
-            $f = fopen('/dev/urandom', 'r');
-            $read = strlen($buffer);
-            while ($read < $raw_salt_len) {
-                $buffer .= fread($f, $raw_salt_len - $read);
-                $read = strlen($buffer);
-            }
-            fclose($f);
-            if ($read >= $raw_salt_len) {
-                $buffer_valid = true;
-            }
-        }
-
-        if (!$buffer_valid || strlen($buffer) < $raw_salt_len) {
-            $bl = strlen($buffer);
-            for ($i = 0; $i < $raw_salt_len; $i++) {
-                if ($i < $bl) {
-                    $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
-                } else {
-                    $buffer .= chr(mt_rand(0, 255));
-                }
-            }
-        }
-
-        $salt = $buffer;
-
-        // encode string with the Base64 variant used by crypt
-        $base64_digits   = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-        $bcrypt64_digits = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-        $base64_string   = base64_encode($salt);
-        $salt = strtr(rtrim($base64_string, '='), $base64_digits, $bcrypt64_digits);
-
-	    $salt = substr($salt, 0, $this->salt_length);
+			 $buffer = mcrypt_create_iv($raw_salt_len, MCRYPT_DEV_URANDOM);
+			if ($buffer) {
+				$buffer_valid = true;
+			}
+		}
+
+		if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) {
+			$buffer = openssl_random_pseudo_bytes($raw_salt_len);
+			if ($buffer) {
+				$buffer_valid = true;
+			}
+		}
+
+		if (!$buffer_valid && @is_readable('/dev/urandom')) {
+			$f = fopen('/dev/urandom', 'r');
+			$read = strlen($buffer);
+			while ($read < $raw_salt_len) {
+				$buffer .= fread($f, $raw_salt_len - $read);
+				$read = strlen($buffer);
+			}
+			fclose($f);
+			if ($read >= $raw_salt_len) {
+				$buffer_valid = true;
+			}
+		}
+
+		if (!$buffer_valid || strlen($buffer) < $raw_salt_len) {
+			$bl = strlen($buffer);
+			for ($i = 0; $i < $raw_salt_len; $i++) {
+				if ($i < $bl) {
+					$buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
+				} else {
+					$buffer .= chr(mt_rand(0, 255));
+				}
+			}
+		}
+
+		$salt = $buffer;
+
+		// encode string with the Base64 variant used by crypt
+		$base64_digits   = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+		$bcrypt64_digits = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+		$base64_string   = base64_encode($salt);
+		$salt = strtr(rtrim($base64_string, '='), $base64_digits, $bcrypt64_digits);
+
+		$salt = substr($salt, 0, $this->salt_length);
 
 
 		return $salt;
@@ -456,11 +456,11 @@ 
 		if ($code !== FALSE)
 		{
 			$query = $this->db->select($this->identity_column)
-			                  ->where('activation_code', $code)
-			                  ->where('id', $id)
-			                  ->limit(1)
-		    				  ->order_by('id', 'desc')
-			                  ->get($this->tables['users']);
+							  ->where('activation_code', $code)
+							  ->where('id', $id)
+							  ->limit(1)
+							  ->order_by('id', 'desc')
+							  ->get($this->tables['users']);
 
 			$result = $query->row();
 
@@ -472,8 +472,8 @@ 
 			}
 
 			$data = array(
-			    'activation_code' => NULL,
-			    'active'          => 1
+				'activation_code' => NULL,
+				'active'          => 1
 			);
 
 			$this->trigger_events('extra_where');
@@ -482,8 +482,8 @@ 
 		else
 		{
 			$data = array(
-			    'activation_code' => NULL,
-			    'active'          => 1
+				'activation_code' => NULL,
+				'active'          => 1
 			);
 
 
@@ -524,18 +524,18 @@ 
 			$this->set_error('deactivate_unsuccessful');
 			return FALSE;
 		}
-                elseif($this->ion_auth->logged_in() && $this->user()->row()->id == $id)
-                {
-                        $this->set_error('deactivate_current_user_unsuccessful');
-                        return FALSE;
-                }
+				elseif($this->ion_auth->logged_in() && $this->user()->row()->id == $id)
+				{
+						$this->set_error('deactivate_current_user_unsuccessful');
+						return FALSE;
+				}
 
 		$activation_code       = sha1(md5(microtime()));
 		$this->activation_code = $activation_code;
 
 		$data = array(
-		    'activation_code' => $activation_code,
-		    'active'          => 0
+			'activation_code' => $activation_code,
+			'active'          => 0
 		);
 
 		$this->trigger_events('extra_where');
@@ -562,8 +562,8 @@ 
 		if ($this->db->count_all_results($this->tables['users']) > 0)
 		{
 			$data = array(
-			    'forgotten_password_code' => NULL,
-			    'forgotten_password_time' => NULL
+				'forgotten_password_code' => NULL,
+				'forgotten_password_time' => NULL
 			);
 
 			$this->db->update($this->tables['users'], $data, array('forgotten_password_code' => $code));
@@ -591,10 +591,10 @@ 
 		$this->trigger_events('extra_where');
 
 		$query = $this->db->select('id, password, salt')
-		                  ->where($this->identity_column, $identity)
-		                  ->limit(1)
-		    			  ->order_by('id', 'desc')
-		                  ->get($this->tables['users']);
+						  ->where($this->identity_column, $identity)
+						  ->limit(1)
+						  ->order_by('id', 'desc')
+						  ->get($this->tables['users']);
 
 		if ($query->num_rows() !== 1)
 		{
@@ -610,10 +610,10 @@ 
 		// store the new password and reset the remember code so all remembered instances have to re-login
 		// also clear the forgotten password code
 		$data = array(
-		    'password' => $new,
-		    'remember_code' => NULL,
-		    'forgotten_password_code' => NULL,
-		    'forgotten_password_time' => NULL,
+			'password' => $new,
+			'remember_code' => NULL,
+			'forgotten_password_code' => NULL,
+			'forgotten_password_time' => NULL,
 		);
 
 		$this->trigger_events('extra_where');
@@ -647,10 +647,10 @@ 
 		$this->trigger_events('extra_where');
 
 		$query = $this->db->select('id, password, salt')
-		                  ->where($this->identity_column, $identity)
-		                  ->limit(1)
-		    			  ->order_by('id', 'desc')
-		                  ->get($this->tables['users']);
+						  ->where($this->identity_column, $identity)
+						  ->limit(1)
+						  ->order_by('id', 'desc')
+						  ->get($this->tables['users']);
 
 		if ($query->num_rows() !== 1)
 		{
@@ -668,8 +668,8 @@ 
 			// store the new password and reset the remember code so all remembered instances have to re-login
 			$hashed_new_password  = $this->hash_password($new, $user->salt);
 			$data = array(
-			    'password' => $hashed_new_password,
-			    'remember_code' => NULL,
+				'password' => $hashed_new_password,
+				'remember_code' => NULL,
 			);
 
 			$this->trigger_events('extra_where');
@@ -714,7 +714,7 @@ 
 										->group_by("id")
 										->order_by("id", "ASC")
 										->limit(1)
-		                ->count_all_results($this->tables['users']) > 0;
+						->count_all_results($this->tables['users']) > 0;
 	}
 
 	/**
@@ -738,7 +738,7 @@ 
 										->group_by("id")
 										->order_by("id", "ASC")
 										->limit(1)
-		                ->count_all_results($this->tables['users']) > 0;
+						->count_all_results($this->tables['users']) > 0;
 	}
 
 	/**
@@ -757,7 +757,7 @@ 
 		}
 
 		return $this->db->where($this->identity_column, $identity)
-		                ->count_all_results($this->tables['users']) > 0;
+						->count_all_results($this->tables['users']) > 0;
 	}
 
 	/**
@@ -805,8 +805,8 @@ 
 		$this->trigger_events('extra_where');
 
 		$update = array(
-		    'forgotten_password_code' => $key,
-		    'forgotten_password_time' => time()
+			'forgotten_password_code' => $key,
+			'forgotten_password_time' => time()
 		);
 
 		$this->db->update($this->tables['users'], $update, array($this->identity_column => $identity));
@@ -855,9 +855,9 @@ 
 			$password = $this->salt();
 
 			$data = array(
-			    'password'                => $this->hash_password($password, $salt),
-			    'forgotten_password_code' => NULL,
-			    'active'                  => 1,
+				'password'                => $this->hash_password($password, $salt),
+				'forgotten_password_code' => NULL,
+				'active'                  => 1,
 			 );
 
 			$this->db->update($this->tables['users'], $data, array('forgotten_password_code' => $code));
@@ -911,13 +911,13 @@ 
 
 		// Users table.
 		$data = array(
-		    $this->identity_column   => $identity,
-		    'username'   => $identity,
-		    'password'   => $password,
-		    'email'      => $email,
-		    'ip_address' => $ip_address,
-		    'created_on' => time(),
-		    'active'     => ($manual_activation === false ? 1 : 0)
+			$this->identity_column   => $identity,
+			'username'   => $identity,
+			'password'   => $password,
+			'email'      => $email,
+			'ip_address' => $ip_address,
+			'created_on' => time(),
+			'active'     => ($manual_activation === false ? 1 : 0)
 		);
 
 		if ($this->store_salt)
@@ -974,10 +974,10 @@ 
 		$this->trigger_events('extra_where');
 
 		$query = $this->db->select($this->identity_column . ', email, id, password, active, last_login')
-		                  ->where($this->identity_column, $identity)
-		                  ->limit(1)
-		    			  ->order_by('id', 'desc')
-		                  ->get($this->tables['users']);
+						  ->where($this->identity_column, $identity)
+						  ->limit(1)
+						  ->order_by('id', 'desc')
+						  ->get($this->tables['users']);
 
 		if($this->is_max_login_attempts_exceeded($identity))
 		{
@@ -1035,50 +1035,50 @@ 
 		return FALSE;
 	}
 
-    /**
-     * recheck_session verifies if the session should be rechecked according to
-     * the configuration item recheck_timer. If it does, then it will check if the user is still active
-     * @return bool
-     */
+	/**
+	 * recheck_session verifies if the session should be rechecked according to
+	 * the configuration item recheck_timer. If it does, then it will check if the user is still active
+	 * @return bool
+	 */
 	public function recheck_session()
-    {
-        $recheck = (null !== $this->config->item('recheck_timer', 'ion_auth')) ? $this->config->item('recheck_timer', 'ion_auth') : 0;
-
-        if($recheck!==0)
-        {
-            $last_login = $this->session->userdata('last_check');
-            if($last_login+$recheck < time())
-            {
-                $query = $this->db->select('id')
-                    ->where(array($this->identity_column=>$this->session->userdata('identity'),'active'=>'1'))
-                    ->limit(1)
-                    ->order_by('id', 'desc')
-                    ->get($this->tables['users']);
-                if ($query->num_rows() === 1)
-                {
-                    $this->session->set_userdata('last_check',time());
-                }
-                else
-                {
-                    $this->trigger_events('logout');
-
-                    $identity = $this->config->item('identity', 'ion_auth');
-
-                    if (substr(CI_VERSION, 0, 1) == '2')
-                    {
-                        $this->session->unset_userdata( array($identity => '', 'id' => '', 'user_id' => '') );
-                    }
-                    else
-                    {
-                        $this->session->unset_userdata( array($identity, 'id', 'user_id') );
-                    }
-                    return false;
-                }
-            }
-        }
-
-        return (bool) $this->session->userdata('identity');
-    }
+	{
+		$recheck = (null !== $this->config->item('recheck_timer', 'ion_auth')) ? $this->config->item('recheck_timer', 'ion_auth') : 0;
+
+		if($recheck!==0)
+		{
+			$last_login = $this->session->userdata('last_check');
+			if($last_login+$recheck < time())
+			{
+				$query = $this->db->select('id')
+					->where(array($this->identity_column=>$this->session->userdata('identity'),'active'=>'1'))
+					->limit(1)
+					->order_by('id', 'desc')
+					->get($this->tables['users']);
+				if ($query->num_rows() === 1)
+				{
+					$this->session->set_userdata('last_check',time());
+				}
+				else
+				{
+					$this->trigger_events('logout');
+
+					$identity = $this->config->item('identity', 'ion_auth');
+
+					if (substr(CI_VERSION, 0, 1) == '2')
+					{
+						$this->session->unset_userdata( array($identity => '', 'id' => '', 'user_id' => '') );
+					}
+					else
+					{
+						$this->session->unset_userdata( array($identity, 'id', 'user_id') );
+					}
+					return false;
+				}
+			}
+		}
+
+		return (bool) $this->session->userdata('identity');
+	}
 
 	/**
 	 * is_max_login_attempts_exceeded
@@ -1115,20 +1115,20 @@ 
 	 */
 	public function get_attempts_num($identity, $ip_address = NULL)
 	{
-        if ($this->config->item('track_login_attempts', 'ion_auth')) {
-            $this->db->select('1', FALSE);
-            $this->db->where('login', $identity);
-            if ($this->config->item('track_login_ip_address', 'ion_auth')) {
-	        if (!isset($ip_address)) {
-	            $ip_address = $this->_prepare_ip($this->input->ip_address());
-	        }
-            	$this->db->where('ip_address', $ip_address);
-            }
-            $this->db->where('time >', time() - $this->config->item('lockout_time', 'ion_auth'), FALSE);
-            $qres = $this->db->get($this->tables['login_attempts']);
-            return $qres->num_rows();
-        }
-        return 0;
+		if ($this->config->item('track_login_attempts', 'ion_auth')) {
+			$this->db->select('1', FALSE);
+			$this->db->where('login', $identity);
+			if ($this->config->item('track_login_ip_address', 'ion_auth')) {
+			if (!isset($ip_address)) {
+				$ip_address = $this->_prepare_ip($this->input->ip_address());
+			}
+				$this->db->where('ip_address', $ip_address);
+			}
+			$this->db->where('time >', time() - $this->config->item('lockout_time', 'ion_auth'), FALSE);
+			$qres = $this->db->get($this->tables['login_attempts']);
+			return $qres->num_rows();
+		}
+		return 0;
 	}
 
 	/**
@@ -1185,11 +1185,11 @@ 
 	}
 
 	/**
-	* Get the IP address of the last time a login attempt occured from given identity
-	*
+	 * Get the IP address of the last time a login attempt occured from given identity
+	 *
 	 * @param string $identity: user's identity
-	* @return string
-	*/
+	 * @return string
+	 */
 	public function get_last_attempt_ip($identity) {
 		if ($this->config->item('track_login_attempts', 'ion_auth') && $this->config->item('track_login_ip_address', 'ion_auth')) {
 			$this->db->select('ip_address');
@@ -1387,9 +1387,9 @@ 
 		{
 			//default selects
 			$this->db->select(array(
-			    $this->tables['users'].'.*',
-			    $this->tables['users'].'.id as id',
-			    $this->tables['users'].'.id as user_id'
+				$this->tables['users'].'.*',
+				$this->tables['users'].'.id as id',
+				$this->tables['users'].'.id as user_id'
 			));
 		}
 
@@ -1407,9 +1407,9 @@ 
 			{
 				$this->db->distinct();
 				$this->db->join(
-				    $this->tables['users_groups'],
-				    $this->tables['users_groups'].'.'.$this->join['users'].'='.$this->tables['users'].'.id',
-				    'inner'
+					$this->tables['users_groups'],
+					$this->tables['users_groups'].'.'.$this->join['users'].'='.$this->tables['users'].'.id',
+					'inner'
 				);
 			}
 
@@ -1521,9 +1521,9 @@ 
 		$id || $id = $this->session->userdata('user_id');
 
 		return $this->db->select($this->tables['users_groups'].'.'.$this->join['groups'].' as id, '.$this->tables['groups'].'.name, '.$this->tables['groups'].'.description')
-		                ->where($this->tables['users_groups'].'.'.$this->join['users'], $id)
-		                ->join($this->tables['groups'], $this->tables['users_groups'].'.'.$this->join['groups'].'='.$this->tables['groups'].'.id')
-		                ->get($this->tables['users_groups']);
+						->where($this->tables['users_groups'].'.'.$this->join['users'], $id)
+						->join($this->tables['groups'], $this->tables['users_groups'].'.'.$this->join['groups'].'='.$this->tables['groups'].'.id')
+						->get($this->tables['users_groups']);
 	}
 
 	/**
@@ -1744,11 +1744,11 @@ 
 	}
 
 	/**
-	* delete_user
-	*
-	* @return bool
-	* @author Phil Sturgeon
-	**/
+	 * delete_user
+	 *
+	 * @return bool
+	 * @author Phil Sturgeon
+	 **/
 	public function delete_user($id)
 	{
 		$this->trigger_events('pre_delete_user');
@@ -1838,12 +1838,12 @@ 
 		$this->trigger_events('pre_set_session');
 
 		$session_data = array(
-		    'identity'             => $user->{$this->identity_column},
-		    $this->identity_column             => $user->{$this->identity_column},
-		    'email'                => $user->email,
-		    'user_id'              => $user->id, //everyone likes to overwrite id so we'll use user_id
-		    'old_last_login'       => $user->last_login,
-		    'last_check'           => time(),
+			'identity'             => $user->{$this->identity_column},
+			$this->identity_column             => $user->{$this->identity_column},
+			'email'                => $user->email,
+			'user_id'              => $user->id, //everyone likes to overwrite id so we'll use user_id
+			'old_last_login'       => $user->last_login,
+			'last_check'           => time(),
 		);
 
 		$this->session->set_userdata($session_data);
@@ -1888,15 +1888,15 @@ 
 			}
 
 			set_cookie(array(
-			    'name'   => $this->config->item('identity_cookie_name', 'ion_auth'),
-			    'value'  => $user->{$this->identity_column},
-			    'expire' => $expire
+				'name'   => $this->config->item('identity_cookie_name', 'ion_auth'),
+				'value'  => $user->{$this->identity_column},
+				'expire' => $expire
 			));
 
 			set_cookie(array(
-			    'name'   => $this->config->item('remember_cookie_name', 'ion_auth'),
-			    'value'  => $salt,
-			    'expire' => $expire
+				'name'   => $this->config->item('remember_cookie_name', 'ion_auth'),
+				'value'  => $salt,
+				'expire' => $expire
 			));
 
 			$this->trigger_events(array('post_remember_user', 'remember_user_successful'));
@@ -1929,12 +1929,12 @@ 
 		// get the user
 		$this->trigger_events('extra_where');
 		$query = $this->db->select($this->identity_column.', id, email, last_login')
-		                  ->where($this->identity_column, urldecode(get_cookie($this->config->item('identity_cookie_name', 'ion_auth'))))
-		                  ->where('remember_code', get_cookie($this->config->item('remember_cookie_name', 'ion_auth')))
+						  ->where($this->identity_column, urldecode(get_cookie($this->config->item('identity_cookie_name', 'ion_auth'))))
+						  ->where('remember_code', get_cookie($this->config->item('remember_cookie_name', 'ion_auth')))
 				  ->where('active',1)
-		                  ->limit(1)
-		    			  ->order_by('id', 'desc')
-		                  ->get($this->tables['users']);
+						  ->limit(1)
+						  ->order_by('id', 'desc')
+						  ->get($this->tables['users']);
 
 		// if the user was found, sign them in
 		if ($query->num_rows() == 1)
@@ -1964,7 +1964,7 @@ 
 	 * create_group
 	 *
 	 * @author aditya menon
-	*/
+	 */
 	public function create_group($group_name = FALSE, $group_description = '', $additional_data = array())
 	{
 		// bail if the group name was not passed
@@ -2028,12 +2028,12 @@ 
 		}
 
 		// restrict change of name of the admin group
-        $group = $this->db->get_where($this->tables['groups'], array('id' => $group_id))->row();
-        if($this->config->item('admin_group', 'ion_auth') === $group->name && $group_name !== $group->name)
-        {
-            $this->set_error('group_name_admin_not_alter');
-            return FALSE;
-        }
+		$group = $this->db->get_where($this->tables['groups'], array('id' => $group_id))->row();
+		if($this->config->item('admin_group', 'ion_auth') === $group->name && $group_name !== $group->name)
+		{
+			$this->set_error('group_name_admin_not_alter');
+			return FALSE;
+		}
 
 
 		// IMPORTANT!! Third parameter was string type $description; this following code is to maintain backward compatibility
@@ -2054,11 +2054,11 @@ 
 	}
 
 	/**
-	* delete_group
-	*
-	* @return bool
-	* @author aditya menon
-	**/
+	 * delete_group
+	 *
+	 * @return bool
+	 * @author aditya menon
+	 **/
 	public function delete_group($group_id = FALSE)
 	{
 		// bail if mandatory param not set

Spacing +180 added lines, -180 removed lines

@@ -1,4 +1,4 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if(!defined('BASEPATH')) exit('No direct script access allowed');
 /**
 * Name:  Ion Auth Model
 *
@@ -171,13 +171,13 @@ 
 		$this->lang->load('ion_auth');
 
 		// initialize db tables data
-		$this->tables  = $this->config->item('tables', 'ion_auth');
+		$this->tables = $this->config->item('tables', 'ion_auth');
 
 		//initialize data
 		$this->identity_column = $this->config->item('identity', 'ion_auth');
 		$this->store_salt      = $this->config->item('store_salt', 'ion_auth');
 		$this->salt_length     = $this->config->item('salt_length', 'ion_auth');
-		$this->join			   = $this->config->item('join', 'ion_auth');
+		$this->join = $this->config->item('join', 'ion_auth');
 
 
 		// initialize hash method options (Bcrypt)
@@ -194,7 +194,7 @@ 
 		$delimiters_source = $this->config->item('delimiters_source', 'ion_auth');
 
 		// load the error delimeters either from the config file or use what's been supplied to form validation
-		if ($delimiters_source === 'form_validation')
+		if($delimiters_source === 'form_validation')
 		{
 			// load in delimiters from form_validation
 			// to keep this simple we'll load the value using reflection since these properties are protected
@@ -225,10 +225,10 @@ 
 		$this->_ion_hooks = new stdClass;
 
 		// load the bcrypt class if needed
-		if ($this->hash_method == 'bcrypt') {
-			if ($this->random_rounds)
+		if($this->hash_method == 'bcrypt') {
+			if($this->random_rounds)
 			{
-				$rand = rand($this->min_rounds,$this->max_rounds);
+				$rand = rand($this->min_rounds, $this->max_rounds);
 				$params = array('rounds' => $rand);
 			}
 			else
@@ -237,7 +237,7 @@ 
 			}
 
 			$params['salt_prefix'] = $this->config->item('salt_prefix', 'ion_auth');
-			$this->load->library('bcrypt',$params);
+			$this->load->library('bcrypt', $params);
 		}
 
 		$this->trigger_events('model_constructor');
@@ -260,28 +260,28 @@ 
 	 * @return void
 	 * @author Mathew
 	 **/
-	public function hash_password($password, $salt=false, $use_sha1_override=FALSE)
+	public function hash_password($password, $salt = false, $use_sha1_override = FALSE)
 	{
-		if (empty($password))
+		if(empty($password))
 		{
 			return FALSE;
 		}
 
 		// bcrypt
-		if ($use_sha1_override === FALSE && $this->hash_method == 'bcrypt')
+		if($use_sha1_override === FALSE && $this->hash_method == 'bcrypt')
 		{
 			return $this->bcrypt->hash($password);
 		}
 
 
-		if ($this->store_salt && $salt)
+		if($this->store_salt && $salt)
 		{
-			return  sha1($password . $salt);
+			return  sha1($password.$salt);
 		}
 		else
 		{
 			$salt = $this->salt();
-			return  $salt . substr(sha1($salt . $password), 0, -$this->salt_length);
+			return  $salt.substr(sha1($salt.$password), 0, -$this->salt_length);
 		}
 	}
 
@@ -292,9 +292,9 @@ 
 	 * @return void
 	 * @author Mathew
 	 **/
-	public function hash_password_db($id, $password, $use_sha1_override=FALSE)
+	public function hash_password_db($id, $password, $use_sha1_override = FALSE)
 	{
-		if (empty($id) || empty($password))
+		if(empty($id) || empty($password))
 		{
 			return FALSE;
 		}
@@ -309,15 +309,15 @@ 
 
 		$hash_password_db = $query->row();
 
-		if ($query->num_rows() !== 1)
+		if($query->num_rows() !== 1)
 		{
 			return FALSE;
 		}
 
 		// bcrypt
-		if ($use_sha1_override === FALSE && $this->hash_method == 'bcrypt')
+		if($use_sha1_override === FALSE && $this->hash_method == 'bcrypt')
 		{
-			if ($this->bcrypt->verify($password,$hash_password_db->password))
+			if($this->bcrypt->verify($password, $hash_password_db->password))
 			{
 				return TRUE;
 			}
@@ -326,15 +326,15 @@ 
 		}
 
 		// sha1
-		if ($this->store_salt)
+		if($this->store_salt)
 		{
-			$db_password = sha1($password . $hash_password_db->salt);
+			$db_password = sha1($password.$hash_password_db->salt);
 		}
 		else
 		{
 			$salt = substr($hash_password_db->password, 0, $this->salt_length);
 
-			$db_password =  $salt . substr(sha1($salt . $password), 0, -$this->salt_length);
+			$db_password = $salt.substr(sha1($salt.$password), 0, -$this->salt_length);
 		}
 
 		if($db_password == $hash_password_db->password)
@@ -374,44 +374,44 @@ 
  		$buffer = '';
         $buffer_valid = false;
 
-        if (function_exists('random_bytes')) {
+        if(function_exists('random_bytes')) {
 		  $buffer = random_bytes($raw_salt_len);
-		  if ($buffer) {
+		  if($buffer) {
 		    $buffer_valid = true;
 		  }
 		}
 
-		if (!$buffer_valid && function_exists('mcrypt_create_iv') && !defined('PHALANGER')) {
+		if(!$buffer_valid && function_exists('mcrypt_create_iv') && !defined('PHALANGER')) {
 		     $buffer = mcrypt_create_iv($raw_salt_len, MCRYPT_DEV_URANDOM);
-		    if ($buffer) {
+		    if($buffer) {
 		        $buffer_valid = true;
 		    }
 		}
 
-        if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) {
+        if(!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) {
             $buffer = openssl_random_pseudo_bytes($raw_salt_len);
-            if ($buffer) {
+            if($buffer) {
                 $buffer_valid = true;
             }
         }
 
-        if (!$buffer_valid && @is_readable('/dev/urandom')) {
+        if(!$buffer_valid && @is_readable('/dev/urandom')) {
             $f = fopen('/dev/urandom', 'r');
             $read = strlen($buffer);
-            while ($read < $raw_salt_len) {
+            while($read < $raw_salt_len) {
                 $buffer .= fread($f, $raw_salt_len - $read);
                 $read = strlen($buffer);
             }
             fclose($f);
-            if ($read >= $raw_salt_len) {
+            if($read >= $raw_salt_len) {
                 $buffer_valid = true;
             }
         }
 
-        if (!$buffer_valid || strlen($buffer) < $raw_salt_len) {
+        if(!$buffer_valid || strlen($buffer) < $raw_salt_len) {
             $bl = strlen($buffer);
-            for ($i = 0; $i < $raw_salt_len; $i++) {
-                if ($i < $bl) {
+            for($i = 0; $i < $raw_salt_len; $i++) {
+                if($i < $bl) {
                     $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
                 } else {
                     $buffer .= chr(mt_rand(0, 255));
@@ -453,7 +453,7 @@ 
 	{
 		$this->trigger_events('pre_activate');
 
-		if ($code !== FALSE)
+		if($code !== FALSE)
 		{
 			$query = $this->db->select($this->identity_column)
 			                  ->where('activation_code', $code)
@@ -464,7 +464,7 @@ 
 
 			$result = $query->row();
 
-			if ($query->num_rows() !== 1)
+			if($query->num_rows() !== 1)
 			{
 				$this->trigger_events(array('post_activate', 'post_activate_unsuccessful'));
 				$this->set_error('activate_unsuccessful');
@@ -493,7 +493,7 @@ 
 
 
 		$return = $this->db->affected_rows() == 1;
-		if ($return)
+		if($return)
 		{
 			$this->trigger_events(array('post_activate', 'post_activate_successful'));
 			$this->set_message('activate_successful');
@@ -519,7 +519,7 @@ 
 	{
 		$this->trigger_events('deactivate');
 
-		if (!isset($id))
+		if(!isset($id))
 		{
 			$this->set_error('deactivate_unsuccessful');
 			return FALSE;
@@ -542,7 +542,7 @@ 
 		$this->db->update($this->tables['users'], $data, array('id' => $id));
 
 		$return = $this->db->affected_rows() == 1;
-		if ($return)
+		if($return)
 			$this->set_message('deactivate_successful');
 		else
 			$this->set_error('deactivate_unsuccessful');
@@ -552,14 +552,14 @@ 
 
 	public function clear_forgotten_password_code($code) {
 
-		if (empty($code))
+		if(empty($code))
 		{
 			return FALSE;
 		}
 
 		$this->db->where('forgotten_password_code', $code);
 
-		if ($this->db->count_all_results($this->tables['users']) > 0)
+		if($this->db->count_all_results($this->tables['users']) > 0)
 		{
 			$data = array(
 			    'forgotten_password_code' => NULL,
@@ -583,7 +583,7 @@ 
 	public function reset_password($identity, $new) {
 		$this->trigger_events('pre_change_password');
 
-		if (!$this->identity_check($identity)) {
+		if(!$this->identity_check($identity)) {
 			$this->trigger_events(array('post_change_password', 'post_change_password_unsuccessful'));
 			return FALSE;
 		}
@@ -596,7 +596,7 @@ 
 		    			  ->order_by('id', 'desc')
 		                  ->get($this->tables['users']);
 
-		if ($query->num_rows() !== 1)
+		if($query->num_rows() !== 1)
 		{
 			$this->trigger_events(array('post_change_password', 'post_change_password_unsuccessful'));
 			$this->set_error('password_change_unsuccessful');
@@ -620,7 +620,7 @@ 
 		$this->db->update($this->tables['users'], $data, array($this->identity_column => $identity));
 
 		$return = $this->db->affected_rows() == 1;
-		if ($return)
+		if($return)
 		{
 			$this->trigger_events(array('post_change_password', 'post_change_password_successful'));
 			$this->set_message('password_change_successful');
@@ -652,7 +652,7 @@ 
 		    			  ->order_by('id', 'desc')
 		                  ->get($this->tables['users']);
 
-		if ($query->num_rows() !== 1)
+		if($query->num_rows() !== 1)
 		{
 			$this->trigger_events(array('post_change_password', 'post_change_password_unsuccessful'));
 			$this->set_error('password_change_unsuccessful');
@@ -663,10 +663,10 @@ 
 
 		$old_password_matches = $this->hash_password_db($user->id, $old);
 
-		if ($old_password_matches === TRUE)
+		if($old_password_matches === TRUE)
 		{
 			// store the new password and reset the remember code so all remembered instances have to re-login
-			$hashed_new_password  = $this->hash_password($new, $user->salt);
+			$hashed_new_password = $this->hash_password($new, $user->salt);
 			$data = array(
 			    'password' => $hashed_new_password,
 			    'remember_code' => NULL,
@@ -675,7 +675,7 @@ 
 			$this->trigger_events('extra_where');
 
 			$successfully_changed_password_in_db = $this->db->update($this->tables['users'], $data, array($this->identity_column => $identity));
-			if ($successfully_changed_password_in_db)
+			if($successfully_changed_password_in_db)
 			{
 				$this->trigger_events(array('post_change_password', 'post_change_password_successful'));
 				$this->set_message('password_change_successful');
@@ -703,7 +703,7 @@ 
 	{
 		$this->trigger_events('username_check');
 
-		if (empty($username))
+		if(empty($username))
 		{
 			return FALSE;
 		}
@@ -727,7 +727,7 @@ 
 	{
 		$this->trigger_events('email_check');
 
-		if (empty($email))
+		if(empty($email))
 		{
 			return FALSE;
 		}
@@ -751,7 +751,7 @@ 
 	{
 		$this->trigger_events('identity_check');
 
-		if (empty($identity))
+		if(empty($identity))
 		{
 			return FALSE;
 		}
@@ -770,7 +770,7 @@ 
 	 **/
 	public function forgotten_password($identity)
 	{
-		if (empty($identity))
+		if(empty($identity))
 		{
 			$this->trigger_events(array('post_forgotten_password', 'post_forgotten_password_unsuccessful'));
 			return FALSE;
@@ -782,18 +782,18 @@ 
 			$activation_code_part = openssl_random_pseudo_bytes(128);
 		}
 
-		for($i=0;$i<1024;$i++) {
-			$activation_code_part = sha1($activation_code_part . mt_rand() . microtime());
+		for($i = 0; $i < 1024; $i++) {
+			$activation_code_part = sha1($activation_code_part.mt_rand().microtime());
 		}
 
 		$key = $this->hash_code($activation_code_part.$identity);
 
 		// If enable query strings is set, then we need to replace any unsafe characters so that the code can still work
-		if ($key != '' && $this->config->item('permitted_uri_chars') != '' && $this->config->item('enable_query_strings') == FALSE)
+		if($key != '' && $this->config->item('permitted_uri_chars') != '' && $this->config->item('enable_query_strings') == FALSE)
 		{
 			// preg_quote() in PHP 5.3 escapes -, so the str_replace() and addition of - to preg_quote() is to maintain backwards
 			// compatibility as many are unaware of how characters in the permitted_uri_chars will be parsed as a regex pattern
-			if ( ! preg_match("|^[".str_replace(array('\\-', '\-'), '-', preg_quote($this->config->item('permitted_uri_chars'), '-'))."]+$|i", $key))
+			if(!preg_match("|^[".str_replace(array('\\-', '\-'), '-', preg_quote($this->config->item('permitted_uri_chars'), '-'))."]+$|i", $key))
 			{
 				$key = preg_replace("/[^".$this->config->item('permitted_uri_chars')."]+/i", "-", $key);
 			}
@@ -813,7 +813,7 @@ 
 
 		$return = $this->db->affected_rows() == 1;
 
-		if ($return)
+		if($return)
 			$this->trigger_events(array('post_forgotten_password', 'post_forgotten_password_successful'));
 		else
 			$this->trigger_events(array('post_forgotten_password', 'post_forgotten_password_unsuccessful'));
@@ -827,11 +827,11 @@ 
 	 * @return string
 	 * @author Mathew
 	 **/
-	public function forgotten_password_complete($code, $salt=FALSE)
+	public function forgotten_password_complete($code, $salt = FALSE)
 	{
 		$this->trigger_events('pre_forgotten_password_complete');
 
-		if (empty($code))
+		if(empty($code))
 		{
 			$this->trigger_events(array('post_forgotten_password_complete', 'post_forgotten_password_complete_unsuccessful'));
 			return FALSE;
@@ -839,12 +839,12 @@ 
 
 		$profile = $this->where('forgotten_password_code', $code)->users()->row(); //pass the code to profile
 
-		if ($profile) {
+		if($profile) {
 
-			if ($this->config->item('forgot_password_expiration', 'ion_auth') > 0) {
+			if($this->config->item('forgot_password_expiration', 'ion_auth') > 0) {
 				//Make sure it isn't expired
 				$expiration = $this->config->item('forgot_password_expiration', 'ion_auth');
-				if (time() - $profile->forgotten_password_time > $expiration) {
+				if(time() - $profile->forgotten_password_time > $expiration) {
 					//it has expired
 					$this->set_error('forgot_password_expired');
 					$this->trigger_events(array('post_forgotten_password_complete', 'post_forgotten_password_complete_unsuccessful'));
@@ -882,20 +882,20 @@ 
 
 		$manual_activation = $this->config->item('manual_activation', 'ion_auth');
 
-		if ($this->identity_check($identity))
+		if($this->identity_check($identity))
 		{
 			$this->set_error('account_creation_duplicate_identity');
 			return FALSE;
 		}
-		elseif ( !$this->config->item('default_group', 'ion_auth') && empty($groups) )
+		elseif(!$this->config->item('default_group', 'ion_auth') && empty($groups))
 		{
 			$this->set_error('account_creation_missing_default_group');
 			return FALSE;
 		}
 
 		// check if the default set in config exists in database
-		$query = $this->db->get_where($this->tables['groups'],array('name' => $this->config->item('default_group', 'ion_auth')),1)->row();
-		if( !isset($query->id) && empty($groups) )
+		$query = $this->db->get_where($this->tables['groups'], array('name' => $this->config->item('default_group', 'ion_auth')), 1)->row();
+		if(!isset($query->id) && empty($groups))
 		{
 			$this->set_error('account_creation_invalid_default_group');
 			return FALSE;
@@ -920,7 +920,7 @@ 
 		    'active'     => ($manual_activation === false ? 1 : 0)
 		);
 
-		if ($this->store_salt)
+		if($this->store_salt)
 		{
 			$data['salt'] = $salt;
 		}
@@ -933,18 +933,18 @@ 
 
 		$this->db->insert($this->tables['users'], $user_data);
 
-		$id = $this->db->insert_id($this->tables['users'] . '_id_seq');
+		$id = $this->db->insert_id($this->tables['users'].'_id_seq');
 
 		// add in groups array if it doesn't exists and stop adding into default group if default group ids are set
-		if( isset($default_group->id) && empty($groups) )
+		if(isset($default_group->id) && empty($groups))
 		{
 			$groups[] = $default_group->id;
 		}
 
-		if (!empty($groups))
+		if(!empty($groups))
 		{
 			// add to groups
-			foreach ($groups as $group)
+			foreach($groups as $group)
 			{
 				$this->add_to_group($group, $id);
 			}
@@ -961,11 +961,11 @@ 
 	 * @return bool
 	 * @author Mathew
 	 **/
-	public function login($identity, $password, $remember=FALSE)
+	public function login($identity, $password, $remember = FALSE)
 	{
 		$this->trigger_events('pre_login');
 
-		if (empty($identity) || empty($password))
+		if(empty($identity) || empty($password))
 		{
 			$this->set_error('login_unsuccessful');
 			return FALSE;
@@ -973,7 +973,7 @@ 
 
 		$this->trigger_events('extra_where');
 
-		$query = $this->db->select($this->identity_column . ', email, id, password, active, last_login')
+		$query = $this->db->select($this->identity_column.', email, id, password, active, last_login')
 		                  ->where($this->identity_column, $identity)
 		                  ->limit(1)
 		    			  ->order_by('id', 'desc')
@@ -990,15 +990,15 @@ 
 			return FALSE;
 		}
 
-		if ($query->num_rows() === 1)
+		if($query->num_rows() === 1)
 		{
 			$user = $query->row();
 
 			$password = $this->hash_password_db($user->id, $password);
 
-			if ($password === TRUE)
+			if($password === TRUE)
 			{
-				if ($user->active == 0)
+				if($user->active == 0)
 				{
 					$this->trigger_events('post_login_unsuccessful');
 					$this->set_error('login_unsuccessful_not_active');
@@ -1012,7 +1012,7 @@ 
 
 				$this->clear_login_attempts($identity);
 
-				if ($remember && $this->config->item('remember_users', 'ion_auth'))
+				if($remember && $this->config->item('remember_users', 'ion_auth'))
 				{
 					$this->remember_user($user->id);
 				}
@@ -1044,19 +1044,19 @@ 
     {
         $recheck = (null !== $this->config->item('recheck_timer', 'ion_auth')) ? $this->config->item('recheck_timer', 'ion_auth') : 0;
 
-        if($recheck!==0)
+        if($recheck !== 0)
         {
             $last_login = $this->session->userdata('last_check');
-            if($last_login+$recheck < time())
+            if($last_login + $recheck < time())
             {
                 $query = $this->db->select('id')
-                    ->where(array($this->identity_column=>$this->session->userdata('identity'),'active'=>'1'))
+                    ->where(array($this->identity_column=>$this->session->userdata('identity'), 'active'=>'1'))
                     ->limit(1)
                     ->order_by('id', 'desc')
                     ->get($this->tables['users']);
-                if ($query->num_rows() === 1)
+                if($query->num_rows() === 1)
                 {
-                    $this->session->set_userdata('last_check',time());
+                    $this->session->set_userdata('last_check', time());
                 }
                 else
                 {
@@ -1064,13 +1064,13 @@ 
 
                     $identity = $this->config->item('identity', 'ion_auth');
 
-                    if (substr(CI_VERSION, 0, 1) == '2')
+                    if(substr(CI_VERSION, 0, 1) == '2')
                     {
-                        $this->session->unset_userdata( array($identity => '', 'id' => '', 'user_id' => '') );
+                        $this->session->unset_userdata(array($identity => '', 'id' => '', 'user_id' => ''));
                     }
                     else
                     {
-                        $this->session->unset_userdata( array($identity, 'id', 'user_id') );
+                        $this->session->unset_userdata(array($identity, 'id', 'user_id'));
                     }
                     return false;
                 }
@@ -1092,9 +1092,9 @@ 
 	 * @return boolean
 	 **/
 	public function is_max_login_attempts_exceeded($identity, $ip_address = NULL) {
-		if ($this->config->item('track_login_attempts', 'ion_auth')) {
+		if($this->config->item('track_login_attempts', 'ion_auth')) {
 			$max_attempts = $this->config->item('maximum_login_attempts', 'ion_auth');
-			if ($max_attempts > 0) {
+			if($max_attempts > 0) {
 				$attempts = $this->get_attempts_num($identity, $ip_address);
 				return $attempts >= $max_attempts;
 			}
@@ -1115,11 +1115,11 @@ 
 	 */
 	public function get_attempts_num($identity, $ip_address = NULL)
 	{
-        if ($this->config->item('track_login_attempts', 'ion_auth')) {
+        if($this->config->item('track_login_attempts', 'ion_auth')) {
             $this->db->select('1', FALSE);
             $this->db->where('login', $identity);
-            if ($this->config->item('track_login_ip_address', 'ion_auth')) {
-	        if (!isset($ip_address)) {
+            if($this->config->item('track_login_ip_address', 'ion_auth')) {
+	        if(!isset($ip_address)) {
 	            $ip_address = $this->_prepare_ip($this->input->ip_address());
 	        }
             	$this->db->where('ip_address', $ip_address);
@@ -1164,11 +1164,11 @@ 
 	 * @return int
 	 */
 	public function get_last_attempt_time($identity, $ip_address = NULL) {
-		if ($this->config->item('track_login_attempts', 'ion_auth')) {
+		if($this->config->item('track_login_attempts', 'ion_auth')) {
 			$this->db->select('time');
 			$this->db->where('login', $identity);
-			if ($this->config->item('track_login_ip_address', 'ion_auth')) {
-				if (!isset($ip_address)) {
+			if($this->config->item('track_login_ip_address', 'ion_auth')) {
+				if(!isset($ip_address)) {
 					$ip_address = $this->_prepare_ip($this->input->ip_address());
 				}
 				$this->db->where('ip_address', $ip_address);
@@ -1191,7 +1191,7 @@ 
 	* @return string
 	*/
 	public function get_last_attempt_ip($identity) {
-		if ($this->config->item('track_login_attempts', 'ion_auth') && $this->config->item('track_login_ip_address', 'ion_auth')) {
+		if($this->config->item('track_login_attempts', 'ion_auth') && $this->config->item('track_login_ip_address', 'ion_auth')) {
 			$this->db->select('ip_address');
 			$this->db->where('login', $identity);
 			$this->db->order_by('id', 'desc');
@@ -1214,9 +1214,9 @@ 
 	 * @param string $identity: user's identity
 	 **/
 	public function increase_login_attempts($identity) {
-		if ($this->config->item('track_login_attempts', 'ion_auth')) {
+		if($this->config->item('track_login_attempts', 'ion_auth')) {
 			$data = array('ip_address' => '', 'login' => $identity, 'time' => time());
-			if ($this->config->item('track_login_ip_address', 'ion_auth')) {
+			if($this->config->item('track_login_ip_address', 'ion_auth')) {
 				$data['ip_address'] = $this->_prepare_ip($this->input->ip_address());
 			}
 			return $this->db->insert($this->tables['login_attempts'], $data);
@@ -1238,13 +1238,13 @@ 
 	 *                            Use get_last_attempt_ip($identity) to retrieve user's last IP
 	 **/
 	public function clear_login_attempts($identity, $old_attempts_expire_period = 86400, $ip_address = NULL) {
-		if ($this->config->item('track_login_attempts', 'ion_auth')) {
+		if($this->config->item('track_login_attempts', 'ion_auth')) {
 			// Make sure $old_attempts_expire_period is at least equals to lockout_time
 			$old_attempts_expire_period = max($old_attempts_expire_period, $this->config->item('lockout_time', 'ion_auth'));
 
 			$this->db->where('login', $identity);
-			if ($this->config->item('track_login_ip_address', 'ion_auth')) {
-				if (!isset($ip_address)) {
+			if($this->config->item('track_login_ip_address', 'ion_auth')) {
+				if(!isset($ip_address)) {
 					$ip_address = $this->_prepare_ip($this->input->ip_address());
 				}
 				$this->db->where('ip_address', $ip_address);
@@ -1277,7 +1277,7 @@ 
 	{
 		$this->trigger_events('where');
 
-		if (!is_array($where))
+		if(!is_array($where))
 		{
 			$where = array($where => $value);
 		}
@@ -1309,7 +1309,7 @@ 
 		return $this;
 	}
 
-	public function order_by($by, $order='desc')
+	public function order_by($by, $order = 'desc')
 	{
 		$this->trigger_events('order_by');
 
@@ -1374,9 +1374,9 @@ 
 	{
 		$this->trigger_events('users');
 
-		if (isset($this->_ion_select) && !empty($this->_ion_select))
+		if(isset($this->_ion_select) && !empty($this->_ion_select))
 		{
-			foreach ($this->_ion_select as $select)
+			foreach($this->_ion_select as $select)
 			{
 				$this->db->select($select);
 			}
@@ -1394,16 +1394,16 @@ 
 		}
 
 		// filter by group id(s) if passed
-		if (isset($groups))
+		if(isset($groups))
 		{
 			// build an array if only one group was passed
-			if (!is_array($groups))
+			if(!is_array($groups))
 			{
 				$groups = Array($groups);
 			}
 
 			// join and then run a where_in against the group ids
-			if (isset($groups) && !empty($groups))
+			if(isset($groups) && !empty($groups))
 			{
 				$this->db->distinct();
 				$this->db->join(
@@ -1425,8 +1425,8 @@ 
 			// if group name was used we do one more join with groups
 			if(!empty($group_names))
 			{
-				$this->db->join($this->tables['groups'], $this->tables['users_groups'] . '.' . $this->join['groups'] . ' = ' . $this->tables['groups'] . '.id', 'inner');
-				$this->db->where_in($this->tables['groups'] . '.name', $group_names);
+				$this->db->join($this->tables['groups'], $this->tables['users_groups'].'.'.$this->join['groups'].' = '.$this->tables['groups'].'.id', 'inner');
+				$this->db->where_in($this->tables['groups'].'.name', $group_names);
 			}
 			if(!empty($group_ids))
 			{
@@ -1437,9 +1437,9 @@ 
 		$this->trigger_events('extra_where');
 
 		// run each where that was passed
-		if (isset($this->_ion_where) && !empty($this->_ion_where))
+		if(isset($this->_ion_where) && !empty($this->_ion_where))
 		{
-			foreach ($this->_ion_where as $where)
+			foreach($this->_ion_where as $where)
 			{
 				$this->db->where($where);
 			}
@@ -1447,9 +1447,9 @@ 
 			$this->_ion_where = array();
 		}
 
-		if (isset($this->_ion_like) && !empty($this->_ion_like))
+		if(isset($this->_ion_like) && !empty($this->_ion_like))
 		{
-			foreach ($this->_ion_like as $like)
+			foreach($this->_ion_like as $like)
 			{
 				$this->db->or_like($like['like'], $like['value'], $like['position']);
 			}
@@ -1457,22 +1457,22 @@ 
 			$this->_ion_like = array();
 		}
 
-		if (isset($this->_ion_limit) && isset($this->_ion_offset))
+		if(isset($this->_ion_limit) && isset($this->_ion_offset))
 		{
 			$this->db->limit($this->_ion_limit, $this->_ion_offset);
 
 			$this->_ion_limit  = NULL;
 			$this->_ion_offset = NULL;
 		}
-		else if (isset($this->_ion_limit))
+		else if(isset($this->_ion_limit))
 		{
 			$this->db->limit($this->_ion_limit);
 
-			$this->_ion_limit  = NULL;
+			$this->_ion_limit = NULL;
 		}
 
 		// set the order
-		if (isset($this->_ion_order_by) && isset($this->_ion_order))
+		if(isset($this->_ion_order_by) && isset($this->_ion_order))
 		{
 			$this->db->order_by($this->_ion_order_by, $this->_ion_order);
 
@@ -1513,7 +1513,7 @@ 
 	 * @return array
 	 * @author Ben Edmunds
 	 **/
-	public function get_users_groups($id=FALSE)
+	public function get_users_groups($id = FALSE)
 	{
 		$this->trigger_events('get_users_group');
 
@@ -1532,7 +1532,7 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function add_to_group($group_ids, $user_id=false)
+	public function add_to_group($group_ids, $user_id = false)
 	{
 		$this->trigger_events('add_to_group');
 
@@ -1547,11 +1547,11 @@ 
 		$return = 0;
 
 		// Then insert each into the database
-		foreach ($group_ids as $group_id)
+		foreach($group_ids as $group_id)
 		{
-			if ($this->db->insert($this->tables['users_groups'], array( $this->join['groups'] => (float)$group_id, $this->join['users'] => (float)$user_id)))
+			if($this->db->insert($this->tables['users_groups'], array($this->join['groups'] => (float) $group_id, $this->join['users'] => (float) $user_id)))
 			{
-				if (isset($this->_cache_groups[$group_id])) {
+				if(isset($this->_cache_groups[$group_id])) {
 					$group_name = $this->_cache_groups[$group_id];
 				}
 				else {
@@ -1575,7 +1575,7 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function remove_from_group($group_ids=false, $user_id=false)
+	public function remove_from_group($group_ids = false, $user_id = false)
 	{
 		$this->trigger_events('remove_from_group');
 
@@ -1586,7 +1586,7 @@ 
 		}
 
 		// if group id(s) are passed remove user from the group(s)
-		if( ! empty($group_ids))
+		if(!empty($group_ids))
 		{
 			if(!is_array($group_ids))
 			{
@@ -1595,8 +1595,8 @@ 
 
 			foreach($group_ids as $group_id)
 			{
-				$this->db->delete($this->tables['users_groups'], array($this->join['groups'] => (float)$group_id, $this->join['users'] => (float)$user_id));
-				if (isset($this->_cache_user_in_group[$user_id]) && isset($this->_cache_user_in_group[$user_id][$group_id]))
+				$this->db->delete($this->tables['users_groups'], array($this->join['groups'] => (float) $group_id, $this->join['users'] => (float) $user_id));
+				if(isset($this->_cache_user_in_group[$user_id]) && isset($this->_cache_user_in_group[$user_id][$group_id]))
 				{
 					unset($this->_cache_user_in_group[$user_id][$group_id]);
 				}
@@ -1607,7 +1607,7 @@ 
 		// otherwise remove user from all groups
 		else
 		{
-			if ($return = $this->db->delete($this->tables['users_groups'], array($this->join['users'] => (float)$user_id))) {
+			if($return = $this->db->delete($this->tables['users_groups'], array($this->join['users'] => (float) $user_id))) {
 				$this->_cache_user_in_group[$user_id] = array();
 			}
 		}
@@ -1625,31 +1625,31 @@ 
 		$this->trigger_events('groups');
 
 		// run each where that was passed
-		if (isset($this->_ion_where) && !empty($this->_ion_where))
+		if(isset($this->_ion_where) && !empty($this->_ion_where))
 		{
-			foreach ($this->_ion_where as $where)
+			foreach($this->_ion_where as $where)
 			{
 				$this->db->where($where);
 			}
 			$this->_ion_where = array();
 		}
 
-		if (isset($this->_ion_limit) && isset($this->_ion_offset))
+		if(isset($this->_ion_limit) && isset($this->_ion_offset))
 		{
 			$this->db->limit($this->_ion_limit, $this->_ion_offset);
 
 			$this->_ion_limit  = NULL;
 			$this->_ion_offset = NULL;
 		}
-		else if (isset($this->_ion_limit))
+		else if(isset($this->_ion_limit))
 		{
 			$this->db->limit($this->_ion_limit);
 
-			$this->_ion_limit  = NULL;
+			$this->_ion_limit = NULL;
 		}
 
 		// set the order
-		if (isset($this->_ion_order_by) && isset($this->_ion_order))
+		if(isset($this->_ion_order_by) && isset($this->_ion_order))
 		{
 			$this->db->order_by($this->_ion_order_by, $this->_ion_order);
 		}
@@ -1669,7 +1669,7 @@ 
 	{
 		$this->trigger_events('group');
 
-		if (isset($id))
+		if(isset($id))
 		{
 			$this->where($this->tables['groups'].'.id', $id);
 		}
@@ -1694,7 +1694,7 @@ 
 
 		$this->db->trans_begin();
 
-		if (array_key_exists($this->identity_column, $data) && $this->identity_check($data[$this->identity_column]) && $user->{$this->identity_column} !== $data[$this->identity_column])
+		if(array_key_exists($this->identity_column, $data) && $this->identity_check($data[$this->identity_column]) && $user->{$this->identity_column} !== $data[$this->identity_column])
 		{
 			$this->db->trans_rollback();
 			$this->set_error('account_creation_duplicate_identity');
@@ -1708,11 +1708,11 @@ 
 		// Filter the data passed
 		$data = $this->_filter_data($this->tables['users'], $data);
 
-		if (array_key_exists($this->identity_column, $data) || array_key_exists('password', $data) || array_key_exists('email', $data))
+		if(array_key_exists($this->identity_column, $data) || array_key_exists('password', $data) || array_key_exists('email', $data))
 		{
-			if (array_key_exists('password', $data))
+			if(array_key_exists('password', $data))
 			{
-				if( ! empty($data['password']))
+				if(!empty($data['password']))
 				{
 					$data['password'] = $this->hash_password($data['password'], $user->salt);
 				}
@@ -1727,7 +1727,7 @@ 
 		$this->trigger_events('extra_where');
 		$this->db->update($this->tables['users'], $data, array('id' => $user->id));
 
-		if ($this->db->trans_status() === FALSE)
+		if($this->db->trans_status() === FALSE)
 		{
 			$this->db->trans_rollback();
 
@@ -1762,7 +1762,7 @@ 
 		$this->db->delete($this->tables['users'], array('id' => $id));
 
 
-		if ($this->db->trans_status() === FALSE)
+		if($this->db->trans_status() === FALSE)
 		{
 			$this->db->trans_rollback();
 			$this->trigger_events(array('post_delete_user', 'post_delete_user_unsuccessful'));
@@ -1809,7 +1809,7 @@ 
 		// if the user_expire is set to zero we'll set the expiration two years from now.
 		if($this->config->item('user_expire', 'ion_auth') === 0)
 		{
-			$expire = (60*60*24*365*2);
+			$expire = (60 * 60 * 24 * 365 * 2);
 		}
 		// otherwise use what is set
 		else
@@ -1863,7 +1863,7 @@ 
 	{
 		$this->trigger_events('pre_remember_user');
 
-		if (!$id)
+		if(!$id)
 		{
 			return FALSE;
 		}
@@ -1874,12 +1874,12 @@ 
 
 		$this->db->update($this->tables['users'], array('remember_code' => $salt), array('id' => $id));
 
-		if ($this->db->affected_rows() > -1)
+		if($this->db->affected_rows() > -1)
 		{
 			// if the user_expire is set to zero we'll set the expiration two years from now.
 			if($this->config->item('user_expire', 'ion_auth') === 0)
 			{
-				$expire = (60*60*24*365*2);
+				$expire = (60 * 60 * 24 * 365 * 2);
 			}
 			// otherwise use what is set
 			else
@@ -1918,7 +1918,7 @@ 
 		$this->trigger_events('pre_login_remembered_user');
 
 		// check for valid data
-		if (!get_cookie($this->config->item('identity_cookie_name', 'ion_auth'))
+		if(!get_cookie($this->config->item('identity_cookie_name', 'ion_auth'))
 			|| !get_cookie($this->config->item('remember_cookie_name', 'ion_auth'))
 			|| !$this->identity_check(get_cookie($this->config->item('identity_cookie_name', 'ion_auth'))))
 		{
@@ -1931,13 +1931,13 @@ 
 		$query = $this->db->select($this->identity_column.', id, email, last_login')
 		                  ->where($this->identity_column, urldecode(get_cookie($this->config->item('identity_cookie_name', 'ion_auth'))))
 		                  ->where('remember_code', get_cookie($this->config->item('remember_cookie_name', 'ion_auth')))
-				  ->where('active',1)
+				  ->where('active', 1)
 		                  ->limit(1)
 		    			  ->order_by('id', 'desc')
 		                  ->get($this->tables['users']);
 
 		// if the user was found, sign them in
-		if ($query->num_rows() == 1)
+		if($query->num_rows() == 1)
 		{
 			$user = $query->row();
 
@@ -1946,7 +1946,7 @@ 
 			$this->set_session($user);
 
 			// extend the users cookies if the option is enabled
-			if ($this->config->item('user_extend_on_login', 'ion_auth'))
+			if($this->config->item('user_extend_on_login', 'ion_auth'))
 			{
 				$this->remember_user($user->id);
 			}
@@ -1982,17 +1982,17 @@ 
 			return FALSE;
 		}
 
-		$data = array('name'=>$group_name,'description'=>$group_description);
+		$data = array('name'=>$group_name, 'description'=>$group_description);
 
 		// filter out any data passed that doesnt have a matching column in the groups table
 		// and merge the set group data and the additional data
-		if (!empty($additional_data)) $data = array_merge($this->_filter_data($this->tables['groups'], $additional_data), $data);
+		if(!empty($additional_data)) $data = array_merge($this->_filter_data($this->tables['groups'], $additional_data), $data);
 
 		$this->trigger_events('extra_group_set');
 
 		// insert the new group
 		$this->db->insert($this->tables['groups'], $data);
-		$group_id = $this->db->insert_id($this->tables['groups'] . '_id_seq');
+		$group_id = $this->db->insert_id($this->tables['groups'].'_id_seq');
 
 		// report success
 		$this->set_message('group_creation_successful');
@@ -2008,11 +2008,11 @@ 
 	 **/
 	public function update_group($group_id = FALSE, $group_name = FALSE, $additional_data = array())
 	{
-		if (empty($group_id)) return FALSE;
+		if(empty($group_id)) return FALSE;
 
 		$data = array();
 
-		if (!empty($group_name))
+		if(!empty($group_name))
 		{
 			// we are changing the name, so do some checks
 
@@ -2038,12 +2038,12 @@ 
 
 		// IMPORTANT!! Third parameter was string type $description; this following code is to maintain backward compatibility
 		// New projects should work with 3rd param as array
-		if (is_string($additional_data)) $additional_data = array('description' => $additional_data);
+		if(is_string($additional_data)) $additional_data = array('description' => $additional_data);
 
 
 		// filter out any data passed that doesnt have a matching column in the groups table
 		// and merge the set group data and the additional data
-		if (!empty($additional_data)) $data = array_merge($this->_filter_data($this->tables['groups'], $additional_data), $data);
+		if(!empty($additional_data)) $data = array_merge($this->_filter_data($this->tables['groups'], $additional_data), $data);
 
 
 		$this->db->update($this->tables['groups'], $data, array('id' => $group_id));
@@ -2083,7 +2083,7 @@ 
 		// remove the group itself
 		$this->db->delete($this->tables['groups'], array('id' => $group_id));
 
-		if ($this->db->trans_status() === FALSE)
+		if($this->db->trans_status() === FALSE)
 		{
 			$this->db->trans_rollback();
 			$this->trigger_events(array('post_delete_group', 'post_delete_group_unsuccessful'));
@@ -2108,7 +2108,7 @@ 
 
 	public function remove_hook($event, $name)
 	{
-		if (isset($this->_ion_hooks->{$event}[$name]))
+		if(isset($this->_ion_hooks->{$event}[$name]))
 		{
 			unset($this->_ion_hooks->{$event}[$name]);
 		}
@@ -2116,7 +2116,7 @@ 
 
 	public function remove_hooks($event)
 	{
-		if (isset($this->_ion_hooks->$event))
+		if(isset($this->_ion_hooks->$event))
 		{
 			unset($this->_ion_hooks->$event);
 		}
@@ -2124,7 +2124,7 @@ 
 
 	protected function _call_hook($event, $name)
 	{
-		if (isset($this->_ion_hooks->{$event}[$name]) && method_exists($this->_ion_hooks->{$event}[$name]->class, $this->_ion_hooks->{$event}[$name]->method))
+		if(isset($this->_ion_hooks->{$event}[$name]) && method_exists($this->_ion_hooks->{$event}[$name]->class, $this->_ion_hooks->{$event}[$name]->method))
 		{
 			$hook = $this->_ion_hooks->{$event}[$name];
 
@@ -2136,18 +2136,18 @@ 
 
 	public function trigger_events($events)
 	{
-		if (is_array($events) && !empty($events))
+		if(is_array($events) && !empty($events))
 		{
-			foreach ($events as $event)
+			foreach($events as $event)
 			{
 				$this->trigger_events($event);
 			}
 		}
 		else
 		{
-			if (isset($this->_ion_hooks->$events) && !empty($this->_ion_hooks->$events))
+			if(isset($this->_ion_hooks->$events) && !empty($this->_ion_hooks->$events))
 			{
-				foreach ($this->_ion_hooks->$events as $name => $hook)
+				foreach($this->_ion_hooks->$events as $name => $hook)
 				{
 					$this->_call_hook($events, $name);
 				}
@@ -2215,10 +2215,10 @@ 
 	public function messages()
 	{
 		$_output = '';
-		foreach ($this->messages as $message)
+		foreach($this->messages as $message)
 		{
-			$messageLang = $this->lang->line($message) ? $this->lang->line($message) : '##' . $message . '##';
-			$_output .= $this->message_start_delimiter . $messageLang . $this->message_end_delimiter;
+			$messageLang = $this->lang->line($message) ? $this->lang->line($message) : '##'.$message.'##';
+			$_output .= $this->message_start_delimiter.$messageLang.$this->message_end_delimiter;
 		}
 
 		return $_output;
@@ -2234,13 +2234,13 @@ 
 	 **/
 	public function messages_array($langify = TRUE)
 	{
-		if ($langify)
+		if($langify)
 		{
 			$_output = array();
-			foreach ($this->messages as $message)
+			foreach($this->messages as $message)
 			{
-				$messageLang = $this->lang->line($message) ? $this->lang->line($message) : '##' . $message . '##';
-				$_output[] = $this->message_start_delimiter . $messageLang . $this->message_end_delimiter;
+				$messageLang = $this->lang->line($message) ? $this->lang->line($message) : '##'.$message.'##';
+				$_output[] = $this->message_start_delimiter.$messageLang.$this->message_end_delimiter;
 			}
 			return $_output;
 		}
@@ -2293,10 +2293,10 @@ 
 	public function errors()
 	{
 		$_output = '';
-		foreach ($this->errors as $error)
+		foreach($this->errors as $error)
 		{
-			$errorLang = $this->lang->line($error) ? $this->lang->line($error) : '##' . $error . '##';
-			$_output .= $this->error_start_delimiter . $errorLang . $this->error_end_delimiter;
+			$errorLang = $this->lang->line($error) ? $this->lang->line($error) : '##'.$error.'##';
+			$_output .= $this->error_start_delimiter.$errorLang.$this->error_end_delimiter;
 		}
 
 		return $_output;
@@ -2312,13 +2312,13 @@ 
 	 **/
 	public function errors_array($langify = TRUE)
 	{
-		if ($langify)
+		if($langify)
 		{
 			$_output = array();
-			foreach ($this->errors as $error)
+			foreach($this->errors as $error)
 			{
-				$errorLang = $this->lang->line($error) ? $this->lang->line($error) : '##' . $error . '##';
-				$_output[] = $this->error_start_delimiter . $errorLang . $this->error_end_delimiter;
+				$errorLang = $this->lang->line($error) ? $this->lang->line($error) : '##'.$error.'##';
+				$_output[] = $this->error_start_delimiter.$errorLang.$this->error_end_delimiter;
 			}
 			return $_output;
 		}
@@ -2351,11 +2351,11 @@ 
 		$filtered_data = array();
 		$columns = $this->db->list_fields($table);
 
-		if (is_array($data))
+		if(is_array($data))
 		{
-			foreach ($columns as $column)
+			foreach($columns as $column)
 			{
-				if (array_key_exists($column, $data))
+				if(array_key_exists($column, $data))
 					$filtered_data[$column] = $data[$column];
 			}
 		}

Braces +228 added lines, -427 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
 * Name:  Ion Auth Model
 *
@@ -19,8 +21,7 @@ 
 *
 */
 
-class Ion_auth_model extends CI_Model
-{
+class Ion_auth_model extends CI_Model {
 	/**
 	 * Holds an array of tables used
 	 *
@@ -161,8 +162,7 @@ 
 	 **/
 	protected $_cache_groups = array();
 
-	public function __construct()
-	{
+	public function __construct() {
 		parent::__construct();
 		$this->load->database();
 		$this->config->load('ion_auth', TRUE);
@@ -194,8 +194,7 @@ 
 		$delimiters_source = $this->config->item('delimiters_source', 'ion_auth');
 
 		// load the error delimeters either from the config file or use what's been supplied to form validation
-		if ($delimiters_source === 'form_validation')
-		{
+		if ($delimiters_source === 'form_validation') {
 			// load in delimiters from form_validation
 			// to keep this simple we'll load the value using reflection since these properties are protected
 			$this->load->library('form_validation');
@@ -210,9 +209,7 @@ 
 			$error_suffix->setAccessible(TRUE);
 			$this->error_end_delimiter = $error_suffix->getValue($this->form_validation);
 			$this->message_end_delimiter = $this->error_end_delimiter;
-		}
-		else
-		{
+		} else {
 			// use delimiters from config
 			$this->message_start_delimiter = $this->config->item('message_start_delimiter', 'ion_auth');
 			$this->message_end_delimiter   = $this->config->item('message_end_delimiter', 'ion_auth');
@@ -226,13 +223,10 @@ 
 
 		// load the bcrypt class if needed
 		if ($this->hash_method == 'bcrypt') {
-			if ($this->random_rounds)
-			{
+			if ($this->random_rounds) {
 				$rand = rand($this->min_rounds,$this->max_rounds);
 				$params = array('rounds' => $rand);
-			}
-			else
-			{
+			} else {
 				$params = array('rounds' => $this->default_rounds);
 			}
 
@@ -260,26 +254,20 @@ 
 	 * @return void
 	 * @author Mathew
 	 **/
-	public function hash_password($password, $salt=false, $use_sha1_override=FALSE)
-	{
-		if (empty($password))
-		{
+	public function hash_password($password, $salt=false, $use_sha1_override=FALSE) {
+		if (empty($password)) {
 			return FALSE;
 		}
 
 		// bcrypt
-		if ($use_sha1_override === FALSE && $this->hash_method == 'bcrypt')
-		{
+		if ($use_sha1_override === FALSE && $this->hash_method == 'bcrypt') {
 			return $this->bcrypt->hash($password);
 		}
 
 
-		if ($this->store_salt && $salt)
-		{
+		if ($this->store_salt && $salt) {
 			return  sha1($password . $salt);
-		}
-		else
-		{
+		} else {
 			$salt = $this->salt();
 			return  $salt . substr(sha1($salt . $password), 0, -$this->salt_length);
 		}
@@ -292,10 +280,8 @@ 
 	 * @return void
 	 * @author Mathew
 	 **/
-	public function hash_password_db($id, $password, $use_sha1_override=FALSE)
-	{
-		if (empty($id) || empty($password))
-		{
+	public function hash_password_db($id, $password, $use_sha1_override=FALSE) {
+		if (empty($id) || empty($password)) {
 			return FALSE;
 		}
 
@@ -309,16 +295,13 @@ 
 
 		$hash_password_db = $query->row();
 
-		if ($query->num_rows() !== 1)
-		{
+		if ($query->num_rows() !== 1) {
 			return FALSE;
 		}
 
 		// bcrypt
-		if ($use_sha1_override === FALSE && $this->hash_method == 'bcrypt')
-		{
-			if ($this->bcrypt->verify($password,$hash_password_db->password))
-			{
+		if ($use_sha1_override === FALSE && $this->hash_method == 'bcrypt') {
+			if ($this->bcrypt->verify($password,$hash_password_db->password)) {
 				return TRUE;
 			}
 
@@ -326,23 +309,17 @@ 
 		}
 
 		// sha1
-		if ($this->store_salt)
-		{
+		if ($this->store_salt) {
 			$db_password = sha1($password . $hash_password_db->salt);
-		}
-		else
-		{
+		} else {
 			$salt = substr($hash_password_db->password, 0, $this->salt_length);
 
 			$db_password =  $salt . substr(sha1($salt . $password), 0, -$this->salt_length);
 		}
 
-		if($db_password == $hash_password_db->password)
-		{
+		if($db_password == $hash_password_db->password) {
 			return TRUE;
-		}
-		else
-		{
+		} else {
 			return FALSE;
 		}
 	}
@@ -353,8 +330,7 @@ 
 	 * @return void
 	 * @author Mathew
 	 **/
-	public function hash_code($password)
-	{
+	public function hash_code($password) {
 		return $this->hash_password($password, FALSE, TRUE);
 	}
 
@@ -366,8 +342,7 @@ 
 	 * @return void
 	 * @author Anthony Ferrera
 	 **/
-	public function salt()
-	{
+	public function salt() {
 
 		$raw_salt_len = 16;
 
@@ -449,12 +424,10 @@ 
 	 * @return void
 	 * @author Mathew
 	 **/
-	public function activate($id, $code = false)
-	{
+	public function activate($id, $code = false) {
 		$this->trigger_events('pre_activate');
 
-		if ($code !== FALSE)
-		{
+		if ($code !== FALSE) {
 			$query = $this->db->select($this->identity_column)
 			                  ->where('activation_code', $code)
 			                  ->where('id', $id)
@@ -464,8 +437,7 @@ 
 
 			$result = $query->row();
 
-			if ($query->num_rows() !== 1)
-			{
+			if ($query->num_rows() !== 1) {
 				$this->trigger_events(array('post_activate', 'post_activate_unsuccessful'));
 				$this->set_error('activate_unsuccessful');
 				return FALSE;
@@ -478,9 +450,7 @@ 
 
 			$this->trigger_events('extra_where');
 			$this->db->update($this->tables['users'], $data, array('id' => $id));
-		}
-		else
-		{
+		} else {
 			$data = array(
 			    'activation_code' => NULL,
 			    'active'          => 1
@@ -493,13 +463,10 @@ 
 
 
 		$return = $this->db->affected_rows() == 1;
-		if ($return)
-		{
+		if ($return) {
 			$this->trigger_events(array('post_activate', 'post_activate_successful'));
 			$this->set_message('activate_successful');
-		}
-		else
-		{
+		} else {
 			$this->trigger_events(array('post_activate', 'post_activate_unsuccessful'));
 			$this->set_error('activate_unsuccessful');
 		}
@@ -515,17 +482,13 @@ 
 	 * @return void
 	 * @author Mathew
 	 **/
-	public function deactivate($id = NULL)
-	{
+	public function deactivate($id = NULL) {
 		$this->trigger_events('deactivate');
 
-		if (!isset($id))
-		{
+		if (!isset($id)) {
 			$this->set_error('deactivate_unsuccessful');
 			return FALSE;
-		}
-                elseif($this->ion_auth->logged_in() && $this->user()->row()->id == $id)
-                {
+		} elseif($this->ion_auth->logged_in() && $this->user()->row()->id == $id) {
                         $this->set_error('deactivate_current_user_unsuccessful');
                         return FALSE;
                 }
@@ -542,25 +505,24 @@ 
 		$this->db->update($this->tables['users'], $data, array('id' => $id));
 
 		$return = $this->db->affected_rows() == 1;
-		if ($return)
-			$this->set_message('deactivate_successful');
-		else
-			$this->set_error('deactivate_unsuccessful');
+		if ($return) {
+					$this->set_message('deactivate_successful');
+		} else {
+					$this->set_error('deactivate_unsuccessful');
+		}
 
 		return $return;
 	}
 
 	public function clear_forgotten_password_code($code) {
 
-		if (empty($code))
-		{
+		if (empty($code)) {
 			return FALSE;
 		}
 
 		$this->db->where('forgotten_password_code', $code);
 
-		if ($this->db->count_all_results($this->tables['users']) > 0)
-		{
+		if ($this->db->count_all_results($this->tables['users']) > 0) {
 			$data = array(
 			    'forgotten_password_code' => NULL,
 			    'forgotten_password_time' => NULL
@@ -596,8 +558,7 @@ 
 		    			  ->order_by('id', 'desc')
 		                  ->get($this->tables['users']);
 
-		if ($query->num_rows() !== 1)
-		{
+		if ($query->num_rows() !== 1) {
 			$this->trigger_events(array('post_change_password', 'post_change_password_unsuccessful'));
 			$this->set_error('password_change_unsuccessful');
 			return FALSE;
@@ -620,13 +581,10 @@ 
 		$this->db->update($this->tables['users'], $data, array($this->identity_column => $identity));
 
 		$return = $this->db->affected_rows() == 1;
-		if ($return)
-		{
+		if ($return) {
 			$this->trigger_events(array('post_change_password', 'post_change_password_successful'));
 			$this->set_message('password_change_successful');
-		}
-		else
-		{
+		} else {
 			$this->trigger_events(array('post_change_password', 'post_change_password_unsuccessful'));
 			$this->set_error('password_change_unsuccessful');
 		}
@@ -640,8 +598,7 @@ 
 	 * @return bool
 	 * @author Mathew
 	 **/
-	public function change_password($identity, $old, $new)
-	{
+	public function change_password($identity, $old, $new) {
 		$this->trigger_events('pre_change_password');
 
 		$this->trigger_events('extra_where');
@@ -652,8 +609,7 @@ 
 		    			  ->order_by('id', 'desc')
 		                  ->get($this->tables['users']);
 
-		if ($query->num_rows() !== 1)
-		{
+		if ($query->num_rows() !== 1) {
 			$this->trigger_events(array('post_change_password', 'post_change_password_unsuccessful'));
 			$this->set_error('password_change_unsuccessful');
 			return FALSE;
@@ -663,8 +619,7 @@ 
 
 		$old_password_matches = $this->hash_password_db($user->id, $old);
 
-		if ($old_password_matches === TRUE)
-		{
+		if ($old_password_matches === TRUE) {
 			// store the new password and reset the remember code so all remembered instances have to re-login
 			$hashed_new_password  = $this->hash_password($new, $user->salt);
 			$data = array(
@@ -675,13 +630,10 @@ 
 			$this->trigger_events('extra_where');
 
 			$successfully_changed_password_in_db = $this->db->update($this->tables['users'], $data, array($this->identity_column => $identity));
-			if ($successfully_changed_password_in_db)
-			{
+			if ($successfully_changed_password_in_db) {
 				$this->trigger_events(array('post_change_password', 'post_change_password_successful'));
 				$this->set_message('password_change_successful');
-			}
-			else
-			{
+			} else {
 				$this->trigger_events(array('post_change_password', 'post_change_password_unsuccessful'));
 				$this->set_error('password_change_unsuccessful');
 			}
@@ -699,12 +651,10 @@ 
 	 * @return bool
 	 * @author Mathew
 	 **/
-	public function username_check($username = '')
-	{
+	public function username_check($username = '') {
 		$this->trigger_events('username_check');
 
-		if (empty($username))
-		{
+		if (empty($username)) {
 			return FALSE;
 		}
 
@@ -723,12 +673,10 @@ 
 	 * @return bool
 	 * @author Mathew
 	 **/
-	public function email_check($email = '')
-	{
+	public function email_check($email = '') {
 		$this->trigger_events('email_check');
 
-		if (empty($email))
-		{
+		if (empty($email)) {
 			return FALSE;
 		}
 
@@ -747,12 +695,10 @@ 
 	 * @return bool
 	 * @author Mathew
 	 **/
-	public function identity_check($identity = '')
-	{
+	public function identity_check($identity = '') {
 		$this->trigger_events('identity_check');
 
-		if (empty($identity))
-		{
+		if (empty($identity)) {
 			return FALSE;
 		}
 
@@ -768,10 +714,8 @@ 
 	 * @updated Ryan
 	 * @updated 52aa456eef8b60ad6754b31fbdcc77bb
 	 **/
-	public function forgotten_password($identity)
-	{
-		if (empty($identity))
-		{
+	public function forgotten_password($identity) {
+		if (empty($identity)) {
 			$this->trigger_events(array('post_forgotten_password', 'post_forgotten_password_unsuccessful'));
 			return FALSE;
 		}
@@ -789,12 +733,10 @@ 
 		$key = $this->hash_code($activation_code_part.$identity);
 
 		// If enable query strings is set, then we need to replace any unsafe characters so that the code can still work
-		if ($key != '' && $this->config->item('permitted_uri_chars') != '' && $this->config->item('enable_query_strings') == FALSE)
-		{
+		if ($key != '' && $this->config->item('permitted_uri_chars') != '' && $this->config->item('enable_query_strings') == FALSE) {
 			// preg_quote() in PHP 5.3 escapes -, so the str_replace() and addition of - to preg_quote() is to maintain backwards
 			// compatibility as many are unaware of how characters in the permitted_uri_chars will be parsed as a regex pattern
-			if ( ! preg_match("|^[".str_replace(array('\\-', '\-'), '-', preg_quote($this->config->item('permitted_uri_chars'), '-'))."]+$|i", $key))
-			{
+			if ( ! preg_match("|^[".str_replace(array('\\-', '\-'), '-', preg_quote($this->config->item('permitted_uri_chars'), '-'))."]+$|i", $key)) {
 				$key = preg_replace("/[^".$this->config->item('permitted_uri_chars')."]+/i", "-", $key);
 			}
 		}
@@ -813,10 +755,11 @@ 
 
 		$return = $this->db->affected_rows() == 1;
 
-		if ($return)
-			$this->trigger_events(array('post_forgotten_password', 'post_forgotten_password_successful'));
-		else
-			$this->trigger_events(array('post_forgotten_password', 'post_forgotten_password_unsuccessful'));
+		if ($return) {
+					$this->trigger_events(array('post_forgotten_password', 'post_forgotten_password_successful'));
+		} else {
+					$this->trigger_events(array('post_forgotten_password', 'post_forgotten_password_unsuccessful'));
+		}
 
 		return $return;
 	}
@@ -827,12 +770,10 @@ 
 	 * @return string
 	 * @author Mathew
 	 **/
-	public function forgotten_password_complete($code, $salt=FALSE)
-	{
+	public function forgotten_password_complete($code, $salt=FALSE) {
 		$this->trigger_events('pre_forgotten_password_complete');
 
-		if (empty($code))
-		{
+		if (empty($code)) {
 			$this->trigger_events(array('post_forgotten_password_complete', 'post_forgotten_password_complete_unsuccessful'));
 			return FALSE;
 		}
@@ -876,27 +817,22 @@ 
 	 * @return bool
 	 * @author Mathew
 	 **/
-	public function register($identity, $password, $email, $additional_data = array(), $groups = array())
-	{
+	public function register($identity, $password, $email, $additional_data = array(), $groups = array()) {
 		$this->trigger_events('pre_register');
 
 		$manual_activation = $this->config->item('manual_activation', 'ion_auth');
 
-		if ($this->identity_check($identity))
-		{
+		if ($this->identity_check($identity)) {
 			$this->set_error('account_creation_duplicate_identity');
 			return FALSE;
-		}
-		elseif ( !$this->config->item('default_group', 'ion_auth') && empty($groups) )
-		{
+		} elseif ( !$this->config->item('default_group', 'ion_auth') && empty($groups) ) {
 			$this->set_error('account_creation_missing_default_group');
 			return FALSE;
 		}
 
 		// check if the default set in config exists in database
 		$query = $this->db->get_where($this->tables['groups'],array('name' => $this->config->item('default_group', 'ion_auth')),1)->row();
-		if( !isset($query->id) && empty($groups) )
-		{
+		if( !isset($query->id) && empty($groups) ) {
 			$this->set_error('account_creation_invalid_default_group');
 			return FALSE;
 		}
@@ -920,8 +856,7 @@ 
 		    'active'     => ($manual_activation === false ? 1 : 0)
 		);
 
-		if ($this->store_salt)
-		{
+		if ($this->store_salt) {
 			$data['salt'] = $salt;
 		}
 
@@ -936,16 +871,13 @@ 
 		$id = $this->db->insert_id($this->tables['users'] . '_id_seq');
 
 		// add in groups array if it doesn't exists and stop adding into default group if default group ids are set
-		if( isset($default_group->id) && empty($groups) )
-		{
+		if( isset($default_group->id) && empty($groups) ) {
 			$groups[] = $default_group->id;
 		}
 
-		if (!empty($groups))
-		{
+		if (!empty($groups)) {
 			// add to groups
-			foreach ($groups as $group)
-			{
+			foreach ($groups as $group) {
 				$this->add_to_group($group, $id);
 			}
 		}
@@ -961,12 +893,10 @@ 
 	 * @return bool
 	 * @author Mathew
 	 **/
-	public function login($identity, $password, $remember=FALSE)
-	{
+	public function login($identity, $password, $remember=FALSE) {
 		$this->trigger_events('pre_login');
 
-		if (empty($identity) || empty($password))
-		{
+		if (empty($identity) || empty($password)) {
 			$this->set_error('login_unsuccessful');
 			return FALSE;
 		}
@@ -979,8 +909,7 @@ 
 		    			  ->order_by('id', 'desc')
 		                  ->get($this->tables['users']);
 
-		if($this->is_max_login_attempts_exceeded($identity))
-		{
+		if($this->is_max_login_attempts_exceeded($identity)) {
 			// Hash something anyway, just to take up time
 			$this->hash_password($password);
 
@@ -990,16 +919,13 @@ 
 			return FALSE;
 		}
 
-		if ($query->num_rows() === 1)
-		{
+		if ($query->num_rows() === 1) {
 			$user = $query->row();
 
 			$password = $this->hash_password_db($user->id, $password);
 
-			if ($password === TRUE)
-			{
-				if ($user->active == 0)
-				{
+			if ($password === TRUE) {
+				if ($user->active == 0) {
 					$this->trigger_events('post_login_unsuccessful');
 					$this->set_error('login_unsuccessful_not_active');
 
@@ -1012,8 +938,7 @@ 
 
 				$this->clear_login_attempts($identity);
 
-				if ($remember && $this->config->item('remember_users', 'ion_auth'))
-				{
+				if ($remember && $this->config->item('remember_users', 'ion_auth')) {
 					$this->remember_user($user->id);
 				}
 
@@ -1040,36 +965,27 @@ 
      * the configuration item recheck_timer. If it does, then it will check if the user is still active
      * @return bool
      */
-	public function recheck_session()
-    {
+	public function recheck_session() {
         $recheck = (null !== $this->config->item('recheck_timer', 'ion_auth')) ? $this->config->item('recheck_timer', 'ion_auth') : 0;
 
-        if($recheck!==0)
-        {
+        if($recheck!==0) {
             $last_login = $this->session->userdata('last_check');
-            if($last_login+$recheck < time())
-            {
+            if($last_login+$recheck < time()) {
                 $query = $this->db->select('id')
                     ->where(array($this->identity_column=>$this->session->userdata('identity'),'active'=>'1'))
                     ->limit(1)
                     ->order_by('id', 'desc')
                     ->get($this->tables['users']);
-                if ($query->num_rows() === 1)
-                {
+                if ($query->num_rows() === 1) {
                     $this->session->set_userdata('last_check',time());
-                }
-                else
-                {
+                } else {
                     $this->trigger_events('logout');
 
                     $identity = $this->config->item('identity', 'ion_auth');
 
-                    if (substr(CI_VERSION, 0, 1) == '2')
-                    {
+                    if (substr(CI_VERSION, 0, 1) == '2') {
                         $this->session->unset_userdata( array($identity => '', 'id' => '', 'user_id' => '') );
-                    }
-                    else
-                    {
+                    } else {
                         $this->session->unset_userdata( array($identity, 'id', 'user_id') );
                     }
                     return false;
@@ -1113,8 +1029,7 @@ 
 	 *                            Use get_last_attempt_ip($identity) to retrieve user's last IP
 	 * @return int
 	 */
-	public function get_attempts_num($identity, $ip_address = NULL)
-	{
+	public function get_attempts_num($identity, $ip_address = NULL) {
         if ($this->config->item('track_login_attempts', 'ion_auth')) {
             $this->db->select('1', FALSE);
             $this->db->where('login', $identity);
@@ -1257,28 +1172,24 @@ 
 		return FALSE;
 	}
 
-	public function limit($limit)
-	{
+	public function limit($limit) {
 		$this->trigger_events('limit');
 		$this->_ion_limit = $limit;
 
 		return $this;
 	}
 
-	public function offset($offset)
-	{
+	public function offset($offset) {
 		$this->trigger_events('offset');
 		$this->_ion_offset = $offset;
 
 		return $this;
 	}
 
-	public function where($where, $value = NULL)
-	{
+	public function where($where, $value = NULL) {
 		$this->trigger_events('where');
 
-		if (!is_array($where))
-		{
+		if (!is_array($where)) {
 			$where = array($where => $value);
 		}
 
@@ -1287,8 +1198,7 @@ 
 		return $this;
 	}
 
-	public function like($like, $value = NULL, $position = 'both')
-	{
+	public function like($like, $value = NULL, $position = 'both') {
 		$this->trigger_events('like');
 
 		array_push($this->_ion_like, array(
@@ -1300,8 +1210,7 @@ 
 		return $this;
 	}
 
-	public function select($select)
-	{
+	public function select($select) {
 		$this->trigger_events('select');
 
 		$this->_ion_select[] = $select;
@@ -1309,8 +1218,7 @@ 
 		return $this;
 	}
 
-	public function order_by($by, $order='desc')
-	{
+	public function order_by($by, $order='desc') {
 		$this->trigger_events('order_by');
 
 		$this->_ion_order_by = $by;
@@ -1319,8 +1227,7 @@ 
 		return $this;
 	}
 
-	public function row()
-	{
+	public function row() {
 		$this->trigger_events('row');
 
 		$row = $this->response->row();
@@ -1328,8 +1235,7 @@ 
 		return $row;
 	}
 
-	public function row_array()
-	{
+	public function row_array() {
 		$this->trigger_events(array('row', 'row_array'));
 
 		$row = $this->response->row_array();
@@ -1337,8 +1243,7 @@ 
 		return $row;
 	}
 
-	public function result()
-	{
+	public function result() {
 		$this->trigger_events('result');
 
 		$result = $this->response->result();
@@ -1346,8 +1251,7 @@ 
 		return $result;
 	}
 
-	public function result_array()
-	{
+	public function result_array() {
 		$this->trigger_events(array('result', 'result_array'));
 
 		$result = $this->response->result_array();
@@ -1355,8 +1259,7 @@ 
 		return $result;
 	}
 
-	public function num_rows()
-	{
+	public function num_rows() {
 		$this->trigger_events(array('num_rows'));
 
 		$result = $this->response->num_rows();
@@ -1370,21 +1273,16 @@ 
 	 * @return object Users
 	 * @author Ben Edmunds
 	 **/
-	public function users($groups = NULL)
-	{
+	public function users($groups = NULL) {
 		$this->trigger_events('users');
 
-		if (isset($this->_ion_select) && !empty($this->_ion_select))
-		{
-			foreach ($this->_ion_select as $select)
-			{
+		if (isset($this->_ion_select) && !empty($this->_ion_select)) {
+			foreach ($this->_ion_select as $select) {
 				$this->db->select($select);
 			}
 
 			$this->_ion_select = array();
-		}
-		else
-		{
+		} else {
 			//default selects
 			$this->db->select(array(
 			    $this->tables['users'].'.*',
@@ -1394,17 +1292,14 @@ 
 		}
 
 		// filter by group id(s) if passed
-		if (isset($groups))
-		{
+		if (isset($groups)) {
 			// build an array if only one group was passed
-			if (!is_array($groups))
-			{
+			if (!is_array($groups)) {
 				$groups = Array($groups);
 			}
 
 			// join and then run a where_in against the group ids
-			if (isset($groups) && !empty($groups))
-			{
+			if (isset($groups) && !empty($groups)) {
 				$this->db->distinct();
 				$this->db->join(
 				    $this->tables['users_groups'],
@@ -1416,20 +1311,20 @@ 
 			// verify if group name or group id was used and create and put elements in different arrays
 			$group_ids = array();
 			$group_names = array();
-			foreach($groups as $group)
-			{
-				if(is_numeric($group)) $group_ids[] = $group;
-				else $group_names[] = $group;
+			foreach($groups as $group) {
+				if(is_numeric($group)) {
+					$group_ids[] = $group;
+				} else {
+					$group_names[] = $group;
+				}
 			}
 			$or_where_in = (!empty($group_ids) && !empty($group_names)) ? 'or_where_in' : 'where_in';
 			// if group name was used we do one more join with groups
-			if(!empty($group_names))
-			{
+			if(!empty($group_names)) {
 				$this->db->join($this->tables['groups'], $this->tables['users_groups'] . '.' . $this->join['groups'] . ' = ' . $this->tables['groups'] . '.id', 'inner');
 				$this->db->where_in($this->tables['groups'] . '.name', $group_names);
 			}
-			if(!empty($group_ids))
-			{
+			if(!empty($group_ids)) {
 				$this->db->{$or_where_in}($this->tables['users_groups'].'.'.$this->join['groups'], $group_ids);
 			}
 		}
@@ -1437,43 +1332,35 @@ 
 		$this->trigger_events('extra_where');
 
 		// run each where that was passed
-		if (isset($this->_ion_where) && !empty($this->_ion_where))
-		{
-			foreach ($this->_ion_where as $where)
-			{
+		if (isset($this->_ion_where) && !empty($this->_ion_where)) {
+			foreach ($this->_ion_where as $where) {
 				$this->db->where($where);
 			}
 
 			$this->_ion_where = array();
 		}
 
-		if (isset($this->_ion_like) && !empty($this->_ion_like))
-		{
-			foreach ($this->_ion_like as $like)
-			{
+		if (isset($this->_ion_like) && !empty($this->_ion_like)) {
+			foreach ($this->_ion_like as $like) {
 				$this->db->or_like($like['like'], $like['value'], $like['position']);
 			}
 
 			$this->_ion_like = array();
 		}
 
-		if (isset($this->_ion_limit) && isset($this->_ion_offset))
-		{
+		if (isset($this->_ion_limit) && isset($this->_ion_offset)) {
 			$this->db->limit($this->_ion_limit, $this->_ion_offset);
 
 			$this->_ion_limit  = NULL;
 			$this->_ion_offset = NULL;
-		}
-		else if (isset($this->_ion_limit))
-		{
+		} else if (isset($this->_ion_limit)) {
 			$this->db->limit($this->_ion_limit);
 
 			$this->_ion_limit  = NULL;
 		}
 
 		// set the order
-		if (isset($this->_ion_order_by) && isset($this->_ion_order))
-		{
+		if (isset($this->_ion_order_by) && isset($this->_ion_order)) {
 			$this->db->order_by($this->_ion_order_by, $this->_ion_order);
 
 			$this->_ion_order    = NULL;
@@ -1491,8 +1378,7 @@ 
 	 * @return object
 	 * @author Ben Edmunds
 	 **/
-	public function user($id = NULL)
-	{
+	public function user($id = NULL) {
 		$this->trigger_events('user');
 
 		// if no id was passed use the current users id
@@ -1513,8 +1399,7 @@ 
 	 * @return array
 	 * @author Ben Edmunds
 	 **/
-	public function get_users_groups($id=FALSE)
-	{
+	public function get_users_groups($id=FALSE) {
 		$this->trigger_events('get_users_group');
 
 		// if no id was passed use the current users id
@@ -1532,29 +1417,24 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function add_to_group($group_ids, $user_id=false)
-	{
+	public function add_to_group($group_ids, $user_id=false) {
 		$this->trigger_events('add_to_group');
 
 		// if no id was passed use the current users id
 		$user_id || $user_id = $this->session->userdata('user_id');
 
-		if(!is_array($group_ids))
-		{
+		if(!is_array($group_ids)) {
 			$group_ids = array($group_ids);
 		}
 
 		$return = 0;
 
 		// Then insert each into the database
-		foreach ($group_ids as $group_id)
-		{
-			if ($this->db->insert($this->tables['users_groups'], array( $this->join['groups'] => (float)$group_id, $this->join['users'] => (float)$user_id)))
-			{
+		foreach ($group_ids as $group_id) {
+			if ($this->db->insert($this->tables['users_groups'], array( $this->join['groups'] => (float)$group_id, $this->join['users'] => (float)$user_id))) {
 				if (isset($this->_cache_groups[$group_id])) {
 					$group_name = $this->_cache_groups[$group_id];
-				}
-				else {
+				} else {
 					$group = $this->group($group_id)->result();
 					$group_name = $group[0]->name;
 					$this->_cache_groups[$group_id] = $group_name;
@@ -1575,29 +1455,23 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function remove_from_group($group_ids=false, $user_id=false)
-	{
+	public function remove_from_group($group_ids=false, $user_id=false) {
 		$this->trigger_events('remove_from_group');
 
 		// user id is required
-		if(empty($user_id))
-		{
+		if(empty($user_id)) {
 			return FALSE;
 		}
 
 		// if group id(s) are passed remove user from the group(s)
-		if( ! empty($group_ids))
-		{
-			if(!is_array($group_ids))
-			{
+		if( ! empty($group_ids)) {
+			if(!is_array($group_ids)) {
 				$group_ids = array($group_ids);
 			}
 
-			foreach($group_ids as $group_id)
-			{
+			foreach($group_ids as $group_id) {
 				$this->db->delete($this->tables['users_groups'], array($this->join['groups'] => (float)$group_id, $this->join['users'] => (float)$user_id));
-				if (isset($this->_cache_user_in_group[$user_id]) && isset($this->_cache_user_in_group[$user_id][$group_id]))
-				{
+				if (isset($this->_cache_user_in_group[$user_id]) && isset($this->_cache_user_in_group[$user_id][$group_id])) {
 					unset($this->_cache_user_in_group[$user_id][$group_id]);
 				}
 			}
@@ -1605,8 +1479,7 @@ 
 			$return = TRUE;
 		}
 		// otherwise remove user from all groups
-		else
-		{
+		else {
 			if ($return = $this->db->delete($this->tables['users_groups'], array($this->join['users'] => (float)$user_id))) {
 				$this->_cache_user_in_group[$user_id] = array();
 			}
@@ -1620,37 +1493,30 @@ 
 	 * @return object
 	 * @author Ben Edmunds
 	 **/
-	public function groups()
-	{
+	public function groups() {
 		$this->trigger_events('groups');
 
 		// run each where that was passed
-		if (isset($this->_ion_where) && !empty($this->_ion_where))
-		{
-			foreach ($this->_ion_where as $where)
-			{
+		if (isset($this->_ion_where) && !empty($this->_ion_where)) {
+			foreach ($this->_ion_where as $where) {
 				$this->db->where($where);
 			}
 			$this->_ion_where = array();
 		}
 
-		if (isset($this->_ion_limit) && isset($this->_ion_offset))
-		{
+		if (isset($this->_ion_limit) && isset($this->_ion_offset)) {
 			$this->db->limit($this->_ion_limit, $this->_ion_offset);
 
 			$this->_ion_limit  = NULL;
 			$this->_ion_offset = NULL;
-		}
-		else if (isset($this->_ion_limit))
-		{
+		} else if (isset($this->_ion_limit)) {
 			$this->db->limit($this->_ion_limit);
 
 			$this->_ion_limit  = NULL;
 		}
 
 		// set the order
-		if (isset($this->_ion_order_by) && isset($this->_ion_order))
-		{
+		if (isset($this->_ion_order_by) && isset($this->_ion_order)) {
 			$this->db->order_by($this->_ion_order_by, $this->_ion_order);
 		}
 
@@ -1665,12 +1531,10 @@ 
 	 * @return object
 	 * @author Ben Edmunds
 	 **/
-	public function group($id = NULL)
-	{
+	public function group($id = NULL) {
 		$this->trigger_events('group');
 
-		if (isset($id))
-		{
+		if (isset($id)) {
 			$this->where($this->tables['groups'].'.id', $id);
 		}
 
@@ -1686,16 +1550,14 @@ 
 	 * @return bool
 	 * @author Phil Sturgeon
 	 **/
-	public function update($id, array $data)
-	{
+	public function update($id, array $data) {
 		$this->trigger_events('pre_update_user');
 
 		$user = $this->user($id)->row();
 
 		$this->db->trans_begin();
 
-		if (array_key_exists($this->identity_column, $data) && $this->identity_check($data[$this->identity_column]) && $user->{$this->identity_column} !== $data[$this->identity_column])
-		{
+		if (array_key_exists($this->identity_column, $data) && $this->identity_check($data[$this->identity_column]) && $user->{$this->identity_column} !== $data[$this->identity_column]) {
 			$this->db->trans_rollback();
 			$this->set_error('account_creation_duplicate_identity');
 
@@ -1708,16 +1570,11 @@ 
 		// Filter the data passed
 		$data = $this->_filter_data($this->tables['users'], $data);
 
-		if (array_key_exists($this->identity_column, $data) || array_key_exists('password', $data) || array_key_exists('email', $data))
-		{
-			if (array_key_exists('password', $data))
-			{
-				if( ! empty($data['password']))
-				{
+		if (array_key_exists($this->identity_column, $data) || array_key_exists('password', $data) || array_key_exists('email', $data)) {
+			if (array_key_exists('password', $data)) {
+				if( ! empty($data['password'])) {
 					$data['password'] = $this->hash_password($data['password'], $user->salt);
-				}
-				else
-				{
+				} else {
 					// unset password so it doesn't effect database entry if no password passed
 					unset($data['password']);
 				}
@@ -1727,8 +1584,7 @@ 
 		$this->trigger_events('extra_where');
 		$this->db->update($this->tables['users'], $data, array('id' => $user->id));
 
-		if ($this->db->trans_status() === FALSE)
-		{
+		if ($this->db->trans_status() === FALSE) {
 			$this->db->trans_rollback();
 
 			$this->trigger_events(array('post_update_user', 'post_update_user_unsuccessful'));
@@ -1749,8 +1605,7 @@ 
 	* @return bool
 	* @author Phil Sturgeon
 	**/
-	public function delete_user($id)
-	{
+	public function delete_user($id) {
 		$this->trigger_events('pre_delete_user');
 
 		$this->db->trans_begin();
@@ -1762,8 +1617,7 @@ 
 		$this->db->delete($this->tables['users'], array('id' => $id));
 
 
-		if ($this->db->trans_status() === FALSE)
-		{
+		if ($this->db->trans_status() === FALSE) {
 			$this->db->trans_rollback();
 			$this->trigger_events(array('post_delete_user', 'post_delete_user_unsuccessful'));
 			$this->set_error('delete_unsuccessful');
@@ -1783,8 +1637,7 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function update_last_login($id)
-	{
+	public function update_last_login($id) {
 		$this->trigger_events('update_last_login');
 
 		$this->load->helper('date');
@@ -1802,18 +1655,15 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function set_lang($lang = 'en')
-	{
+	public function set_lang($lang = 'en') {
 		$this->trigger_events('set_lang');
 
 		// if the user_expire is set to zero we'll set the expiration two years from now.
-		if($this->config->item('user_expire', 'ion_auth') === 0)
-		{
+		if($this->config->item('user_expire', 'ion_auth') === 0) {
 			$expire = (60*60*24*365*2);
 		}
 		// otherwise use what is set
-		else
-		{
+		else {
 			$expire = $this->config->item('user_expire', 'ion_auth');
 		}
 
@@ -1832,8 +1682,7 @@ 
 	 * @return bool
 	 * @author jrmadsen67
 	 **/
-	public function set_session($user)
-	{
+	public function set_session($user) {
 
 		$this->trigger_events('pre_set_session');
 
@@ -1859,12 +1708,10 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function remember_user($id)
-	{
+	public function remember_user($id) {
 		$this->trigger_events('pre_remember_user');
 
-		if (!$id)
-		{
+		if (!$id) {
 			return FALSE;
 		}
 
@@ -1874,16 +1721,13 @@ 
 
 		$this->db->update($this->tables['users'], array('remember_code' => $salt), array('id' => $id));
 
-		if ($this->db->affected_rows() > -1)
-		{
+		if ($this->db->affected_rows() > -1) {
 			// if the user_expire is set to zero we'll set the expiration two years from now.
-			if($this->config->item('user_expire', 'ion_auth') === 0)
-			{
+			if($this->config->item('user_expire', 'ion_auth') === 0) {
 				$expire = (60*60*24*365*2);
 			}
 			// otherwise use what is set
-			else
-			{
+			else {
 				$expire = $this->config->item('user_expire', 'ion_auth');
 			}
 
@@ -1913,15 +1757,13 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function login_remembered_user()
-	{
+	public function login_remembered_user() {
 		$this->trigger_events('pre_login_remembered_user');
 
 		// check for valid data
 		if (!get_cookie($this->config->item('identity_cookie_name', 'ion_auth'))
 			|| !get_cookie($this->config->item('remember_cookie_name', 'ion_auth'))
-			|| !$this->identity_check(get_cookie($this->config->item('identity_cookie_name', 'ion_auth'))))
-		{
+			|| !$this->identity_check(get_cookie($this->config->item('identity_cookie_name', 'ion_auth')))) {
 			$this->trigger_events(array('post_login_remembered_user', 'post_login_remembered_user_unsuccessful'));
 			return FALSE;
 		}
@@ -1937,8 +1779,7 @@ 
 		                  ->get($this->tables['users']);
 
 		// if the user was found, sign them in
-		if ($query->num_rows() == 1)
-		{
+		if ($query->num_rows() == 1) {
 			$user = $query->row();
 
 			$this->update_last_login($user->id);
@@ -1946,8 +1787,7 @@ 
 			$this->set_session($user);
 
 			// extend the users cookies if the option is enabled
-			if ($this->config->item('user_extend_on_login', 'ion_auth'))
-			{
+			if ($this->config->item('user_extend_on_login', 'ion_auth')) {
 				$this->remember_user($user->id);
 			}
 
@@ -1965,19 +1805,16 @@ 
 	 *
 	 * @author aditya menon
 	*/
-	public function create_group($group_name = FALSE, $group_description = '', $additional_data = array())
-	{
+	public function create_group($group_name = FALSE, $group_description = '', $additional_data = array()) {
 		// bail if the group name was not passed
-		if(!$group_name)
-		{
+		if(!$group_name) {
 			$this->set_error('group_name_required');
 			return FALSE;
 		}
 
 		// bail if the group name already exists
 		$existing_group = $this->db->get_where($this->tables['groups'], array('name' => $group_name))->num_rows();
-		if($existing_group !== 0)
-		{
+		if($existing_group !== 0) {
 			$this->set_error('group_already_exists');
 			return FALSE;
 		}
@@ -1986,7 +1823,9 @@ 
 
 		// filter out any data passed that doesnt have a matching column in the groups table
 		// and merge the set group data and the additional data
-		if (!empty($additional_data)) $data = array_merge($this->_filter_data($this->tables['groups'], $additional_data), $data);
+		if (!empty($additional_data)) {
+			$data = array_merge($this->_filter_data($this->tables['groups'], $additional_data), $data);
+		}
 
 		$this->trigger_events('extra_group_set');
 
@@ -2006,20 +1845,19 @@ 
 	 * @return bool
 	 * @author aditya menon
 	 **/
-	public function update_group($group_id = FALSE, $group_name = FALSE, $additional_data = array())
-	{
-		if (empty($group_id)) return FALSE;
+	public function update_group($group_id = FALSE, $group_name = FALSE, $additional_data = array()) {
+		if (empty($group_id)) {
+			return FALSE;
+		}
 
 		$data = array();
 
-		if (!empty($group_name))
-		{
+		if (!empty($group_name)) {
 			// we are changing the name, so do some checks
 
 			// bail if the group name already exists
 			$existing_group = $this->db->get_where($this->tables['groups'], array('name' => $group_name))->row();
-			if(isset($existing_group->id) && $existing_group->id != $group_id)
-			{
+			if(isset($existing_group->id) && $existing_group->id != $group_id) {
 				$this->set_error('group_already_exists');
 				return FALSE;
 			}
@@ -2029,8 +1867,7 @@ 
 
 		// restrict change of name of the admin group
         $group = $this->db->get_where($this->tables['groups'], array('id' => $group_id))->row();
-        if($this->config->item('admin_group', 'ion_auth') === $group->name && $group_name !== $group->name)
-        {
+        if($this->config->item('admin_group', 'ion_auth') === $group->name && $group_name !== $group->name) {
             $this->set_error('group_name_admin_not_alter');
             return FALSE;
         }
@@ -2038,12 +1875,16 @@ 
 
 		// IMPORTANT!! Third parameter was string type $description; this following code is to maintain backward compatibility
 		// New projects should work with 3rd param as array
-		if (is_string($additional_data)) $additional_data = array('description' => $additional_data);
+		if (is_string($additional_data)) {
+			$additional_data = array('description' => $additional_data);
+		}
 
 
 		// filter out any data passed that doesnt have a matching column in the groups table
 		// and merge the set group data and the additional data
-		if (!empty($additional_data)) $data = array_merge($this->_filter_data($this->tables['groups'], $additional_data), $data);
+		if (!empty($additional_data)) {
+			$data = array_merge($this->_filter_data($this->tables['groups'], $additional_data), $data);
+		}
 
 
 		$this->db->update($this->tables['groups'], $data, array('id' => $group_id));
@@ -2059,16 +1900,13 @@ 
 	* @return bool
 	* @author aditya menon
 	**/
-	public function delete_group($group_id = FALSE)
-	{
+	public function delete_group($group_id = FALSE) {
 		// bail if mandatory param not set
-		if(!$group_id || empty($group_id))
-		{
+		if(!$group_id || empty($group_id)) {
 			return FALSE;
 		}
 		$group = $this->group($group_id)->row();
-		if($group->name == $this->config->item('admin_group', 'ion_auth'))
-		{
+		if($group->name == $this->config->item('admin_group', 'ion_auth')) {
 			$this->trigger_events(array('post_delete_group', 'post_delete_group_notallowed'));
 			$this->set_error('group_delete_notallowed');
 			return FALSE;
@@ -2083,8 +1921,7 @@ 
 		// remove the group itself
 		$this->db->delete($this->tables['groups'], array('id' => $group_id));
 
-		if ($this->db->trans_status() === FALSE)
-		{
+		if ($this->db->trans_status() === FALSE) {
 			$this->db->trans_rollback();
 			$this->trigger_events(array('post_delete_group', 'post_delete_group_unsuccessful'));
 			$this->set_error('group_delete_unsuccessful');
@@ -2098,34 +1935,27 @@ 
 		return TRUE;
 	}
 
-	public function set_hook($event, $name, $class, $method, $arguments)
-	{
+	public function set_hook($event, $name, $class, $method, $arguments) {
 		$this->_ion_hooks->{$event}[$name] = new stdClass;
 		$this->_ion_hooks->{$event}[$name]->class     = $class;
 		$this->_ion_hooks->{$event}[$name]->method    = $method;
 		$this->_ion_hooks->{$event}[$name]->arguments = $arguments;
 	}
 
-	public function remove_hook($event, $name)
-	{
-		if (isset($this->_ion_hooks->{$event}[$name]))
-		{
+	public function remove_hook($event, $name) {
+		if (isset($this->_ion_hooks->{$event}[$name])) {
 			unset($this->_ion_hooks->{$event}[$name]);
 		}
 	}
 
-	public function remove_hooks($event)
-	{
-		if (isset($this->_ion_hooks->$event))
-		{
+	public function remove_hooks($event) {
+		if (isset($this->_ion_hooks->$event)) {
 			unset($this->_ion_hooks->$event);
 		}
 	}
 
-	protected function _call_hook($event, $name)
-	{
-		if (isset($this->_ion_hooks->{$event}[$name]) && method_exists($this->_ion_hooks->{$event}[$name]->class, $this->_ion_hooks->{$event}[$name]->method))
-		{
+	protected function _call_hook($event, $name) {
+		if (isset($this->_ion_hooks->{$event}[$name]) && method_exists($this->_ion_hooks->{$event}[$name]->class, $this->_ion_hooks->{$event}[$name]->method)) {
 			$hook = $this->_ion_hooks->{$event}[$name];
 
 			return call_user_func_array(array($hook->class, $hook->method), $hook->arguments);
@@ -2134,21 +1964,14 @@ 
 		return FALSE;
 	}
 
-	public function trigger_events($events)
-	{
-		if (is_array($events) && !empty($events))
-		{
-			foreach ($events as $event)
-			{
+	public function trigger_events($events) {
+		if (is_array($events) && !empty($events)) {
+			foreach ($events as $event) {
 				$this->trigger_events($event);
 			}
-		}
-		else
-		{
-			if (isset($this->_ion_hooks->$events) && !empty($this->_ion_hooks->$events))
-			{
-				foreach ($this->_ion_hooks->$events as $name => $hook)
-				{
+		} else {
+			if (isset($this->_ion_hooks->$events) && !empty($this->_ion_hooks->$events)) {
+				foreach ($this->_ion_hooks->$events as $name => $hook) {
 					$this->_call_hook($events, $name);
 				}
 			}
@@ -2163,8 +1986,7 @@ 
 	 * @return void
 	 * @author Ben Edmunds
 	 **/
-	public function set_message_delimiters($start_delimiter, $end_delimiter)
-	{
+	public function set_message_delimiters($start_delimiter, $end_delimiter) {
 		$this->message_start_delimiter = $start_delimiter;
 		$this->message_end_delimiter   = $end_delimiter;
 
@@ -2179,8 +2001,7 @@ 
 	 * @return void
 	 * @author Ben Edmunds
 	 **/
-	public function set_error_delimiters($start_delimiter, $end_delimiter)
-	{
+	public function set_error_delimiters($start_delimiter, $end_delimiter) {
 		$this->error_start_delimiter = $start_delimiter;
 		$this->error_end_delimiter   = $end_delimiter;
 
@@ -2195,8 +2016,7 @@ 
 	 * @return void
 	 * @author Ben Edmunds
 	 **/
-	public function set_message($message)
-	{
+	public function set_message($message) {
 		$this->messages[] = $message;
 
 		return $message;
@@ -2212,11 +2032,9 @@ 
 	 * @return void
 	 * @author Ben Edmunds
 	 **/
-	public function messages()
-	{
+	public function messages() {
 		$_output = '';
-		foreach ($this->messages as $message)
-		{
+		foreach ($this->messages as $message) {
 			$messageLang = $this->lang->line($message) ? $this->lang->line($message) : '##' . $message . '##';
 			$_output .= $this->message_start_delimiter . $messageLang . $this->message_end_delimiter;
 		}
@@ -2232,20 +2050,15 @@ 
 	 * @return array
 	 * @author Raul Baldner Junior
 	 **/
-	public function messages_array($langify = TRUE)
-	{
-		if ($langify)
-		{
+	public function messages_array($langify = TRUE) {
+		if ($langify) {
 			$_output = array();
-			foreach ($this->messages as $message)
-			{
+			foreach ($this->messages as $message) {
 				$messageLang = $this->lang->line($message) ? $this->lang->line($message) : '##' . $message . '##';
 				$_output[] = $this->message_start_delimiter . $messageLang . $this->message_end_delimiter;
 			}
 			return $_output;
-		}
-		else
-		{
+		} else {
 			return $this->messages;
 		}
 	}
@@ -2259,8 +2072,7 @@ 
 	 * @return void
 	 * @author Ben Edmunds
 	 **/
-	public function clear_messages()
-	{
+	public function clear_messages() {
 		$this->messages = array();
 
 		return TRUE;
@@ -2275,8 +2087,7 @@ 
 	 * @return void
 	 * @author Ben Edmunds
 	 **/
-	public function set_error($error)
-	{
+	public function set_error($error) {
 		$this->errors[] = $error;
 
 		return $error;
@@ -2290,11 +2101,9 @@ 
 	 * @return void
 	 * @author Ben Edmunds
 	 **/
-	public function errors()
-	{
+	public function errors() {
 		$_output = '';
-		foreach ($this->errors as $error)
-		{
+		foreach ($this->errors as $error) {
 			$errorLang = $this->lang->line($error) ? $this->lang->line($error) : '##' . $error . '##';
 			$_output .= $this->error_start_delimiter . $errorLang . $this->error_end_delimiter;
 		}
@@ -2310,20 +2119,15 @@ 
 	 * @return array
 	 * @author Raul Baldner Junior
 	 **/
-	public function errors_array($langify = TRUE)
-	{
-		if ($langify)
-		{
+	public function errors_array($langify = TRUE) {
+		if ($langify) {
 			$_output = array();
-			foreach ($this->errors as $error)
-			{
+			foreach ($this->errors as $error) {
 				$errorLang = $this->lang->line($error) ? $this->lang->line($error) : '##' . $error . '##';
 				$_output[] = $this->error_start_delimiter . $errorLang . $this->error_end_delimiter;
 			}
 			return $_output;
-		}
-		else
-		{
+		} else {
 			return $this->errors;
 		}
 	}
@@ -2337,8 +2141,7 @@ 
 	 * @return void
 	 * @author Ben Edmunds
 	 **/
-	public function clear_errors()
-	{
+	public function clear_errors() {
 		$this->errors = array();
 
 		return TRUE;
@@ -2346,17 +2149,15 @@ 
 
 
 
-	protected function _filter_data($table, $data)
-	{
+	protected function _filter_data($table, $data) {
 		$filtered_data = array();
 		$columns = $this->db->list_fields($table);
 
-		if (is_array($data))
-		{
-			foreach ($columns as $column)
-			{
-				if (array_key_exists($column, $data))
-					$filtered_data[$column] = $data[$column];
+		if (is_array($data)) {
+			foreach ($columns as $column) {
+				if (array_key_exists($column, $data)) {
+									$filtered_data[$column] = $data[$column];
+				}
 			}
 		}
 

Upper-Lower-Casing +13 added lines, -13 removed lines

@@ -260,7 +260,7 @@ 
 	 * @return void
 	 * @author Mathew
 	 **/
-	public function hash_password($password, $salt=false, $use_sha1_override=FALSE)
+	public function hash_password($password, $salt=FALSE, $use_sha1_override=FALSE)
 	{
 		if (empty($password))
 		{
@@ -372,26 +372,26 @@ 
 		$raw_salt_len = 16;
 
  		$buffer = '';
-        $buffer_valid = false;
+        $buffer_valid = FALSE;
 
         if (function_exists('random_bytes')) {
 		  $buffer = random_bytes($raw_salt_len);
 		  if ($buffer) {
-		    $buffer_valid = true;
+		    $buffer_valid = TRUE;
 		  }
 		}
 
 		if (!$buffer_valid && function_exists('mcrypt_create_iv') && !defined('PHALANGER')) {
 		     $buffer = mcrypt_create_iv($raw_salt_len, MCRYPT_DEV_URANDOM);
 		    if ($buffer) {
-		        $buffer_valid = true;
+		        $buffer_valid = TRUE;
 		    }
 		}
 
         if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) {
             $buffer = openssl_random_pseudo_bytes($raw_salt_len);
             if ($buffer) {
-                $buffer_valid = true;
+                $buffer_valid = TRUE;
             }
         }
 
@@ -404,7 +404,7 @@ 
             }
             fclose($f);
             if ($read >= $raw_salt_len) {
-                $buffer_valid = true;
+                $buffer_valid = TRUE;
             }
         }
 
@@ -449,7 +449,7 @@ 
 	 * @return void
 	 * @author Mathew
 	 **/
-	public function activate($id, $code = false)
+	public function activate($id, $code = FALSE)
 	{
 		$this->trigger_events('pre_activate');
 
@@ -917,7 +917,7 @@ 
 		    'email'      => $email,
 		    'ip_address' => $ip_address,
 		    'created_on' => time(),
-		    'active'     => ($manual_activation === false ? 1 : 0)
+		    'active'     => ($manual_activation === FALSE ? 1 : 0)
 		);
 
 		if ($this->store_salt)
@@ -1042,7 +1042,7 @@ 
      */
 	public function recheck_session()
     {
-        $recheck = (null !== $this->config->item('recheck_timer', 'ion_auth')) ? $this->config->item('recheck_timer', 'ion_auth') : 0;
+        $recheck = (NULL !== $this->config->item('recheck_timer', 'ion_auth')) ? $this->config->item('recheck_timer', 'ion_auth') : 0;
 
         if($recheck!==0)
         {
@@ -1072,7 +1072,7 @@ 
                     {
                         $this->session->unset_userdata( array($identity, 'id', 'user_id') );
                     }
-                    return false;
+                    return FALSE;
                 }
             }
         }
@@ -1399,7 +1399,7 @@ 
 			// build an array if only one group was passed
 			if (!is_array($groups))
 			{
-				$groups = Array($groups);
+				$groups = array($groups);
 			}
 
 			// join and then run a where_in against the group ids
@@ -1532,7 +1532,7 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function add_to_group($group_ids, $user_id=false)
+	public function add_to_group($group_ids, $user_id=FALSE)
 	{
 		$this->trigger_events('add_to_group');
 
@@ -1575,7 +1575,7 @@ 
 	 * @return bool
 	 * @author Ben Edmunds
 	 **/
-	public function remove_from_group($group_ids=false, $user_id=false)
+	public function remove_from_group($group_ids=FALSE, $user_id=FALSE)
 	{
 		$this->trigger_events('remove_from_group');