Index: branches/5.2.x/core/kernel/db/cat_event_handler.php =================================================================== diff -u -N -r15065 -r15130 --- branches/5.2.x/core/kernel/db/cat_event_handler.php (.../cat_event_handler.php) (revision 15065) +++ branches/5.2.x/core/kernel/db/cat_event_handler.php (.../cat_event_handler.php) (revision 15130) @@ -1,6 +1,6 @@ getObject(); /* @var $object kDBItem */ @@ -82,7 +82,7 @@ * @return bool * @access public */ - public function CheckPermission(kEvent &$event) + public function CheckPermission(kEvent $event) { if ( !$this->Application->isAdmin ) { if ( $event->Name == 'OnSetSortingDirect' ) { @@ -164,7 +164,7 @@ * @param kEvent $event * @return string */ - function _getPermissionCheckIDs(&$event) + function _getPermissionCheckIDs($event) { if ($event->Name == 'OnSave') { $selected_ids = implode(',', $this->getSelectedIDs($event, true)); @@ -186,7 +186,7 @@ * @param kEvent $event * @return Array */ - function _getPermissionCheckInfo(&$event) + function _getPermissionCheckInfo($event) { $perm_helper =& $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ @@ -223,7 +223,7 @@ * @return void * @access protected */ - protected function OnCopy(&$event) + protected function OnCopy($event) { $this->Application->RemoveVar('clipboard'); @@ -241,7 +241,7 @@ * @return void * @access protected */ - protected function OnCut(&$event) + protected function OnCut($event) { $this->Application->RemoveVar('clipboard'); $clipboard_helper =& $this->Application->recallObject('ClipboardHelper'); @@ -257,7 +257,7 @@ * @param kEvent $event * @return bool */ - function _checkPastePermission(&$event) + function _checkPastePermission($event) { $perm_helper =& $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ @@ -278,7 +278,7 @@ * @return void * @access protected */ - protected function OnPaste(&$event) + protected function OnPaste($event) { if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) || !$this->_checkPastePermission($event) ) { $event->status = kEvent::erFAIL; @@ -319,7 +319,7 @@ * @return void * @access protected */ - protected function OnMassDelete(kEvent &$event) + protected function OnMassDelete(kEvent $event) { if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) { $event->status = kEvent::erFAIL; @@ -375,7 +375,7 @@ * @param kEvent $event * @return Array */ - function getTypeClauses(&$event) + function getTypeClauses($event) { $types = $event->getEventParam('types'); $types = $types ? explode(',', $types) : Array (); @@ -591,7 +591,7 @@ * @access protected * @see kDBEventHandler::OnListBuild() */ - protected function SetCustomQuery(kEvent &$event) + protected function SetCustomQuery(kEvent $event) { parent::SetCustomQuery($event); @@ -747,7 +747,7 @@ * @return void * @access protected */ - protected function prepareObject(&$object, kEvent &$event) + protected function prepareObject(&$object, kEvent $event) { $this->prepareItemStatuses($event); $object->addCalculatedField('CachedNavbar', 'l' . $this->Application->GetVar('m_lang') . '_CachedNavbar'); @@ -765,7 +765,7 @@ * * @param kEvent $event */ - function prepareItemStatuses(&$event) + function prepareItemStatuses($event) { $object =& $event->getObject( Array('skip_autoload' => true) ); @@ -818,7 +818,7 @@ * @return float * @access protected */ - protected function CalculateHotLimit(&$event) + protected function CalculateHotLimit($event) { $property_map = $this->Application->getUnitOption($event->Prefix, 'ItemPropertyMappings'); @@ -854,7 +854,7 @@ * @return void * @access protected */ - protected function OnBeforeItemUpdate(kEvent &$event) + protected function OnBeforeItemUpdate(kEvent $event) { parent::OnBeforeItemUpdate($event); @@ -891,7 +891,7 @@ * @return void * @access protected */ - protected function OnAfterItemLoad(kEvent &$event) + protected function OnAfterItemLoad(kEvent $event) { parent::OnAfterItemLoad($event); @@ -962,7 +962,7 @@ * @return void * @access protected */ - protected function OnAfterItemUpdate(kEvent &$event) + protected function OnAfterItemUpdate(kEvent $event) { parent::OnAfterItemUpdate($event); @@ -1022,7 +1022,7 @@ * @return void * @access protected */ - protected function OnAfterItemCreate(kEvent &$event) + protected function OnAfterItemCreate(kEvent $event) { parent::OnAfterItemCreate($event); @@ -1085,7 +1085,7 @@ * * @param kEvent $event */ - function OnSimpleSearch(&$event) + function OnSimpleSearch($event) { $event->redirect = false; $search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search'; @@ -1362,7 +1362,7 @@ * * @param kEvent $event */ - function OnSubSearch(&$event) + function OnSubSearch($event) { $ids = Array (); $search_table = TABLE_PREFIX . 'ses_' . $this->Application->GetSID() . '_' . TABLE_PREFIX . 'Search'; @@ -1384,7 +1384,7 @@ * @param kEvent $event * @todo Change all hardcoded Products table & In-Commerce module usage to dynamic usage from item config !!! */ - function OnAdvancedSearch(&$event) + function OnAdvancedSearch($event) { $query_object =& $this->Application->recallObject('HTTPQuery'); /* @var $query_object kHTTPQuery */ @@ -1813,7 +1813,7 @@ * @access protected * @see kDBEventHandler::OnListBuild() */ - protected function SetPagination(kEvent &$event) + protected function SetPagination(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBList */ @@ -1888,7 +1888,7 @@ * @return void * @access protected */ - protected function OnExport(kEvent &$event) + protected function OnExport(kEvent $event) { $selected_ids = $this->StoreSelectedIDs($event); if ( implode(',', $selected_ids) == '' ) { @@ -1917,7 +1917,7 @@ * * @param kEvent $event */ - function OnExportProgress(&$event) + function OnExportProgress($event) { $export_object =& $this->Application->recallObject('CatItemExportHelper'); /* @var $export_object kCatDBItemExportHelper */ @@ -1958,7 +1958,7 @@ * @return Array * @access protected */ - public function getCustomExportColumns(kEvent &$event) + public function getCustomExportColumns(kEvent $event) { return Array ( '__VIRTUAL__ThumbnailImage' => 'ThumbnailImage', @@ -1972,7 +1972,7 @@ * * @param kEvent $event */ - function setCustomExportColumns(&$event) + function setCustomExportColumns($event) { $this->restorePrimaryImage($event); } @@ -1984,7 +1984,7 @@ * @return void * @access protected */ - protected function restorePrimaryImage(&$event) + protected function restorePrimaryImage($event) { $object =& $event->getObject(); /* @var $object kCatDBItem */ @@ -2054,7 +2054,7 @@ * @return void * @access protected */ - protected function OnNew(kEvent &$event) + protected function OnNew(kEvent $event) { parent::OnNew($event); @@ -2071,7 +2071,7 @@ * * @param kEvent $event */ - function OnProcessSelected(&$event) + function OnProcessSelected($event) { $dst_field = $this->Application->RecallVar('dst_field'); $selected_ids = $this->Application->GetVar('selected_ids'); @@ -2103,7 +2103,7 @@ * * @param kEvent $event */ - function OnSaveSettings(&$event) + function OnSaveSettings($event) { $event->redirect = false; $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -2129,7 +2129,7 @@ * * @param kEvent $event */ - function OnResetSettings(&$event) + function OnResetSettings($event) { $this->Application->StoreVar('ImportCategory', $this->Application->getBaseCategory()); } @@ -2140,7 +2140,7 @@ * @return void * @todo Used? */ - function OnCancelAction(&$event) + function OnCancelAction($event) { $event->redirect = $this->Application->GetVar('cancel_template'); $event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial()); @@ -2155,7 +2155,7 @@ * @param string $id_field * @param string $cached_field */ - function cacheItemOwner(&$event, $id_field, $cached_field) + function cacheItemOwner($event, $id_field, $cached_field) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -2185,7 +2185,7 @@ * @return void * @access protected */ - protected function OnPreSave(kEvent &$event) + protected function OnPreSave(kEvent $event) { parent::OnPreSave($event); @@ -2259,7 +2259,7 @@ * @return void * @access protected */ - protected function OnPreCreate(kEvent &$event) + protected function OnPreCreate(kEvent $event) { parent::OnPreCreate($event); @@ -2281,7 +2281,7 @@ * @return void * @access protected */ - protected function OnBeforeDeleteOriginal(kEvent &$event) + protected function OnBeforeDeleteOriginal(kEvent $event) { } @@ -2293,7 +2293,7 @@ * @return void * @access protected */ - protected function OnAfterDeleteOriginal(kEvent &$event) + protected function OnAfterDeleteOriginal(kEvent $event) { } @@ -2306,7 +2306,7 @@ * @return void * @access protected */ - protected function OnBeforeClone(kEvent &$event) + protected function OnBeforeClone(kEvent $event) { parent::OnBeforeClone($event); @@ -2327,7 +2327,7 @@ * @return void * @access protected */ - protected function OnBeforeItemCreate(kEvent &$event) + protected function OnBeforeItemCreate(kEvent $event) { parent::OnBeforeItemCreate($event); @@ -2352,7 +2352,7 @@ * * @param kEvent $event */ - function setItemStatusByPermission(&$event) + function setItemStatusByPermission($event) { $use_pending_editing = $this->Application->getUnitOption($event->Prefix, 'UsePendingEditing'); @@ -2384,7 +2384,7 @@ * @return void * @access protected */ - protected function OnCreate(kEvent &$event) + protected function OnCreate(kEvent $event) { parent::OnCreate($event); @@ -2456,7 +2456,7 @@ * @return void * @access protected */ - protected function OnUpdate(kEvent &$event) + protected function OnUpdate(kEvent $event) { $use_pending = $this->Application->getUnitOption($event->Prefix, 'UsePendingEditing'); if ($this->Application->isAdminUser || !$use_pending) { @@ -2549,7 +2549,7 @@ * @param kEvent $event * @param string $template_key - {suggest,modify} */ - function SetFrontRedirectTemplate(&$event, $template_key) + function SetFrontRedirectTemplate($event, $template_key) { if ( $this->Application->isAdmin || $event->status != kEvent::erSUCCESS ) { return; @@ -2593,7 +2593,7 @@ * @return void * @access protected */ - protected function iterateItems(kEvent &$event) + protected function iterateItems(kEvent $event) { if ( $event->Name != 'OnMassApprove' && $event->Name != 'OnMassDecline' ) { parent::iterateItems($event); @@ -2642,7 +2642,7 @@ * @return void * @access protected */ - protected function OnDelete(kEvent &$event) + protected function OnDelete(kEvent $event) { parent::OnDelete($event); @@ -2659,7 +2659,7 @@ * @return bool * @access protected */ - protected function checkItemStatus(kEvent &$event) + protected function checkItemStatus(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -2691,7 +2691,7 @@ * @access protected * @see kDBEventHandler::OnListBuild() */ - protected function SetSorting(kEvent &$event) + protected function SetSorting(kEvent $event) { if ( !$this->Application->isAdmin ) { $event->setEventParam('same_special', true); @@ -2707,7 +2707,7 @@ * @return int * @access protected */ - protected function getPerPage(kEvent &$event) + protected function getPerPage(kEvent $event) { if ( !$this->Application->isAdmin ) { $event->setEventParam('same_special', true); @@ -2735,7 +2735,7 @@ * @return void * @access protected */ - protected function OnAfterConfigRead(kEvent &$event) + protected function OnAfterConfigRead(kEvent $event) { parent::OnAfterConfigRead($event); @@ -2775,7 +2775,7 @@ $this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); } - function changeSortings(&$event) + function changeSortings($event) { $remove_sortings = Array (); @@ -2813,7 +2813,7 @@ * * @param kEvent $event */ - function OnDownloadFile(&$event) + function OnDownloadFile($event) { $object =& $event->getObject(); /* @var $object kCatDBItem */ @@ -2837,7 +2837,7 @@ * * @param kEvent $event */ - function OnMakeVote(&$event) + function OnMakeVote($event) { $event->status = kEvent::erSTOP; @@ -2864,7 +2864,7 @@ * @return void * @access protected */ - protected function OnReviewHelpful(&$event) + protected function OnReviewHelpful($event) { if ( $this->Application->GetVar('ajax') == 'yes' ) { $event->status = kEvent::erSTOP; @@ -2917,7 +2917,7 @@ * @return void * @access protected */ - protected function OnCloneSubItem(kEvent &$event) + protected function OnCloneSubItem(kEvent $event) { parent::OnCloneSubItem($event); @@ -2939,7 +2939,7 @@ * @return void * @access protected */ - protected function OnAfterItemValidate(kEvent &$event) + protected function OnAfterItemValidate(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */