X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=a645927026f536bac49e96477950f001d317dc56;hb=a84f77d6ba15a64ff00453f5d5190c021ce460ed;hp=654403c8415d853333666ddaa1cc1cc621c5c4b6;hpb=7f959169b7220b4ed3e083cb2a545fe2c5400f9c;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
index 654403c8..a6459270 100644
--- a/index.php
+++ b/index.php
@@ -8,58 +8,85 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-include dirname(__FILE__).'/inc/poche/config.inc.php';
+define ('POCHE', '1.0.0');
+require_once 'inc/poche/global.inc.php';
 
-#XSRF protection with token
-if (!empty($_POST)) {
-    if (!Session::isToken($_POST['token'])) {
-        die(_('Wrong token'));
-    }
-    unset($_SESSION['tokens']);
-}
+# Start Poche
+$poche = new Poche();
+$notInstalledMessage = $poche -> getNotInstalledMessage();
 
+# Parse GET & REFERER vars
 $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
 $view = Tools::checkVar('view', 'home');
 $action = Tools::checkVar('action');
 $id = Tools::checkVar('id');
-$_SESSION['sort'] = Tools::checkVar('sort');
+$_SESSION['sort'] = Tools::checkVar('sort', 'id');
 $url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
 
+# vars to _always_ send to templates
+$tpl_vars = array(
+    'referer' => $referer,
+    'view' => $view,
+    'poche_url' => Tools::getPocheUrl(),
+    'title' => _('poche, a read it later open source system'),
+    'token' => Session::getToken(),
+    'theme' => $poche->getTheme()
+);
+
+if (! empty($notInstalledMessage)) {
+    if (! Poche::$canRenderTemplates || ! Poche::$configFileAvailable) {
+        # We cannot use Twig to display the error message 
+        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');
+        $tpl_vars = array_merge($tpl_vars, array('msg' => $poche->getNotInstalledMessage()));
+        echo $poche->tpl->render($tpl_file, $tpl_vars);
+        exit;
+    }
+}
+
+# poche actions
 if (isset($_GET['login'])) {
     # hello you
     $poche->login($referer);
-}
-elseif (isset($_GET['logout'])) {
+} elseif (isset($_GET['logout'])) {
     # see you soon !
     $poche->logout();
-}
-elseif (isset($_GET['config'])) {
+} elseif (isset($_GET['config'])) {
     # Update password
     $poche->updatePassword();
-}
-elseif (isset($_GET['import'])) {
-    $poche->import($_GET['from']);
-}
-elseif (isset($_GET['export'])) {
+} elseif (isset($_GET['import'])) {
+    $import = $poche->import($_GET['from']);
+} elseif (isset($_GET['export'])) {
     $poche->export();
+} elseif (isset($_GET['updatetheme'])) {
+    $poche->updateTheme();
+} elseif (isset($_GET['updatelanguage'])) {
+    $poche->updateLanguage();
 }
 
-$tpl_vars = array(
-    'referer' => $referer,
-    'view' => $view,
-    'poche_url' => Tools::getPocheUrl(),
-    'title' => _('poche, a read it later open source system'),
-    'token' => Session::getToken(),
-);
+elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) {
+    $plain_url = new Url(base64_encode($_GET['plainurl']));
+    $poche->action('add', $plain_url);
+}
 
 if (Session::isLogged()) {
     $poche->action($action, $url, $id);
     $tpl_file = Tools::getTplFile($view);
     $tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id));
+} else {
+    $tpl_file = Tools::getTplFile('login');
 }
-else {
-    $tpl_file = 'login.twig';
-}
 
-# Aaaaaaand action !
+# because messages can be added in $poche->action(), we have to add this entry now (we can add it before)
+$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