Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 06:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor datetime_convert into Temporal::convert

Browse source 
- Changed parameter order to save space
- Refactor select_timezone into Temporal::getTimezoneSelect
- Refactor field_timezone into Temporal::getTimezoneField
This commit is contained in:
Hypolite Petovan 2018-01-24 21:08:45 -05:00
parent d478ef6c6d
commit dc366bf1f7
62 changed files with 512 additions and 432 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Module/Login.php
View file

@ -11,7 +11,10 @@ use Friendica\Core\L10n;
use Friendica\Database\DBM;
use Friendica\Model\User;
use Friendica\Util\Network;
use Friendica\Util\Temporal;
use dba;
use Exception;
use LightOpenID;
require_once 'boot.php';
require_once 'include/datetime.php';
@ -68,7 +71,7 @@ class Login extends BaseModule
// Otherwise it's probably an openid.
try {
$openid = new \LightOpenID;
$openid = new LightOpenID;
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
$_SESSION['remember'] = $_POST['remember'];
@ -118,7 +121,7 @@ class Login extends BaseModule
// if we haven't failed up this point, log them in.
$_SESSION['remember'] = $_POST['remember'];
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
$_SESSION['last_login_date'] = Temporal::convert();
authenticate_success($record, true, true);
if (x($_SESSION, 'return_url')) {
@ -217,10 +220,10 @@ class Login extends BaseModule
// stays logged in for a long time, e.g. with "Remember Me"
$login_refresh = false;
if (!x($_SESSION['last_login_date'])) {
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
$_SESSION['last_login_date'] = Temporal::convert();
}
if (strcmp(datetime_convert('UTC', 'UTC', 'now - 12 hours'), $_SESSION['last_login_date']) > 0) {
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
if (strcmp(Temporal::convert('now - 12 hours'), $_SESSION['last_login_date']) > 0) {
$_SESSION['last_login_date'] = Temporal::convert();
$login_refresh = true;
}
authenticate_success($user, false, false, $login_refresh);