From c765c3679fee3ed9e4bad9954a808116187a7e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 4 Aug 2013 21:42:46 +0200 Subject: import in poche and not in an external file --- index.php | 49 +++++++------------------------------------------ 1 file changed, 7 insertions(+), 42 deletions(-) (limited to 'index.php') diff --git a/index.php b/index.php index 40779698..1554c0a6 100644 --- a/index.php +++ b/index.php @@ -10,8 +10,6 @@ include dirname(__FILE__).'/inc/poche/config.inc.php'; -$notices = array(); - # XSRF protection with token // if (!empty($_POST)) { // if (!Session::isToken($_POST['token'])) { @@ -25,50 +23,18 @@ $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']; 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'])) { + $poche->import($_GET['from']); } # Aaaaaaand action ! @@ -87,7 +53,6 @@ $tpl_vars = array( 'demo' => MODE_DEMO, 'title' => _('poche, a read it later open source system'), 'token' => Session::getToken(), - 'notices' => $notices, ); if (Session::isLogged()) { -- cgit v1.2.3