All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ГЕО во всех ответах, код ответа

This commit is contained in:
Krivchikov Dmitry 2016-04-24 12:53:35 +03:00
parent 1c9913b7c0
commit 969efad78b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
controllers/ApiController.php
View File

@ -11,7 +11,7 @@ class ApiController extends Controller
// $request = array('method' => 'categories'); // $request = array('method' => 'categories');
// $request = array('method' => 'location'); // $request = array('method' => 'location');
// $request = array('method' => 'points'); // $request = array('method' => 'points');
// $request = array('method' => 'point', 'data' => array('id' => 124)); // $request = array('method' => 'point', 'data' => '{"id":12}');
if (!is_array($request)) { if (!is_array($request)) {
self::error('Bad request!'); self::error('Bad request!');
@ -42,7 +42,7 @@ class ApiController extends Controller
break; break;
} }
self::renderPartial('json.php', $answer); self::renderPartial('json.php', array('data' => $answer));
} }
/** /**
@ -73,7 +73,7 @@ class ApiController extends Controller
$result[] = $tempPoint; $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); $point = Point::model()->getByPK($id);
if (!$point->id) { if (!$point->id) {
self::error('Unknown point!'); self::error('Unknown point!', 404);
} }
$point->descriptionHtml = nl2br($point->description); $point->descriptionHtml = nl2br($point->description);
@ -131,7 +131,7 @@ class ApiController extends Controller
$point->inFavorites = Favorite::model()->checkIsMy($id); $point->inFavorites = Favorite::model()->checkIsMy($id);
$point->iLike = Like::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); $categories = array_reverse($categories);
return array('status' => 'success','data' => $categories); return array('status' => 'success','data' => $categories, 'geo' => App::$userGeo);
} }
static private function getLocation() static private function getLocation()
@ -158,12 +158,12 @@ class ApiController extends Controller
return array('status' => 'success','data' => App::$userGeo); 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) { if ($message) {
$answer['message'] = $message; $answer['data'] = $message;
} }
self::renderPartial('json.php', array('data' => $answer)); self::renderPartial('json.php', array('data' => $answer));