From 3bf414a7acfde921f4da025f7fe2e9a43c80137e Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Sun, 24 Apr 2016 01:14:54 +0300
Subject: [PATCH] =?UTF-8?q?API=20-=20=D0=BA=D1=80=D0=B0=D1=81=D0=B8=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B8=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/ApiController.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/controllers/ApiController.php b/controllers/ApiController.php
index 72440f0..8c6133c 100644
--- a/controllers/ApiController.php
+++ b/controllers/ApiController.php
@@ -7,7 +7,7 @@ class ApiController extends Controller
 	{
 		$request = json_decode(file_get_contents('php://input'), 1);
 		if (!is_array($request)) {
-			App::error404();
+			self::error('Bad request!');
 		}
 
 		$method = isset($request['method']) ? $request['method'] : NULL;
@@ -28,7 +28,7 @@ class ApiController extends Controller
 				$answer = self::getPoint($data);
 				break;
 			default:
-				App::error404();
+				self::error('Unknown method!');
 				break;
 		}
 
@@ -58,7 +58,7 @@ class ApiController extends Controller
 			$result[] = $tempPoint;
 		}
 
-		return array('data' => $result);
+		return array('status' => 'success','data' => $result);
 	}
 
 	/**
@@ -69,13 +69,13 @@ class ApiController extends Controller
 		$id = isset($data['id']) ? intval($data['id']) : NULL;
 
 		if (!$id) {
-			return FALSE;
+			self::error('Broken request!');
 		}
 
 		$point = Point::model()->getByPK($id);
 
 		if (!$point) {
-			return FALSE;
+			self::error('Unknown point!');
 		}
 
 		$point->descriptionHtml = nl2br($point->description);
@@ -116,7 +116,7 @@ class ApiController extends Controller
 		$point->inFavorites = Favorite::model()->checkIsMy($id);
 		$point->iLike = Like::model()->checkIsMy($id);
 
-		return array('data' => $point->getValues());
+		return array('status' => 'success','data' => $point->getValues());
 	}
 
 	/**
@@ -135,7 +135,17 @@ class ApiController extends Controller
 
 		$categories = array_reverse($categories);
 
-		return array('data' => $categories);
+		return array('status' => 'success','data' => $categories);
 	}
 
+	static private function error($message = FALSE)
+	{
+		$answer = array('status' => 'error');
+
+		if ($message) {
+			$answer['message'] = $message;
+		}
+
+		self::renderPartial('json.php', $answer);
+	}
 }