oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

import in poche and not in an external file

Browse source
This commit is contained in:
Nicolas Lœuillet 2013-08-04 21:42:46 +02:00
parent eb1af59219
commit c765c3679f
9 changed files with 125 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

49
index.php
View file

@ -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()) {