diff options
| author | Greg Roach <fisharebest@gmail.com> | 2014-11-04 15:27:48 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2014-11-04 15:50:00 +0000 |
| commit | 6b7ac6a816a08a6f23e7b5429da31f625a91926a (patch) | |
| tree | c46bf71abb94024b0139d7dd5abe2266cfc661a4 /includes/session.php | |
| parent | 3160840d64465805ebaead744a3a1c4391e90dfb (diff) | |
| download | webtrees-6b7ac6a816a08a6f23e7b5429da31f625a91926a.tar.gz webtrees-6b7ac6a816a08a6f23e7b5429da31f625a91926a.tar.bz2 webtrees-6b7ac6a816a08a6f23e7b5429da31f625a91926a.zip | |
Use Auth class instead of constants - will allow better masquerade function. Escape username, to remove restriction on allowed characters.
Diffstat (limited to 'includes/session.php')
| -rw-r--r-- | includes/session.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/includes/session.php b/includes/session.php index 53a516e924..500e36a333 100644 --- a/includes/session.php +++ b/includes/session.php @@ -467,8 +467,9 @@ if (!$SEARCH_SPIDER && !$WT_SESSION->initiated) { // An existing session } -// Who are we? -define('WT_USER_ID', Auth::id()); +/** @deprecated Will be removed in 1.7.0 */ +define('WT_USER_ID', Auth::id()); +/** @deprecated Will be removed in 1.7.0 */ define('WT_USER_NAME', Auth::id() ? Auth::user()->getUserName() : ''); // Set the active GEDCOM @@ -548,7 +549,7 @@ define('WT_TIMESTAMP', (int)WT_DB::prepare("SELECT UNIX_TIMESTAMP()")->fetchOne( // Server timezone is defined in php.ini define('WT_SERVER_TIMESTAMP', WT_TIMESTAMP + (int)date('Z')); -if (WT_USER_ID) { +if (Auth::check()) { define('WT_CLIENT_TIMESTAMP', WT_TIMESTAMP - $WT_SESSION->timediff); } else { define('WT_CLIENT_TIMESTAMP', WT_SERVER_TIMESTAMP); |