X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=adfef71bef24e815cef7eef8152ccd27e5ea2c4a;hb=c8b4ef7fed01c4d94ac9d2325bd2c6e97f831bad;hp=1554c0a65501c2333c3d58eb0710f0d11c5b3c24;hpb=c765c3679fee3ed9e4bad9954a808116187a7e83;p=github%2Fwallabag%2Fwallabag.git diff --git a/index.php b/index.php old mode 100644 new mode 100755 index 1554c0a6..adfef71b --- a/index.php +++ b/index.php @@ -1,67 +1,22 @@ + * @category wallabag + * @author Nicolas Lœuillet * @copyright 2013 - * @license http://www.wtfpl.net/ see COPYING file + * @license http://opensource.org/licenses/MIT see COPYING file */ -include dirname(__FILE__).'/inc/poche/config.inc.php'; +define ('POCHE', '1.8.1'); +require 'check_essentials.php'; +require 'check_setup.php'; +require_once 'inc/poche/global.inc.php'; -# XSRF protection with token -// if (!empty($_POST)) { -// if (!Session::isToken($_POST['token'])) { -// die(_('Wrong token')); -// // TODO remettre le test -// } -// unset($_SESSION['tokens']); -// } +// Start session +Session::$sessionName = 'wallabag'; +Session::init(); -$referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']; - -if (isset($_GET['login'])) { - # hello you - $poche->login($referer); -} -elseif (isset($_GET['logout'])) { - # see you soon ! - $poche->logout(); -} -elseif (isset($_GET['config'])) { - # Update password - $poche->updatePassword(); -} -elseif (isset($_GET['import'])) { - $poche->import($_GET['from']); -} - -# 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'] : ''); - -$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(), -); - -if (Session::isLogged()) { - $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 $poche->tpl->render($tpl_file, $tpl_vars); \ No newline at end of file +// Let's rock ! +$wallabag = new Poche(); +$wallabag->run();