aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-04 21:34:36 -0800
committerfriendica <info@friendica.com>2013-01-04 21:34:36 -0800
commit490867ebf7ca6451bf2304fd15dc8796716f6911 (patch)
tree9b1e136817c5eabce0cb43b87b381c157160370c
parent37957204215854f2d80ca8b975f275ebda305f7e (diff)
downloadvolse-hubzilla-490867ebf7ca6451bf2304fd15dc8796716f6911.tar.gz
volse-hubzilla-490867ebf7ca6451bf2304fd15dc8796716f6911.tar.bz2
volse-hubzilla-490867ebf7ca6451bf2304fd15dc8796716f6911.zip
port "remember me" from Friendica
-rw-r--r--boot.php2
-rw-r--r--include/auth.php98
-rw-r--r--include/security.php4
-rw-r--r--view/theme/redbasic/css/style.css17
-rw-r--r--view/tpl/login.tpl2
5 files changed, 78 insertions, 45 deletions
diff --git a/boot.php b/boot.php
index 6e90af0bc..c122ba075 100644
--- a/boot.php
+++ b/boot.php
@@ -1077,7 +1077,7 @@ if(! function_exists('login')) {
'$form_id' => $form_id,
'$lname' => array('username', t('Email') , '', ''),
'$lpassword' => array('password', t('Password'), '', ''),
-
+ '$remember' => array('remember', t('Remember me'), '', ''),
'$hiddens' => $hiddens,
'$register' => $reg,
diff --git a/include/auth.php b/include/auth.php
index 3f877cd1d..c12432449 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -4,6 +4,9 @@
require_once('include/security.php');
function nuke_session() {
+
+ new_cookie(0);
+
unset($_SESSION['authenticated']);
unset($_SESSION['account_id']);
unset($_SESSION['uid']);
@@ -61,14 +64,14 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
goaway(z_root());
}
- if(x($_SESSION,'visitor_id') && (! x($_SESSION,'uid'))) {
- $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
- intval($_SESSION['visitor_id'])
- );
- if(count($r)) {
- $a->contact = $r[0];
- }
- }
+// if(x($_SESSION,'visitor_id') && (! x($_SESSION,'uid'))) {
+// $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+// intval($_SESSION['visitor_id'])
+// );
+// if(count($r)) {
+// $a->contact = $r[0];
+// }
+// }
if(x($_SESSION,'uid') || x($_SESSION,'account_id')) {
@@ -83,35 +86,30 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
goaway(z_root());
}
- if(x($_SESSION,'account_id')) {
- $r = q("select * from account where account_id = %d limit 1",
- intval($_SESSION['account_id'])
- );
- if(count($r) && (($r[0]['account_flags'] == ACCOUNT_OK) || ($r[0]['account_flags'] == ACCOUNT_UNVERIFIED))) {
- get_app()->account = $r[0];
- authenticate_success($r[0]);
- }
- else {
- $_SESSION['account_id'] = 0;
- nuke_session();
- goaway(z_root());
+ $r = q("select * from account where account_id = %d limit 1",
+ intval($_SESSION['account_id'])
+ );
+
+ if(($r) && (($r[0]['account_flags'] == ACCOUNT_OK) || ($r[0]['account_flags'] == ACCOUNT_UNVERIFIED))) {
+ get_app()->account = $r[0];
+ $login_refresh = false;
+ if(! x($_SESSION,'last_login_date')) {
+ $_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
}
+ if(strcmp(datetime_convert('UTC','UTC','now - 12 hours'), $_SESSION['last_login_date']) > 0 ) {
+ $_SESSION['last_login_date'] = datetime_convert();
+ $login_refresh = true;
+ }
+ authenticate_success($r[0], false, false, false, $login_refresh);
}
else {
- $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
- FROM `user` WHERE `uid` = %d AND `blocked` = 0
- AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
- intval($_SESSION['uid'])
- );
- }
-
- if(! count($r)) {
+ $_SESSION['account_id'] = 0;
nuke_session();
goaway(z_root());
}
- authenticate_success($r[0]);
}
+
}
else {
@@ -159,18 +157,6 @@ else {
logger('authenticate: ' . print_r(get_app()->account,true));
-
- // process normal login request
-
-// $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
-// FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
-// AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
-// dbesc(trim($_POST['username'])),
-// dbesc(trim($_POST['username'])),
-// dbesc($encrypted)
-// );
-// if(count($r))
-// $record = $r[0];
}
if((! $record) || (! count($record))) {
@@ -179,9 +165,39 @@ else {
goaway(z_root());
}
+ // If the user specified to remember the authentication, then change the cookie
+ // to expire after one year (the default is when the browser is closed).
+ // If the user did not specify to remember, change the cookie to expire when the
+ // browser is closed. The reason this is necessary is because if the user
+ // specifies to remember, then logs out and logs back in without specifying to
+ // remember, the old "remember" cookie may remain and prevent the session from
+ // expiring when the browser is closed.
+ //
+ // It seems like I should be able to test for the old cookie, but for some reason when
+ // I read the lifetime value from session_get_cookie_params(), I always get '0'
+ // (i.e. expire when the browser is closed), even when there's a time expiration
+ // on the cookie
+
+ if($_POST['remember']) {
+ new_cookie(31449600); // one year
+ }
+ else {
+ new_cookie(0); // 0 means delete on browser exit
+ }
+
// if we haven't failed up this point, log them in.
+ $_SESSION['last_login_date'] = datetime_convert();
authenticate_success($record, true, true);
}
}
+
+function new_cookie($time) {
+ $old_sid = session_id();
+ session_set_cookie_params("$time");
+ session_regenerate_id(false);
+
+ q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+}
+
diff --git a/include/security.php b/include/security.php
index ddfb8201d..276c8f97c 100644
--- a/include/security.php
+++ b/include/security.php
@@ -1,6 +1,6 @@
<?php
-function authenticate_success($user_record, $login_initial = false, $interactive = false,$return = false) {
+function authenticate_success($user_record, $login_initial = false, $interactive = false,$return = false,$update_lastlog = false) {
$a = get_app();
@@ -15,7 +15,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
$_SESSION['account_id'] = $user_record['account_id'];
$_SESSION['authenticated'] = 1;
- if($login_initial) {
+ if($login_initial || $update_lastlog) {
q("update account set account_lastlog = '%s' where account_id = %d limit 1",
dbesc(datetime_convert()),
intval($_SESSION['account_id'])
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b3435b28f..f600f5272 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -512,6 +512,21 @@ div.wall-item-content-wrapper.shiny {
float: left;
}
+#main-login #id_remember {
+ float: left;
+ padding: 0;
+ margin-top: 15px;
+ margin-bottom: 0;
+ width: 20px;
+}
+
+#main-login .field.checkbox label {
+ margin-top: 15px;
+ margin-bottom: 0;
+ float: left;
+ width: 100px;
+}
+
#main-login .field_end {
clear: both;
}
@@ -3080,7 +3095,7 @@ brain is weird like that */
*/
.field {
margin-bottom: 10px;
- padding-bottom: 10px;
+/* padding-bottom: 10px; */
overflow: auto;
width: 100%
}
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index 9cecef5c7..149c46e4c 100644
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -11,6 +11,8 @@
{{ if $register }}<a href="$register.link" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
</div>
+
+ {{ inc field_checkbox.tpl with $field=$remember }}{{ endinc }}
<div id="login-standard-end"></div>