From edd23ce6a0c50fbe0a94709599511a6efe338fee Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Fri, 1 Apr 2016 19:45:14 +0300
Subject: [PATCH] =?UTF-8?q?ADD=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B5=20?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D0=BA=D0=BE=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.php                | 4 ++--
 config_template.php    | 1 +
 views/modals/login.php | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app.php b/app.php
index e3fa56c..1f3446a 100644
--- a/app.php
+++ b/app.php
@@ -169,9 +169,9 @@ class App
 	 * @param string $paramName
 	 * @return multi
 	 */
-	public static function getConfig($paramName)
+	public static function getConfig($paramName, $defaultValue = NULL)
 	{
-		return isset(self::$config[$paramName]) ? self::$config[$paramName] : NULL;
+		return isset(self::$config[$paramName]) ? self::$config[$paramName] : $defaultValue;
 	}
 
 	/**
diff --git a/config_template.php b/config_template.php
index 670250d..c7c7f73 100644
--- a/config_template.php
+++ b/config_template.php
@@ -19,5 +19,6 @@ return array(
 	'ganalytics' => true,
 	'disableSMS' => false,
 	'alarmerKey' => '02f559-a3c1f3-44d756', // key OR FALSE
+	'protocol' => 'https', // https (default) || http
 );
 
diff --git a/views/modals/login.php b/views/modals/login.php
index dc886ab..ef69e9c 100644
--- a/views/modals/login.php
+++ b/views/modals/login.php
@@ -13,7 +13,7 @@
 				<p style="text-align: justify; text-indent: 15px;">
 					Мы сохраняем только ваше имя, ник и аватарку, не запрашивая лишних данных. Приятных путешествий!
 				</p>
-				<div style="display: inline-block;" id="uLogin" data-ulogin="display=panel;fields=first_name,nickname,photo_big;providers=twitter,mailru,vkontakte,google,yandex,facebook,instagram;hidden=odnoklassniki,livejournal,openid,foursquare,tumblr;redirect_uri=https%3A%2F%2F<?= $_SERVER['HTTP_HOST'] ?>%2Findex%2Flogin"></div>
+				<div style="display: inline-block;" id="uLogin" data-ulogin="display=panel;fields=first_name,nickname,photo_big;providers=twitter,mailru,vkontakte,google,yandex,facebook,instagram;hidden=odnoklassniki,livejournal,openid,foursquare,tumblr;redirect_uri=<?= App::getConfig('protocol', 'https') ?>%3A%2F%2F<?= $_SERVER['HTTP_HOST'] ?>%2Findex%2Flogin"></div>
 			</div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Отмена</button>