diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-10-22 08:51:30 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-10-22 08:51:30 +0200 |
commit | b6d859fa927be8e60752ea44d682401b10671dfa (patch) | |
tree | 3900bacab453cc7f3e5f6c742aea151abc453d3c /index.php | |
parent | 1a0d776394d7e10b5e017f00d3626e3de6ba3688 (diff) | |
parent | 1ba1628ed6d22833096049ca9975c3d72f99804c (diff) | |
download | wallabag-b6d859fa927be8e60752ea44d682401b10671dfa.tar.gz wallabag-b6d859fa927be8e60752ea44d682401b10671dfa.tar.zst wallabag-b6d859fa927be8e60752ea44d682401b10671dfa.zip |
Merge branch 'dev' of https://github.com/inthepoche/poche into dev
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -81,8 +81,18 @@ if (Session::isLogged()) { | |||
81 | $poche->action($action, $url, $id); | 81 | $poche->action($action, $url, $id); |
82 | $tpl_file = Tools::getTplFile($view); | 82 | $tpl_file = Tools::getTplFile($view); |
83 | $tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id)); | 83 | $tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id)); |
84 | } elseif(isset($_SERVER['PHP_AUTH_USER'])) { | ||
85 | if($poche->store->userExists($_SERVER['PHP_AUTH_USER'])) { | ||
86 | $poche->login($referer); | ||
87 | } else { | ||
88 | $poche->messages->add('e', _('login failed: user doesn\'t exist')); | ||
89 | Tools::logm('user doesn\'t exist'); | ||
90 | $tpl_file = Tools::getTplFile('login'); | ||
91 | $tpl_vars['http_auth'] = 1; | ||
92 | } | ||
84 | } else { | 93 | } else { |
85 | $tpl_file = Tools::getTplFile('login'); | 94 | $tpl_file = Tools::getTplFile('login'); |
95 | $tpl_vars['http_auth'] = 0; | ||
86 | } | 96 | } |
87 | 97 | ||
88 | # because messages can be added in $poche->action(), we have to add this entry now (we can add it before) | 98 | # because messages can be added in $poche->action(), we have to add this entry now (we can add it before) |
@@ -90,4 +100,4 @@ $messages = $poche->messages->display('all', FALSE); | |||
90 | $tpl_vars = array_merge($tpl_vars, array('messages' => $messages)); | 100 | $tpl_vars = array_merge($tpl_vars, array('messages' => $messages)); |
91 | 101 | ||
92 | # display poche | 102 | # display poche |
93 | echo $poche->tpl->render($tpl_file, $tpl_vars); \ No newline at end of file | 103 | echo $poche->tpl->render($tpl_file, $tpl_vars); |