X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=dc064428d3a6a7f620bb210c24771c848a395be6;hb=68abd9c71b1d2f7bb2e9d21819584d1d15005b25;hp=91d0b3047fef9770c7ae80b1d5f67b7f498d6b27;hpb=da368cc84f4d79afc30052a209502fa8fd17241e;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
index 91d0b304..dc064428 100644
--- a/index.php
+++ b/index.php
@@ -10,78 +10,92 @@
 
 include dirname(__FILE__).'/inc/config.php';
 
-myTool::initPhp();
+$notices = array();
 
 # XSRF protection with token
-if (!empty($_POST)) {
-    if (!Session::isToken($_POST['token'])) {
-        die('Wrong token.');
-    }
-    unset($_SESSION['tokens']);
-}
+// if (!empty($_POST)) {
+//     if (!Session::isToken($_POST['token'])) {
+//         die(_('Wrong token'));
+//         // TODO remettre le test
+//     }
+//     unset($_SESSION['tokens']);
+// }
 
-$ref = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
+$referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
 
 if (isset($_GET['login'])) {
-    // Login
+    # hello you
     if (!empty($_POST['login']) && !empty($_POST['password'])) {
         if (Session::login($_SESSION['login'], $_SESSION['pass'], $_POST['login'], encode_string($_POST['password'] . $_POST['login']))) {
-            logm('login successful');
-            $msg->add('s', 'welcome in your poche!');
+            pocheTools::logm('login successful');
+            $pocheTools[]['value'] = _('login successful');
+
             if (!empty($_POST['longlastingsession'])) {
                 $_SESSION['longlastingsession'] = 31536000;
                 $_SESSION['expires_on'] = time() + $_SESSION['longlastingsession'];
                 session_set_cookie_params($_SESSION['longlastingsession']);
             } else {
-                session_set_cookie_params(0); // when browser closes
+                session_set_cookie_params(0);
             }
             session_regenerate_id(true);
-
-            MyTool::redirect($ref);
+            pocheTools::redirect($referer);
         }
-        logm('login failed');
-        die("Login failed !");
+        pocheTools::logm('login failed');
+        $notices[]['value'] = _('Login failed !');
+        pocheTools::redirect();
     } else {
-        logm('login failed');
+        pocheTools::logm('login failed');
+        pocheTools::redirect();
     }
 }
 elseif (isset($_GET['logout'])) {
-    logm('logout');
+    # see you soon !
+    pocheTools::logm('logout');
     Session::logout();
-    MyTool::redirect();
+    pocheTools::redirect();
 }
 elseif  (isset($_GET['config'])) {
+    # Update password
     if (isset($_POST['password']) && isset($_POST['password_repeat'])) {
         if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") {
-            logm('password updated');
-            $store->updatePassword(encode_string($_POST['password'] . $_SESSION['login']));
-            $msg->add('s', 'your password has been updated');
+            if (!MODE_DEMO) {
+                pocheTools::logm('password updated');
+                $store->updatePassword(encode_string($_POST['password'] . $_SESSION['login']));
+                Session::logout();
+                pocheTools::redirect();
+            }
+            else {
+                pocheTools::logm('in demo mode, you can\'t do this');
+            }
         }
-        else
-            $msg->add('e', 'your password can\'t be empty and you have to repeat it in the second field');
     }
-    else
-        $msg->add('e', 'error in your password update');
 }
 
-# Traitement des paramètres et déclenchement des actions
-$view               = (isset ($_REQUEST['view'])) ? htmlentities($_REQUEST['view']) : 'index';
-$full_head          = (isset ($_REQUEST['full_head'])) ? htmlentities($_REQUEST['full_head']) : 'yes';
-$action             = (isset ($_REQUEST['action'])) ? htmlentities($_REQUEST['action']) : '';
-$_SESSION['sort']   = (isset ($_REQUEST['sort'])) ? htmlentities($_REQUEST['sort']) : 'id';
-$id                 = (isset ($_REQUEST['id'])) ? htmlspecialchars($_REQUEST['id']) : '';
-$url                = (isset ($_GET['url'])) ? $_GET['url'] : '';
+# Aaaaaaand action !
+$view = (isset ($_REQUEST['view'])) ? htmlentities($_REQUEST['view']) : 'home';
+$full_head = (isset ($_REQUEST['full_head'])) ? htmlentities($_REQUEST['full_head']) : 'yes';
+$action = (isset ($_REQUEST['action'])) ? htmlentities($_REQUEST['action']) : '';
+$_SESSION['sort'] = (isset ($_REQUEST['sort'])) ? htmlentities($_REQUEST['sort']) : 'id';
+$id = (isset ($_REQUEST['id'])) ? htmlspecialchars($_REQUEST['id']) : '';
+$url = (isset ($_GET['url'])) ? $_GET['url'] : '';
 
-$tpl->assign('isLogged', Session::isLogged());
-$tpl->assign('referer', $ref);
-$tpl->assign('view', $view);
-$tpl->assign('poche_url', myTool::getUrl());
-$tpl->assign('title', 'poche, a read it later open source system');
+$tpl_vars = array(
+    'referer' => $referer,
+    'view' => $view,
+    'poche_url' => pocheTools::getUrl(),
+    'demo' => MODE_DEMO,
+    'title' => _('poche, a read it later open source system'),
+    'token' => Session::getToken(),
+    'notices' => $notices,
+);
 
 if (Session::isLogged()) {
     action_to_do($action, $url, $id);
-    display_view($view, $id, $full_head);
+    $tpl_file = get_tpl_file($view);
+    $tpl_vars = array_merge($tpl_vars, display_view($view, $id));
 }
 else {
-    $tpl->draw('login');
+    $tpl_file = 'login.twig';
 }
+
+echo $twig->render($tpl_file, $tpl_vars);
\ No newline at end of file