vérificatio CSRF et mise en page

[github/wallabag/wallabag.git] / index.php

diff --git a/index.php b/index.php
index 1cb32f58ca9ca5358abecafb21ab4f5da9ed364a..d477d699d965cafa945d6c9e22233beecdb94d11 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -10,12 +10,16 @@
 
 include dirname(__FILE__).'/inc/config.php';
 
-$action = (isset ($_GET['action'])) ? htmlspecialchars($_GET['action']) : '';
-$view   = (isset ($_GET['view'])) ? htmlspecialchars($_GET['view']) : 'index';
-$id     = (isset ($_GET['id'])) ? htmlspecialchars($_GET['id']) : '';
+$action = (isset ($_REQUEST['action'])) ? htmlentities($_REQUEST['action']) : '';
+$view   = (isset ($_GET['view'])) ? htmlentities($_GET['view']) : 'index';
+$id     = (isset ($_REQUEST['id'])) ? htmlspecialchars($_REQUEST['id']) : '';
 $url    = (isset ($_GET['url'])) ? $_GET['url'] : '';
+$token    = (isset ($_POST['token'])) ? $_POST['token'] : '';
+
+if ($action != '') {
+    action_to_do($action, $id, $url, $token);
+}
 
-action_to_do($action, $id);
 $entries = display_view($view);
 
 $tpl->assign('title', 'poche, a read it later open source system');
@@ -23,4 +27,5 @@ $tpl->assign('view', $view);
 $tpl->assign('poche_url', get_poche_url());
 $tpl->assign('entries', $entries);
 $tpl->assign('load_all_js', 1);
+$tpl->assign('token', $_SESSION['token_poche']);
 $tpl->draw('home');
\ No newline at end of file