Fixed negation styling

softwarespot · softwarespot · commit f9cd854abb3d · 2016-04-03T08:31:38.000+03:00
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
@@ -422,7 +422,7 @@ public function __construct($config = 'rest')
             $supported_formats = [];
         }
 
-        if (!is_array($supported_formats))
+        if ( ! is_array($supported_formats))
         {
             $supported_formats = [$supported_formats];
         }
@@ -553,7 +553,7 @@ public function __construct($config = 'rest')
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
-        if ($this->auth_override === FALSE && (!($this->config->item('rest_enable_keys') && $this->_allow === TRUE) || ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE)))
+        if ($this->auth_override === FALSE && ! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) || ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE))
         {
             $rest_auth = strtolower($this->config->item('rest_auth'));
             switch ($rest_auth)
@@ -620,10 +620,10 @@ public function _remap($object_called, $arguments = [])
         $controller_method = $object_called.'_'.$this->request->method;
 
         // Do we want to log this method (if allowed by config)?
-        $log_method = !(isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
+        $log_method = ! (isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
 
         // Use keys for this method?
-        $use_key = !(isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === FALSE);
+        $use_key = ! (isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === FALSE);
 
         // They provided a key, but it wasn't valid, so get them out of here
         if ($this->config->item('rest_enable_keys') && $use_key && $this->_allow === FALSE)
@@ -985,7 +985,7 @@ protected function _detect_api_key()
         // Find the key from server or arguments
         if (($key = isset($this->_args[$api_key_variable]) ? $this->_args[$api_key_variable] : $this->input->server($key_name)))
         {
-            if (!($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))
+            if ( ! ($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))
             {
                 return FALSE;
             }
@@ -1213,12 +1213,12 @@ protected function _auth_override_check()
         $auth_override_class_method = $this->config->item('auth_override_class_method');
 
         // Check to see if the override array is even populated
-        if (!empty($auth_override_class_method))
+        if ( ! empty($auth_override_class_method))
         {
-            // check for wildcard flag for rules for classes
-            if (!empty($auth_override_class_method[$this->router->class]['*'])) // Check for class overrides
+            // Check for wildcard flag for rules for classes
+            if ( ! empty($auth_override_class_method[$this->router->class]['*'])) // Check for class overrides
             {
-                // None auth override found, prepare nothing but send back a TRUE override flag
+                // No auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method[$this->router->class]['*'] === 'none')
                 {
                     return TRUE;
@@ -1258,7 +1258,7 @@ protected function _auth_override_check()
             }
 
             // Check to see if there's an override value set for the current class/method being called
-            if (!empty($auth_override_class_method[$this->router->class][$this->router->method]))
+            if ( ! empty($auth_override_class_method[$this->router->class][$this->router->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method[$this->router->class][$this->router->method] === 'none')
@@ -1304,10 +1304,10 @@ protected function _auth_override_check()
         $auth_override_class_method_http = $this->config->item('auth_override_class_method_http');
 
         // Check to see if the override array is even populated
-        if (!empty($auth_override_class_method_http))
+        if ( ! empty($auth_override_class_method_http))
         {
             // check for wildcard flag for rules for classes
-            if(!empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method]))
+            if ( ! empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'none')
@@ -1349,7 +1349,7 @@ protected function _auth_override_check()
             }
 
             // Check to see if there's an override value set for the current class/method/HTTP-method being called
-            if(!empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method]))
+            if ( ! empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'none')
@@ -1854,7 +1854,7 @@ protected function _check_login($username = NULL, $password = FALSE)
         $rest_auth = strtolower($this->config->item('rest_auth'));
         $valid_logins = $this->config->item('rest_valid_logins');
 
-        if (!$this->config->item('auth_source') && $rest_auth === 'digest')
+        if ( ! $this->config->item('auth_source') && $rest_auth === 'digest')
         {
             // For digest we do not have a password passed as argument
             return md5($username.':'.$this->config->item('rest_realm').':'.(isset($valid_logins[$username]) ? $valid_logins[$username] : ''));
@@ -1904,7 +1904,7 @@ protected function _check_php_session()
         $key = $this->config->item('auth_source');
 
         // If falsy, then the user isn't logged in
-        if (!$this->session->userdata($key))
+        if ( ! $this->session->userdata($key))
         {
             // Display an error response
             $this->response([

Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ public function __construct($config = 'rest')`
`422`	`422`	`$supported_formats = [];`
`423`	`423`	`}`
`424`	`424`
`425`		`- if (!is_array($supported_formats))`
	`425`	`+ if ( ! is_array($supported_formats))`
`426`	`426`	`{`
`427`	`427`	`$supported_formats = [$supported_formats];`
`428`	`428`	`}`
`@@ -553,7 +553,7 @@ public function __construct($config = 'rest')`
`553`	`553`	`}`
`554`	`554`
`555`	`555`	`// When there is no specific override for the current class/method, use the default auth value set in the config`
`556`		`- if ($this->auth_override === FALSE && (!($this->config->item('rest_enable_keys') && $this->_allow === TRUE) \|\| ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE)))`
	`556`	`+ if ($this->auth_override === FALSE && ! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) \|\| ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE))`
`557`	`557`	`{`
`558`	`558`	`$rest_auth = strtolower($this->config->item('rest_auth'));`
`559`	`559`	`switch ($rest_auth)`
`@@ -620,10 +620,10 @@ public function _remap($object_called, $arguments = [])`
`620`	`620`	`$controller_method = $object_called.'_'.$this->request->method;`
`621`	`621`
`622`	`622`	`// Do we want to log this method (if allowed by config)?`
`623`		`- $log_method = !(isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);`
	`623`	`+ $log_method = ! (isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);`
`624`	`624`
`625`	`625`	`// Use keys for this method?`
`626`		`- $use_key = !(isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === FALSE);`
	`626`	`+ $use_key = ! (isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === FALSE);`
`627`	`627`
`628`	`628`	`// They provided a key, but it wasn't valid, so get them out of here`
`629`	`629`	`if ($this->config->item('rest_enable_keys') && $use_key && $this->_allow === FALSE)`
`@@ -985,7 +985,7 @@ protected function _detect_api_key()`
`985`	`985`	`// Find the key from server or arguments`
`986`	`986`	`if (($key = isset($this->_args[$api_key_variable]) ? $this->_args[$api_key_variable] : $this->input->server($key_name)))`
`987`	`987`	`{`
`988`		`- if (!($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))`
	`988`	`+ if ( ! ($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))`
`989`	`989`	`{`
`990`	`990`	`return FALSE;`
`991`	`991`	`}`
`@@ -1213,12 +1213,12 @@ protected function _auth_override_check()`
`1213`	`1213`	`$auth_override_class_method = $this->config->item('auth_override_class_method');`
`1214`	`1214`
`1215`	`1215`	`// Check to see if the override array is even populated`
`1216`		`- if (!empty($auth_override_class_method))`
	`1216`	`+ if ( ! empty($auth_override_class_method))`
`1217`	`1217`	`{`
`1218`		`- // check for wildcard flag for rules for classes`
`1219`		`- if (!empty($auth_override_class_method[$this->router->class]['*'])) // Check for class overrides`
	`1218`	`+ // Check for wildcard flag for rules for classes`
	`1219`	`+ if ( ! empty($auth_override_class_method[$this->router->class]['*'])) // Check for class overrides`
`1220`	`1220`	`{`
`1221`		`- // None auth override found, prepare nothing but send back a TRUE override flag`
	`1221`	`+ // No auth override found, prepare nothing but send back a TRUE override flag`
`1222`	`1222`	`if ($auth_override_class_method[$this->router->class]['*'] === 'none')`
`1223`	`1223`	`{`
`1224`	`1224`	`return TRUE;`
`@@ -1258,7 +1258,7 @@ protected function _auth_override_check()`
`1258`	`1258`	`}`
`1259`	`1259`
`1260`	`1260`	`// Check to see if there's an override value set for the current class/method being called`
`1261`		`- if (!empty($auth_override_class_method[$this->router->class][$this->router->method]))`
	`1261`	`+ if ( ! empty($auth_override_class_method[$this->router->class][$this->router->method]))`
`1262`	`1262`	`{`
`1263`	`1263`	`// None auth override found, prepare nothing but send back a TRUE override flag`
`1264`	`1264`	`if ($auth_override_class_method[$this->router->class][$this->router->method] === 'none')`
`@@ -1304,10 +1304,10 @@ protected function _auth_override_check()`
`1304`	`1304`	`$auth_override_class_method_http = $this->config->item('auth_override_class_method_http');`
`1305`	`1305`
`1306`	`1306`	`// Check to see if the override array is even populated`
`1307`		`- if (!empty($auth_override_class_method_http))`
	`1307`	`+ if ( ! empty($auth_override_class_method_http))`
`1308`	`1308`	`{`
`1309`	`1309`	`// check for wildcard flag for rules for classes`
`1310`		`- if(!empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method]))`
	`1310`	`+ if ( ! empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method]))`
`1311`	`1311`	`{`
`1312`	`1312`	`// None auth override found, prepare nothing but send back a TRUE override flag`
`1313`	`1313`	`if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'none')`
`@@ -1349,7 +1349,7 @@ protected function _auth_override_check()`
`1349`	`1349`	`}`
`1350`	`1350`
`1351`	`1351`	`// Check to see if there's an override value set for the current class/method/HTTP-method being called`
`1352`		`- if(!empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method]))`
	`1352`	`+ if ( ! empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method]))`
`1353`	`1353`	`{`
`1354`	`1354`	`// None auth override found, prepare nothing but send back a TRUE override flag`
`1355`	`1355`	`if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'none')`
`@@ -1854,7 +1854,7 @@ protected function _check_login($username = NULL, $password = FALSE)`
`1854`	`1854`	`$rest_auth = strtolower($this->config->item('rest_auth'));`
`1855`	`1855`	`$valid_logins = $this->config->item('rest_valid_logins');`
`1856`	`1856`
`1857`		`- if (!$this->config->item('auth_source') && $rest_auth === 'digest')`
	`1857`	`+ if ( ! $this->config->item('auth_source') && $rest_auth === 'digest')`
`1858`	`1858`	`{`
`1859`	`1859`	`// For digest we do not have a password passed as argument`
`1860`	`1860`	`return md5($username.':'.$this->config->item('rest_realm').':'.(isset($valid_logins[$username]) ? $valid_logins[$username] : ''));`
`@@ -1904,7 +1904,7 @@ protected function _check_php_session()`
`1904`	`1904`	`$key = $this->config->item('auth_source');`
`1905`	`1905`
`1906`	`1906`	`// If falsy, then the user isn't logged in`
`1907`		`- if (!$this->session->userdata($key))`
	`1907`	`+ if ( ! $this->session->userdata($key))`
`1908`	`1908`	`{`
`1909`	`1909`	`// Display an error response`
`1910`	`1910`	`$this->response([`