ci-bonfire / Sprint

myth/Api/Auth/APIAuthentication.php

Indentation +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 	 */
 	public function setRealm($realm)
 	{
-	    $this->realm = $realm;
+		$this->realm = $realm;
 		return $this;
 	}
 
@@ -116,7 +116,7 @@ 
 			'password'  => $password
 		];
 
-	    $user = $this->validate($data, true);
+		$user = $this->validate($data, true);
 
 		$this->user = $user;
 
@@ -272,7 +272,7 @@ 
 	 */
 	public function checkIPBlacklist()
 	{
-	    $blacklist = explode(',', config_item('api.ip_blacklist'));
+		$blacklist = explode(',', config_item('api.ip_blacklist'));
 
 		array_walk($blacklist, function (&$item, $key) {
 			$item = trim($item);

Spacing +22 added lines, -22 removed lines

@@ -48,7 +48,7 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function __construct($ci=null)
+	public function __construct($ci = null)
 	{
 		parent::__construct($ci);
 
@@ -114,7 +114,7 @@ 
 		// so request authorization by the client.
 		if (empty($username) || empty($password))
 		{
-			$this->ci->output->set_header('WWW-Authenticate: Basic realm="'. config_item('api.realm') .'"');
+			$this->ci->output->set_header('WWW-Authenticate: Basic realm="'.config_item('api.realm').'"');
 			return false;
 		}
 
@@ -170,7 +170,7 @@ 
 		// No digest string? Then you're done. Go home.
 		if (empty($digest_string))
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));
 			return false;
 		}
 
@@ -180,9 +180,9 @@ 
 		preg_match_all('@(username|nonce|uri|nc|cnonce|qop|response)=[\'"]?([^\'",]+)@', $digest_string, $matches);
 		$digest = (empty($matches[1]) || empty($matches[2])) ? array() : array_combine($matches[1], $matches[2]);
 
-		if (! array_key_exists('username', $digest))
+		if ( ! array_key_exists('username', $digest))
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));
 			return false;
 		}
 
@@ -194,10 +194,10 @@ 
 
 		// Grab the user that corresponds to that "username"
 		// exact field determined in the api config file - api.auth_field setting.
-		$user = $this->user_model->as_array()->find_by( config_item('api.auth_field'), $digest['username'] );
-		if (!  $user)
+		$user = $this->user_model->as_array()->find_by(config_item('api.auth_field'), $digest['username']);
+		if ( ! $user)
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));
 			return false;
 		}
 
@@ -206,16 +206,16 @@ 
 
 		if ($digest['qop'] == 'auth')
 		{
-			$A2 = md5( strtoupper( $_SERVER['REQUEST_METHOD'] ) .':'. $digest['uri'] );
+			$A2 = md5(strtoupper($_SERVER['REQUEST_METHOD']).':'.$digest['uri']);
 		} else {
 			$body = file_get_contents('php://input');
-			$A2 = md5( strtoupper( $_SERVER['REQUEST_METHOD'] ) .':'. $digest['uri'] .':'. md5($body) );
+			$A2 = md5(strtoupper($_SERVER['REQUEST_METHOD']).':'.$digest['uri'].':'.md5($body));
 		}
-		$valid_response = md5($A1 .':'. $digest['nonce'].':'. $digest['nc'] .':'. $digest['cnonce'] .':'. $digest['qop'] .':'. $A2);
+		$valid_response = md5($A1.':'.$digest['nonce'].':'.$digest['nc'].':'.$digest['cnonce'].':'.$digest['qop'].':'.$A2);
 
 		if ($digest['response'] != $valid_response)
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));
 			return false;
 		}
 
@@ -261,7 +261,7 @@ 
 		{
 			// If throttling time is above zero, we can't allow
 			// logins now.
-			if ($time = (int)$this->isThrottled($this->email) > 0)
+			if ($time = (int) $this->isThrottled($this->email) > 0)
 			{
 				$this->error = sprintf(lang('api.throttled'), $time);
 				return false;
@@ -270,7 +270,7 @@ 
 			$this->email = null;
 		}
 
-		if (! $user)
+		if ( ! $user)
 		{
 			$this->user = null;
 			return $user;
@@ -298,13 +298,13 @@ 
 	{
 	    $blacklist = explode(',', config_item('api.ip_blacklist'));
 
-		array_walk($blacklist, function (&$item, $key) {
+		array_walk($blacklist, function(&$item, $key) {
 			$item = trim($item);
 		});
 
 		if (in_array($this->ci->input->ip_address(), $blacklist))
 		{
-			throw new \Exception( lang('api.ip_denied'), 401);
+			throw new \Exception(lang('api.ip_denied'), 401);
 		}
 
 		return true;
@@ -323,13 +323,13 @@ 
 
 		array_push($whitelist, '127.0.0.1', '0.0.0.0');
 
-		array_walk($whitelist, function (&$item, $key) {
+		array_walk($whitelist, function(&$item, $key) {
 			$item = trim($item);
 		});
 
-		if (! in_array($this->ci->input->ip_address(), $whitelist))
+		if ( ! in_array($this->ci->input->ip_address(), $whitelist))
 		{
-			throw new \Exception( lang('api.ip_denied'), 401);
+			throw new \Exception(lang('api.ip_denied'), 401);
 		}
 
 		return true;
@@ -386,9 +386,9 @@ 
 	 *
 	 * @return bool|mixed|void
 	 */
-	public function login($credentials, $remember=false)
+	public function login($credentials, $remember = false)
 	{
-		throw new \BadMethodCallException( lang('api.unused_method') );
+		throw new \BadMethodCallException(lang('api.unused_method'));
 	}
 
 	//--------------------------------------------------------------------
@@ -403,7 +403,7 @@ 
 	 */
 	public function logout()
 	{
-		throw new \BadMethodCallException( lang('api.unused_method') );
+		throw new \BadMethodCallException(lang('api.unused_method'));
 	}
 
 	//--------------------------------------------------------------------