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

diff --git a/index.php b/index.php
index 654403c8..5f43b740 100644
--- a/index.php
+++ b/index.php
@@ -8,23 +8,23 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-include dirname(__FILE__).'/inc/poche/config.inc.php';
-
-#XSRF protection with token
-if (!empty($_POST)) {
-    if (!Session::isToken($_POST['token'])) {
-        die(_('Wrong token'));
-    }
-    unset($_SESSION['tokens']);
+if (file_exists(__DIR__ . '/inc/poche/myconfig.inc.php')) {
+    require_once __DIR__ . '/inc/poche/myconfig.inc.php';
 }
+require_once './inc/poche/Tools.class.php';
+Tools::createMyConfig();
 
+include dirname(__FILE__).'/inc/poche/config.inc.php';
+
+# 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'] : '');
 
+# poche actions
 if (isset($_GET['login'])) {
     # hello you
     $poche->login($referer);
@@ -38,12 +38,13 @@ 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,
@@ -61,5 +62,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