on the road to 1.1.0

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

diff --git a/index.php b/index.php
index dc064428d3a6a7f620bb210c24771c848a395be6..66a2e816a277eeee92480cf83a1c6217910623c2 100644 (file)
--- a/index.php
+++ b/index.php
@@ -8,94 +8,96 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-include dirname(__FILE__).'/inc/config.php';
+define ('POCHE', '1.1.0');
+require_once 'inc/poche/global.inc.php';
+session_start(); 
 
-$notices = array();
-
-# XSRF protection with token
-// if (!empty($_POST)) {
-//     if (!Session::isToken($_POST['token'])) {
-//         die(_('Wrong token'));
-//         // TODO remettre le test
-//     }
-//     unset($_SESSION['tokens']);
-// }
+# Start Poche
+$poche = new Poche();
+$notInstalledMessage = $poche -> getNotInstalledMessage();
 
+# 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'] : '');
 
-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');
+# vars to _always_ send to templates
+$tpl_vars = array(
+    'referer' => $referer,
+    'view' => $view,
+    'poche_url' => Tools::getPocheUrl(),
+    'title' => _('poche, a read it later open source system'),
+    'token' => Session::getToken(),
+    'theme' => $poche->getTheme()
+);
 
-            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);
+if (! empty($notInstalledMessage)) {
+    if (! Poche::$canRenderTemplates || ! Poche::$configFileAvailable) {
+        # We cannot use Twig to display the error message 
+        echo '<h1>Errors</h1><ol>';
+        foreach ($notInstalledMessage as $message) {
+            echo '<li>' . $message . '</li>';
         }
-        pocheTools::logm('login failed');
-        $notices[]['value'] = _('Login failed !');
-        pocheTools::redirect();
+        echo '</ol>';
+        die();
     } else {
-        pocheTools::logm('login failed');
-        pocheTools::redirect();
+        # Twig is installed, put the error message in the template
+        $tpl_file = Tools::getTplFile('error');
+        $tpl_vars = array_merge($tpl_vars, array('msg' => $poche->getNotInstalledMessage()));
+        echo $poche->tpl->render($tpl_file, $tpl_vars);
+        exit;
     }
 }
-elseif (isset($_GET['logout'])) {
+
+# poche actions
+if (isset($_GET['login'])) {
+    # hello you
+    $poche->login($referer);
+} elseif (isset($_GET['logout'])) {
     # see you soon !
-    pocheTools::logm('logout');
-    Session::logout();
-    pocheTools::redirect();
-}
-elseif  (isset($_GET['config'])) {
+    $poche->logout();
+} 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'])) {
+    $import = $poche->import($_GET['from']);
+} elseif (isset($_GET['export'])) {
+    $poche->export();
+} elseif (isset($_GET['updatetheme'])) {
+    $poche->updateTheme();
+} elseif (isset($_GET['updatelanguage'])) {
+    $poche->updateLanguage();
 }
 
-# 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,
-    'title' => _('poche, a read it later open source system'),
-    'token' => Session::getToken(),
-    'notices' => $notices,
-);
+elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) {
+    $plain_url = new Url(base64_encode($_GET['plainurl']));
+    $poche->action('add', $plain_url);
+}
 
 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));
-}
-else {
-    $tpl_file = 'login.twig';
+    $poche->action($action, $url, $id);
+    $tpl_file = Tools::getTplFile($view);
+    $tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id));
+} elseif(isset($_SERVER['PHP_AUTH_USER'])) {
+    if($poche->store->userExists($_SERVER['PHP_AUTH_USER'])) {
+        $poche->login($referer);
+    } else {
+        $poche->messages->add('e', _('login failed: user doesn\'t exist'));
+        Tools::logm('user doesn\'t exist');
+        $tpl_file = Tools::getTplFile('login');
+        $tpl_vars['http_auth'] = 1;
+    }
+} else {
+    $tpl_file = Tools::getTplFile('login');
+    $tpl_vars['http_auth'] = 0;
 }
 
-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)
+$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);