Merge pull request chriskacerguis#677 from teabrg/master

Check if API KEY submitted is activated

Author: chriskacerguis

application/libraries/REST_Controller.php

@@ -999,7 +999,16 @@ 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 you have a field to check if the API KEY provided by the user is activated or not 
+            //(in case you quickly want to deactivate specific users)
+            // you can also perform an extra check for this
+            
+            $existsactive = $this->db->query("SELECT api_key_activated FROM api_keys WHERE api_key = '".$key."' ");
+            // Using the Query builder method. This will only work if you have a column named activated in the api_key table.
+            //If you also want to add this as a config item replace the get('activated') with $this->config->item('rest_key_activated_column').
+            $existsactive = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get('activated')->result();
+            $isactive = $existsactive->result();
+            if ( ! ($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row() ) || $isactive[0]->api_key_activated == 'no' )
             {
                 return FALSE;
             }