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

ADD возможность задать в конфиге используемый протокол

This commit is contained in:
Krivchikov Dmitry 2016-04-01 19:45:14 +03:00
parent d9043955cc
commit edd23ce6a0
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.php
View File

@ -169,9 +169,9 @@ class App
* @param string $paramName * @param string $paramName
* @return multi * @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;
} }
/** /**

1
config_template.php
View File

@ -19,5 +19,6 @@ return array(
'ganalytics' => true, 'ganalytics' => true,
'disableSMS' => false, 'disableSMS' => false,
'alarmerKey' => '02f559-a3c1f3-44d756', // key OR FALSE 'alarmerKey' => '02f559-a3c1f3-44d756', // key OR FALSE
'protocol' => 'https', // https (default) || http
); );

2
views/modals/login.php
View File

@ -13,7 +13,7 @@
<p style="text-align: justify; text-indent: 15px;"> <p style="text-align: justify; text-indent: 15px;">
Мы сохраняем только ваше имя, ник и аватарку, не запрашивая лишних данных. Приятных путешествий! Мы сохраняем только ваше имя, ник и аватарку, не запрашивая лишних данных. Приятных путешествий!
</p> </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>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Отмена</button> <button type="button" class="btn btn-default" data-dismiss="modal">Отмена</button>