From 969efad78b6904ebf233cee193631e77a2569e0e Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Sun, 24 Apr 2016 12:53:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=93=D0=95=D0=9E=20=D0=B2=D0=BE=20=D0=B2?=
 =?UTF-8?q?=D1=81=D0=B5=D1=85=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D0=B0=D1=85?=
 =?UTF-8?q?,=20=D0=BA=D0=BE=D0=B4=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/ApiController.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/controllers/ApiController.php b/controllers/ApiController.php
index 26ba982..b7de946 100644
--- a/controllers/ApiController.php
+++ b/controllers/ApiController.php
@@ -11,7 +11,7 @@ class ApiController extends Controller
 //		$request = array('method' => 'categories');
 //		$request = array('method' => 'location');
 //		$request = array('method' => 'points');
-//		$request = array('method' => 'point', 'data' => array('id' => 124));
+//		$request = array('method' => 'point', 'data' => '{"id":12}');
 
 		if (!is_array($request)) {
 			self::error('Bad request!');
@@ -42,7 +42,7 @@ class ApiController extends Controller
 				break;
 		}
 
-		self::renderPartial('json.php', $answer);
+		self::renderPartial('json.php', array('data' => $answer));
 	}
 
 	/**
@@ -73,7 +73,7 @@ class ApiController extends Controller
 			$result[] = $tempPoint;
 		}
 
-		return array('status' => 'success','data' => $result);
+		return array('status' => 'success','data' => $result, 'geo' => App::$userGeo);
 	}
 
 	/**
@@ -90,7 +90,7 @@ class ApiController extends Controller
 		$point = Point::model()->getByPK($id);
 
 		if (!$point->id) {
-			self::error('Unknown point!');
+			self::error('Unknown point!', 404);
 		}
 
 		$point->descriptionHtml = nl2br($point->description);
@@ -131,7 +131,7 @@ class ApiController extends Controller
 		$point->inFavorites = Favorite::model()->checkIsMy($id);
 		$point->iLike = Like::model()->checkIsMy($id);
 
-		return array('status' => 'success','data' => $point->getValues());
+		return array('status' => 'success','data' => $point->getValues(), 'geo' => App::$userGeo);
 	}
 
 	/**
@@ -150,7 +150,7 @@ class ApiController extends Controller
 
 		$categories = array_reverse($categories);
 
-		return array('status' => 'success','data' => $categories);
+		return array('status' => 'success','data' => $categories, 'geo' => App::$userGeo);
 	}
 
 	static private function getLocation()
@@ -158,12 +158,12 @@ class ApiController extends Controller
 		return array('status' => 'success','data' => App::$userGeo);
 	}
 
-	static private function error($message = FALSE)
+	static private function error($message = FALSE, $code = 500)
 	{
-		$answer = array('status' => 'error');
+		$answer = array('status' => 'error', 'code' => $code);
 
 		if ($message) {
-			$answer['message'] = $message;
+			$answer['data'] = $message;
 		}
 
 		self::renderPartial('json.php', array('data' => $answer));