Index: branches/5.2.x/core/units/users/users_event_handler.php =================================================================== diff -u -N -r15101 -r15130 --- branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15101) +++ branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15130) @@ -1,6 +1,6 @@ Name == 'OnLogin' || $event->Name == 'OnLoginAjax' || $event->Name == 'OnLogout' ) { // permission is checked in OnLogin event directly @@ -221,7 +221,7 @@ * * @param kEvent $event */ - function OnSessionExpire(&$event) + function OnSessionExpire($event) { $this->Application->resetCounters('UserSessions'); @@ -262,7 +262,7 @@ * * @param kEvent $event */ - function OnDeleteExpiredSessions(&$event) + function OnDeleteExpiredSessions($event) { if (defined('IS_INSTALL') && IS_INSTALL) { return ; @@ -278,7 +278,7 @@ * @return void * @access protected */ - protected function OnLogin(&$event) + protected function OnLogin($event) { $object =& $event->getObject( Array ('form_name' => 'login') ); /* @var $object kDBItem */ @@ -314,7 +314,7 @@ * @return void * @access protected */ - protected function OnLoginAjax(&$event) + protected function OnLoginAjax($event) { $ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper'); /* @var $ajax_form_helper AjaxFormHelper */ @@ -327,7 +327,7 @@ * * @param kEvent $event */ - function OnAutoLoginUser(&$event) + function OnAutoLoginUser($event) { $remember_login_cookie = $this->Application->GetVar('remember_login'); @@ -346,7 +346,7 @@ * * @param kEvent $event */ - function OnInpLogin(&$event) + function OnInpLogin($event) { $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize')); /* @var $sync_manager UsersSyncronizeManager */ @@ -364,7 +364,7 @@ * * @param kEvent $event */ - function OnInpLogout(&$event) + function OnInpLogout($event) { $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize')); /* @var $sync_manager UsersSyncronizeManager */ @@ -379,7 +379,7 @@ * @return void * @access protected */ - protected function OnLogout(&$event) + protected function OnLogout($event) { $user_helper =& $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ @@ -395,7 +395,7 @@ * @return void * @access protected */ - protected function OnAfterItemCreate(kEvent &$event) + protected function OnAfterItemCreate(kEvent $event) { parent::OnAfterItemCreate($event); @@ -411,7 +411,7 @@ * @return void * @access protected */ - protected function OnCreate(kEvent &$event) + protected function OnCreate(kEvent $event) { if ( $this->Application->isAdmin ) { parent::OnCreate($event); @@ -460,7 +460,7 @@ * @return void * @access protected */ - protected function OnRegisterAjax(kEvent &$event) + protected function OnRegisterAjax(kEvent $event) { $ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper'); /* @var $ajax_form_helper AjaxFormHelper */ @@ -490,7 +490,7 @@ * * @param kEvent $event */ - function autoLoginUser(&$event) + function autoLoginUser($event) { $object =& $event->getObject(); /* @var $object UsersItem */ @@ -515,7 +515,7 @@ * @return void * @access protected */ - protected function OnBeforeItemCreate(kEvent &$event) + protected function OnBeforeItemCreate(kEvent $event) { parent::OnBeforeItemCreate($event); @@ -591,7 +591,7 @@ * * @param kEvent $event */ - protected function assignToPrimaryGroup(&$event) + protected function assignToPrimaryGroup($event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -621,7 +621,7 @@ * @return void * @access protected */ - protected function OnAfterItemValidate(kEvent &$event) + protected function OnAfterItemValidate(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -638,7 +638,7 @@ * * @param kEvent $event */ - function OnRecommend(&$event) + function OnRecommend($event) { $object =& $event->getObject( Array ('form_name' => 'recommend') ); /* @var $object kDBItem */ @@ -676,7 +676,7 @@ * * @param kEvent $event */ - function OnUpdateAddress(&$event) + function OnUpdateAddress($event) { $object =& $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ @@ -708,7 +708,7 @@ * * @param kEvent $event */ - function OnSubscribeQuery(&$event) + function OnSubscribeQuery($event) { $object =& $event->getObject( Array ('form_name' => 'subscription') ); /* @var $object UsersItem */ @@ -741,7 +741,7 @@ * * @param kEvent $event */ - function OnSubscribeUser(&$event) + function OnSubscribeUser($event) { $object =& $event->getObject( Array ('form_name' => 'subscription') ); /* @var $object UsersItem */ @@ -842,7 +842,7 @@ * @param kEvent $event * @return void */ - function OnForgotPassword(&$event) + function OnForgotPassword($event) { $object =& $event->getObject( Array ('form_name' => 'forgot_password') ); /* @var $object kDBItem */ @@ -911,7 +911,7 @@ * @return void * @access protected */ - protected function OnUpdate(kEvent &$event) + protected function OnUpdate(kEvent $event) { parent::OnUpdate($event); @@ -927,7 +927,7 @@ * @return void * @access protected */ - protected function OnBeforeItemUpdate(kEvent &$event) + protected function OnBeforeItemUpdate(kEvent $event) { parent::OnBeforeItemUpdate($event); @@ -965,7 +965,7 @@ * * @param kEvent $event */ - function beforeItemChanged(&$event) + function beforeItemChanged($event) { $object =& $event->getObject(); /* @var $object UsersItem */ @@ -999,7 +999,7 @@ * @param kEvent $event * @param bool $for_registration */ - function setNextTemplate(&$event, $for_registration = false) + function setNextTemplate($event, $for_registration = false) { $event->SetRedirectParam('opener', 's'); @@ -1034,7 +1034,7 @@ * * @param kEvent $event */ - function OnCheckExpiredMembership(&$event) + function OnCheckExpiredMembership($event) { // send pre-expiration reminders: begin $pre_expiration = adodb_mktime() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24; @@ -1086,7 +1086,7 @@ * @return void * @access protected */ - protected function OnRefreshForm(&$event) + protected function OnRefreshForm($event) { $event->redirect = false; $item_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); @@ -1105,7 +1105,7 @@ * * @param kEvent $event */ - function OnSetPersistantVariable(&$event) + function OnSetPersistantVariable($event) { $field = $this->Application->GetVar('field'); $value = $this->Application->GetVar('value'); @@ -1124,7 +1124,7 @@ * @return int * @access public */ - public function getPassedID(kEvent &$event) + public function getPassedID(kEvent $event) { switch ($event->Special) { case 'ord': @@ -1170,7 +1170,7 @@ * * @param kEvent $event */ - function OnUpdateRootPassword(&$event) + function OnUpdateRootPassword($event) { return $this->OnUpdatePassword($event); } @@ -1182,7 +1182,7 @@ * @return void * @access protected */ - protected function OnUpdatePassword(&$event) + protected function OnUpdatePassword($event) { $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); if ( !$items_info ) { @@ -1262,7 +1262,7 @@ * @return void * @access protected */ - protected function OnMassResetSettings(&$event) + protected function OnMassResetSettings($event) { if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) { $event->status = kEvent::erFAIL; @@ -1296,7 +1296,7 @@ * @return bool * @access protected */ - protected function checkItemStatus(kEvent &$event) + protected function checkItemStatus(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -1317,7 +1317,7 @@ * @return void * @access protected */ - protected function OnAfterItemUpdate(kEvent &$event) + protected function OnAfterItemUpdate(kEvent $event) { parent::OnAfterItemUpdate($event); @@ -1342,7 +1342,7 @@ * * @param kEvent $event */ - protected function afterItemChanged(&$event) + protected function afterItemChanged($event) { $this->saveUserImages($event); @@ -1375,7 +1375,7 @@ * @return void * @access protected */ - protected function OnBeforeDeleteFromLive(kEvent &$event) + protected function OnBeforeDeleteFromLive(kEvent $event) { parent::OnBeforeDeleteFromLive($event); @@ -1395,7 +1395,7 @@ * @return void * @access protected */ - protected function OnAfterCopyToLive(kEvent &$event) + protected function OnAfterCopyToLive(kEvent $event) { parent::OnAfterCopyToLive($event); @@ -1485,7 +1485,7 @@ * @return void * @access protected */ - protected function sendEmailChangeEvent(kEvent &$event) + protected function sendEmailChangeEvent(kEvent $event) { $object =& $event->getObject(); /* @var $object UsersItem */ @@ -1536,7 +1536,7 @@ * @return void * @access protected */ - protected function OnAfterConfigRead(kEvent &$event) + protected function OnAfterConfigRead(kEvent $event) { parent::OnAfterConfigRead($event); @@ -1607,7 +1607,7 @@ * * @param kEvent $event */ - function OnMassCloneUsers(&$event) + function OnMassCloneUsers($event) { if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) { $event->status = kEvent::erFAIL; @@ -1629,7 +1629,7 @@ * @return void * @access protected */ - protected function OnBeforeClone(kEvent &$event) + protected function OnBeforeClone(kEvent $event) { parent::OnBeforeClone($event); @@ -1648,7 +1648,7 @@ * * @param kEvent $event */ - function OnSaveSelected(&$event) + function OnSaveSelected($event) { $this->StoreSelectedIDs($event); @@ -1661,7 +1661,7 @@ * * @param kEvent $event */ - function OnProcessSelected(&$event) + function OnProcessSelected($event) { $event->SetRedirectParam('opener', 'u'); $user_ids = $this->getSelectedIDs($event, true); @@ -1712,7 +1712,7 @@ * @return void * @access protected */ - protected function OnAfterItemLoad(kEvent &$event) + protected function OnAfterItemLoad(kEvent $event) { parent::OnAfterItemLoad($event); @@ -1754,7 +1754,7 @@ * * @param kEvent $event */ - function saveUserImages(&$event) + function saveUserImages($event) { if (!$this->Application->isAdmin) { $image_helper =& $this->Application->recallObject('ImageHelper'); @@ -1775,7 +1775,7 @@ * @return void * @access protected */ - protected function OnPreCreate(kEvent &$event) + protected function OnPreCreate(kEvent $event) { parent::OnPreCreate($event); @@ -1808,7 +1808,7 @@ * * @param kEvent $event */ - function _makePasswordRequired(&$event) + function _makePasswordRequired($event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -1824,7 +1824,7 @@ * @return void * @access protected */ - protected function LoadItem(kEvent &$event) + protected function LoadItem(kEvent $event) { $id = $this->getPassedID($event); @@ -1846,7 +1846,7 @@ * * @param kEvent $event */ - function OnAfterLogin(&$event) + function OnAfterLogin($event) { } @@ -1856,7 +1856,7 @@ * * @param kEvent $event */ - function OnBeforeLogout(&$event) + function OnBeforeLogout($event) { } @@ -1866,7 +1866,7 @@ * * @param kEvent $event */ - function OnGeneratePassword(&$event) + function OnGeneratePassword($event) { $event->status = kEvent::erSTOP; @@ -1880,7 +1880,7 @@ * * @param kEvent $event */ - function OnResetLostPassword(&$event) + function OnResetLostPassword($event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -1907,7 +1907,7 @@ * @return void * @access protected */ - protected function OnResetRootPassword(&$event) + protected function OnResetRootPassword($event) { $password_formatter =& $this->Application->recallObject('kPasswordFormatter'); /* @var $password_formatter kPasswordFormatter */ @@ -1929,7 +1929,7 @@ * @return void * @access protected */ - protected function OnLoginAs(kEvent &$event) + protected function OnLoginAs(kEvent $event) { $user_helper =& $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */