diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-07-27 21:50:28 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-07-27 21:50:28 +0200 |
commit | 6056aaf0769e59944b2d77a3b294f5098a731c3e (patch) | |
tree | 072dd0829585d2a6e874fecf32add09366e4872d /inc | |
parent | 66eab89252fa04d5d9f11bf4abcc1c18ac17a1ca (diff) | |
download | wallabag-6056aaf0769e59944b2d77a3b294f5098a731c3e.tar.gz wallabag-6056aaf0769e59944b2d77a3b294f5098a731c3e.tar.zst wallabag-6056aaf0769e59944b2d77a3b294f5098a731c3e.zip |
fix #1237, display a message instead of button when connections are not through https
Diffstat (limited to 'inc')
-rwxr-xr-x | inc/poche/Poche.class.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 15d83bfe..ea196ce2 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -450,6 +450,7 @@ class Poche | |||
450 | $token = $this->user->getConfigValue('token'); | 450 | $token = $this->user->getConfigValue('token'); |
451 | $http_auth = (isset($_SERVER['PHP_AUTH_USER']) || isset($_SERVER['REMOTE_USER'])) ? true : false; | 451 | $http_auth = (isset($_SERVER['PHP_AUTH_USER']) || isset($_SERVER['REMOTE_USER'])) ? true : false; |
452 | $only_user = ($this->store->listUsers() > 1) ? false : true; | 452 | $only_user = ($this->store->listUsers() > 1) ? false : true; |
453 | $https = substr(Tools::getPocheUrl(), 0, 5) == 'https'; | ||
453 | $tpl_vars = array( | 454 | $tpl_vars = array( |
454 | 'themes' => $themes, | 455 | 'themes' => $themes, |
455 | 'languages' => $languages, | 456 | 'languages' => $languages, |
@@ -462,7 +463,8 @@ class Poche | |||
462 | 'token' => $token, | 463 | 'token' => $token, |
463 | 'user_id' => $this->user->getId(), | 464 | 'user_id' => $this->user->getId(), |
464 | 'http_auth' => $http_auth, | 465 | 'http_auth' => $http_auth, |
465 | 'only_user' => $only_user | 466 | 'only_user' => $only_user, |
467 | 'https' => $https | ||
466 | ); | 468 | ); |
467 | Tools::logm('config view'); | 469 | Tools::logm('config view'); |
468 | break; | 470 | break; |