Added some status = 0/1 to the main REST_Controller responses.

Author: Phil Sturgeon

application/controllers/api/keys.php

@@ -92,11 +92,9 @@ public function index_delete()
 	 */
 	public function level_post()
     {
-		$this->load->helper('security');
-
 		$key = $this->post('key');
 		$new_level = $this->post('level');
-
+		
 		// Does this key even exist?
 		if ( ! self::_key_exists($key))
 		{
@@ -107,7 +105,7 @@ public function level_post()
 		// Update the key level
 		if (self::_update_key($key, array('level' => $new_level)))
 		{
-			$this->response(array('status' => 1, 'success' => $this->rest->db->last_query()), 200); // 201 = Created
+			$this->response(array('status' => 1, 'success' => 'Key was updated.'), 200); // 201 = Created
 		}
 
 		else
@@ -128,8 +126,6 @@ public function level_post()
 	 */
 	public function regenerate_post()
     {
-		$this->load->helper('security');
-		
 		$old_key = $this->post('key');
 		$key_details = self::_get_key($old_key);
 
@@ -164,6 +160,8 @@ public function regenerate_post()
 
 	private function _generate_key()
 	{
+		$this->load->helper('security');
+		
 		do
 		{
 			$salt = dohash(time().mt_rand());

application/libraries/REST_Controller.php

@@ -112,7 +112,7 @@ function _remap($object_called)
 			// Their key is shit
 			if ( ! $this->_detect_api_key())
 			{
-				$this->response(array('error' => 'Invalid API Key.'), 403);
+				$this->response(array('status' => 0, 'error' => 'Invalid API Key.'), 403);
 				return;
 			}
 
@@ -128,7 +128,7 @@ function _remap($object_called)
 			// They don't have good enough perms
 			if ( ! $authorized)
 			{
-				$this->response(array('error' => 'This API key does not have enough permissions.'), 401);
+				$this->response(array('status' => 0, 'error' => 'This API key does not have enough permissions.'), 401);
 				return;
 			}
 		}