ci-bonfire / Sprint

myth/Auth/Flat/FlatGroupsModel.php

Spacing +7 added lines, -7 removed lines

@@ -86,8 +86,8 @@ 
 	public function addUserToGroup($user_id, $group_id)
 	{
 	    $data = [
-		    'user_id'   => (int)$user_id,
-		    'group_id'  => (int)$group_id
+		    'user_id'   => (int) $user_id,
+		    'group_id'  => (int) $group_id
 	    ];
 
 		return $this->db->insert('auth_groups_users', $data);
@@ -106,8 +106,8 @@ 
 	public function removeUserFromGroup($user_id, $group_id)
 	{
 	    return $this->where([
-		    'user_id' => (int)$user_id,
-		    'group_id' => (int)$group_id
+		    'user_id' => (int) $user_id,
+		    'group_id' => (int) $group_id
 	    ])->delete('auth_groups_users');
 	}
 
@@ -122,7 +122,7 @@ 
 	 */
 	public function removeUserFromAllGroups($user_id)
 	{
-	    return $this->db->where('user_id', (int)$user_id)
+	    return $this->db->where('user_id', (int) $user_id)
 		                ->delete('auth_groups_users');
 	}
 
@@ -156,8 +156,8 @@ 
 	public function addPermissionToGroup($permission_id, $group_id)
 	{
 		$data = [
-			'permission_id' => (int)$permission_id,
-			'group_id'      => (int)$group_id
+			'permission_id' => (int) $permission_id,
+			'group_id'      => (int) $group_id
 		];
 
 	    return $this->db->insert('auth_groups_permissions', $data);

myth/Auth/Flat/FlatPermissionsModel.php

Spacing +2 added lines, -2 removed lines

@@ -84,11 +84,11 @@
 	{
 		$permissions = $this->join('auth_groups_permissions', 'auth_groups_permissions.permission_id = auth_permissions.id', 'inner')
 							->join('auth_groups_users', 'auth_groups_users.group_id = auth_groups_permissions.group_id', 'inner')
-							->where('auth_groups_users.user_id', (int)$user_id)
+							->where('auth_groups_users.user_id', (int) $user_id)
 							->as_array()
 							->find_all();
 
-		if (! $permissions)
+		if ( ! $permissions)
 		{
 			return false;
 		}

myth/Auth/FlatAuthorization.php

Spacing +83 added lines, -83 removed lines

@@ -49,7 +49,7 @@ 
 	public function __construct($groupModel = null, $permModel = null)
 	{
 		$this->groupModel      = ! empty($groupModel) ? $groupModel : new FlatGroupsModel();
-		$this->permissionModel = ! empty($permModel)  ? $permModel  : new FlatPermissionsModel();
+		$this->permissionModel = ! empty($permModel) ? $permModel : new FlatPermissionsModel();
 
 		get_instance()->load->language('auth/auth');
 	}
@@ -72,7 +72,7 @@ 
 	 */
 	public function useModel($model)
 	{
-		$this->user_model =& $model;
+		$this->user_model = & $model;
 
 		return $this;
 	}
@@ -94,11 +94,11 @@ 
 	 *
 	 * @return bool
 	 */
-	public function inGroup( $groups, $user_id )
+	public function inGroup($groups, $user_id)
 	{
-		if ( ! is_array( $groups ) )
+		if ( ! is_array($groups))
 		{
-			$groups = [ $groups ];
+			$groups = [$groups];
 		}
 
 		if (empty($user_id))
@@ -106,14 +106,14 @@ 
 			return null;
 		}
 
-		$user_groups = $this->groupModel->getGroupsForUser( (int) $user_id );
+		$user_groups = $this->groupModel->getGroupsForUser((int) $user_id);
 
-		if ( ! $user_groups )
+		if ( ! $user_groups)
 		{
 			return false;
 		}
 
-		foreach ( $groups as $group )
+		foreach ($groups as $group)
 		{
 			if (is_numeric($group))
 			{
@@ -147,9 +147,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function hasPermission( $permission, $user_id )
+	public function hasPermission($permission, $user_id)
 	{
-		if (empty($permission) || (! is_string($permission) && ! is_numeric($permission)) )
+		if (empty($permission) || ( ! is_string($permission) && ! is_numeric($permission)))
 		{
 			return null;
 		}
@@ -162,19 +162,19 @@ 
 		// Get the Permission ID
 		$permission_id = $this->getPermissionID($permission);
 
-		if ( ! is_numeric( $permission_id ) )
+		if ( ! is_numeric($permission_id))
 		{
 			return false;
 		}
 
 		// First check the permission model. If that exists, then we're golden.
-		if ($this->permissionModel->doesUserHavePermission( (int)$user_id, (int)$permission_id ) )
+		if ($this->permissionModel->doesUserHavePermission((int) $user_id, (int) $permission_id))
 		{
 			return true;
 		}
 
 		// Still here? Then we have one last check to make - any user private permissions.
-		return $this->doesUserHavePermission( (int)$user_id, (int)$permission_id);
+		return $this->doesUserHavePermission((int) $user_id, (int) $permission_id);
 	}
 
 	//--------------------------------------------------------------------
@@ -187,19 +187,19 @@ 
 	 *
 	 * @return bool
 	 */
-	public function addUserToGroup( $user_id, $group )
+	public function addUserToGroup($user_id, $group)
 	{
 		if (empty($user_id) || ! is_numeric($user_id))
 		{
 			return null;
 		}
 
-		if (empty($group) || (! is_numeric($group) && ! is_string($group) ) )
+		if (empty($group) || ( ! is_numeric($group) && ! is_string($group)))
 		{
 			return null;
 		}
 
-		if (! Events::trigger('beforeAddUserToGroup', [$user_id, $group]))
+		if ( ! Events::trigger('beforeAddUserToGroup', [$user_id, $group]))
 		{
 			return false;
 		}
@@ -207,12 +207,12 @@ 
 		$group_id = $this->getGroupID($group);
 
 		// Group ID
-		if ( ! is_numeric( $group_id ) )
+		if ( ! is_numeric($group_id))
 		{
 			return null;
 		}
 
-		if ( ! $this->groupModel->addUserToGroup( (int)$user_id, (int)$group_id ) )
+		if ( ! $this->groupModel->addUserToGroup((int) $user_id, (int) $group_id))
 		{
 			$this->error = $this->groupModel->error();
 
@@ -234,19 +234,19 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function removeUserFromGroup( $user_id, $group )
+	public function removeUserFromGroup($user_id, $group)
 	{
 		if (empty($user_id) || ! is_numeric($user_id))
 		{
 			return null;
 		}
 
-		if (empty($group) || (! is_numeric($group) && ! is_string($group) ) )
+		if (empty($group) || ( ! is_numeric($group) && ! is_string($group)))
 		{
 			return null;
 		}
 
-		if (! Events::trigger('beforeRemoveUserFromGroup', [$user_id, $group]))
+		if ( ! Events::trigger('beforeRemoveUserFromGroup', [$user_id, $group]))
 		{
 			return false;
 		}
@@ -254,12 +254,12 @@ 
 		$group_id = $this->getGroupID($group);
 
 		// Group ID
-		if ( ! is_numeric( $group_id ) )
+		if ( ! is_numeric($group_id))
 		{
 			return false;
 		}
 
-		if ( ! $this->groupModel->removeUserFromGroup( $user_id, $group_id ) )
+		if ( ! $this->groupModel->removeUserFromGroup($user_id, $group_id))
 		{
 			$this->error = $this->groupModel->error();
 
@@ -281,25 +281,25 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function addPermissionToGroup( $permission, $group )
+	public function addPermissionToGroup($permission, $group)
 	{
 		$permission_id = $this->getPermissionID($permission);
 		$group_id      = $this->getGroupID($group);
 
 		// Permission ID
-		if ( ! is_numeric( $permission_id ) )
+		if ( ! is_numeric($permission_id))
 		{
 			return false;
 		}
 
 		// Group ID
-		if ( ! is_numeric( $group_id ) )
+		if ( ! is_numeric($group_id))
 		{
 			return false;
 		}
 
 		// Remove it!
-		if ( ! $this->groupModel->addPermissionToGroup( $permission_id, $group_id ) )
+		if ( ! $this->groupModel->addPermissionToGroup($permission_id, $group_id))
 		{
 			$this->error = $this->groupModel->error();
 
@@ -319,25 +319,25 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function removePermissionFromGroup( $permission, $group )
+	public function removePermissionFromGroup($permission, $group)
 	{
 		$permission_id = $this->getPermissionID($permission);
 		$group_id      = $this->getGroupID($group);
 
 		// Permission ID
-		if ( ! is_numeric( $permission_id ) )
+		if ( ! is_numeric($permission_id))
 		{
 			return false;
 		}
 
 		// Group ID
-		if ( ! is_numeric( $group_id ) )
+		if ( ! is_numeric($group_id))
 		{
 			return false;
 		}
 
 		// Remove it!
-		if ( ! $this->groupModel->removePermissionFromGroup( $permission_id, $group_id ) )
+		if ( ! $this->groupModel->removePermissionFromGroup($permission_id, $group_id))
 		{
 			$this->error = $this->groupModel->error();
 
@@ -358,11 +358,11 @@ 
 	 *
 	 * @return int|bool
 	 */
-	public function addPermissionToUser( $permission, $user_id )
+	public function addPermissionToUser($permission, $user_id)
 	{
 		$permission_id = $this->getPermissionID($permission);
 
-		if (! is_numeric($permission_id) )
+		if ( ! is_numeric($permission_id))
 		{
 			return null;
 		}
@@ -372,21 +372,21 @@ 
 			return null;
 		}
 
-		$user_id = (int)$user_id;
+		$user_id = (int) $user_id;
 
-		if (! Events::trigger('beforeAddPermissionToUser', [$user_id, $permission]))
+		if ( ! Events::trigger('beforeAddPermissionToUser', [$user_id, $permission]))
 		{
 			return false;
 		}
 
-		$ci =& get_instance();
+		$ci = & get_instance();
 		$ci->load->model('User_model');
 
 		$permissions = $ci->user_model->getMetaItem($user_id, 'RBAC_permissions');
 
 		// If we already have permissions, unserialize them and add
 		// the new permission to it.
-		if (! empty($permissions))
+		if ( ! empty($permissions))
 		{
 			$permissions = unserialize($permissions);
 		}
@@ -411,11 +411,11 @@ 
 	 * @param int/string $permission
 	 * @param int        $user_id
 	 */
-	public function removePermissionFromUser( $permission, $user_id )
+	public function removePermissionFromUser($permission, $user_id)
 	{
 		$permission_id = $this->getPermissionID($permission);
 
-		if (! is_numeric($permission_id) )
+		if ( ! is_numeric($permission_id))
 		{
 			return false;
 		}
@@ -425,26 +425,26 @@ 
 			return null;
 		}
 
-		$user_id = (int)$user_id;
+		$user_id = (int) $user_id;
 
-		if (! Events::trigger('beforeRemovePermissionFromUser', [$user_id, $permission]))
+		if ( ! Events::trigger('beforeRemovePermissionFromUser', [$user_id, $permission]))
 		{
 			return false;
 		}
 
 		// Grab the existing permissions for this user, and remove
 		// the permission id from the list.
-		$ci =& get_instance();
+		$ci = & get_instance();
 		$ci->load->model('User_model');
 
 		$permissions = $ci->user_model->getMetaItem($user_id, 'RBAC_permissions');
 
-		if (! is_array($permissions))
+		if ( ! is_array($permissions))
 		{
 			$permissions = [];
 		}
 
-		unset($permissions[ array_search($permission_id, $permissions) ]);
+		unset($permissions[array_search($permission_id, $permissions)]);
 
 		// Save the updated permissions
 		return $ci->user_model->saveMetaToUser($user_id, 'RBAC_permissions', serialize($permissions));
@@ -464,7 +464,7 @@ 
 	{
 		$permission_id = $this->getPermissionID($permission);
 
-		if (! is_numeric($permission_id) )
+		if ( ! is_numeric($permission_id))
 		{
 			return false;
 		}
@@ -474,14 +474,14 @@ 
 			return null;
 		}
 
-		$user_id = (int)$user_id;
+		$user_id = (int) $user_id;
 
 		$model = $this->user_model;
 
 		if (empty($model))
 		{
-			$ci =& get_instance();
-			$ci->load->model( 'User_model' );
+			$ci = & get_instance();
+			$ci->load->model('User_model');
 
 			$model = $ci->user_model;
 		}
@@ -506,14 +506,14 @@ 
 	 *
 	 * @return object|null
 	 */
-	public function group( $group )
+	public function group($group)
 	{
-		if ( is_numeric( $group ) )
+		if (is_numeric($group))
 		{
-			return $this->groupModel->find( (int) $group );
+			return $this->groupModel->find((int) $group);
 		}
 
-		return $this->groupModel->find_by( 'name', $group );
+		return $this->groupModel->find_by('name', $group);
 	}
 
 	//--------------------------------------------------------------------
@@ -536,16 +536,16 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function createGroup( $name, $description = '' )
+	public function createGroup($name, $description = '')
 	{
 		$data = [
 			'name'        => $name,
 			'description' => $description
 		];
 
-		$id = $this->groupModel->insert( $data );
+		$id = $this->groupModel->insert($data);
 
-		if ( is_numeric( $id ) )
+		if (is_numeric($id))
 		{
 			return (int) $id;
 		}
@@ -564,9 +564,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public function deleteGroup( $group_id )
+	public function deleteGroup($group_id)
 	{
-		if ( ! $this->groupModel->delete( $group_id ) )
+		if ( ! $this->groupModel->delete($group_id))
 		{
 			$this->error = $this->groupModel->error();
 
@@ -587,18 +587,18 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function updateGroup( $id, $name, $description = '' )
+	public function updateGroup($id, $name, $description = '')
 	{
 		$data = [
 			'name' => $name
 		];
 
-		if ( ! empty( $description ) )
+		if ( ! empty($description))
 		{
 			$data['description'] = $description;
 		}
 
-		if ( ! $this->groupModel->update( (int) $id, $data ) )
+		if ( ! $this->groupModel->update((int) $id, $data))
 		{
 			$this->error = $this->groupModel->error();
 
@@ -618,23 +618,23 @@ 
 	 *
 	 * @return int|false
 	 */
-	protected function getGroupID( $group )
+	protected function getGroupID($group)
 	{
 		if (is_numeric($group))
 		{
-			return (int)$group;
+			return (int) $group;
 		}
 
-		$g = $this->groupModel->find_by( 'name', $group );
+		$g = $this->groupModel->find_by('name', $group);
 
-		if ( ! $g )
+		if ( ! $g)
 		{
 			$this->error = lang('auth.group_not_found');
 
 			return FALSE;
 		}
 
-		return (int)$g->id;
+		return (int) $g->id;
 	}
 
 	//--------------------------------------------------------------------
@@ -650,14 +650,14 @@ 
 	 *
 	 * @return object|null
 	 */
-	public function permission( $permission )
+	public function permission($permission)
 	{
-		if ( is_numeric( $permission ) )
+		if (is_numeric($permission))
 		{
-			return $this->permissionModel->find( (int) $permission );
+			return $this->permissionModel->find((int) $permission);
 		}
 
-		return $this->permissionModel->find_by( 'LOWER(name)', strtolower( $permission ) );
+		return $this->permissionModel->find_by('LOWER(name)', strtolower($permission));
 	}
 
 	//--------------------------------------------------------------------
@@ -682,16 +682,16 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function createPermission( $name, $description = '' )
+	public function createPermission($name, $description = '')
 	{
 		$data = [
 			'name'        => $name,
 			'description' => $description
 		];
 
-		$id = $this->permissionModel->insert( $data );
+		$id = $this->permissionModel->insert($data);
 
-		if ( is_numeric( $id ) )
+		if (is_numeric($id))
 		{
 			return (int) $id;
 		}
@@ -710,9 +710,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function deletePermission( $permission_id )
+	public function deletePermission($permission_id)
 	{
-		if ( ! $this->permissionModel->delete( $permission_id ) )
+		if ( ! $this->permissionModel->delete($permission_id))
 		{
 			$this->error = $this->permissionModel->error();
 
@@ -720,7 +720,7 @@ 
 		}
 
 		// Remove the permission from all groups
-		$this->groupModel->removePermissionFromAllGroups( $permission_id );
+		$this->groupModel->removePermissionFromAllGroups($permission_id);
 
 		return TRUE;
 	}
@@ -736,18 +736,18 @@ 
 	 *
 	 * @return bool
 	 */
-	public function updatePermission( $id, $name, $description = '' )
+	public function updatePermission($id, $name, $description = '')
 	{
 		$data = [
 			'name' => $name
 		];
 
-		if ( ! empty( $description ) )
+		if ( ! empty($description))
 		{
 			$data['description'] = $description;
 		}
 
-		if ( ! $this->permissionModel->update( (int) $id, $data ) )
+		if ( ! $this->permissionModel->update((int) $id, $data))
 		{
 			$this->error = $this->permissionModel->error();
 
@@ -767,25 +767,25 @@ 
 	 *
 	 * @return int|null
 	 */
-	protected function getPermissionID( $permission )
+	protected function getPermissionID($permission)
 	{
 		// If it's a number, we're done here.
 		if (is_numeric($permission))
 		{
-			return (int)$permission;
+			return (int) $permission;
 		}
 
 		// Otherwise, pull it from the database.
-		$p = $this->permissionModel->find_by( 'name', $permission );
+		$p = $this->permissionModel->find_by('name', $permission);
 
-		if ( ! $p )
+		if ( ! $p)
 		{
 			$this->error = lang('auth.permission_not_found');
 
 			return FALSE;
 		}
 
-		return (int)$p->id;
+		return (int) $p->id;
 	}
 
 	//--------------------------------------------------------------------

myth/Auth/LocalAuthentication.php

Spacing +60 added lines, -60 removed lines

@@ -62,21 +62,21 @@ 
 
     //--------------------------------------------------------------------
 
-    public function __construct( $ci=null )
+    public function __construct($ci = null)
     {
         if ($ci)
         {
-            $this->ci= $ci;
+            $this->ci = $ci;
         }
         else
         {
-            $this->ci =& get_instance();
+            $this->ci = & get_instance();
         }
 
         // Get our compatibility password file loaded up.
-        if (! function_exists('password_hash'))
+        if ( ! function_exists('password_hash'))
         {
-            require_once dirname(__FILE__) .'password.php';
+            require_once dirname(__FILE__).'password.php';
         }
 
         if (empty($this->ci->session))
@@ -101,18 +101,18 @@ 
      * @param bool  $remember
      * @return bool|mixed
      */
-    public function login($credentials, $remember=false)
+    public function login($credentials, $remember = false)
     {
         $user = $this->validate($credentials, true);
 
-        if (! $user)
+        if ( ! $user)
         {
 	        // We need to send an error even if no
 	        // user was found!
 	        $this->error = lang('auth.invalid_user');
 
 	        // If an email is present, log the attempt
-	        if (! empty($credentials['email']) )
+	        if ( ! empty($credentials['email']))
 	        {
 		        $this->ci->login_model->recordLoginAttempt($credentials['email']);
 	        }
@@ -128,7 +128,7 @@ 
 
         // If throttling time is above zero, we can't allow
         // logins now.
-        $time = (int)$this->isThrottled($user['email']);
+        $time = (int) $this->isThrottled($user['email']);
         if ($time > 0)
         {
             $this->error = sprintf(lang('auth.throttled'), $time);
@@ -159,7 +159,7 @@ 
      * @param bool $return_user
      * @return mixed
      */
-    public function validate($credentials, $return_user=false)
+    public function validate($credentials, $return_user = false)
     {
         // Can't validate without a password.
         if (empty($credentials['password']) || count($credentials) < 2)
@@ -179,7 +179,7 @@ 
 	    }
 
         // Ensure that the fields are allowed validation fields
-	    if (! in_array(key($credentials), config_item('auth.valid_fields')) )
+	    if ( ! in_array(key($credentials), config_item('auth.valid_fields')))
 	    {
 		    $this->error = lang('auth.invalid_credentials');
 		    return false;
@@ -187,7 +187,7 @@ 
 
         // We do not want to force case-sensitivity on things
         // like username and email for usability sake.
-        if (! empty($credentials['email']))
+        if ( ! empty($credentials['email']))
         {
             $credentials['email'] = strtolower($credentials['email']);
         }
@@ -197,16 +197,16 @@ 
                                  ->where($credentials)
                                  ->first();
 
-        if (! $user)
+        if ( ! $user)
         {
             $this->error = lang('auth.invalid_user');
             return false;
         }
 
         // Now, try matching the passwords.
-        $result =  password_verify($password, $user['password_hash']);
+        $result = password_verify($password, $user['password_hash']);
 
-        if (! $result)
+        if ( ! $result)
         {
             $this->error = lang('auth.invalid_password');
             $this->ci->login_model->recordLoginAttempt($user['email']);
@@ -217,7 +217,7 @@ 
         // This would be due to the hash algorithm or hash
         // cost changing since the last time that a user
         // logged in.
-        if (password_needs_rehash($user['password_hash'], PASSWORD_DEFAULT, ['cost' => config_item('auth.hash_cost')] ))
+        if (password_needs_rehash($user['password_hash'], PASSWORD_DEFAULT, ['cost' => config_item('auth.hash_cost')]))
         {
             $new_hash = Password::hashPassword($password);
             $this->user_model->skip_validation()
@@ -226,7 +226,7 @@ 
         }
 
         // Is the user active?
-        if (! $user['active'])
+        if ( ! $user['active'])
         {
             $this->error = lang('auth.inactive_account');
             return false;
@@ -246,7 +246,7 @@ 
     {
         $this->ci->load->helper('cookie');
 
-        if (! Events::trigger('beforeLogout', [$this->user]))
+        if ( ! Events::trigger('beforeLogout', [$this->user]))
         {
             return false;
         }
@@ -255,10 +255,10 @@ 
         // available for flash messages, etc.
         if (isset($_SESSION))
         {
-            foreach ( $_SESSION as $key => $value )
+            foreach ($_SESSION as $key => $value)
             {
-                $_SESSION[ $key ] = NULL;
-                unset( $_SESSION[ $key ] );
+                $_SESSION[$key] = NULL;
+                unset($_SESSION[$key]);
             }
         }
         // Also, regenerate the session ID for a touch of added safety.
@@ -284,7 +284,7 @@ 
     {
         $id = $this->ci->session->userdata('logged_in');
 
-        if (! $id)
+        if ( ! $id)
         {
             return false;
         }
@@ -292,10 +292,10 @@ 
         // If the user var hasn't been filled in, we need to fill it in,
         // since this method will typically be used as the only method
         // to determine whether a user is logged in or not.
-        if (! $this->user)
+        if ( ! $this->user)
         {
             $this->user = $this->user_model->as_array()
-                                           ->find_by('id', (int)$id);
+                                           ->find_by('id', (int) $id);
 
             if (empty($this->user))
             {
@@ -319,14 +319,14 @@ 
      */
     public function viaRemember()
     {
-        if (! config_item('auth.allow_remembering'))
+        if ( ! config_item('auth.allow_remembering'))
         {
             return false;
         }
 
         $this->ci->load->helper('cookie');
 
-        if (! $token = get_cookie('remember'))
+        if ( ! $token = get_cookie('remember'))
         {
             return false;
         }
@@ -335,7 +335,7 @@ 
         $query = $this->ci->db->where('hash', $this->ci->login_model->hashRememberToken($token))
                               ->get('auth_tokens');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return false;
         }
@@ -373,16 +373,16 @@ 
         // If via email, we need to generate a hash
         $this->ci->load->helper('string');
         $token = random_string('alnum', 24);
-        $user_data['activate_hash'] = hash('sha1', config_item('auth.salt') . $token);
+        $user_data['activate_hash'] = hash('sha1', config_item('auth.salt').$token);
 
         // Email should NOT be case sensitive.
-        if (! empty($user_data['email']))
+        if ( ! empty($user_data['email']))
         {
             $user_data['email'] = strtolower($user_data['email']);
         }
 
         // Save the user
-        if (! $id = $this->user_model->insert($user_data))
+        if ( ! $id = $this->user_model->insert($user_data))
         {
             $this->error = $this->user_model->error();
             return false;
@@ -413,25 +413,25 @@ 
     {
         $post = [
             'email'         => $data['email'],
-            'activate_hash' => hash('sha1', config_item('auth.salt') . $data['code'])
+            'activate_hash' => hash('sha1', config_item('auth.salt').$data['code'])
         ];
 
         $user = $this->user_model->where($post)
                                  ->first();
 
-        if (! $user) {
+        if ( ! $user) {
             $this->error = $this->user_model->error() ? $this->user_model->error() : lang('auth.activate_no_user');
 
             return false;
         }
 
-        if (! $this->user_model->update($user->id, ['active' => 1, 'activate_hash' => null]))
+        if ( ! $this->user_model->update($user->id, ['active' => 1, 'activate_hash' => null]))
         {
             $this->error = $this->user_model->error();
             return false;
         }
 
-        Events::trigger('didActivate', [(array)$user]);
+        Events::trigger('didActivate', [(array) $user]);
 
         return true;
     }
@@ -446,7 +446,7 @@ 
      */
     public function activateUserById($id)
     {
-        if (! $this->user_model->update($id, ['active' => 1, 'activate_hash' => null]))
+        if ( ! $this->user_model->update($id, ['active' => 1, 'activate_hash' => null]))
         {
             $this->error = $this->user_model->error();
             return false;
@@ -478,12 +478,12 @@ 
      */
     public function id()
     {
-        if (! is_array($this->user) || empty($this->user['id']))
+        if ( ! is_array($this->user) || empty($this->user['id']))
         {
             return null;
         }
 
-        return (int)$this->user['id'];
+        return (int) $this->user['id'];
     }
 
     //--------------------------------------------------------------------
@@ -500,7 +500,7 @@ 
     public function isThrottled($email)
     {
         // Not throttling? Get outta here!
-        if (! config_item('auth.allow_throttling'))
+        if ( ! config_item('auth.allow_throttling'))
         {
             return false;
         }
@@ -564,7 +564,7 @@ 
         {
             $this->error = lang('auth.bruteBan_notice');
 
-            $ban_time = 60 * 15;    // 15 minutes
+            $ban_time = 60 * 15; // 15 minutes
             $_SESSION['bruteBan'] = time() + $ban_time;
             return $ban_time;
         }
@@ -612,7 +612,7 @@ 
         // Is it a valid user?
         $user = $this->user_model->find_by('email', $email);
 
-        if (! $user)
+        if ( ! $user)
         {
             $this->error = lang('auth.invalid_email');
             return false;
@@ -621,17 +621,17 @@ 
         // Generate/store our codes
         $this->ci->load->helper('string');
         $token = random_string('alnum', 24);
-        $hash = hash('sha1', config_item('auth.salt') .$token);
+        $hash = hash('sha1', config_item('auth.salt').$token);
 
         $result = $this->user_model->update($user->id, ['reset_hash' => $hash]);
 
-        if (! $result)
+        if ( ! $result)
         {
             $this->error = $this->user_model->error();
             return false;
         }
 
-        Events::trigger('didRemindUser', [(array)$user, $token]);
+        Events::trigger('didRemindUser', [(array) $user, $token]);
 
         return true;
     }
@@ -658,10 +658,10 @@ 
         }
 
         // Generate a hash to match against the table.
-        $credentials['reset_hash'] = hash('sha1', config_item('auth.salt') .$credentials['code']);
+        $credentials['reset_hash'] = hash('sha1', config_item('auth.salt').$credentials['code']);
         unset($credentials['code']);
 
-        if (! empty($credentials['email']))
+        if ( ! empty($credentials['email']))
         {
             $credentials['email'] = strtolower($credentials['email']);
         }
@@ -669,7 +669,7 @@ 
         // Is there a matching user?
         $user = $this->user_model->find_by($credentials);
 
-        if (! $user)
+        if ( ! $user)
         {
             $this->error = lang('auth.reset_no_user');
             return false;
@@ -682,13 +682,13 @@ 
             'reset_hash'   => null
         ];
 
-        if (! $this->user_model->update($user->id, $data))
+        if ( ! $this->user_model->update($user->id, $data))
         {
             $this->error = $this->user_model->error();
             return false;
         }
 
-        Events::trigger('didResetPassword', [(array)$user]);
+        Events::trigger('didResetPassword', [(array) $user]);
 
         return true;
     }
@@ -704,7 +704,7 @@ 
      * @param null $message
      * @return mixed
      */
-    public function changeStatus($newStatus, $message=null)
+    public function changeStatus($newStatus, $message = null)
     {
         // todo actually record new users status!
     }
@@ -721,14 +721,14 @@ 
      * @param bool $allow_any_parent
      * @return mixed
      */
-    public function useModel($model, $allow_any_parent=false)
+    public function useModel($model, $allow_any_parent = false)
     {
-        if (! $allow_any_parent && get_parent_class($model) != 'Myth\Models\CIDbModel')
+        if ( ! $allow_any_parent && get_parent_class($model) != 'Myth\Models\CIDbModel')
         {
             throw new \RuntimeException('Models passed into LocalAuthenticate MUST extend Myth\Models\CIDbModel');
         }
 
-        $this->user_model =& $model;
+        $this->user_model = & $model;
 
         return $this;
     }
@@ -800,7 +800,7 @@ 
      */
     protected function rememberUser($user)
     {
-        if (! config_item('auth.allow_remembering'))
+        if ( ! config_item('auth.allow_remembering'))
         {
             log_message('debug', 'Auth library set to refuse "Remember Me" functionality.');
             return false;
@@ -819,13 +819,13 @@ 
      * @param null $token
      * @return mixed
      */
-    protected function refreshRememberCookie($user, $token=null)
+    protected function refreshRememberCookie($user, $token = null)
     {
         $this->ci->load->helper('cookie');
 
         // If a token is passed in, we know we're removing the
         // old one.
-        if (! empty($token))
+        if ( ! empty($token))
         {
             $this->invalidateRememberCookie($user['email'], $token);
         }
@@ -835,7 +835,7 @@ 
         // Save the token to the database.
         $data = [
             'email'   => $user['email'],
-            'hash'    => sha1(config_item('auth.salt') . $new_token),
+            'hash'    => sha1(config_item('auth.salt').$new_token),
             'created' => date('Y-m-d H:i:s')
         ];
 
@@ -843,13 +843,13 @@ 
 
         // Create the cookie
         set_cookie(
-            'remember',                             // Cookie Name
-            $new_token,                             // Value
-            config_item('auth.remember_length'),    // # Seconds until it expires
+            'remember', // Cookie Name
+            $new_token, // Value
+            config_item('auth.remember_length'), // # Seconds until it expires
             config_item('cookie_domain'),
             config_item('cookie_path'),
             config_item('cookie_prefix'),
-            false,                                  // Only send over HTTPS?
+            false, // Only send over HTTPS?
             true                                    // Hide from Javascript?
         );
 

myth/Auth/Password.php

Spacing +8 added lines, -8 removed lines

@@ -30,7 +30,7 @@ 
  * @since       Version 1.0
  */
 
-define('DICTIONARY_PATH', dirname(__FILE__) .'/dictionary.txt');
+define('DICTIONARY_PATH', dirname(__FILE__).'/dictionary.txt');
 
 /**
  * Class Password
@@ -60,7 +60,7 @@ 
      */
     public static function hashPassword($password)
     {
-        if (! config_item('auth.hash_cost'))
+        if ( ! config_item('auth.hash_cost'))
         {
             get_instance()->load->config('auth');
         }
@@ -157,8 +157,8 @@ 
             else if ($tempchr == ord(" "))  $space = true;
             else  $other = true;
         }
-        $extrabits = ($upper && $lower && $other ? ($numeric ? 6 : 5) : ($numeric && !$upper && !$lower ? ($other ? -2 : -6) : 0));
-        if (!$space)  $extrabits -= 2;
+        $extrabits = ($upper && $lower && $other ? ($numeric ? 6 : 5) : ($numeric && ! $upper && ! $lower ? ($other ? -2 : -6) : 0));
+        if ( ! $space)  $extrabits -= 2;
         else if (count(explode(" ", preg_replace('/\s+/', " ", $password))) > 3)  $extrabits++;
         $result = self::getNISTNumBits($password, true) + $extrabits;
 
@@ -332,15 +332,15 @@ 
                         }
 
                         $found = false;
-                        while (!$found && $x2 - $x >= $minwordlen)
+                        while ( ! $found && $x2 - $x >= $minwordlen)
                         {
-                            $word = "/\\n" . substr($password, $x, $minwordlen);
-                            for ($x3 = $x + $minwordlen; $x3 < $x2; $x3++)  $word .= "(" . $password{$x3};
+                            $word = "/\\n".substr($password, $x, $minwordlen);
+                            for ($x3 = $x + $minwordlen; $x3 < $x2; $x3++)  $word .= "(".$password{$x3};
                             for ($x3 = $x + $minwordlen; $x3 < $x2; $x3++)  $word .= ")?";
                             $word .= "\\n/";
 
                             preg_match_all($word, $data, $matches);
-                            if (!count($matches[0]))
+                            if ( ! count($matches[0]))
                             {
                                 $password{$x} = "*";
                                 $x++;

myth/CIModules/auth/controllers/Auth.php

Spacing +18 added lines, -18 removed lines

@@ -71,14 +71,14 @@ 
                 'password' => $this->input->post('password')
             ];
 
-            $remember = (bool)$this->input->post('remember');
+            $remember = (bool) $this->input->post('remember');
 
             if ($auth->login($post_data, $remember))
             {
 	            // Is the user being forced to reset their password?
 	            if ($auth->user()['force_pass_reset'] == 1)
 	            {
-		            redirect( Route::named('change_pass') );
+		            redirect(Route::named('change_pass'));
 	            }
 
                 unset($_SESSION['redirect_url']);
@@ -135,7 +135,7 @@ 
             if ($auth->registerUser($post_data))
             {
                 $this->setMessage(lang('auth.did_register'), 'success');
-                redirect( Route::named('login') );
+                redirect(Route::named('login'));
             }
             else
             {
@@ -168,7 +168,7 @@ 
             if ($auth->activateUser($post_data))
             {
                 $this->setMessage(lang('auth.did_activate'), 'success');
-                redirect( Route::named('login') );
+                redirect(Route::named('login'));
             }
             else
             {
@@ -201,7 +201,7 @@ 
             if ($auth->remindUser($this->input->post('email')))
             {
                 $this->setMessage(lang('auth.send_success'), 'success');
-                redirect( Route::named('reset_pass') );
+                redirect(Route::named('reset_pass'));
             }
             else
             {
@@ -236,7 +236,7 @@ 
             if ($auth->resetPassword($credentials, $password, $pass_confirm))
             {
                 $this->setMessage(lang('auth.new_password_success'), 'success');
-                redirect( Route::named('login') );
+                redirect(Route::named('login'));
             }
             else
             {
@@ -267,9 +267,9 @@ 
 		$this->load->model('user_model');
 		$auth->useModel($this->user_model);
 
-		if (! $auth->isLoggedIn())
+		if ( ! $auth->isLoggedIn())
 		{
-			redirect( Route::named('login') );
+			redirect(Route::named('login'));
 		}
 
 		$this->load->helper('form');
@@ -281,35 +281,35 @@ 
 			$pass_confirm = $this->input->post('pass_confirm');
 
 			// Does the current password match?
-			if (! password_verify($current_pass, $auth->user()['password_hash']))
+			if ( ! password_verify($current_pass, $auth->user()['password_hash']))
 			{
-				$this->setMessage( lang('auth.bad_current_pass'), 'warning');
-				redirect( current_url() );
+				$this->setMessage(lang('auth.bad_current_pass'), 'warning');
+				redirect(current_url());
 			}
 
 			// Do the passwords match?
 			if ($password != $pass_confirm)
 			{
-				$this->setMessage( lang('auth.pass_must_match'), 'warning');
-				redirect( current_url() );
+				$this->setMessage(lang('auth.pass_must_match'), 'warning');
+				redirect(current_url());
 			}
 
 			$hash = \Myth\Auth\Password::hashPassword($password);
 
-			if (! $this->user_model->update( $auth->id(), ['password_hash' => $hash, 'force_pass_reset' => 0]) )
+			if ( ! $this->user_model->update($auth->id(), ['password_hash' => $hash, 'force_pass_reset' => 0]))
 			{
-				$this->setMessage( 'Error: '. $this->user_model->error(), 'danger');
-				redirect( current_url() );
+				$this->setMessage('Error: '.$this->user_model->error(), 'danger');
+				redirect(current_url());
 			}
 
 			$redirect_url = $this->session->userdata('redirect_url');
 			unset($_SESSION['redirect_url']);
 
-			$this->setMessage( lang('auth.new_password_success'), 'success' );
+			$this->setMessage(lang('auth.new_password_success'), 'success');
 
 			$auth->logout();
 
-			redirect( Route::named('login') );
+			redirect(Route::named('login'));
 		}
 
 		$this->addScript('register.js');

myth/CIModules/auth/controllers/Test.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 		// Convert the milliseconds to seconds.
 	    $target_time = $target_time / 1000;
 
-		CLI::write('Testing for password hash value with a target time of '. $target_time .' seconds...');
+		CLI::write('Testing for password hash value with a target time of '.$target_time.' seconds...');
 
 		// Taken from the PHP manual
 		$cost = 8;
@@ -59,7 +59,7 @@ 
 			$end = microtime(true);
 		} while (($end - $start) < $target_time);
 
-		CLI::write("Hash value should be set to: ". CLI::color($cost, 'green'));
+		CLI::write("Hash value should be set to: ".CLI::color($cost, 'green'));
 	}
 	
 	//--------------------------------------------------------------------

myth/CIModules/auth/helpers/password_helper.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
  * @since       Version 1.0
  */
 
-if (! function_exists('isStrongPassword'))
+if ( ! function_exists('isStrongPassword'))
 {
     /**
      * Works with Myth\Auth\Password to enforce a strong password.
@@ -45,7 +45,7 @@ 
 
         $strong = \Myth\Auth\Password::isStrongPassword($password, $min_strength, $use_dict);
 
-        if (! $strong)
+        if ( ! $strong)
         {
             if (isset(get_instance()->form_validation))
             {

myth/CIModules/auth/language/english/auth_lang.php

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
 $lang['auth.password_strength']     = 'Password Strength';
 $lang['auth.pass_not_strong']       = 'The Password must be stronger.';
 
-$lang['auth.have_account']          = 'Already a member? <a href="'. site_url( \Myth\Route::named('login') ) .'">Sign In</a>';
-$lang['auth.need_account']          = 'Need an Account? <a href="'. site_url( \Myth\Route::named('register') ) .'">Sign Up</a>';
-$lang['auth.forgot_pass']           = '<a href="'. site_url( \Myth\Route::named('forgot_pass') ) .'">Forgot your Password?</a>';
+$lang['auth.have_account']          = 'Already a member? <a href="'.site_url(\Myth\Route::named('login')).'">Sign In</a>';
+$lang['auth.need_account']          = 'Need an Account? <a href="'.site_url(\Myth\Route::named('register')).'">Sign Up</a>';
+$lang['auth.forgot_pass']           = '<a href="'.site_url(\Myth\Route::named('forgot_pass')).'">Forgot your Password?</a>';
 
 $lang['auth.first_name']            = 'First Name';
 $lang['auth.last_name']             = 'Last Name';
@@ -56,7 +56,7 @@ 
 $lang['auth.activate']              = 'Activate';
 $lang['auth.inactive_account']      = 'Your account is not active.';
 
-$lang['auth.register_subject']      = "Open to activate your account at ". config_item('site.name');
+$lang['auth.register_subject']      = "Open to activate your account at ".config_item('site.name');
 $lang['auth.activate_no_user']      = 'Unable to find a user with those credentials.';
 $lang['auth.remind_subject']        = "Here's how to reset your password...";
 $lang['auth.need_reset_code']       = 'You must provide the Reset Code.';