diff options
| author | Stanislav Atanasov <lucifer@anavaro.com> | 2015-06-04 19:57:45 +0300 |
|---|---|---|
| committer | Stanislav Atanasov <lucifer@anavaro.com> | 2015-06-20 23:46:37 +0300 |
| commit | 7d24510d68338e10f670cea1ea64131602d05e57 (patch) | |
| tree | 7973a9e186028ecba1ba27bec3a19c339f44dca3 /phpBB/phpbb/session.php | |
| parent | afa4c07a13c43d9e4c9fd6b4a56e6f53d3540b71 (diff) | |
| download | forums-7d24510d68338e10f670cea1ea64131602d05e57.tar forums-7d24510d68338e10f670cea1ea64131602d05e57.tar.gz forums-7d24510d68338e10f670cea1ea64131602d05e57.tar.bz2 forums-7d24510d68338e10f670cea1ea64131602d05e57.tar.xz forums-7d24510d68338e10f670cea1ea64131602d05e57.zip | |
[ticket/13817] Add _after
As requested events are named *_after
core.session_start_after is moved after
USERS_TABLE update to prevent returning
session data from extensions
PHPBB3-13817
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index de9bd808b4..5bd56ca0ec 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -851,18 +851,6 @@ class session $_SID = $this->session_id; $this->data = array_merge($this->data, $sql_ary); - /** - * Event to send new session data to extension - * - * @event core.session_create - * @var array session_data Associative array of session keys to be updated - * @since 3.1.5-RC1 - */ - $session_data = $this->data; - $vars = array('session_data'); - extract($phpbb_dispatcher->trigger_event('core.session_create', compact($vars))); - unset($session_data); - if (!$bot) { $cookie_expire = $this->time_now + (($config['max_autologin_time']) ? 86400 * (int) $config['max_autologin_time'] : 31536000); @@ -905,6 +893,18 @@ class session $_SID = ''; } + $session_data = $this->data; + /** + * Event to send new session data to extension + * + * @event core.session_create_after + * @var array session_data Associative array of session keys to be updated + * @since 3.1.5-RC1 + */ + $vars = array('session_data'); + extract($phpbb_dispatcher->trigger_event('core.session_create_after', compact($vars))); + unset($session_data); + return true; } @@ -925,18 +925,18 @@ class session AND session_user_id = " . (int) $this->data['user_id']; $db->sql_query($sql); + $user_id = (int) $this->data['user_id']; + $session_id = $this->session_id; /** * Event to send session kill information to extension * - * @event core.session_kill + * @event core.session_kill_after * @var int user_id user_id of the session user. * @var string session_id current user's session_id * @since 3.1.5-RC1 */ - $user_id = (int) $this->data['user_id']; - $session_id = $this->session_id; - $vars = array('user_id', 'session_id'); - extract($phpbb_dispatcher->trigger_event('core.session_kill', compact($vars))); + $vars = array('user_id', 'session_id', 'new_session'); + extract($phpbb_dispatcher->trigger_event('core.session_kill_after', compact($vars))); unset($user_id); unset($session_id); @@ -1078,10 +1078,10 @@ class session /** * Event to trigger extension on session_gc * - * @event core.session_gc + * @event core.session_gc_after * @since 3.1.5-RC1 */ - $phpbb_dispatcher->dispatch('core.session_gc'); + $phpbb_dispatcher->dispatch('core.session_gc_after'); return; } |