From c70d82c57d46ae5f11a2361e10f5c2a08eccdea4 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Sat, 8 Aug 2015 23:56:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=20=D0=B1=D0=BB=D0=B8=D0=B6=D0=B0=D0=B9?= =?UTF-8?q?=D1=88=D0=B8=D1=85=20=D0=B8=20=D0=BF=D0=BE=D1=85=D0=BE=D0=B6?= =?UTF-8?q?=D0=B8=D1=85=20=D1=82=D0=BE=D1=87=D0=BA=D0=B0=D1=85=20=D0=B2?= =?UTF-8?q?=D1=8B=D0=B2=D0=BE=D0=B4=D1=8F=D1=82=D1=81=D1=8F=20=D1=82=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=BE=D1=82=D0=BC=D0=BE=D0=B4=D0=B5?= =?UTF-8?q?=D1=80=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ground/controllers/PageController.php | 60 ++++++++++++--------------- ground/models/Point.php | 2 + 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/ground/controllers/PageController.php b/ground/controllers/PageController.php index 6d7284a..7f558c5 100644 --- a/ground/controllers/PageController.php +++ b/ground/controllers/PageController.php @@ -8,18 +8,18 @@ class PageController extends Controller self::$layout = 'layoutPage.php'; self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); - self::addScript('/js/jquery-2.1.0.min.js'); - self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); - self::addScript('/js/bootstrap.min.js'); - self::addStyle('/css/bootstrap.min.css'); - self::addStyle('/css/bootstrap-theme.min.css'); + self::addScript('/js/jquery-2.1.0.min.js'); + self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); + self::addScript('/js/bootstrap.min.js'); + self::addStyle('/css/bootstrap.min.css'); + self::addStyle('/css/bootstrap-theme.min.css'); $notModeratedPoints = $result = array(); // On moderation if (App::$user && App::$user->isAdmin) { - $param['order']='id DESC'; - $param['where']= '`moderate` = 0'; + $param['order'] = 'id DESC'; + $param['where'] = '`moderate` = 0'; $points = Point::model()->getAll($param); $categories = Category::model()->getAll(array('order' => 'ord ASC')); @@ -38,9 +38,9 @@ class PageController extends Controller // ------------------------------------------ $param = array(); - $param['order']='id DESC'; + $param['order'] = 'id DESC'; if (App::getParam('category')) { - $param['where'] = 'categoryId = '.(int)App::getParam('category').' AND `moderate` = 1'; + $param['where'] = 'categoryId = ' . (int) App::getParam('category') . ' AND `moderate` = 1'; } else { $param['where'] = '`moderate` = 1'; if (!(App::$user && App::$user->isAdmin)) { @@ -48,11 +48,11 @@ class PageController extends Controller } } $points = Point::model()->getAll($param); - $categories = Category::model()->getAll(array('order' => 'ord ASC')); + $categories = Category::model()->getAll(array('order' => 'ord ASC')); $result = array(); - foreach ($points as $point) { + foreach ($points as $point) { $id = $point->id; $result[$id]['id'] = $point->id; $result[$id]['name'] = $point->name; @@ -61,7 +61,7 @@ class PageController extends Controller $result[$id]['author'] = $point->authorUser->nick; $result[$id]['categoryId'] = $point->categoryId; $result[$id]['categoryIcon'] = $categories[$point->categoryId]->icon; - } + } $res = App::DB()->query("SELECT COUNT(`id`) pointsCount FROM `points`")->fetch(PDO::FETCH_ASSOC); App::setConfig('title', $res['pointsCount'] . ' или даже больше поводов не сидеть дома'); @@ -80,8 +80,7 @@ class PageController extends Controller self::$layout = 'layoutPage.php'; $pointId = (int) App::getParam('id'); - if ($pointId) - { + if ($pointId) { self::addScript('/js/jquery-2.1.0.min.js'); self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); self::addScript('/js/bootstrap.min.js'); @@ -110,14 +109,13 @@ class PageController extends Controller $point = Point::model()->getByPK($pointId); - if ($point->id == NULL) - { + if ($point->id == NULL) { App::error404(); } $point->descriptionHtml = nl2br($point->description); $point->name = htmlspecialchars($point->name); - App::setConfig('title', $point->name. ' - wikipoints.ru'); + App::setConfig('title', $point->name . ' - wikipoints.ru'); self::addVar('pointLat', $point->lat); self::addVar('pointLng', $point->lng); self::addVar('pointId', $point->id); @@ -133,7 +131,7 @@ class PageController extends Controller $point->iLike = Like::model()->checkIsMy($pointId); - $photoLinks = PhotoLinks::model()->getAll(array('where'=>'`pointId` = '.$pointId)); + $photoLinks = PhotoLinks::model()->getAll(array('where' => '`pointId` = ' . $pointId)); $photoLinksRes = array(); if ($photoLinks) { foreach ($photoLinks as $photoLink) { @@ -144,7 +142,7 @@ class PageController extends Controller } $photoLinksRes = implode('; ', array_keys($photoLinksRes)); - $similarPoints = Point::model()->getAll(array('where' => 'categoryId = '.$point->categoryId.' AND `id` <> '.$point->id.' ORDER BY RAND() LIMIT 6;')); + $similarPoints = Point::model()->getAll(array('where' => '`moderate` = 1 AND categoryId = ' . $point->categoryId . ' AND `id` <> ' . $point->id . ' ORDER BY RAND() LIMIT 6;')); $closestPoints = Point::model()->getClosestPoints($pointId); $randomPoint = Point::model()->getRandom(); $randomPoint->description = mb_substr($randomPoint->description, 0, 400, 'UTF-8'); @@ -164,8 +162,7 @@ class PageController extends Controller 'user' => App::$user, 'photoLinks' => $photoLinksRes, )); - } else - { + } else { App::error404(); } } @@ -175,8 +172,7 @@ class PageController extends Controller self::$layout = 'layoutPage.php'; $articleId = (int) App::getParam('id'); - if ($articleId) - { + if ($articleId) { self::addScript('/js/jquery-2.1.0.min.js'); self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); self::addScript('/js/bootstrap.min.js'); @@ -192,12 +188,11 @@ class PageController extends Controller $article = Article::model()->getByPK($articleId); - if ($article->id == NULL) - { + if ($article->id == NULL) { App::error404(); } - App::setConfig('title', $article->title. ' - wikipoints.ru'); + App::setConfig('title', $article->title . ' - wikipoints.ru'); self::render('article.php', array( 'article' => $article, @@ -205,8 +200,7 @@ class PageController extends Controller // 'og' => Helper::buildOG($point), // 'user' => App::$user, )); - } else - { + } else { App::error404(); } } @@ -214,12 +208,10 @@ class PageController extends Controller static function actionVkpoint() { $pointId = (int) App::getParam('id'); - if (App::$user && App::$user->isAdmin == 1 && $pointId) - { + if (App::$user && App::$user->isAdmin == 1 && $pointId) { $point = Point::model()->getByPK($pointId); - if ($point->id == NULL) - { + if ($point->id == NULL) { App::error404(); } @@ -234,8 +226,7 @@ class PageController extends Controller 'point' => $point, 'photos' => $point->photos, )); - } else - { + } else { App::error404(); } } @@ -246,4 +237,5 @@ class PageController extends Controller 'point' => Point::model()->getRandom(), )); } + } diff --git a/ground/models/Point.php b/ground/models/Point.php index e002273..9a3edd8 100644 --- a/ground/models/Point.php +++ b/ground/models/Point.php @@ -55,6 +55,8 @@ class Point extends Model SQRT(POW(`lat`-:lat,2)+POW(`lng`-:lng,2)) ) AS `dist` FROM `' . $this->_tableName_ . '` WHERE + `moderate` = 1 + AND `lat` BETWEEN :minLat AND :maxLat AND `lng` BETWEEN :minLng AND :maxLng