Merge pull request #853 from wallabag/fix-for-#797

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

diff --git a/index.php b/index.php
old mode 100644 (file)
new mode 100755 (executable)
index 81bd017..39990d5
--- a/index.php
+++ b/index.php
@@ -1,97 +1,22 @@
 <?php
 /**
- * poche, a read it later open source system
+ * wallabag, self hostable application allowing you to not miss any content anymore
  *
- * @category   poche
- * @author     Nicolas Lœuillet <support@inthepoche.com>
+ * @category   wallabag
+ * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
- * @license    http://www.wtfpl.net/ see COPYING file
+ * @license    http://opensource.org/licenses/MIT see COPYING file
  */
 
-include dirname(__FILE__).'/inc/config.php';
+define ('POCHE', '1.8.0');
+require 'check_essentials.php';
+require 'check_setup.php';
+require_once 'inc/poche/global.inc.php';
 
-$errors = array();
+// Start session
+Session::$sessionName = 'wallabag';
+Session::init();
 
-# XSRF protection with token
-if (!empty($_POST)) {
-    if (!Session::isToken($_POST['token'])) {
-        #die(_('Wrong token'));
-        // TODO CORRIGER ICI !!! 
-    }
-    unset($_SESSION['tokens']);
-}
-
-$referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
-
-if (isset($_GET['login'])) {
-    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');
-            $errors[]['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_regenerate_id(true);
-            pocheTools::redirect($referer);
-        }
-        pocheTools::logm('login failed');
-        $errors[]['value'] = _('Login failed !');
-    } else {
-        pocheTools::logm('login failed');
-    }
-}
-elseif (isset($_GET['logout'])) {
-    pocheTools::logm('logout');
-    Session::logout();
-    pocheTools::redirect();
-}
-elseif  (isset($_GET['config'])) {
-    if (isset($_POST['password']) && isset($_POST['password_repeat'])) {
-        if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") {
-            pocheTools::logm('password updated');
-            if (!MODE_DEMO) {
-                $store->updatePassword(encode_string($_POST['password'] . $_SESSION['login']));
-                #your password has been updated
-            }
-            else {
-                #in demo mode, you can\'t update password
-            }
-        }
-        #else
-        #your password can\'t be empty and you have to repeat it in the second field
-    }
-}
-
-# Traitement des paramètres et déclenchement des actions
-$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(),
-    'errors' => $errors,
-);
-
-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';
-}
-
-echo $twig->render($tpl_file, $tpl_vars);
\ No newline at end of file
+// Let's rock !
+$wallabag = new Poche();
+$wallabag->run();
\ No newline at end of file