share email +twitter / class messages

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

diff --git a/index.php b/index.php
index dc064428d3a6a7f620bb210c24771c848a395be6..dd70a989d897ebd5b6cbb51bb1e251818f51a779 100644 (file)
--- a/index.php
+++ b/index.php
@@ -8,94 +8,61 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-include dirname(__FILE__).'/inc/config.php';
+include dirname(__FILE__).'/inc/poche/config.inc.php';
 
-$notices = array();
-
-# XSRF protection with token
+#XSRF protection with token
 // if (!empty($_POST)) {
 //     if (!Session::isToken($_POST['token'])) {
 //         die(_('Wrong token'));
-//         // TODO remettre le test
 //     }
 //     unset($_SESSION['tokens']);
 // }
 
 $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');
+$url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
 
 if (isset($_GET['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']))) {
-            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);
-            }
-            session_regenerate_id(true);
-            pocheTools::redirect($referer);
-        }
-        pocheTools::logm('login failed');
-        $notices[]['value'] = _('Login failed !');
-        pocheTools::redirect();
-    } else {
-        pocheTools::logm('login failed');
-        pocheTools::redirect();
-    }
+    $poche->login($referer);
 }
 elseif (isset($_GET['logout'])) {
     # see you soon !
-    pocheTools::logm('logout');
-    Session::logout();
-    pocheTools::redirect();
+    $poche->logout();
 }
-elseif  (isset($_GET['config'])) {
+elseif (isset($_GET['config'])) {
     # Update password
-    if (isset($_POST['password']) && isset($_POST['password_repeat'])) {
-        if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") {
-            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');
-            }
-        }
-    }
+    $poche->updatePassword();
+}
+elseif (isset($_GET['import'])) {
+    $poche->import($_GET['from']);
+}
+elseif (isset($_GET['export'])) {
+    $poche->export();
 }
-
-# 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_vars = array(
     'referer' => $referer,
     'view' => $view,
-    'poche_url' => pocheTools::getUrl(),
-    'demo' => MODE_DEMO,
+    'poche_url' => Tools::getPocheUrl(),
     'title' => _('poche, a read it later open source system'),
     'token' => Session::getToken(),
-    'notices' => $notices,
 );
 
 if (Session::isLogged()) {
-    action_to_do($action, $url, $id);
-    $tpl_file = get_tpl_file($view);
-    $tpl_vars = array_merge($tpl_vars, display_view($view, $id));
+    $poche->action($action, $url, $id);
+    $tpl_file = Tools::getTplFile($view);
+    $tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id));
 }
 else {
     $tpl_file = 'login.twig';
 }
 
-echo $twig->render($tpl_file, $tpl_vars);
\ No newline at end of file
+# because messages can be added in $poche->action(), we have to add this entry now (we can add it before)
+$tpl_vars = array_merge($tpl_vars, array('messages' => $poche->messages->display()));
+
+# Aaaaaaand action !
+echo $poche->tpl->render($tpl_file, $tpl_vars);
\ No newline at end of file