X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=ba146257a8e7905ed9dbc235a26de85c1064bc2f;hb=2ab37d6205d3e4f7bfacf702de6755a924931751;hp=fdcfc32860f02861b9d76f97a31e4b7711abf4eb;hpb=36b92198425618a098941494000e21935208cb90;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
index fdcfc328..ba146257 100644
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE', '1.0.0');
+define ('POCHE', '1.2.0');
 require_once 'inc/poche/global.inc.php';
 session_start(); 
 
@@ -81,8 +81,18 @@ if (Session::isLogged()) {
     $poche->action($action, $url, $id);
     $tpl_file = Tools::getTplFile($view);
     $tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id));
+} elseif(isset($_SERVER['PHP_AUTH_USER'])) {
+    if($poche->store->userExists($_SERVER['PHP_AUTH_USER'])) {
+        $poche->login($referer);
+    } else {
+        $poche->messages->add('e', _('login failed: user doesn\'t exist'));
+        Tools::logm('user doesn\'t exist');
+        $tpl_file = Tools::getTplFile('login');
+        $tpl_vars['http_auth'] = 1;
+    }
 } else {
     $tpl_file = Tools::getTplFile('login');
+    $tpl_vars['http_auth'] = 0;
 }
 
 # 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);
 $tpl_vars = array_merge($tpl_vars, array('messages' => $messages));
 
 # display poche
-echo $poche->tpl->render($tpl_file, $tpl_vars);
\ No newline at end of file
+echo $poche->tpl->render($tpl_file, $tpl_vars);