X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=ba146257a8e7905ed9dbc235a26de85c1064bc2f;hb=7a4482b8a43afca7f5c311ae7e44b3f0c4d239c0;hp=4aebfe10a1caf2e4717a1ca849487e19fcdcfcb6;hpb=00dbaf90bc44ef3ed0abaebb15307756e054a027;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
index 4aebfe10..ba146257 100644
--- a/index.php
+++ b/index.php
@@ -8,7 +8,9 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
+define ('POCHE', '1.2.0');
 require_once 'inc/poche/global.inc.php';
+session_start(); 
 
 # Start Poche
 $poche = new Poche();
@@ -35,7 +37,12 @@ $tpl_vars = array(
 if (! empty($notInstalledMessage)) {
     if (! Poche::$canRenderTemplates || ! Poche::$configFileAvailable) {
         # We cannot use Twig to display the error message 
-        die($notInstalledMessage);
+        echo '<h1>Errors</h1><ol>';
+        foreach ($notInstalledMessage as $message) {
+            echo '<li>' . $message . '</li>';
+        }
+        echo '</ol>';
+        die();
     } else {
         # Twig is installed, put the error message in the template
         $tpl_file = Tools::getTplFile('error');
@@ -61,7 +68,10 @@ if (isset($_GET['login'])) {
     $poche->export();
 } elseif (isset($_GET['updatetheme'])) {
     $poche->updateTheme();
+} elseif (isset($_GET['updatelanguage'])) {
+    $poche->updateLanguage();
 }
+
 elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) {
     $plain_url = new Url(base64_encode($_GET['plainurl']));
     $poche->action('add', $plain_url);
@@ -71,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)
@@ -80,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);