DakuTree / manga-tracker

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

Indentation +208 added lines, -208 removed lines

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

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

Indentation +118 added lines, -118 removed lines

@@ -13,84 +13,84 @@ 
    */
   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");
-    }
+	if(CRYPT_BLOWFISH != 1) {
+	  throw new Exception("bcrypt not supported in this installation. See http://php.net/crypt");
+	}
 
-    $this->rounds = $params['rounds'];
-    $this->salt_prefix = $params['salt_prefix'];
+	$this->rounds = $params['rounds'];
+	$this->salt_prefix = $params['salt_prefix'];
   }
 
   public function hash($input) {
-    $hash = crypt($input, $this->getSalt());
+	$hash = crypt($input, $this->getSalt());
 
-    if(strlen($hash) > 13) {
-      return $hash;
-    }
+	if(strlen($hash) > 13) {
+	  return $hash;
+	}
 
-    return false;
+	return false;
   }
 
   /**
    * @param $input
    * @param $existingHash
    * @return bool
-     */
+   */
   public function verify($input, $existingHash) {
-    $hash = crypt($input, $existingHash);
-    return $this->hashEquals($existingHash, $hash);
+	$hash = crypt($input, $existingHash);
+	return $this->hashEquals($existingHash, $hash);
   }
   
    /**
-   * Polyfill for hash_equals()
-   * Code mainly taken from hash_equals() compat function of CodeIgniter 3
-   *
-   * @param  string  $known_string
-   * @param  string  $user_string
-   * @return  bool
-   */
+    * Polyfill for hash_equals()
+    * Code mainly taken from hash_equals() compat function of CodeIgniter 3
+    *
+    * @param  string  $known_string
+    * @param  string  $user_string
+    * @return  bool
+    */
   private function hashEquals($known_string, $user_string)
   {
-    // For CI3 or PHP >= 5.6
-    if (function_exists('hash_equals')) 
-    {
-      return hash_equals($known_string, $user_string);
-    }
+	// For CI3 or PHP >= 5.6
+	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))
-    {
-      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))
-    {
-      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))
-    {
-      return FALSE;
-    }
-
-    $diff = 0;
-    for ($i = 0; $i < $length; $i++)
-    {
-      $diff |= ord($known_string[$i]) ^ ord($user_string[$i]);
-    }
-
-    return ($diff === 0);
+	// 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))
+	{
+	  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))
+	{
+	  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))
+	{
+	  return FALSE;
+	}
+
+	$diff = 0;
+	for ($i = 0; $i < $length; $i++)
+	{
+	  $diff |= ord($known_string[$i]) ^ ord($user_string[$i]);
+	}
+
+	return ($diff === 0);
   }
 
   private function getSalt() {
-    $salt = sprintf($this->salt_prefix.'%02d$', $this->rounds);
+	$salt = sprintf($this->salt_prefix.'%02d$', $this->rounds);
 
-    $bytes = $this->getRandomBytes(16);
+	$bytes = $this->getRandomBytes(16);
 
-    $salt .= $this->encodeBytes($bytes);
+	$salt .= $this->encodeBytes($bytes);
 
-    return $salt;
+	return $salt;
   }
 
   private $randomState;
@@ -99,78 +99,78 @@ 
   /**
    * @param $count
    * @return string
-     */
+   */
   private function getRandomBytes($count) {
-    $bytes = '';
-
-    if(function_exists('openssl_random_pseudo_bytes') &&
-        (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) { // OpenSSL slow on Win
-      $bytes = openssl_random_pseudo_bytes($count);
-    }
-
-    if($bytes === '' && @is_readable('/dev/urandom') &&
-       ($hRand = @fopen('/dev/urandom', 'rb')) !== FALSE) {
-      $bytes = fread($hRand, $count);
-      fclose($hRand);
-    }
-
-    if(strlen($bytes) < $count) {
-      $bytes = '';
-
-      if($this->randomState === null) {
-        $this->randomState = microtime();
-        if(function_exists('getmypid')) {
-          $this->randomState .= getmypid();
-        }
-      }
-
-      for($i = 0; $i < $count; $i += 16) {
-        $this->randomState = md5(microtime() . $this->randomState);
-
-        if (PHP_VERSION >= '5') {
-          $bytes .= md5($this->randomState, true);
-        } else {
-          $bytes .= pack('H*', md5($this->randomState));
-        }
-      }
-
-      $bytes = substr($bytes, 0, $count);
-    }
-
-    return $bytes;
+	$bytes = '';
+
+	if(function_exists('openssl_random_pseudo_bytes') &&
+		(strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) { // OpenSSL slow on Win
+	  $bytes = openssl_random_pseudo_bytes($count);
+	}
+
+	if($bytes === '' && @is_readable('/dev/urandom') &&
+	   ($hRand = @fopen('/dev/urandom', 'rb')) !== FALSE) {
+	  $bytes = fread($hRand, $count);
+	  fclose($hRand);
+	}
+
+	if(strlen($bytes) < $count) {
+	  $bytes = '';
+
+	  if($this->randomState === null) {
+		$this->randomState = microtime();
+		if(function_exists('getmypid')) {
+		  $this->randomState .= getmypid();
+		}
+	  }
+
+	  for($i = 0; $i < $count; $i += 16) {
+		$this->randomState = md5(microtime() . $this->randomState);
+
+		if (PHP_VERSION >= '5') {
+		  $bytes .= md5($this->randomState, true);
+		} else {
+		  $bytes .= pack('H*', md5($this->randomState));
+		}
+	  }
+
+	  $bytes = substr($bytes, 0, $count);
+	}
+
+	return $bytes;
   }
 
   /**
    * @param $input
    * @return string
-     */
+   */
   private function encodeBytes($input) {
-    // The following is code from the PHP Password Hashing Framework
-    $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
-    $output = '';
-    $i = 0;
-    do {
-      $c1 = ord($input[$i++]);
-      $output .= $itoa64[$c1 >> 2];
-      $c1 = ($c1 & 0x03) << 4;
-      if ($i >= 16) {
-        $output .= $itoa64[$c1];
-        break;
-      }
-
-      $c2 = ord($input[$i++]);
-      $c1 |= $c2 >> 4;
-      $output .= $itoa64[$c1];
-      $c1 = ($c2 & 0x0f) << 2;
-
-      $c2 = ord($input[$i++]);
-      $c1 |= $c2 >> 6;
-      $output .= $itoa64[$c1];
-      $output .= $itoa64[$c2 & 0x3f];
-    } while (1);
-
-    return $output;
+	// The following is code from the PHP Password Hashing Framework
+	$itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+	$output = '';
+	$i = 0;
+	do {
+	  $c1 = ord($input[$i++]);
+	  $output .= $itoa64[$c1 >> 2];
+	  $c1 = ($c1 & 0x03) << 4;
+	  if ($i >= 16) {
+		$output .= $itoa64[$c1];
+		break;
+	  }
+
+	  $c2 = ord($input[$i++]);
+	  $c1 |= $c2 >> 4;
+	  $output .= $itoa64[$c1];
+	  $c1 = ($c2 & 0x0f) << 2;
+
+	  $c2 = ord($input[$i++]);
+	  $c1 |= $c2 >> 6;
+	  $output .= $itoa64[$c1];
+	  $output .= $itoa64[$c2 & 0x3f];
+	} while (1);
+
+	return $output;
   }
 }
 

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

Indentation +12 added lines, -12 removed lines

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

application/third_party/Gravatar/libraries/Gravatar.php

Indentation +425 added lines, -425 removed lines

@@ -23,487 +23,487 @@
 
 class Gravatar {
 
-    protected $defaults;
-
-    protected $gravatar_base_url;
-    protected $gravatar_secure_base_url;
-    protected $gravatar_image_extension;
-    protected $gravatar_image_size;
-    protected $gravatar_default_image;
-    protected $gravatar_force_default_image;
-    protected $gravatar_rating ;
-    protected $gravatar_useragent;
+	protected $defaults;
+
+	protected $gravatar_base_url;
+	protected $gravatar_secure_base_url;
+	protected $gravatar_image_extension;
+	protected $gravatar_image_size;
+	protected $gravatar_default_image;
+	protected $gravatar_force_default_image;
+	protected $gravatar_rating ;
+	protected $gravatar_useragent;
 
-    protected $last_error = GRAVATAR_NO_ERROR;
-
-    protected $is_https;
-    protected $curl_exists;
-    protected $allow_url_fopen;
-
-    public function __construct($config = array()) {
-
-        $this->defaults = array(
-            'gravatar_base_url' => 'http://www.gravatar.com/',
-            'gravatar_secure_base_url' => 'https://secure.gravatar.com/',
-            'gravatar_image_extension' => '.png',
-            'gravatar_image_size' => 80,
-            'gravatar_default_image' => '',
-            'gravatar_force_default_image' => false,
-            'gravatar_rating' => '',
-            'gravatar_useragent' => 'PHP Gravatar Library',
-        );
-
-        $this->is_https = $this->is_https();
-        $this->curl_exists = function_exists('curl_init');
-        $allow_url_fopen = @ini_get('allow_url_fopen');
-        $allow_url_fopen = $allow_url_fopen === false || in_array(strtolower($allow_url_fopen), array('on', 'true', '1'));
-        $this->allow_url_fopen = $allow_url_fopen;
-
-        if (!is_array($config)) {
-            $config = array();
-        }
-
-        $this->defaults = array_merge($this->defaults, $config);
-        $this->initialize($this->defaults);
-    }
-
-    public function initialize($config = array()) {
-
-        if (!is_array($config)) {
-            $config = array();
-        }
-
-        foreach ($config as $key => $value) {
-            $this->{$key} = $value;
-        }
-
-        $this->gravatar_base_url = (string) $this->gravatar_base_url;
-        $this->gravatar_secure_base_url = (string) $this->gravatar_secure_base_url;
-        $this->gravatar_image_extension = (string) $this->gravatar_image_extension;
-
-        $this->gravatar_image_size = (int) $this->gravatar_image_size;
-
-        if ($this->gravatar_image_size <= 0) {
-            $this->gravatar_image_size = 80;
-        }
-
-        $this->gravatar_default_image = (string) $this->gravatar_default_image;
-        $this->gravatar_force_default_image = !empty($this->gravatar_force_default_image);
-        $this->gravatar_rating = (string) $this->gravatar_rating;
-        $this->gravatar_useragent = (string) $this->gravatar_useragent;
-
-        return $this;
-    }
-
-    public function reset() {
-
-        $this->initialize($this->defaults);
-
-        return $this;
-    }
-
-    public function get_defaults() {
-
-        return $this->defaults;
-    }
-
-    /**
-     * Creates a URL for requesting a Gravatar image.
-     * @link http://en.gravatar.com/site/implement/images/
-     *
-     * @param   string      $email                  A registered email.
-     * @param   int         $size                   The requested size of the avarar in pixels (a square image).
-     * @param   string      $default_image          The fallback image option: '', '404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank'.
-     * @param   bool        $force_default_image    Enforces the fallback image to be shown.
-     * @param   string      $rating                 The level of allowed self-rate of the avatar: '', 'g' (default), 'pg', 'r', 'x'.
-     * @return  string                              Returns the URL of the avatar to be requested.
-     *
-     * When optional parameters are not set, their default values are taken
-     * from the configuration file application/config/gravatar.php
-     */
-    public function get($email, $size = null, $default_image = null, $force_default_image = null, $rating = null) {
-
-        $url = ($this->is_https ? $this->gravatar_secure_base_url : $this->gravatar_base_url).'avatar/'.$this->create_hash($email).$this->gravatar_image_extension;
-
-        $query = array();
-
-        $size = (int) $size;
+	protected $last_error = GRAVATAR_NO_ERROR;
+
+	protected $is_https;
+	protected $curl_exists;
+	protected $allow_url_fopen;
+
+	public function __construct($config = array()) {
+
+		$this->defaults = array(
+			'gravatar_base_url' => 'http://www.gravatar.com/',
+			'gravatar_secure_base_url' => 'https://secure.gravatar.com/',
+			'gravatar_image_extension' => '.png',
+			'gravatar_image_size' => 80,
+			'gravatar_default_image' => '',
+			'gravatar_force_default_image' => false,
+			'gravatar_rating' => '',
+			'gravatar_useragent' => 'PHP Gravatar Library',
+		);
+
+		$this->is_https = $this->is_https();
+		$this->curl_exists = function_exists('curl_init');
+		$allow_url_fopen = @ini_get('allow_url_fopen');
+		$allow_url_fopen = $allow_url_fopen === false || in_array(strtolower($allow_url_fopen), array('on', 'true', '1'));
+		$this->allow_url_fopen = $allow_url_fopen;
+
+		if (!is_array($config)) {
+			$config = array();
+		}
+
+		$this->defaults = array_merge($this->defaults, $config);
+		$this->initialize($this->defaults);
+	}
+
+	public function initialize($config = array()) {
+
+		if (!is_array($config)) {
+			$config = array();
+		}
+
+		foreach ($config as $key => $value) {
+			$this->{$key} = $value;
+		}
+
+		$this->gravatar_base_url = (string) $this->gravatar_base_url;
+		$this->gravatar_secure_base_url = (string) $this->gravatar_secure_base_url;
+		$this->gravatar_image_extension = (string) $this->gravatar_image_extension;
+
+		$this->gravatar_image_size = (int) $this->gravatar_image_size;
+
+		if ($this->gravatar_image_size <= 0) {
+			$this->gravatar_image_size = 80;
+		}
+
+		$this->gravatar_default_image = (string) $this->gravatar_default_image;
+		$this->gravatar_force_default_image = !empty($this->gravatar_force_default_image);
+		$this->gravatar_rating = (string) $this->gravatar_rating;
+		$this->gravatar_useragent = (string) $this->gravatar_useragent;
+
+		return $this;
+	}
+
+	public function reset() {
+
+		$this->initialize($this->defaults);
+
+		return $this;
+	}
+
+	public function get_defaults() {
+
+		return $this->defaults;
+	}
+
+	/**
+	 * Creates a URL for requesting a Gravatar image.
+	 * @link http://en.gravatar.com/site/implement/images/
+	 *
+	 * @param   string      $email                  A registered email.
+	 * @param   int         $size                   The requested size of the avarar in pixels (a square image).
+	 * @param   string      $default_image          The fallback image option: '', '404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank'.
+	 * @param   bool        $force_default_image    Enforces the fallback image to be shown.
+	 * @param   string      $rating                 The level of allowed self-rate of the avatar: '', 'g' (default), 'pg', 'r', 'x'.
+	 * @return  string                              Returns the URL of the avatar to be requested.
+	 *
+	 * When optional parameters are not set, their default values are taken
+	 * from the configuration file application/config/gravatar.php
+	 */
+	public function get($email, $size = null, $default_image = null, $force_default_image = null, $rating = null) {
+
+		$url = ($this->is_https ? $this->gravatar_secure_base_url : $this->gravatar_base_url).'avatar/'.$this->create_hash($email).$this->gravatar_image_extension;
+
+		$query = array();
+
+		$size = (int) $size;
 
-        if ($size <= 0) {
-            $size = $this->gravatar_image_size;
-        }
+		if ($size <= 0) {
+			$size = $this->gravatar_image_size;
+		}
 
-        if ($size > 0) {
-            $query['s'] = $size;
-        }
+		if ($size > 0) {
+			$query['s'] = $size;
+		}
 
-        if (isset($default_image)) {
-            $default_image = (string) $default_image;
-        } else {
-            $default_image = $this->gravatar_default_image;
-        }
+		if (isset($default_image)) {
+			$default_image = (string) $default_image;
+		} else {
+			$default_image = $this->gravatar_default_image;
+		}
 
-        if ($default_image != '') {
-            $query['d'] = $default_image;
-        }
+		if ($default_image != '') {
+			$query['d'] = $default_image;
+		}
 
-        if (isset($force_default_image)) {
-            $force_default_image = !empty($force_default_image);
-        } else {
-            $force_default_image = $this->gravatar_force_default_image;
-        }
+		if (isset($force_default_image)) {
+			$force_default_image = !empty($force_default_image);
+		} else {
+			$force_default_image = $this->gravatar_force_default_image;
+		}
 
-        if ($force_default_image) {
-            $query['f'] = 'y';
-        }
+		if ($force_default_image) {
+			$query['f'] = 'y';
+		}
 
-        if (isset($rating)) {
-            $rating = (string) $rating;
-        } else {
-            $rating = $this->gravatar_rating;
-        }
+		if (isset($rating)) {
+			$rating = (string) $rating;
+		} else {
+			$rating = $this->gravatar_rating;
+		}
 
-        if ($rating != '') {
-            $query['r'] = $rating;
-        }
+		if ($rating != '') {
+			$query['r'] = $rating;
+		}
 
-        if (!empty($query)) {
-            $url = $url.'?'.http_build_query($query);
-        }
+		if (!empty($query)) {
+			$url = $url.'?'.http_build_query($query);
+		}
 
-        return $url;
-    }
+		return $url;
+	}
 
-    /**
-     * Executes a request for Gravatar profile data and returns it as a multidimensional array.
-     * @link https://en.gravatar.com/site/implement/profiles/
-     *
-     * @param   string      $email          A registered email.
-     * @return  array/null                  Received profile data.
-     */
-    public function get_profile_data($email) {
+	/**
+	 * Executes a request for Gravatar profile data and returns it as a multidimensional array.
+	 * @link https://en.gravatar.com/site/implement/profiles/
+	 *
+	 * @param   string      $email          A registered email.
+	 * @return  array/null                  Received profile data.
+	 */
+	public function get_profile_data($email) {
 
-        $result = $this->execute_profile_request($email, 'php');
+		$result = $this->execute_profile_request($email, 'php');
 
-        if ($this->last_error != GRAVATAR_NO_ERROR) {
-            return null;
-        }
+		if ($this->last_error != GRAVATAR_NO_ERROR) {
+			return null;
+		}
 
-        $result = @ unserialize($result);
+		$result = @ unserialize($result);
 
-        if ($result === false) {
+		if ($result === false) {
 
-            $this->last_error = GRAVATAR_INCORRECT_FORMAT;
-            return null;
-        }
+			$this->last_error = GRAVATAR_INCORRECT_FORMAT;
+			return null;
+		}
 
-        if (!is_array($result)) {
+		if (!is_array($result)) {
 
-            $this->last_error = GRAVATAR_PROFILE_DOES_NOT_EXIST;
-            return null;
-        }
+			$this->last_error = GRAVATAR_PROFILE_DOES_NOT_EXIST;
+			return null;
+		}
 
-        if (!isset($result['entry']) || !isset($result['entry'][0])) {
+		if (!isset($result['entry']) || !isset($result['entry'][0])) {
 
-            $this->last_error = GRAVATAR_INCORRECT_FORMAT;
-            return null;
-        }
+			$this->last_error = GRAVATAR_INCORRECT_FORMAT;
+			return null;
+		}
 
-        return $result['entry'][0];
-    }
+		return $result['entry'][0];
+	}
 
-    /**
-     * Executes a request for Gravatar profile data and returns raw received response.
-     * @link https://en.gravatar.com/site/implement/profiles/
-     *
-     * @param   string      $email      A registered email.
-     * @param   string      $format     '', 'json', 'xml', 'php', 'vcf', 'qr'.
-     * @return  string/null             Received profile raw data.
-     */
-    public function execute_profile_request($email, $format = null) {
+	/**
+	 * Executes a request for Gravatar profile data and returns raw received response.
+	 * @link https://en.gravatar.com/site/implement/profiles/
+	 *
+	 * @param   string      $email      A registered email.
+	 * @param   string      $format     '', 'json', 'xml', 'php', 'vcf', 'qr'.
+	 * @return  string/null             Received profile raw data.
+	 */
+	public function execute_profile_request($email, $format = null) {
 
-        $this->last_error = GRAVATAR_NO_ERROR;
+		$this->last_error = GRAVATAR_NO_ERROR;
 
-        if (function_exists('valid_email')) {
+		if (function_exists('valid_email')) {
 
-            if (!valid_email($email)) {
+			if (!valid_email($email)) {
 
-                $this->last_error = GRAVATAR_INVALID_EMAIL;
-                return null;
-            }
+				$this->last_error = GRAVATAR_INVALID_EMAIL;
+				return null;
+			}
 
-        } else {
+		} else {
 
-            if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+			if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
 
-                $this->last_error = GRAVATAR_INVALID_EMAIL;
-                return null;
-            }
-        }
+				$this->last_error = GRAVATAR_INVALID_EMAIL;
+				return null;
+			}
+		}
 
-        $format = trim($format);
+		$format = trim($format);
 
-        if ($format != '') {
-            $format = '.'.ltrim($format, '.');
-        }
+		if ($format != '') {
+			$format = '.'.ltrim($format, '.');
+		}
 
-        $result = null;
+		$result = null;
 
-        if ($this->curl_exists) {
+		if ($this->curl_exists) {
 
-            $url = $this->gravatar_secure_base_url.$this->create_hash($email).$format;
+			$url = $this->gravatar_secure_base_url.$this->create_hash($email).$format;
 
-            $ch = curl_init();
+			$ch = curl_init();
 
-            $options = array(
-                CURLOPT_USERAGENT, $this->gravatar_useragent,
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_POST => true,
-                CURLOPT_POSTFIELDS => array(),
-                CURLOPT_URL => $url,
-                CURLOPT_TIMEOUT => 3,
-            );
+			$options = array(
+				CURLOPT_USERAGENT, $this->gravatar_useragent,
+				CURLOPT_RETURNTRANSFER => true,
+				CURLOPT_POST => true,
+				CURLOPT_POSTFIELDS => array(),
+				CURLOPT_URL => $url,
+				CURLOPT_TIMEOUT => 3,
+			);
 
-            if (!ini_get('safe_mode') && !ini_get('open_basedir')) {
-                $options[CURLOPT_FOLLOWLOCATION] = true;
-            }
+			if (!ini_get('safe_mode') && !ini_get('open_basedir')) {
+				$options[CURLOPT_FOLLOWLOCATION] = true;
+			}
 
-            curl_setopt_array($ch, $options);
+			curl_setopt_array($ch, $options);
 
-            $result = curl_exec($ch);
+			$result = curl_exec($ch);
 
-            $code = @ curl_getinfo($ch, CURLINFO_HTTP_CODE);
+			$code = @ curl_getinfo($ch, CURLINFO_HTTP_CODE);
 
-            @ curl_close($ch);
+			@ curl_close($ch);
 
-            if ($code != 200) {
+			if ($code != 200) {
 
-                $this->last_error = GRAVATAR_CANT_CONNECT;
-                return null;
-            }
+				$this->last_error = GRAVATAR_CANT_CONNECT;
+				return null;
+			}
 
-        } elseif ($this->allow_url_fopen) {
+		} elseif ($this->allow_url_fopen) {
 
-            $url = $this->gravatar_base_url.$this->create_hash($email).$format;
+			$url = $this->gravatar_base_url.$this->create_hash($email).$format;
 
-            $options = array(
-                'http' => array(
-                    'method' => 'GET',
-                    'useragent' => $this->gravatar_useragent,
-                ),
-            );
+			$options = array(
+				'http' => array(
+					'method' => 'GET',
+					'useragent' => $this->gravatar_useragent,
+				),
+			);
 
-            $context = stream_context_create($options);
+			$context = stream_context_create($options);
 
-            $result = @ file_get_contents($url, false, $context);
+			$result = @ file_get_contents($url, false, $context);
 
-        } else {
+		} else {
 
-            $this->last_error = GRAVATAR_CANT_CONNECT;
-            return null;
-        }
+			$this->last_error = GRAVATAR_CANT_CONNECT;
+			return null;
+		}
 
-        if ($result === false) {
+		if ($result === false) {
 
-            $this->last_error = GRAVATAR_CANT_CONNECT;
-            return null;
-        }
+			$this->last_error = GRAVATAR_CANT_CONNECT;
+			return null;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Returns the error code as a result of the last profile request operation.
-     *
-     * @return int          GRAVATAR_NO_ERROR - the last operation was successfull,
-     *                      other returned value indicates failure.
-     */
-    public function last_error() {
+	/**
+	 * Returns the error code as a result of the last profile request operation.
+	 *
+	 * @return int          GRAVATAR_NO_ERROR - the last operation was successfull,
+	 *                      other returned value indicates failure.
+	 */
+	public function last_error() {
 
-        return $this->last_error;
-    }
+		return $this->last_error;
+	}
 
-    /**
-     * Creates a hash value from a provided e-mail address.
-     * @link https://en.gravatar.com/site/implement/hash/
-     *
-     * @param   string      $email      A registered email.
-     * @return  string/null             The hash for accessing the avatar or profile data.
-     */
-    public function create_hash($email) {
-
-        return md5(strtolower(trim($email)));
-    }
-
-    protected function is_https() {
-
-        if (function_exists('is_https')) {
-            return is_https();
-        }
-
-        if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
-            return true;
-        } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
-            return true;
-        } elseif (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
-            return true;
-        }
-
-        return false;
-    }
-
-    //--------------------------------------------------------------------------
-    // The following original methods are kept here for backward compatibility.
-    // Consider them as deprecated.
-    //--------------------------------------------------------------------------
-
-
-    /**
-     * Set the email to be used, converting it into an md5 hash as required by gravatar.com
-     *
-     * @param string $email
-     *
-     * @return string|null Email hash or if email didn't validate then return NULL
-     *
-     * @deprecated
-     */
-    public function set_email($email)
-    {
-        $email = trim(strtolower($email));
-
-        if ( ! filter_var($email, FILTER_VALIDATE_EMAIL) === FALSE)
-        {
-            return md5($email);
-        }
-
-        return NULL;
-    }
-
-    /**
-     * get_gravatar_url
-     *
-     * @see http://en.gravatar.com/site/implement/images/ for available options
-     *
-     * @param string $rating defaults to g
-     * @param string $size defaults to 80
-     * @param string $default_image default sets can be found on the above link
-     * @param boolean $secure set to TRUE if a secure url is required
-     *
-     * @return string gratavar url
-     *
-     * @deprecated
-     */
-    public function get_gravatar($email, $rating = NULL, $size = NULL, $default_image = NULL, $secure = NULL)
-    {
-        $hash = $this->set_email($email);
-
-        if ($hash === NULL)
-        {
-            // $hash has to be set to a value so the gravatar site can return a default image
-            $hash = 'invalid_email';
-        }
-
-        $query_string = NULL;
-        $options = array();
-
-        if ($rating !== NULL)
-        {
-            $options['r'] = $rating;
-        }
-
-        if ($size !== NULL)
-        {
-            $options['s'] = $size;
-        }
-
-        if ($default_image !== NULL)
-        {
-            $options['d'] = urlencode($default_image);
-        }
-
-        if (count($options) > 0)
-        {
-            $query_string = '?'. http_build_query($options);
-        }
-
-        if ($secure !== NULL)
-        {
-            $base = $this->gravatar_secure_base_url;
-        }
-        else
-        {
-            $base = $this->gravatar_base_url;
-        }
-
-        return $base .'avatar/'. $hash . $query_string;
-    }
-
-    /**
-     * Grab the full profile data for a given email from gravatar.com in xml format
-     *
-     * @param string $email
-     * @param string fetch_method defaults to file, 'curl' is the other option
-     *
-     * @return object|null $xml->entry on success, NULL on an error
-     *
-     * @deprecated
-     */
-    public function get_profile($email, $fetch_method = 'file')
-    {
-        $hash = $this->set_email($email);
-
-        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)
-            {
-                return NULL;
-            }
-
-            $str = file_get_contents($this->gravatar_base_url . $hash .'.xml');
-        }
-
-        if ($fetch_method === 'curl')
-        {
-            if ( ! function_exists('curl_init'))
-            {
-                return NULL;
-            }
-
-            $ch = curl_init();
-            $options = array(
-                CURLOPT_RETURNTRANSFER => TRUE,
-                CURLOPT_POST => TRUE,
-                CURLOPT_URL => $this->gravatar_secure_base_url . $hash .'.xml',
-                CURLOPT_TIMEOUT => 3
-            );
-            curl_setopt_array($ch, $options);
-            $str = curl_exec($ch);
-        }
-
-        $xml = simplexml_load_string($str);
-
-        if ($xml === FALSE)
-        {
-            $errors = array();
-            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
-        {
-            return $xml->entry;
-        }
-    }
+	/**
+	 * Creates a hash value from a provided e-mail address.
+	 * @link https://en.gravatar.com/site/implement/hash/
+	 *
+	 * @param   string      $email      A registered email.
+	 * @return  string/null             The hash for accessing the avatar or profile data.
+	 */
+	public function create_hash($email) {
+
+		return md5(strtolower(trim($email)));
+	}
+
+	protected function is_https() {
+
+		if (function_exists('is_https')) {
+			return is_https();
+		}
+
+		if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
+			return true;
+		} elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
+			return true;
+		} elseif (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------------
+	// The following original methods are kept here for backward compatibility.
+	// Consider them as deprecated.
+	//--------------------------------------------------------------------------
+
+
+	/**
+	 * Set the email to be used, converting it into an md5 hash as required by gravatar.com
+	 *
+	 * @param string $email
+	 *
+	 * @return string|null Email hash or if email didn't validate then return NULL
+	 *
+	 * @deprecated
+	 */
+	public function set_email($email)
+	{
+		$email = trim(strtolower($email));
+
+		if ( ! filter_var($email, FILTER_VALIDATE_EMAIL) === FALSE)
+		{
+			return md5($email);
+		}
+
+		return NULL;
+	}
+
+	/**
+	 * get_gravatar_url
+	 *
+	 * @see http://en.gravatar.com/site/implement/images/ for available options
+	 *
+	 * @param string $rating defaults to g
+	 * @param string $size defaults to 80
+	 * @param string $default_image default sets can be found on the above link
+	 * @param boolean $secure set to TRUE if a secure url is required
+	 *
+	 * @return string gratavar url
+	 *
+	 * @deprecated
+	 */
+	public function get_gravatar($email, $rating = NULL, $size = NULL, $default_image = NULL, $secure = NULL)
+	{
+		$hash = $this->set_email($email);
+
+		if ($hash === NULL)
+		{
+			// $hash has to be set to a value so the gravatar site can return a default image
+			$hash = 'invalid_email';
+		}
+
+		$query_string = NULL;
+		$options = array();
+
+		if ($rating !== NULL)
+		{
+			$options['r'] = $rating;
+		}
+
+		if ($size !== NULL)
+		{
+			$options['s'] = $size;
+		}
+
+		if ($default_image !== NULL)
+		{
+			$options['d'] = urlencode($default_image);
+		}
+
+		if (count($options) > 0)
+		{
+			$query_string = '?'. http_build_query($options);
+		}
+
+		if ($secure !== NULL)
+		{
+			$base = $this->gravatar_secure_base_url;
+		}
+		else
+		{
+			$base = $this->gravatar_base_url;
+		}
+
+		return $base .'avatar/'. $hash . $query_string;
+	}
+
+	/**
+	 * Grab the full profile data for a given email from gravatar.com in xml format
+	 *
+	 * @param string $email
+	 * @param string fetch_method defaults to file, 'curl' is the other option
+	 *
+	 * @return object|null $xml->entry on success, NULL on an error
+	 *
+	 * @deprecated
+	 */
+	public function get_profile($email, $fetch_method = 'file')
+	{
+		$hash = $this->set_email($email);
+
+		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)
+			{
+				return NULL;
+			}
+
+			$str = file_get_contents($this->gravatar_base_url . $hash .'.xml');
+		}
+
+		if ($fetch_method === 'curl')
+		{
+			if ( ! function_exists('curl_init'))
+			{
+				return NULL;
+			}
+
+			$ch = curl_init();
+			$options = array(
+				CURLOPT_RETURNTRANSFER => TRUE,
+				CURLOPT_POST => TRUE,
+				CURLOPT_URL => $this->gravatar_secure_base_url . $hash .'.xml',
+				CURLOPT_TIMEOUT => 3
+			);
+			curl_setopt_array($ch, $options);
+			$str = curl_exec($ch);
+		}
+
+		$xml = simplexml_load_string($str);
+
+		if ($xml === FALSE)
+		{
+			$errors = array();
+			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
+		{
+			return $xml->entry;
+		}
+	}
 
 }

application/third_party/Gravatar/helpers/gravatar_helper.php

Indentation +13 added lines, -13 removed lines

@@ -7,23 +7,23 @@
 
 if (!function_exists('gravatar')) {
 
-    // This helper function has been added here for compatibility with PyroCMS.
-    function gravatar($email = '', $size = 50, $rating = 'g', $url_only = false, $default = false) {
+	// This helper function has been added here for compatibility with PyroCMS.
+	function gravatar($email = '', $size = 50, $rating = 'g', $url_only = false, $default = false) {
 
-        $ci = & get_instance();
-        $ci->load->library('gravatar');
+		$ci = & get_instance();
+		$ci->load->library('gravatar');
 
-        if (@ (string) $default == '') {
-            $default = null;
-        }
+		if (@ (string) $default == '') {
+			$default = null;
+		}
 
-        $gravatar_url = $ci->gravatar->get($email, $size, $default, null, $rating);
+		$gravatar_url = $ci->gravatar->get($email, $size, $default, null, $rating);
 
-        if ($url_only) {
-            return $gravatar_url;
-        }
+		if ($url_only) {
+			return $gravatar_url;
+		}
 
-        return '<img src="'.$gravatar_url.'" alt="Gravatar" class="gravatar" />';
-    }
+		return '<img src="'.$gravatar_url.'" alt="Gravatar" class="gravatar" />';
+	}
 
 }

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

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 /**