From 92eddd4ce3aca5e18d6a3a581ca59f20f970c623 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Fri, 29 Jan 2016 15:58:53 +0300
Subject: [PATCH] =?UTF-8?q?FIX=20=D0=BE=D0=BA=D0=BD=D0=BE=20=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=B8=D0=BD=D0=B0=20=D0=BD=D0=B5=20=D0=BD=D0=B0=20=D0=B2?=
 =?UTF-8?q?=D1=81=D0=B5=D1=85=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/FeedController.php  | 4 ----
 controllers/IndexController.php | 4 ----
 controllers/PageController.php  | 4 ----
 controllers/PointController.php | 1 -
 controllers/UserController.php  | 4 ----
 views/comments/all.php          | 3 ---
 views/indexTemplate.php         | 4 ++--
 views/modals/login.php          | 1 +
 8 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/controllers/FeedController.php b/controllers/FeedController.php
index 6493363..db5805a 100644
--- a/controllers/FeedController.php
+++ b/controllers/FeedController.php
@@ -66,10 +66,6 @@ class FeedController extends Controller
 		self::addStyle('/css/bootstrap.min.css');
 		self::addStyle('/css/bootstrap-theme.min.css');
 
-		if (!App::$user) {
-			self::addScript('http://ulogin.ru/js/ulogin.js');
-		}
-
 		self::render('feed/index.php', array(
 			'news' => $news,
 			'articles' => $articles,
diff --git a/controllers/IndexController.php b/controllers/IndexController.php
index 75573f2..1d44023 100644
--- a/controllers/IndexController.php
+++ b/controllers/IndexController.php
@@ -39,10 +39,6 @@ class IndexController extends Controller
 		self::addStyle('/css/fotorama.css');
 		self::addStyle('/css/indexMap.css?ver='.App::getConfig('version'));
 
-		if (!App::$user) {
-			self::addScript('http://ulogin.ru/js/ulogin.js');
-		}
-
 		$category = Category::model()->getAll(array('order' => 'ord ASC'));
 		$categoryArray = Category::model()->getAll(array('order' => 'ord ASC', 'asArray' => true));
 
diff --git a/controllers/PageController.php b/controllers/PageController.php
index b437049..7e05503 100644
--- a/controllers/PageController.php
+++ b/controllers/PageController.php
@@ -17,10 +17,6 @@ class PageController extends Controller
 		self::addStyle('/css/bootstrap.min.css');
 		self::addStyle('/css/bootstrap-theme.min.css');
 
-		if (!App::$user) {
-			self::addScript('http://ulogin.ru/js/ulogin.js');
-		}
-
 		$notModeratedPoints = $result = array();
 
 		// On moderation
diff --git a/controllers/PointController.php b/controllers/PointController.php
index af77e34..7d9d7a2 100644
--- a/controllers/PointController.php
+++ b/controllers/PointController.php
@@ -41,7 +41,6 @@ class PointController extends Controller
 			self::addVar('user', App::$user->id);
 		} else {
 			self::addVar('user', '0');
-			self::addScript('http://ulogin.ru/js/ulogin.js');
 		}
 
 		if ($point->status != Point::statusPublished) {
diff --git a/controllers/UserController.php b/controllers/UserController.php
index e65f014..1c943f2 100644
--- a/controllers/UserController.php
+++ b/controllers/UserController.php
@@ -41,10 +41,6 @@ class UserController extends Controller
 			App::error404();
 		}
 
-		if (!App::$user) {
-			self::addScript('http://ulogin.ru/js/ulogin.js');
-		}
-
 		if (App::$user && App::$user->id == $id) {
 			$articles = Article::model()->getAll(array('where'=>'`author`='.(int)$user->id.' AND `status` != "del"', 'order' => '`pubDate` DESC'));
 		} else {
diff --git a/views/comments/all.php b/views/comments/all.php
index 25d733a..db3b508 100644
--- a/views/comments/all.php
+++ b/views/comments/all.php
@@ -17,7 +17,4 @@ if (App::$user) {
 	self::renderPartial('comments/form.php',array('parentId'=>$parentId, 'parentType' => $parentType));
 } else {
 	self::renderPartial('comments/deny.php', array());
-
-	self::addScript('http://ulogin.ru/js/ulogin.js');
-	self::renderPartial('modals/login.php', array());
 }
diff --git a/views/indexTemplate.php b/views/indexTemplate.php
index bbce04a..9a2fdec 100644
--- a/views/indexTemplate.php
+++ b/views/indexTemplate.php
@@ -135,8 +135,8 @@ if (App::$user) {
 		</div>
 	<?php endif; ?>
 </div>
-<?= $user ? '' : self::renderPartial('modals/login.php', null, true) ?>
-<?= $user ? self::renderPartial('modals/addPoint.php', array('categories' => Category::model()->getCategoriesForChoise()), true) : '' ?>
+<?= App::$user ? '' : self::renderPartial('modals/login.php', null, true) ?>
+<?= App::$user ? self::renderPartial('modals/addPoint.php', array('categories' => Category::model()->getCategoriesForChoise()), true) : '' ?>
 <?= self::renderPartial('modals/categories.php', array('categories' => $categories), true) ?>
 <?= self::renderPartial('modals/image.php', array(), true) ?>
 <map name="vkbutton">
diff --git a/views/modals/login.php b/views/modals/login.php
index ae0c1b9..4bba5dd 100644
--- a/views/modals/login.php
+++ b/views/modals/login.php
@@ -1,3 +1,4 @@
+<script src="//ulogin.ru/js/ulogin.js" async type="text/javascript"></script>
 <div class="modal fade" id="loginModal" tabindex="-1" role="dialog" aria-hidden="true" style="display: none;">
     <div class="modal-dialog">
         <div class="modal-content">