Index: branches/5.1.x/core/units/users/users_event_handler.php =================================================================== diff -u -N -r14115 -r14198 --- branches/5.1.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 14115) +++ branches/5.1.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 14198) @@ -1,6 +1,6 @@ Application->StorePersistentVar('ThisLogin', adodb_mktime()); } - $this->Application->HandleEvent($dummy, 'session-log:OnStartSession'); + $this->Application->HandleEvent($dummy, 'u:OnAfterLogin'); } /** @@ -208,7 +208,7 @@ $sync_manager =& $this->Application->recallObjectP('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize'); $sync_manager->performAction('LogoutUser'); - $this->Application->HandleEvent($dummy, 'session-log:OnEndSession'); + $this->Application->HandleEvent($dummy, 'u:OnBeforeLogout'); $user_id = USER_GUEST; $this->Application->SetVar('u.current_id', $user_id); Index: branches/5.1.x/core/units/visits/visits_config.php =================================================================== diff -u -N -r13962 -r14198 --- branches/5.1.x/core/units/visits/visits_config.php (.../visits_config.php) (revision 13962) +++ branches/5.1.x/core/units/visits/visits_config.php (.../visits_config.php) (revision 14198) @@ -1,6 +1,6 @@ false, 'HookToPrefix' => 'u', 'HookToSpecial' => '*', - 'HookToEvent' => Array ( 'OnLogin' ), + 'HookToEvent' => Array ( 'OnAfterLogin' ), 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnUserLogin', Index: branches/5.1.x/core/units/logs/session_logs/session_logs_config.php =================================================================== diff -u -N -r13962 -r14198 --- branches/5.1.x/core/units/logs/session_logs/session_logs_config.php (.../session_logs_config.php) (revision 13962) +++ branches/5.1.x/core/units/logs/session_logs/session_logs_config.php (.../session_logs_config.php) (revision 14198) @@ -1,6 +1,6 @@ true, + 'Hooks' => Array ( + Array ( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => 'u', + 'HookToSpecial' => '*', + 'HookToEvent' => Array ('OnAfterLogin'), + 'DoPrefix' => '', + 'DoSpecial' => '*', + 'DoEvent' => 'OnStartSession', + ), + + Array ( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => 'u', + 'HookToSpecial' => '*', + 'HookToEvent' => Array ('OnBeforeLogout'), + 'DoPrefix' => '', + 'DoSpecial' => '*', + 'DoEvent' => 'OnEndSession', + ), + ), + 'QueryString' => Array ( 1 => 'id', 2 => 'Page',