mirror of
https://github.com/wallabag/wallabag.git
synced 2025-08-01 17:38:38 +00:00
add Twig & refactor poche
This commit is contained in:
parent
f6c9baab3e
commit
a4565e88ed
218 changed files with 16372 additions and 1555 deletions
46
index.php
46
index.php
|
@ -10,7 +10,7 @@
|
|||
|
||||
include dirname(__FILE__).'/inc/config.php';
|
||||
|
||||
myTool::initPhp();
|
||||
pocheTool::initPhp();
|
||||
|
||||
# XSRF protection with token
|
||||
if (!empty($_POST)) {
|
||||
|
@ -20,14 +20,13 @@ if (!empty($_POST)) {
|
|||
unset($_SESSION['tokens']);
|
||||
}
|
||||
|
||||
$ref = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
|
||||
$referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
|
||||
|
||||
if (isset($_GET['login'])) {
|
||||
// Login
|
||||
if (!empty($_POST['login']) && !empty($_POST['password'])) {
|
||||
if (Session::login($_SESSION['login'], $_SESSION['pass'], $_POST['login'], encode_string($_POST['password'] . $_POST['login']))) {
|
||||
logm('login successful');
|
||||
$msg->add('s', 'welcome in your poche!');
|
||||
pocheTool::logm('login successful');
|
||||
if (!empty($_POST['longlastingsession'])) {
|
||||
$_SESSION['longlastingsession'] = 31536000;
|
||||
$_SESSION['expires_on'] = time() + $_SESSION['longlastingsession'];
|
||||
|
@ -37,33 +36,33 @@ if (isset($_GET['login'])) {
|
|||
}
|
||||
session_regenerate_id(true);
|
||||
|
||||
MyTool::redirect($ref);
|
||||
pocheTool::redirect($referer);
|
||||
}
|
||||
logm('login failed');
|
||||
pocheTool::logm('login failed');
|
||||
die(_("Login failed !"));
|
||||
} else {
|
||||
logm('login failed');
|
||||
pocheTool::logm('login failed');
|
||||
}
|
||||
}
|
||||
elseif (isset($_GET['logout'])) {
|
||||
logm('logout');
|
||||
pocheTool::logm('logout');
|
||||
Session::logout();
|
||||
MyTool::redirect();
|
||||
pocheTool::redirect();
|
||||
}
|
||||
elseif (isset($_GET['config'])) {
|
||||
if (isset($_POST['password']) && isset($_POST['password_repeat'])) {
|
||||
if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") {
|
||||
logm('password updated');
|
||||
pocheTool::logm('password updated');
|
||||
if (!MODE_DEMO) {
|
||||
$store->updatePassword(encode_string($_POST['password'] . $_SESSION['login']));
|
||||
$msg->add('s', _('your password has been updated'));
|
||||
#your password has been updated
|
||||
}
|
||||
else {
|
||||
$msg->add('i', _('in demo mode, you can\'t update password'));
|
||||
#in demo mode, you can\'t update password
|
||||
}
|
||||
}
|
||||
else
|
||||
$msg->add('e', _('your password can\'t be empty and you have to repeat it in the second field'));
|
||||
#else
|
||||
#your password can\'t be empty and you have to repeat it in the second field
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -75,18 +74,21 @@ $_SESSION['sort'] = (isset ($_REQUEST['sort'])) ? htmlentities($_REQUEST['sort
|
|||
$id = (isset ($_REQUEST['id'])) ? htmlspecialchars($_REQUEST['id']) : '';
|
||||
$url = (isset ($_GET['url'])) ? $_GET['url'] : '';
|
||||
|
||||
$tpl->assign('isLogged', Session::isLogged());
|
||||
$tpl->assign('referer', $ref);
|
||||
$tpl->assign('view', $view);
|
||||
$tpl->assign('poche_url', myTool::getUrl());
|
||||
$tpl->assign('demo', MODE_DEMO);
|
||||
$tpl->assign('title', _('poche, a read it later open source system'));
|
||||
$tpl_vars = array(
|
||||
'isLogged' => Session::isLogged(),
|
||||
'referer' => $referer,
|
||||
'view' => $view,
|
||||
'poche_url' => pocheTool::getUrl(),
|
||||
'demo' => MODE_DEMO,
|
||||
'title' => _('poche, a read it later open source system'),
|
||||
);
|
||||
|
||||
if (Session::isLogged()) {
|
||||
action_to_do($action, $url, $id);
|
||||
display_view($view, $id, $full_head);
|
||||
}
|
||||
else {
|
||||
|
||||
$tpl->draw('login');
|
||||
$template = $twig->loadTemplate('login.twig');
|
||||
}
|
||||
|
||||
echo $template->render($tpl_vars);
|
Loading…
Add table
Add a link
Reference in a new issue