X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=a60e4e941704c14a64f9a66c24a2cb7b9dea01e8;hb=refs%2Fpull%2F109%2Fhead;hp=381b8ccc89105d48fa71b773b439f2a7a740ad66;hpb=63c35580c7d60e2278ee6fe9ba2d4440ff0308d6;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
index 381b8ccc..a60e4e94 100644
--- a/index.php
+++ b/index.php
@@ -10,22 +10,15 @@
 
 include dirname(__FILE__).'/inc/poche/config.inc.php';
 
-#XSRF protection with token
-if (!empty($_POST)) {
-    if (!Session::isToken($_POST['token'])) {
-        die(_('Wrong token'));
-        // TODO remettre le test
-    }
-    unset($_SESSION['tokens']);
-}
-
+# Parse GET & REFERER vars
 $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
-$view = Tools::checkVar('view');
+$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'] : '');
 
+# poche actions
 if (isset($_GET['login'])) {
     # hello you
     $poche->login($referer);
@@ -39,17 +32,17 @@ elseif (isset($_GET['config'])) {
     $poche->updatePassword();
 }
 elseif (isset($_GET['import'])) {
-    $poche->import($_GET['from']);
+    $import = $poche->import($_GET['from']);
 }
 elseif (isset($_GET['export'])) {
     $poche->export();
 }
 
+# vars to send to templates
 $tpl_vars = array(
     'referer' => $referer,
     'view' => $view,
     'poche_url' => Tools::getPocheUrl(),
-    'demo' => MODE_DEMO,
     'title' => _('poche, a read it later open source system'),
     'token' => Session::getToken(),
 );
@@ -63,5 +56,9 @@ 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