DakuTree / manga-tracker

application/third_party/Ion-Auth/language/romanian/auth_lang.php

Spacing +2 added lines, -2 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:  Auth Lang - Romanian
 *
@@ -131,7 +131,7 @@ 
 $lang['forgot_password_username_identity_label'] = 'Utilizator';
 $lang['forgot_password_email_identity_label']    = 'Email';
 $lang['forgot_password_email_not_found']         = 'Nu există nicio înregistrare cu acest email.';
-$lang['forgot_password_identity_not_found']         = 'No record of that username address.';
+$lang['forgot_password_identity_not_found'] = 'No record of that username address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Schimbare parolă';

application/third_party/Ion-Auth/language/finnish/ion_auth_lang.php

Spacing +5 added lines, -5 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 Lang - Finnish
 *
@@ -37,7 +37,7 @@ 
 $lang['deactivate_unsuccessful']                 = 'Tilin sulkeminen epäonnistui';
 $lang['activation_email_successful']             = 'Aktivointiviesti lähetetty';
 $lang['activation_email_unsuccessful']           = 'Aktivointiviestiä ei voitu lähettää';
-$lang['deactivate_current_user_unsuccessful']= 'You cannot De-Activate your self.';
+$lang['deactivate_current_user_unsuccessful'] = 'You cannot De-Activate your self.';
 
 // Login / Logout
 $lang['login_successful']                        = 'Olet nyt kirjautunut sisään!';
@@ -63,17 +63,17 @@ 
 $lang['group_name_admin_not_alter'] = 'Admin group name can not be changed';
 
 // Activation Email
-$lang['email_activation_subject']            = 'Tilin aktivointi';
+$lang['email_activation_subject'] = 'Tilin aktivointi';
 $lang['email_activate_heading']    = 'Activate account for %s';
 $lang['email_activate_subheading'] = 'Please click this link to %s.';
 $lang['email_activate_link']       = 'Activate Your Account';
 // Forgot Password Email
-$lang['email_forgotten_password_subject']        = 'Unohtuneen salasanan palautus';
+$lang['email_forgotten_password_subject'] = 'Unohtuneen salasanan palautus';
 $lang['email_forgot_password_heading']    = 'Reset Password for %s';
 $lang['email_forgot_password_subheading'] = 'Please click this link to %s.';
 $lang['email_forgot_password_link']       = 'Reset Your Password';
 // New Password Email
-$lang['email_new_password_subject']              = 'Uusi salasana';
+$lang['email_new_password_subject'] = 'Uusi salasana';
 $lang['email_new_password_heading']    = 'New Password for %s';
 $lang['email_new_password_subheading'] = 'Your password has been reset to: %s';
 

application/third_party/Ion-Auth/language/korean/ion_auth_lang.php

Spacing +22 added lines, -22 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 Lang - Korean
 *
@@ -15,9 +15,9 @@ 
 */
 
 // Account Creation
-$lang['account_creation_successful'] 	  	 = '계정을 만들었습니다';
-$lang['account_creation_unsuccessful'] 	 	 = '계정을 만들 수 없습니다';
-$lang['account_creation_duplicate_email'] 	 = '이 이메일은 사용중이거나 올바르지 않습니다';
+$lang['account_creation_successful'] = '계정을 만들었습니다';
+$lang['account_creation_unsuccessful'] = '계정을 만들 수 없습니다';
+$lang['account_creation_duplicate_email'] = '이 이메일은 사용중이거나 올바르지 않습니다';
 $lang['account_creation_duplicate_identity'] = '이 계정명은 사용중이거나 올바르지 않습니다';
 
 // TODO Please Translate
@@ -26,31 +26,31 @@ 
 
 // Password
 $lang['password_change_successful'] 	 	 = '비밀번호를 바꾸었습니다';
-$lang['password_change_unsuccessful'] 	  	 = '비밀번호를 바꿀 수 없습니다';
+$lang['password_change_unsuccessful'] = '비밀번호를 바꿀 수 없습니다';
 $lang['forgot_password_successful'] 	 	 = '비밀번호 재설정 이메일을 보냈습니다';
-$lang['forgot_password_unsuccessful'] 	 	 = '비밀번호를 재설정할 수 없습니다.';
+$lang['forgot_password_unsuccessful'] = '비밀번호를 재설정할 수 없습니다.';
 
 // Activation
-$lang['activate_successful'] 		  	     = '계정을 활성화하였습니다';
-$lang['activate_unsuccessful'] 		 	     = '계정을 활성화할 수 없습니다';
-$lang['deactivate_successful'] 		  	     = '계정을 비활성화하였습니다';
+$lang['activate_successful'] = '계정을 활성화하였습니다';
+$lang['activate_unsuccessful'] = '계정을 활성화할 수 없습니다';
+$lang['deactivate_successful'] = '계정을 비활성화하였습니다';
 $lang['deactivate_unsuccessful'] 	  	     = '계정을 비활성화할 수 없습니다';
 $lang['activation_email_successful'] 	  	 = '계정 활성화 이메일을 보냈습니다';
-$lang['activation_email_unsuccessful']   	 = '계정 활성화 이메일을 보날 수 없습니다';
-$lang['deactivate_current_user_unsuccessful']= 'You cannot De-Activate your self.';
+$lang['activation_email_unsuccessful'] = '계정 활성화 이메일을 보날 수 없습니다';
+$lang['deactivate_current_user_unsuccessful'] = 'You cannot De-Activate your self.';
 
 // Login / Logout
-$lang['login_successful'] 		  	         = '로그인 하였습니다';
-$lang['login_unsuccessful'] 		  	     = '로그인할 수 없습니다';
-$lang['login_unsuccessful_not_active'] 		 = '계정이 비활성화 되어 로그인할 수 없습니다';
-$lang['login_timeout']                       = '계정이 잠시 잠긴 것 같습니다. 잠시 후에 다시 시도해 주세요.';
+$lang['login_successful'] = '로그인 하였습니다';
+$lang['login_unsuccessful'] = '로그인할 수 없습니다';
+$lang['login_unsuccessful_not_active'] = '계정이 비활성화 되어 로그인할 수 없습니다';
+$lang['login_timeout'] = '계정이 잠시 잠긴 것 같습니다. 잠시 후에 다시 시도해 주세요.';
 $lang['logout_successful'] 		 	         = '로그아웃을 하였습니다';
 
 // Account Changes
 $lang['update_successful'] 		 	         = '계정 정보를 업데이트 하였습니다';
-$lang['update_unsuccessful'] 		 	     = '계정 정보를 업데이트할 수 없습니다';
-$lang['delete_successful']               = '사용자를 삭제하였습니다';
-$lang['delete_unsuccessful']           = '사용자를 삭제할 수 없습니다';
+$lang['update_unsuccessful'] = '계정 정보를 업데이트할 수 없습니다';
+$lang['delete_successful'] = '사용자를 삭제하였습니다';
+$lang['delete_unsuccessful'] = '사용자를 삭제할 수 없습니다';
 
 // Groups
 $lang['group_creation_successful']  = '그룹을 생성하였습니다';
@@ -59,20 +59,20 @@ 
 $lang['group_delete_successful']    = '그룹을 삭제했습니다';
 $lang['group_delete_unsuccessful'] 	= '그룹을 삭제할 수 없습니다';
 $lang['group_delete_notallowed']    = 'Can\'t delete the administrators\' group';
-$lang['group_name_required'] 		= '그룹 이름을 입력해 주십시오';
+$lang['group_name_required'] = '그룹 이름을 입력해 주십시오';
 $lang['group_name_admin_not_alter'] = 'Admin group name can not be changed';
 
 // Activation Email
-$lang['email_activation_subject']            = '계정 활성화 방법을 보내드립니다';
+$lang['email_activation_subject'] = '계정 활성화 방법을 보내드립니다';
 $lang['email_activate_heading']    = 'Activate account for %s';
 $lang['email_activate_subheading'] = 'Please click this link to %s.';
 $lang['email_activate_link']       = 'Activate Your Account';
 // Forgot Password Email
-$lang['email_forgotten_password_subject']    = '잊어버린 비밀번호를 찾는 절차를 보내드립니다';
+$lang['email_forgotten_password_subject'] = '잊어버린 비밀번호를 찾는 절차를 보내드립니다';
 $lang['email_forgot_password_heading']    = 'Reset Password for %s';
 $lang['email_forgot_password_subheading'] = 'Please click this link to %s.';
 $lang['email_forgot_password_link']       = 'Reset Your Password';
 // New Password Email
-$lang['email_new_password_subject']          = '새 비밀번호를 보내드립니다';
+$lang['email_new_password_subject'] = '새 비밀번호를 보내드립니다';
 $lang['email_new_password_heading']    = 'New Password for %s';
 $lang['email_new_password_subheading'] = 'Your password has been reset to: %s';

application/third_party/Ion-Auth/language/korean/auth_lang.php

Spacing +2 added lines, -2 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:  Auth Lang - Korean
 *
@@ -135,7 +135,7 @@ 
 $lang['forgot_password_username_identity_label'] = '계정명';
 $lang['forgot_password_email_identity_label']    = '이메일';
 $lang['forgot_password_email_not_found']         = 'No record of that email address.';
-$lang['forgot_password_identity_not_found']         = 'No record of that username address.';
+$lang['forgot_password_identity_not_found'] = 'No record of that username address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = '비밀번호 바꾸기';

application/third_party/Ion-Auth/language/italian/ion_auth_lang.php

Spacing +22 added lines, -22 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 Lang - Italian
 *
@@ -15,10 +15,10 @@ 
 */
 
 // Account Creation
-$lang['account_creation_successful'] 	  	 = 'Account creato con successo.';
-$lang['account_creation_unsuccessful'] 	 	 = 'Impossibile creare l\'account.';
-$lang['account_creation_duplicate_email'] 	 = 'Email gi&agrave; in uso o non valida.';
-$lang['account_creation_duplicate_identity'] 	 = 'Nome utente gi&agrave; in uso o non valido.';
+$lang['account_creation_successful'] = 'Account creato con successo.';
+$lang['account_creation_unsuccessful'] = 'Impossibile creare l\'account.';
+$lang['account_creation_duplicate_email'] = 'Email gi&agrave; in uso o non valida.';
+$lang['account_creation_duplicate_identity'] = 'Nome utente gi&agrave; in uso o non valido.';
 
 // TODO Please Translate
 $lang['account_creation_missing_default_group'] = 'Default group is not set';
@@ -27,24 +27,24 @@ 
 
 // Password
 $lang['password_change_successful'] 	 	 = 'Password modificata con successo.';
-$lang['password_change_unsuccessful'] 	  	 = 'Impossibile modificare la password.';
+$lang['password_change_unsuccessful'] = 'Impossibile modificare la password.';
 $lang['forgot_password_successful'] 	 	 = 'Email di reset della password inviata.';
-$lang['forgot_password_unsuccessful'] 	 	 = 'Impossibile resettare la password.';
+$lang['forgot_password_unsuccessful'] = 'Impossibile resettare la password.';
 
 // Activation
-$lang['activate_successful'] 		  	 = 'Account attivato.';
-$lang['activate_unsuccessful'] 		 	 = 'Impossibile attivare l\'account.';
-$lang['deactivate_successful'] 		  	 = 'Account disattivato.';
-$lang['deactivate_unsuccessful'] 	  	 = 'Impossibile disattivare l\'account.';
-$lang['activation_email_successful'] 	  	 = 'Email di attivazione inviata.';
-$lang['activation_email_unsuccessful']   	 = 'Impossibile inviare l\'email di attivazione.';
-$lang['deactivate_current_user_unsuccessful']= 'You cannot De-Activate your self.';
+$lang['activate_successful'] = 'Account attivato.';
+$lang['activate_unsuccessful'] = 'Impossibile attivare l\'account.';
+$lang['deactivate_successful'] = 'Account disattivato.';
+$lang['deactivate_unsuccessful'] = 'Impossibile disattivare l\'account.';
+$lang['activation_email_successful'] = 'Email di attivazione inviata.';
+$lang['activation_email_unsuccessful'] = 'Impossibile inviare l\'email di attivazione.';
+$lang['deactivate_current_user_unsuccessful'] = 'You cannot De-Activate your self.';
 
 // Login / Logout
-$lang['login_successful'] 		  	 = 'Login effettuato con successo.';
-$lang['login_unsuccessful'] 		  	 = 'Login non corretto.';
-$lang['login_unsuccessful_not_active'] 		 = 'Account is inactive';
-$lang['login_timeout']                       = 'Temporarily Locked Out. Try again later.';
+$lang['login_successful'] = 'Login effettuato con successo.';
+$lang['login_unsuccessful'] = 'Login non corretto.';
+$lang['login_unsuccessful_not_active'] = 'Account is inactive';
+$lang['login_timeout'] = 'Temporarily Locked Out. Try again later.';
 $lang['logout_successful'] 		 	 = 'Logout effettuato con successo.';
 
 // Account Changes
@@ -60,20 +60,20 @@ 
 $lang['group_delete_successful']    = 'Group deleted';
 $lang['group_delete_unsuccessful'] 	= 'Unable to delete group';
 $lang['group_delete_notallowed']    = 'Can\'t delete the administrators\' group';
-$lang['group_name_required'] 		= 'Group name is a required field';
+$lang['group_name_required'] = 'Group name is a required field';
 $lang['group_name_admin_not_alter'] = 'Admin group name can not be changed';
 
 // Activation Email
-$lang['email_activation_subject']            = 'Attivazione Account';
+$lang['email_activation_subject'] = 'Attivazione Account';
 $lang['email_activate_heading']    = 'Activate account for %s';
 $lang['email_activate_subheading'] = 'Please click this link to %s.';
 $lang['email_activate_link']       = 'Activate Your Account';
 // Forgot Password Email
-$lang['email_forgotten_password_subject']    = 'Verifica il cambio password dimenticata';
+$lang['email_forgotten_password_subject'] = 'Verifica il cambio password dimenticata';
 $lang['email_forgot_password_heading']    = 'Reset Password for %s';
 $lang['email_forgot_password_subheading'] = 'Please click this link to %s.';
 $lang['email_forgot_password_link']       = 'Reset Your Password';
 // New Password Email
-$lang['email_new_password_subject']          = 'Nuova Password';
+$lang['email_new_password_subject'] = 'Nuova Password';
 $lang['email_new_password_heading']    = 'New Password for %s';
 $lang['email_new_password_subheading'] = 'Your password has been reset to: %s';

application/third_party/Ion-Auth/language/italian/auth_lang.php

Spacing +2 added lines, -2 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:  Auth Lang - Italian
 *
@@ -138,7 +138,7 @@ 
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
 $lang['forgot_password_email_not_found']         = 'Indirizzo email non presente nel database.';
-$lang['forgot_password_identity_not_found']         = 'No record of that username address.';
+$lang['forgot_password_identity_not_found'] = 'No record of that username address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Cambia Password';

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

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

application/third_party/Ion-Auth/config/ion_auth.php

Spacing +23 added lines, -23 removed lines

@@ -66,8 +66,8 @@ 
  | salt_prefix: Used for bcrypt. Versions of PHP before 5.3.7 only support "$2a$" as the salt prefix
  | Versions 5.3.7 or greater should use the default of "$2y$".
  */
-$config['hash_method']    = 'bcrypt';	// sha1 or bcrypt, bcrypt is STRONGLY recommended
-$config['default_rounds'] = 8;		// This does not apply if random_rounds is set to true
+$config['hash_method']    = 'bcrypt'; // sha1 or bcrypt, bcrypt is STRONGLY recommended
+$config['default_rounds'] = 8; // This does not apply if random_rounds is set to true
 $config['random_rounds']  = FALSE;
 $config['min_rounds']     = 5;
 $config['max_rounds']     = 9;
@@ -82,24 +82,24 @@ 
  | The controller should check this function and act
  | appropriately. If this variable set to 0, there is no maximum.
  */
-$config['site_title']                 = "Manga Tracker";        // Site Title, example.com
-$config['admin_email']                = "no-reply@trackr.moe";  // Admin Email, admin@example.com //FIXME: This is being used for a lot of things it shouldn't be. We need a diff config option.
-$config['default_group']              = 'members';              // Default group, use name
-$config['admin_group']                = 'admin';                // Default administrators group, use name
-$config['identity']                   = 'email';                // [NOTE: username can be used too] You can use any unique column in your table as identity column. The values in this column, alongside password, will be used for login purposes
-$config['min_password_length']        = 6;                      // Minimum Required Length of Password
-$config['max_password_length']        = 64;                     // Maximum Allowed Length of Password
-$config['email_activation']           = FALSE;                  // Email Activation for registration
-$config['manual_activation']          = FALSE;                  // Manual Activation for registration
-$config['remember_users']             = TRUE;                   // Allow users to be remembered and enable auto-login
+$config['site_title']                 = "Manga Tracker"; // Site Title, example.com
+$config['admin_email']                = "no-reply@trackr.moe"; // Admin Email, admin@example.com //FIXME: This is being used for a lot of things it shouldn't be. We need a diff config option.
+$config['default_group']              = 'members'; // Default group, use name
+$config['admin_group']                = 'admin'; // Default administrators group, use name
+$config['identity']                   = 'email'; // [NOTE: username can be used too] You can use any unique column in your table as identity column. The values in this column, alongside password, will be used for login purposes
+$config['min_password_length']        = 6; // Minimum Required Length of Password
+$config['max_password_length']        = 64; // Maximum Allowed Length of Password
+$config['email_activation']           = FALSE; // Email Activation for registration
+$config['manual_activation']          = FALSE; // Manual Activation for registration
+$config['remember_users']             = TRUE; // Allow users to be remembered and enable auto-login
 $config['user_expire']                = 259200; /*3DAYS*/       // How long to remember the user (seconds). Set to zero for no expiration
-$config['user_extend_on_login']       = TRUE;                   // Extend the users cookies every time they auto-login
-$config['track_login_attempts']       = FALSE;                  // Track the number of failed login attempts for each user or ip. //CHECK: Should this be true?
-$config['track_login_ip_address']     = TRUE;                   // Track login attempts by IP Address, if FALSE will track based on identity. (Default: TRUE)
-$config['maximum_login_attempts']     = 3;                      // The maximum number of failed login attempts.
-$config['lockout_time']               = 600;                    // The number of seconds to lockout an account due to exceeded attempts
+$config['user_extend_on_login']       = TRUE; // Extend the users cookies every time they auto-login
+$config['track_login_attempts']       = FALSE; // Track the number of failed login attempts for each user or ip. //CHECK: Should this be true?
+$config['track_login_ip_address']     = TRUE; // Track login attempts by IP Address, if FALSE will track based on identity. (Default: TRUE)
+$config['maximum_login_attempts']     = 3; // The maximum number of failed login attempts.
+$config['lockout_time']               = 600; // The number of seconds to lockout an account due to exceeded attempts
 $config['forgot_password_expiration'] = 43200000; /*12HR*/      // The number of milliseconds after which a forgot password request will expire. If set to 0, forgot password requests will not expire.
-$config['recheck_timer']              = 0;                      // The number of seconds after which the session is checked again against database to see if the user still exists and is active. Leave 0 if you don't want session recheck. if you really think you need to recheck the session against database, we would recommend a higher value, as this would affect performance.
+$config['recheck_timer']              = 0; // The number of seconds after which the session is checked again against database to see if the user still exists and is active. Leave 0 if you don't want session recheck. if you really think you need to recheck the session against database, we would recommend a higher value, as this would affect performance.
 
 /*
  | -------------------------------------------------------------------------
@@ -176,11 +176,11 @@ 
  | Message Delimiters.
  | -------------------------------------------------------------------------
  */
-$config['delimiters_source']       = 'config'; 	// "config" = use the settings defined here, "form_validation" = use the settings defined in CI's form validation library
-$config['message_start_delimiter'] = '<p>'; 	// Message start delimiter
-$config['message_end_delimiter']   = '</p>'; 	// Message end delimiter
-$config['error_start_delimiter']   = '<p>';		// Error message start delimiter
-$config['error_end_delimiter']     = '</p>';	// Error message end delimiter
+$config['delimiters_source']       = 'config'; // "config" = use the settings defined here, "form_validation" = use the settings defined in CI's form validation library
+$config['message_start_delimiter'] = '<p>'; // Message start delimiter
+$config['message_end_delimiter']   = '</p>'; // Message end delimiter
+$config['error_start_delimiter']   = '<p>'; // Error message start delimiter
+$config['error_end_delimiter']     = '</p>'; // Error message end delimiter
 
 /* End of file ion_auth.php */
 /* Location: ./application/config/ion_auth.php */

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

Spacing +11 added lines, -11 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');
 
 
 class Bcrypt {
@@ -11,7 +11,7 @@ 
    * @param array $params
    * @throws Exception
    */
-  public function __construct($params=array('rounds'=>7, 'salt_prefix'=>'$2y$')) {
+  public function __construct($params = array('rounds'=>7, 'salt_prefix'=>'$2y$')) {
 
     if(CRYPT_BLOWFISH != 1) {
       throw new Exception("bcrypt not supported in this installation. See http://php.net/crypt");
@@ -52,30 +52,30 @@ 
   private function hashEquals($known_string, $user_string)
   {
     // For CI3 or PHP >= 5.6
-    if (function_exists('hash_equals')) 
+    if(function_exists('hash_equals')) 
     {
       return hash_equals($known_string, $user_string);
     }
     
     // For CI2 with PHP < 5.6
     // Code from CI3 https://github.com/bcit-ci/CodeIgniter/blob/develop/system/core/compat/hash.php
-    if ( ! is_string($known_string))
+    if(!is_string($known_string))
     {
       trigger_error('hash_equals(): Expected known_string to be a string, '.strtolower(gettype($known_string)).' given', E_USER_WARNING);
       return FALSE;
     }
-    elseif ( ! is_string($user_string))
+    elseif(!is_string($user_string))
     {
       trigger_error('hash_equals(): Expected user_string to be a string, '.strtolower(gettype($user_string)).' given', E_USER_WARNING);
       return FALSE;
     }
-    elseif (($length = strlen($known_string)) !== strlen($user_string))
+    elseif(($length = strlen($known_string)) !== strlen($user_string))
     {
       return FALSE;
     }
 
     $diff = 0;
-    for ($i = 0; $i < $length; $i++)
+    for($i = 0; $i < $length; $i++)
     {
       $diff |= ord($known_string[$i]) ^ ord($user_string[$i]);
     }
@@ -125,9 +125,9 @@ 
       }
 
       for($i = 0; $i < $count; $i += 16) {
-        $this->randomState = md5(microtime() . $this->randomState);
+        $this->randomState = md5(microtime().$this->randomState);
 
-        if (PHP_VERSION >= '5') {
+        if(PHP_VERSION >= '5') {
           $bytes .= md5($this->randomState, true);
         } else {
           $bytes .= pack('H*', md5($this->randomState));
@@ -154,7 +154,7 @@ 
       $c1 = ord($input[$i++]);
       $output .= $itoa64[$c1 >> 2];
       $c1 = ($c1 & 0x03) << 4;
-      if ($i >= 16) {
+      if($i >= 16) {
         $output .= $itoa64[$c1];
         break;
       }
@@ -168,7 +168,7 @@ 
       $c1 |= $c2 >> 6;
       $output .= $itoa64[$c1];
       $output .= $itoa64[$c2 & 0x3f];
-    } while (1);
+    } while(1);
 
     return $output;
   }