DakuTree / manga-tracker

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

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

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

Braces +11 added lines, -16 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');
+}
 
 
 class Bcrypt {
@@ -49,34 +51,26 @@ 
    * @param  string  $user_string
    * @return  bool
    */
-  private function hashEquals($known_string, $user_string)
-  {
+  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]);
     }
 
@@ -104,7 +98,8 @@ 
     $bytes = '';
 
     if(function_exists('openssl_random_pseudo_bytes') &&
-        (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) { // OpenSSL slow on Win
+        (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) {
+// OpenSSL slow on Win
       $bytes = openssl_random_pseudo_bytes($count);
     }
 

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

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

application/third_party/asset-helper/helpers/asset_helper.php

Braces +35 added lines, -57 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');
+}
 
 /**
  * Sekati CodeIgniter Asset Helper
@@ -52,8 +54,7 @@ 
  */
 
 if (!function_exists('asset_url')) {
-	function asset_url()
-	{
+	function asset_url() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -69,8 +70,7 @@ 
  * @return  string
  */
 if (!function_exists('css_url')) {
-	function css_url()
-	{
+	function css_url() {
 		$CI =& get_instance();
 
 		return $CI->config->slash_item('static_url') . $CI->config->item('css_path');
@@ -84,8 +84,7 @@ 
  * @return  string
  */
 if (!function_exists('less_url')) {
-	function less_url()
-	{
+	function less_url() {
 		$CI =& get_instance();
 
 		return $CI->config->slash_item('static_url') . $CI->config->item('less_path');
@@ -99,8 +98,7 @@ 
  * @return  string
  */
 if (!function_exists('js_url')) {
-	function js_url()
-	{
+	function js_url() {
 		$CI =& get_instance();
 
 		return $CI->config->slash_item('static_url') . $CI->config->item('js_path');
@@ -114,8 +112,7 @@ 
  * @return  string
  */
 if (!function_exists('img_url')) {
-	function img_url()
-	{
+	function img_url() {
 		$CI =& get_instance();
 
 		return $CI->config->slash_item('static_url') . $CI->config->item('img_path');
@@ -129,8 +126,7 @@ 
  * @return  string
  */
 if (!function_exists('swf_url')) {
-	function swf_url()
-	{
+	function swf_url() {
 		$CI =& get_instance();
 
 		return $CI->config->slash_item('static_url') . $CI->config->item('swf_path');
@@ -144,8 +140,7 @@ 
  * @return  string
  */
 if (!function_exists('upload_url')) {
-	function upload_url()
-	{
+	function upload_url() {
 		$CI =& get_instance();
 
 		return base_url() . $CI->config->item('upload_path');
@@ -159,8 +154,7 @@ 
  * @return  string
  */
 if (!function_exists('download_url')) {
-	function download_url()
-	{
+	function download_url() {
 		$CI =& get_instance();
 
 		return base_url() . $CI->config->item('download_path');
@@ -174,8 +168,7 @@ 
  * @return  string
  */
 if (!function_exists('xml_url')) {
-	function xml_url()
-	{
+	function xml_url() {
 		$CI =& get_instance();
 
 		return base_url() . $CI->config->item('xml_path');
@@ -193,8 +186,7 @@ 
  * @return  string
  */
 if (!function_exists('asset_path')) {
-	function asset_path()
-	{
+	function asset_path() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -209,8 +201,7 @@ 
  * @return  string
  */
 if (!function_exists('css_path')) {
-	function css_path()
-	{
+	function css_path() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -225,8 +216,7 @@ 
  * @return  string
  */
 if (!function_exists('less_path')) {
-	function less_path()
-	{
+	function less_path() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -241,8 +231,7 @@ 
  * @return  string
  */
 if (!function_exists('js_path')) {
-	function js_path()
-	{
+	function js_path() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -257,8 +246,7 @@ 
  * @return  string
  */
 if (!function_exists('img_path')) {
-	function img_path()
-	{
+	function img_path() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -273,8 +261,7 @@ 
  * @return  string
  */
 if (!function_exists('swf_path')) {
-	function swf_path()
-	{
+	function swf_path() {
 		$CI =& get_instance();
 
 		return FCPATH . $CI->config->item('swf_path');
@@ -288,8 +275,7 @@ 
  * @return  string
  */
 if (!function_exists('xml_path')) {
-	function xml_path()
-	{
+	function xml_path() {
 		$CI =& get_instance();
 
 		return FCPATH . $CI->config->item('xml_path');
@@ -303,8 +289,7 @@ 
  * @return  string
  */
 if (!function_exists('upload_path')) {
-	function upload_path()
-	{
+	function upload_path() {
 		$CI =& get_instance();
 
 		return FCPATH . $CI->config->item('upload_path');
@@ -318,8 +303,7 @@ 
  * @return  string
  */
 if (!function_exists('upload_path_relative')) {
-	function upload_path_relative()
-	{
+	function upload_path_relative() {
 		$CI =& get_instance();
 
 		return './' . $CI->config->item('upload_path');
@@ -333,8 +317,7 @@ 
  * @return  string
  */
 if (!function_exists('download_path')) {
-	function download_path()
-	{
+	function download_path() {
 		$CI =& get_instance();
 
 		return FCPATH . $CI->config->item('download_path');
@@ -348,8 +331,7 @@ 
  * @return  string
  */
 if (!function_exists('download_path_relative')) {
-	function download_path_relative()
-	{
+	function download_path_relative() {
 		$CI =& get_instance();
 
 		return './' . $CI->config->item('download_path');
@@ -370,8 +352,7 @@ 
  * @return  string
  */
 if (!function_exists('css')) {
-	function css($file, $media = 'all')
-	{
+	function css($file, $media = 'all') {
 		return '<link rel="stylesheet" type="text/css" href="' . css_url() . $file . '" media="' . $media . '">' . "\n";
 	}
 }
@@ -386,8 +367,7 @@ 
  * @return  string
  */
 if (!function_exists('less')) {
-	function less($file)
-	{
+	function less($file) {
 		return '<link rel="stylesheet/less" type="text/css" href="' . less_url() . $file . '">' . "\n";
 	}
 }
@@ -403,12 +383,12 @@ 
  * @return  string
  */
 if (!function_exists('js')) {
-	function js($file, $atts = array())
-	{
+	function js($file, $atts = array()) {
 		$element = '<script type="text/javascript" src="' . js_url() . $file . '"';
 
-		foreach ($atts as $key => $val)
-			$element .= ' ' . $key . '="' . $val . '"';
+		foreach ($atts as $key => $val) {
+					$element .= ' ' . $key . '="' . $val . '"';
+		}
 		$element .= '></script>' . "\n";
 
 		return $element;
@@ -426,11 +406,11 @@ 
  * @return  string
  */
 if (!function_exists('img')) {
-	function img($file, $atts = array())
-	{
+	function img($file, $atts = array()) {
 		$url = '<img src="' . img_url() . $file . '"';
-		foreach ($atts as $key => $val)
-			$url .= ' ' . $key . '="' . $val . '"';
+		foreach ($atts as $key => $val) {
+					$url .= ' ' . $key . '="' . $val . '"';
+		}
 		$url .= " />\n";
 
 		return $url;
@@ -447,8 +427,7 @@ 
  * @return  string
  */
 if (!function_exists('jquery')) {
-	function jquery($version = '')
-	{
+	function jquery($version = '') {
 		// Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if offline
 		$out = '<script src="//ajax.googleapis.com/ajax/libs/jquery/' . $version . '/jquery.min.js"></script>' . "\n";
 		$out .= '<script>window.jQuery || document.write(\'<script src="' . js_url() . 'jquery-' . $version . '.min.js"><\/script>\')</script>' . "\n";
@@ -467,8 +446,7 @@ 
  * @return  string
  */
 if (!function_exists('google_analytics')) {
-	function google_analytics($ua = '')
-	{
+	function google_analytics($ua = '') {
 		// Change UA-XXXXX-X to be your site's ID
 		$out = "<!-- Google Webmaster Tools & Analytics -->\n";
 		$out .= '<script type="text/javascript">';

application/third_party/Gravatar/libraries/Gravatar.php

Braces +19 added lines, -40 removed lines

@@ -367,12 +367,10 @@ 
      *
      * @deprecated
      */
-    public function set_email($email)
-    {
+    public function set_email($email) {
         $email = trim(strtolower($email));
 
-        if ( ! filter_var($email, FILTER_VALIDATE_EMAIL) === FALSE)
-        {
+        if ( ! filter_var($email, FILTER_VALIDATE_EMAIL) === FALSE) {
             return md5($email);
         }
 
@@ -393,12 +391,10 @@ 
      *
      * @deprecated
      */
-    public function get_gravatar($email, $rating = NULL, $size = NULL, $default_image = NULL, $secure = NULL)
-    {
+    public function get_gravatar($email, $rating = NULL, $size = NULL, $default_image = NULL, $secure = NULL) {
         $hash = $this->set_email($email);
 
-        if ($hash === NULL)
-        {
+        if ($hash === NULL) {
             // $hash has to be set to a value so the gravatar site can return a default image
             $hash = 'invalid_email';
         }
@@ -406,32 +402,25 @@ 
         $query_string = NULL;
         $options = array();
 
-        if ($rating !== NULL)
-        {
+        if ($rating !== NULL) {
             $options['r'] = $rating;
         }
 
-        if ($size !== NULL)
-        {
+        if ($size !== NULL) {
             $options['s'] = $size;
         }
 
-        if ($default_image !== NULL)
-        {
+        if ($default_image !== NULL) {
             $options['d'] = urlencode($default_image);
         }
 
-        if (count($options) > 0)
-        {
+        if (count($options) > 0) {
             $query_string = '?'. http_build_query($options);
         }
 
-        if ($secure !== NULL)
-        {
+        if ($secure !== NULL) {
             $base = $this->gravatar_secure_base_url;
-        }
-        else
-        {
+        } else {
             $base = $this->gravatar_base_url;
         }
 
@@ -448,32 +437,26 @@ 
      *
      * @deprecated
      */
-    public function get_profile($email, $fetch_method = 'file')
-    {
+    public function get_profile($email, $fetch_method = 'file') {
         $hash = $this->set_email($email);
 
-        if ($hash === NULL)
-        {
+        if ($hash === NULL) {
             // A hash value of NULL will return no xml so the method returns NULL
             return NULL;
         }
 
         libxml_use_internal_errors(TRUE);
 
-        if ($fetch_method === 'file')
-        {
-            if (ini_get('allow_url_fopen') == FALSE)
-            {
+        if ($fetch_method === 'file') {
+            if (ini_get('allow_url_fopen') == FALSE) {
                 return NULL;
             }
 
             $str = file_get_contents($this->gravatar_base_url . $hash .'.xml');
         }
 
-        if ($fetch_method === 'curl')
-        {
-            if ( ! function_exists('curl_init'))
-            {
+        if ($fetch_method === 'curl') {
+            if ( ! function_exists('curl_init')) {
                 return NULL;
             }
 
@@ -490,18 +473,14 @@ 
 
         $xml = simplexml_load_string($str);
 
-        if ($xml === FALSE)
-        {
+        if ($xml === FALSE) {
             $errors = array();
-            foreach(libxml_get_errors() as $error)
-            {
+            foreach(libxml_get_errors() as $error) {
                 $errors[] = $error->message.'\n';
             }
             $error_string = implode('\n', $errors);
             throw new Exception('Failed loading XML\n'. $error_string);
-        }
-        else
-        {
+        } else {
             return $xml->entry;
         }
     }

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

Braces +3 added lines, -1 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:  Auth Lang - English
 *

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

Braces +3 added lines, -1 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:  Auth Lang - English
 *

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

Braces +3 added lines, -1 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:  Auth Lang - English
 *

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

Braces +3 added lines, -1 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:  Auth Lang - Slovenian
 *