From a4a994dc1968d2c4c8bffd8a6dd7a0d7223113a1 Mon Sep 17 00:00:00 2001
From: Josh Sherman <josh@gravityblvd.com>
Date: Sat, 21 Dec 2013 19:07:07 -0500
Subject: [PATCH] Cleaned up response codes

Closes #21
---
 classes/APIv1.php               | 5 +++++
 modules/api/v1/leaderboard.php  | 9 +++++----
 modules/api/v1/leaderboards.php | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/classes/APIv1.php b/classes/APIv1.php
index 658b91e..9fe339c 100644
--- a/classes/APIv1.php
+++ b/classes/APIv1.php
@@ -90,6 +90,11 @@ class APIv1 extends CustomModule
 	{
 		// Unsure why I had to put this here, I guess it's being overridden somewhere in PICKLES
 		header('Content-type: application/json');
+
+		if (isset($this->return['response_code']))
+		{
+			Browser::status($this->return['response_code']);
+		}
 	}
 }
 
diff --git a/modules/api/v1/leaderboard.php b/modules/api/v1/leaderboard.php
index b131677..e9602e5 100644
--- a/modules/api/v1/leaderboard.php
+++ b/modules/api/v1/leaderboard.php
@@ -11,7 +11,7 @@ class api_v1_leaderboard extends APIv1
 			// Checks if we have a UID
 			if (!isset($_GET['uid']))
 			{
-				throw new Exception('Missing UID.');
+				throw new Exception('You must supply a leaderboard UID.');
 			}
 
 			$leaderboard_uid = $_GET['uid'];
@@ -22,12 +22,12 @@ class api_v1_leaderboard extends APIv1
 
 			if (!$leaderboard)
 			{
-				throw new Exception('Leaderboard UID does not exist.');
+				throw new Exception('Leaderboard does not exist.');
 			}
 
 			if ($this->uid != $leaderboard['uid'])
 			{
-				throw new Exception('Leaderboard UID does not belong to you.');
+				throw new Exception('Leaderboard does not belong to you.');
 			}
 
 			// Sets up our key suffixes
@@ -122,7 +122,8 @@ class api_v1_leaderboard extends APIv1
 		}
 		catch (Exception $e)
 		{
-			return array('response_code' => 400, 'error' => $e->getMessage());
+			$this->response_code = 400;
+			$this->error         = $e->getMessage();
 		}
 	}
 }
diff --git a/modules/api/v1/leaderboards.php b/modules/api/v1/leaderboards.php
index e7dfd08..549529a 100644
--- a/modules/api/v1/leaderboards.php
+++ b/modules/api/v1/leaderboards.php
@@ -6,9 +6,12 @@ class api_v1_leaderboards extends APIv1
 
 	public function __default()
 	{
-		$leaderboards = new leaderboards();
+		if (!isset($this->return['error']))
+		{
+			$leaderboards = new leaderboards();
 
-		return $leaderboards->__default();
+			return $leaderboards->__default();
+		}
 	}
 }