francis94c / ci-rest

models/RESTModel.php

Braces +18 added lines, -6 removed lines

@@ -81,10 +81,14 @@ 
       $this->db->where($this->users_username_column, $username);
     }
     $query = $this->db->get();
-    if ($query->num_rows() == 0) return false;
+    if ($query->num_rows() == 0) {
+     return false;
+    }
     // Authenticate.
     if (password_verify($password, $query->result()[0]->{$this->users_password_column})) {
-      if ($this->users_id_column != null) $context->user_id = $query->result()[0]->{$this->users_id_column};
+      if ($this->users_id_column != null) {
+       $context->user_id = $query->result()[0]->{$this->users_id_column};
+      }
       return true;
     }
     return false;
@@ -96,15 +100,21 @@ 
    */
   public function getAPIKeyData(string $apiKey):?array {
     // Preliminary Check.
-    if ($this->api_key_table == null || $this->api_key_column == null) return null;
+    if ($this->api_key_table == null || $this->api_key_column == null) {
+     return null;
+    }
     // Query.
     $this->db->select($this->api_key_column);
-    if ($this->api_key_limit_column != null) $this->db->select($this->api_key_limit_column);
+    if ($this->api_key_limit_column != null) {
+     $this->db->select($this->api_key_limit_column);
+    }
     $this->db->from($this->api_key_table);
     $this->db->where($this->api_key_column, $apiKey);
     $query = $this->db->get();
     // Process Result.
-    if ($query->num_rows() > 0) return $query->result_array()[0];
+    if ($query->num_rows() > 0) {
+     return $query->result_array()[0];
+    }
     return null;
   }
   /**
@@ -123,7 +133,9 @@ 
   public function getLimitData(string $client, string $group):?array {
     $sql = 'SELECT count, start, (`start` + INTERVAL (1 - TIMESTAMPDIFF(HOUR, UTC_TIMESTAMP(), NOW())) HOUR) AS reset_epoch FROM rest_api_rate_limit WHERE client = ? AND _group = ?';
     $query = $this->db->query($sql, [$client, $group]);
-    if ($query->num_rows() > 0) return $query->result_array()[0];
+    if ($query->num_rows() > 0) {
+     return $query->result_array()[0];
+    }
     return null;
   }
   /**

libraries/REST.php

Braces +25 added lines, -7 removed lines

@@ -138,16 +138,24 @@ 
     // Match Auth Routes.
     // The below algorithm is similar to the one Code Igniter uses in its
     // Routing Class.
-    if ($uri_auths == null || !is_array($uri_auths)) return;
+    if ($uri_auths == null || !is_array($uri_auths)) {
+     return;
+    }
     $auths = null;
     foreach ($uri_auths as $uri => $auth_array) {
       // Convert wildcards to RegEx.
 			$uri = str_replace(array(':any', ':num'), array('[^/]+', '[0-9]+'), $uri);
-      if (preg_match('#^'.$uri.'$#', uri_string())) $auths = $auth_array; // Assign Authentication Steps.
+      if (preg_match('#^'.$uri.'$#', uri_string())) {
+       $auths = $auth_array;
+      }
+      // Assign Authentication Steps.
       break;
     }
     //$auths = $this->ci->config->item('rest')['uri_auth'][uri_string()] ?? null;
-    if ($auths == null) return; // No authentication(s) to acrry out.
+    if ($auths == null) {
+     return;
+    }
+    // No authentication(s) to acrry out.
     // $this->process_auth() terminates the script if authentication fails
     // It will call the callable in the rest.php config file under
     // response_callbacks which matches the necesarry RESTResponse constant
@@ -157,7 +165,9 @@ 
       $this->process_auth($auths);
       return;
     }
-    foreach ($auths as $auth) $this->process_auth($auth);
+    foreach ($auths as $auth) {
+     $this->process_auth($auth);
+    }
   }
   /**
    * [process_auth description]
@@ -202,8 +212,14 @@ 
   private function basic_auth():void {
     $username = $_SERVER['PHP_AUTH_USER'] ?? null;
     $password = $_SERVER['PHP_AUTH_PW'] ?? null;
-    if (!$username || !$password) $this->handle_response(RESTResponse::BAD_REQUEST, RESTAuth::BASIC); // Exits.
-    if (!$this->rest_model->basicAuth($this, $username, $password)) $this->handle_response(RESTResponse::UN_AUTHORIZED, RESTAuth::BASIC); // Exits.
+    if (!$username || !$password) {
+     $this->handle_response(RESTResponse::BAD_REQUEST, RESTAuth::BASIC);
+    }
+    // Exits.
+    if (!$this->rest_model->basicAuth($this, $username, $password)) {
+     $this->handle_response(RESTResponse::UN_AUTHORIZED, RESTAuth::BASIC);
+    }
+    // Exits.
   }
   /**
    * [api_key_auth description]
@@ -263,7 +279,9 @@ 
     // Trunctate Rate Limit Data.
     $this->rest_model->truncateRatelimitData();
     // Check Whitelist.
-    if (in_array($this->ci->input->ip_address(), $this->whitelist)) return;
+    if (in_array($this->ci->input->ip_address(), $this->whitelist)) {
+     return;
+    }
     // Should we acyually Limit?
     if ($this->ip_per_hour > 0) {
       $client = hash('md5', $this->ci->input->ip_address());