mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-18 13:24:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add possibility to keep logged in with form

Browse Source 
Add an option to keep logged in.
Change lifetime of session cookie to 1 year.

See https://github.com/marienfressinaud/FreshRSS/issues/465
This commit is contained in:
Marien Fressinaud
2014-08-10 20:29:43 +02:00
parent 6655c1b429
commit eceb7756cf
5 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controllers/indexController.php
View File

@@ -298,6 +298,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
public function formLoginAction () {
if (Minz_Request::isPost()) {
$ok = false;
$keep_logged_in = Minz_Request::param('keep_logged_in', false);
$nonce = Minz_Session::param('nonce');
$username = Minz_Request::param('username', '');
$c = Minz_Request::param('challenge', '');
@@ -312,6 +313,11 @@ class FreshRSS_index_Controller extends Minz_ActionController {
if ($ok) {
Minz_Session::_param('currentUser', $username);
Minz_Session::_param('passwordHash', $s);
if ($keep_logged_in) {
// New cookie with a lifetime of 1 year!
Minz_Session::keepCookie(31536000);
Minz_Session::regenerateID();
}
} else {
Minz_Log::record('Password mismatch for user ' . $username . ', nonce=' . $nonce . ', c=' . $c, Minz_Log::WARNING);
}
@@ -371,6 +377,9 @@ class FreshRSS_index_Controller extends Minz_ActionController {
Minz_Session::_param('currentUser');
Minz_Session::_param('mail');
Minz_Session::_param('passwordHash');
Minz_Session::keepCookie(0);
Minz_Session::regenerateID();
Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
}
}

1
app/i18n/en.php
View File

@@ -3,6 +3,7 @@
return array (
// LAYOUT
'login' => 'Login',
'keep_logged_in' => 'Keep me logged in',
'login_with_persona' => 'Login with Persona',
'logout' => 'Logout',
'search' => 'Search words or #tags',

1
app/i18n/fr.php
View File

@@ -3,6 +3,7 @@
return array (
// LAYOUT
'login' => 'Connexion',
'session_active' => 'Rester connecté',
'login_with_persona' => 'Connexion avec Persona',
'logout' => 'Déconnexion',
'search' => 'Rechercher des mots ou des #tags',

23
app/views/index/formLogin.phtml
View File

@@ -1,32 +1,39 @@
<div class="prompt">
<h1><?php echo Minz_Translate::t('login'); ?></h1><?php
<h1><?php echo _t('login'); ?></h1><?php
switch (Minz_Configuration::authType()) {
case 'form':
?><form id="loginForm" method="post" action="<?php echo _url('index', 'formLogin'); ?>">
<div>
<label for="username"><?php echo Minz_Translate::t('username'); ?></label>
<label for="username"><?php echo _t('username'); ?></label>
<input type="text" id="username" name="username" size="16" required="required" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" autofocus="autofocus" />
</div>
<div>
<label for="passwordPlain"><?php echo Minz_Translate::t('password'); ?></label>
<label for="passwordPlain"><?php echo _t('password'); ?></label>
<input type="password" id="passwordPlain" required="required" />
<input type="hidden" id="challenge" name="challenge" /><br />
<noscript><strong><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></strong></noscript>
<noscript><strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
</div>
<div>
<button id="loginButton" type="submit" class="btn btn-important"><?php echo Minz_Translate::t('login'); ?></button>
<label class="checkbox" for="keep_logged_in">
<input type="checkbox" name="keep_logged_in" id="keep_logged_in" value="1" />
<?php echo _t('session_active'); ?>
</label>
<br />
</div>
<div>
<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('login'); ?></button>
</div>
</form><?php
break;
case 'persona':
?><p>
<?php echo FreshRSS_Themes::icon('login'); ?>
<a class="signin" href="#"><?php echo Minz_Translate::t('login_with_persona'); ?></a>
<?php echo _i('login'); ?>
<a class="signin" href="#"><?php echo _t('login_with_persona'); ?></a>
</p><?php
break;
} ?>
<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo Minz_Translate::t('about_freshrss'); ?></a></p>
<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a></p>
</div>

37
lib/Minz/Session.php
View File

@@ -15,13 +15,15 @@ class Minz_Session {
* Le nom de session est utilisé comme nom pour les cookies et les URLs (i.e. PHPSESSID).
* Il ne doit contenir que des caractères alphanumériques ; il doit être court et descriptif
*/
public static function init ($name) {
// démarre la session
session_name ($name);
session_set_cookie_params (0, dirname(empty($_SERVER['REQUEST_URI']) ? '/' : dirname($_SERVER['REQUEST_URI'])), null, false, true);
session_start ();
public static function init($name) {
$cookie = session_get_cookie_params();
self::keepCookie($cookie['lifetime']);
if (isset ($_SESSION)) {
// démarre la session
session_name($name);
session_start();
if (isset($_SESSION)) {
self::$session = $_SESSION;
}
}
@@ -68,4 +70,27 @@ class Minz_Session {
Minz_Translate::reset ();
}
}
/**
* Spécifie la durée de vie des cookies
* @param $l la durée de vie
*/
public static function keepCookie($l) {
$cookie_dir = dirname(
empty($_SERVER['SCRIPT_NAME']) ? '' : $_SERVER['SCRIPT_NAME']
) . '/';
session_set_cookie_params($l, $cookie_dir, $_SERVER['HTTP_HOST'],
false, true);
}
/**
* Régénère un id de session.
* Utile pour appeler session_set_cookie_params après session_start()
*/
public static function regenerateID() {
session_regenerate_id(true);
}
}