mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Set default timezone in init_session().

Browse Source
This commit is contained in:
Lóna Lore
2016-12-13 21:31:59 +01:00
parent e25ead78df
commit 2f2b3cc7c0
2 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
class2.php
View File

@@ -1127,25 +1127,13 @@ if (($_SERVER['QUERY_STRING'] == 'logout')/* || (($pref['user_tracking'] == 'ses
exit(); exit();
} }
/** /**
* @addtogroup timezone * @addtogroup timezone
* @{ * @{
*/ */
$tzUser = e107::user(USERID);
if (varset($tzUser['user_timezone'], false) && systemTimeZoneIsValid($tzUser['user_timezone']))
{
date_default_timezone_set($tzUser['user_timezone']);
unset($tzUser);
}
else
{
$tz = vartrue($pref['timezone'], 'UTC');
date_default_timezone_set($tz);
unset($tz);
}
/** /**
* Generate an array of time zones. * Generate an array of time zones.
* *
@@ -1209,13 +1197,7 @@ function systemTimeZoneIsValid($zone = '')
return false; return false;
} }
/** $e_deltaTime = 0;
* @} End of "addtogroup timezone".
*/
$e_deltaTime=0;
if (isset($_COOKIE['e107_tdOffset'])) if (isset($_COOKIE['e107_tdOffset']))
{ {
@@ -1231,6 +1213,10 @@ if (isset($_COOKIE['e107_tzOffset']))
define('TIMEOFFSET', $e_deltaTime); define('TIMEOFFSET', $e_deltaTime);
/**
* @} End of "addtogroup timezone".
*/
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1791,6 +1777,33 @@ function init_session()
// New user model // New user model
$user = e107::getUser(); $user = e107::getUser();
// Get user timezone.
$tzUser = $user->getTimezone();
// If user timezone is valid.
if (varset($tzUser, false) && systemTimeZoneIsValid($tzUser))
{
// Sets the default timezone used by all date/time functions.
date_default_timezone_set($tzUser);
// Save timezone for later use.
define('USERTIMEZONE', $tzUser);
unset($tzUser);
}
else
{
// Use system default timezone.
$pref = e107::getPref();
$tz = vartrue($pref['timezone'], 'UTC');
// Sets the default timezone used by all date/time functions.
date_default_timezone_set($tz);
// Save timezone for later use.
define('USERTIMEZONE', $tz);
unset($tz);
}
define('USERIP', e107::getIPHandler()->getIP(FALSE)); define('USERIP', e107::getIPHandler()->getIP(FALSE));
define('POST_REFERER', md5($user->getToken())); define('POST_REFERER', md5($user->getToken()));

5
e107_handlers/user_model.php
View File

@@ -219,6 +219,11 @@ class e_user_model extends e_admin_model
return ($this->isAdmin() ? $this->get('user_perms') : false); return ($this->isAdmin() ? $this->get('user_perms') : false);
} }
final public function getTimezone()
{
return ($this->get('user_timezone') ? $this->get('user_timezone') : 'UTC');
}
/** /**
* DEPRECATED - will be removed or changed soon (see e_session) * DEPRECATED - will be removed or changed soon (see e_session)
* @return string * @return string