links to original article were wrong

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

diff --git a/index.php b/index.php
index 40779698c4c25a63d04c4afe45515a31d1b9f6cd..5f43b7400c007887e94fe364bb66aabb78635499 100644 (file)
--- a/index.php
+++ b/index.php
@@ -8,86 +8,49 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-include dirname(__FILE__).'/inc/poche/config.inc.php';
-
-$notices = array();
+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();
 
-# XSRF protection with token
-// if (!empty($_POST)) {
-//     if (!Session::isToken($_POST['token'])) {
-//         die(_('Wrong token'));
-//         // TODO remettre le test
-//     }
-//     unset($_SESSION['tokens']);
-// }
+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', 'id');
+$url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
 
+# poche actions
 if (isset($_GET['login'])) {
     # hello you
-    if (!empty($_POST['login']) && !empty($_POST['password'])) {
-        if (Session::login($_SESSION['login'], $_SESSION['pass'], $_POST['login'], Tools::encodeString($_POST['password'] . $_POST['login']))) {
-            Tools::logm('login successful');
-            $notices['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);
-            Tools::redirect($referer);
-        }
-        Tools::logm('login failed');
-        $notices['value'] = _('Login failed !');
-        Tools::redirect();
-    } else {
-        Tools::logm('login failed');
-        Tools::redirect();
-    }
+    $poche->login($referer);
 }
 elseif (isset($_GET['logout'])) {
     # see you soon !
-    Tools::logm('logout');
-    Session::logout();
-    Tools::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) {
-                Tools::logm('password updated');
-                $poche->store->updatePassword(Tools::encodeString($_POST['password'] . $_SESSION['login']));
-                Session::logout();
-                Tools::redirect();
-            }
-            else {
-                Tools::logm('in demo mode, you can\'t do this');
-            }
-        }
-    }
+    $poche->updatePassword();
+}
+elseif (isset($_GET['import'])) {
+    $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 = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
-
+# 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(),
-    'notices' => $notices,
 );
 
 if (Session::isLogged()) {
@@ -99,4 +62,9 @@ else {
     $tpl_file = 'login.twig';
 }
 
+# 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