Index: branches/5.2.x/core/units/users/users_event_handler.php =================================================================== diff -u -N -r15130 -r15137 --- branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15130) +++ branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15137) @@ -1,6 +1,6 @@ Name == 'OnLoginAs' ) { - $admin_session =& $this->Application->recallObject('Session.admin'); + $admin_session = $this->Application->recallObject('Session.admin'); /* @var $admin_session Session */ return $admin_session->LoggedIn(); @@ -176,7 +176,7 @@ } if ( $event->Name == 'OnUpdate' && $user_id > 0 ) { - $user_dummy =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true)); + $user_dummy = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true)); /* @var $user_dummy UsersItem */ foreach ($items_info as $id => $field_values) { @@ -240,7 +240,7 @@ if ($this->Application->GetVar('admin') == 1) { // Front-End showed in admin's right frame - $session_admin =& $this->Application->recallObject('Session.admin'); + $session_admin = $this->Application->recallObject('Session.admin'); /* @var $session_admin Session */ if (!$session_admin->LoggedIn()) { @@ -289,7 +289,7 @@ $password = $object->GetDBField('UserPassword'); $remember_login = $object->GetDBField('UserRememberLogin') == 1; - $user_helper =& $this->Application->recallObject('UserHelper'); + $user_helper = $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ $user_helper->event =& $event; @@ -316,7 +316,7 @@ */ protected function OnLoginAjax($event) { - $ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper'); + $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper'); /* @var $ajax_form_helper AjaxFormHelper */ $ajax_form_helper->transitEvent($event, 'OnLogin'); //, Array ('do_refresh' => 1)); @@ -335,7 +335,7 @@ return ; } - $user_helper =& $this->Application->recallObject('UserHelper'); + $user_helper = $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ $user_helper->loginUser('', '', false, false, $remember_login_cookie); @@ -348,7 +348,7 @@ */ function OnInpLogin($event) { - $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize')); + $sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize')); /* @var $sync_manager UsersSyncronizeManager */ $sync_manager->performAction('LoginUser', $event->getEventParam('user'), $event->getEventParam('pass') ); @@ -366,7 +366,7 @@ */ function OnInpLogout($event) { - $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize')); + $sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize')); /* @var $sync_manager UsersSyncronizeManager */ $sync_manager->performAction('LogoutUser'); @@ -381,7 +381,7 @@ */ protected function OnLogout($event) { - $user_helper =& $this->Application->recallObject('UserHelper'); + $user_helper = $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ $user_helper->event =& $event; @@ -462,7 +462,7 @@ */ protected function OnRegisterAjax(kEvent $event) { - $ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper'); + $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper'); /* @var $ajax_form_helper AjaxFormHelper */ $ajax_form_helper->transitEvent($event, 'OnCreate', Array ('do_refresh' => 1)); @@ -477,7 +477,7 @@ */ protected function getSubscriberByEmail($email) { - $verify_user =& $this->Application->recallObject('u.verify', null, Array ('skip_autoload' => true)); + $verify_user = $this->Application->recallObject('u.verify', null, Array ('skip_autoload' => true)); /* @var $verify_user UsersItem */ $verify_user->Load($email, 'Email'); @@ -496,7 +496,7 @@ /* @var $object UsersItem */ if ( $object->GetDBField('Status') == STATUS_ACTIVE ) { - $user_helper =& $this->Application->recallObject('UserHelper'); + $user_helper = $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ $user =& $user_helper->getUserObject(); @@ -521,7 +521,7 @@ $this->beforeItemChanged($event); - $cs_helper =& $this->Application->recallObject('CountryStatesHelper'); + $cs_helper = $this->Application->recallObject('CountryStatesHelper'); /* @var $cs_helper kCountryStatesHelper */ $object =& $event->getObject(); @@ -540,7 +540,7 @@ $this->setUserGroup($object); - $user_helper =& $this->Application->recallObject('UserHelper'); + $user_helper = $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ if ( !$user_helper->checkBanRules($object) ) { @@ -695,7 +695,7 @@ $object->Validate(); } - $cs_helper =& $this->Application->recallObject('CountryStatesHelper'); + $cs_helper = $this->Application->recallObject('CountryStatesHelper'); /* @var $cs_helper kCountryStatesHelper */ $cs_helper->PopulateStates($event, 'State', 'Country'); @@ -766,7 +766,7 @@ } if ( $object->isSubscriberOnly() ) { - $temp_handler =& $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler'); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems($event->Prefix, '', Array($object->GetID())); @@ -850,7 +850,7 @@ $field_values = $this->getSubmittedFields($event); $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); - $user_object =& $this->Application->recallObject('u.tmp', null, Array('skip_autoload' => true)); + $user_object = $this->Application->recallObject('u.tmp', null, Array('skip_autoload' => true)); /* @var $user_object UsersItem */ $found = $allow_reset = false; @@ -933,7 +933,7 @@ $this->beforeItemChanged($event); - $cs_helper =& $this->Application->recallObject('CountryStatesHelper'); + $cs_helper = $this->Application->recallObject('CountryStatesHelper'); /* @var $cs_helper kCountryStatesHelper */ $cs_helper->CheckStateField($event, 'State', 'Country'); @@ -980,7 +980,7 @@ } if ( $this->Application->ConfigValue('RegistrationCaptcha') ) { - $captcha_helper =& $this->Application->recallObject('CaptchaHelper'); + $captcha_helper = $this->Application->recallObject('CaptchaHelper'); /* @var $captcha_helper kCaptchaHelper */ $captcha_helper->validateCode($event, false); @@ -1128,7 +1128,7 @@ { switch ($event->Special) { case 'ord': - $order =& $this->Application->recallObject('ord'); + $order = $this->Application->recallObject('ord'); /* @var $order OrdersItem */ return $order->GetDBField('PortalUserId'); @@ -1146,7 +1146,7 @@ break; case 'forgot': - $user_helper =& $this->Application->recallObject('UserHelper'); + $user_helper = $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ $id = $user_helper->validateUserCode($this->Application->GetVar('user_key'), 'forgot_password'); @@ -1193,7 +1193,7 @@ $user_id = $this->Application->RecallVar('user_id'); if ( $id == $user_id && ($user_id > 0 || $user_id == USER_ROOT) ) { - $user_dummy =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true)); + $user_dummy = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true)); /* @var $user_dummy kDBItem */ $user_dummy->Load($id); @@ -1544,7 +1544,7 @@ $form_fields =& $forms['default']['Fields']; // 1. arrange user registration countries - $site_helper =& $this->Application->recallObject('SiteHelper'); + $site_helper = $this->Application->recallObject('SiteHelper'); /* @var $site_helper SiteHelper */ $first_country = $site_helper->getDefaultCountry('', false); @@ -1566,7 +1566,7 @@ $form_fields['PrimaryGroupId']['default'] = $this->Application->ConfigValue('User_NewGroup'); // 3. allow avatar upload on Front-End - $file_helper =& $this->Application->recallObject('FileHelper'); + $file_helper = $this->Application->recallObject('FileHelper'); /* @var $file_helper FileHelper */ $file_helper->createItemFiles($event->Prefix, true); // create image fields @@ -1614,7 +1614,7 @@ return; } - $temp_handler =& $this->Application->recallObject($event->Prefix.'_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->Prefix.'_TempHandler', 'kTempTablesHandler'); /* @var $temp_handler kTempTablesHandler */ $ids = $this->StoreSelectedIDs($event); @@ -1717,15 +1717,15 @@ parent::OnAfterItemLoad($event); // linking existing images for item with virtual fields - $image_helper =& $this->Application->recallObject('ImageHelper'); + $image_helper = $this->Application->recallObject('ImageHelper'); /* @var $image_helper ImageHelper */ $object =& $event->getObject(); /* @var $object UsersItem */ $image_helper->LoadItemImages($object); - $cs_helper =& $this->Application->recallObject('CountryStatesHelper'); + $cs_helper = $this->Application->recallObject('CountryStatesHelper'); /* @var $cs_helper kCountryStatesHelper */ $cs_helper->PopulateStates($event, 'State', 'Country'); @@ -1757,7 +1757,7 @@ function saveUserImages($event) { if (!$this->Application->isAdmin) { - $image_helper =& $this->Application->recallObject('ImageHelper'); + $image_helper = $this->Application->recallObject('ImageHelper'); /* @var $image_helper ImageHelper */ $object =& $event->getObject(); @@ -1888,7 +1888,7 @@ $event->CallSubEvent('OnUpdate'); if ( $event->status == kEvent::erSUCCESS ) { - $user_helper =& $this->Application->recallObject('UserHelper'); + $user_helper = $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ $user =& $user_helper->getUserObject(); @@ -1909,7 +1909,7 @@ */ protected function OnResetRootPassword($event) { - $password_formatter =& $this->Application->recallObject('kPasswordFormatter'); + $password_formatter = $this->Application->recallObject('kPasswordFormatter'); /* @var $password_formatter kPasswordFormatter */ $new_root_password = kUtil::generatePassword(); @@ -1931,7 +1931,7 @@ */ protected function OnLoginAs(kEvent $event) { - $user_helper =& $this->Application->recallObject('UserHelper'); + $user_helper = $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ $user =& $user_helper->getUserObject();