Index: branches/5.2.x/core/kernel/db/db_event_handler.php =================================================================== diff -u -N -r15121 -r15130 --- branches/5.2.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 15121) +++ branches/5.2.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 15130) @@ -1,6 +1,6 @@ getSection(); @@ -211,7 +211,7 @@ * @return int * @access public */ - public function getPassedID(kEvent &$event) + public function getPassedID(kEvent $event) { if ( $event->getEventParam('raise_warnings') === false ) { $event->setEventParam('raise_warnings', 1); @@ -281,7 +281,7 @@ * @return Array * @access protected */ - protected function StoreSelectedIDs(kEvent &$event, $direct_ids = null) + protected function StoreSelectedIDs(kEvent $event, $direct_ids = null) { $wid = $this->Application->GetTopmostWid($event->Prefix); $session_name = rtrim($event->getPrefixSpecial() . '_selected_ids_' . $wid, '_'); @@ -351,7 +351,7 @@ * @return Array * @access protected */ - protected function getSelectedIDs(kEvent &$event, $from_session = false) + protected function getSelectedIDs(kEvent $event, $from_session = false) { if ( $from_session ) { $wid = $this->Application->GetTopmostWid($event->Prefix); @@ -372,7 +372,7 @@ * @return void * @access protected */ - protected function OnStoreSelected(kEvent &$event) + protected function OnStoreSelected(kEvent $event) { $this->StoreSelectedIDs($event); @@ -393,7 +393,7 @@ * @return Array * @access protected */ - protected function getSubmittedFields(kEvent &$event) + protected function getSubmittedFields(kEvent $event) { $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); $field_values = $items_info ? array_shift($items_info) : Array (); @@ -432,7 +432,7 @@ * @return void * @access protected */ - protected function clearSelectedIDs(kEvent &$event) + protected function clearSelectedIDs(kEvent $event) { $prefix_special = $event->getPrefixSpecial(); @@ -456,7 +456,7 @@ * @return void * @access protected */ - protected function dbBuild(&$object, kEvent &$event) + protected function dbBuild(&$object, kEvent $event) { // for permission checking inside item/list build events $event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true)); @@ -498,7 +498,7 @@ * @return bool * @access protected */ - protected function checkItemStatus(kEvent &$event) + protected function checkItemStatus(kEvent $event) { $status_fields = $this->Application->getUnitOption($event->Prefix, 'StatusField'); if ( !$status_fields ) { @@ -528,7 +528,7 @@ * @return void * @access protected */ - protected function _errorNotFound(kEvent &$event) + protected function _errorNotFound(kEvent $event) { if ( $event->getEventParam('raise_warnings') === 0 ) { // when it's possible, that autoload fails do nothing @@ -561,7 +561,7 @@ * @param kEvent $event * @access protected */ - protected function OnItemBuild(kEvent &$event) + protected function OnItemBuild(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -640,7 +640,7 @@ * @return void * @access protected */ - protected function OnTempHandlerBuild(kEvent &$event) + protected function OnTempHandlerBuild(kEvent $event) { $object =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler'); /* @var $object kTempTablesHandler */ @@ -661,7 +661,7 @@ * @return bool * @access protected */ - protected function UseTempTables(kEvent &$event) + protected function UseTempTables(kEvent $event) { $top_prefix = $this->Application->GetTopmostPrefix($event->Prefix); // passed parent, not always actual $special = ($top_prefix == $event->Prefix) ? $event->Special : $this->getMainSpecial($event); @@ -676,7 +676,7 @@ * @return void * @access protected */ - protected function LoadItem(kEvent &$event) + protected function LoadItem(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -707,7 +707,7 @@ * @param kEvent $event * @access protected */ - protected function OnListBuild(kEvent &$event) + protected function OnListBuild(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBList */ @@ -758,7 +758,7 @@ * @return string * @access protected */ - protected function getMainSpecial(kEvent &$event) + protected function getMainSpecial(kEvent $event) { $main_special = $event->getEventParam('main_special'); @@ -785,7 +785,7 @@ * @access protected * @see kDBEventHandler::OnListBuild() */ - protected function SetCustomQuery(kEvent &$event) + protected function SetCustomQuery(kEvent $event) { } @@ -797,7 +797,7 @@ * @return void * @access protected */ - protected function OnSetPerPage(kEvent &$event) + protected function OnSetPerPage(kEvent $event) { $per_page = $this->Application->GetVar($event->getPrefixSpecial(true) . '_PerPage'); $event->SetRedirectParam($event->getPrefixSpecial() . '_PerPage', $per_page); @@ -818,7 +818,7 @@ * @return void * @access protected */ - protected function OnSetPage(kEvent &$event) + protected function OnSetPage(kEvent $event) { $page = $this->Application->GetVar($event->getPrefixSpecial(true) . '_Page'); $event->SetRedirectParam($event->getPrefixSpecial() . '_Page', $page); @@ -837,7 +837,7 @@ * @return void * @access protected */ - protected function _passListParams(&$event, $skip_var) + protected function _passListParams($event, $skip_var) { $param_names = array_diff(Array ('page', 'per_page', 'sort_by'), Array ($skip_var)); @@ -883,7 +883,7 @@ * @access protected * @see kDBEventHandler::OnListBuild() */ - protected function SetPagination(kEvent &$event) + protected function SetPagination(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBList */ @@ -940,7 +940,7 @@ * @return int * @access protected */ - protected function getPerPage(kEvent &$event) + protected function getPerPage(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBList */ @@ -1024,7 +1024,7 @@ * @access protected * @see kDBEventHandler::OnListBuild() */ - protected function SetSorting(kEvent &$event) + protected function SetSorting(kEvent $event) { $event->setPseudoClass('_List'); @@ -1124,7 +1124,7 @@ * @return string|Array * @access protected */ - protected function getListSetting(kEvent &$event, $variable_name) + protected function getListSetting(kEvent $event, $variable_name) { $view_name = $this->Application->RecallVar($event->getPrefixSpecial() . '_current_view'); $storage_prefix = $event->getEventParam('same_special') ? $event->Prefix : $event->getPrefixSpecial(); @@ -1153,7 +1153,7 @@ * @return void * @access protected */ - protected function setListSetting(kEvent &$event, $variable_name, $variable_value = null) + protected function setListSetting(kEvent $event, $variable_name, $variable_value = null) { $view_name = $this->Application->RecallVar($event->getPrefixSpecial() . '_current_view'); // $this->Application->StoreVar($event->getPrefixSpecial() . '_' . $variable_name, $variable_value, true); //true for optional @@ -1177,7 +1177,7 @@ * @return void * @access protected */ - protected function AddFilters(kEvent &$event) + protected function AddFilters(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBList */ @@ -1264,7 +1264,7 @@ * @return void * @access protected */ - protected function applyItemFilters(&$event) + protected function applyItemFilters($event) { $filter_values = $this->Application->GetVar('filters', Array ()); @@ -1330,7 +1330,7 @@ * @return void * @access protected */ - protected function OnSetSorting(kEvent &$event) + protected function OnSetSorting(kEvent $event) { $sorting_settings = $this->getListSetting($event, 'Sortings'); $cur_sort1 = getArrayValue($sorting_settings, 'Sort1'); @@ -1374,7 +1374,7 @@ * @return void * @access protected */ - protected function OnSetSortingDirect(kEvent &$event) + protected function OnSetSortingDirect(kEvent $event) { // used on Front-End in category item lists $prefix_special = $event->getPrefixSpecial(); @@ -1421,7 +1421,7 @@ * @return void * @access protected */ - protected function OnResetSorting(kEvent &$event) + protected function OnResetSorting(kEvent $event) { $this->setListSetting($event, 'Sortings'); } @@ -1433,7 +1433,7 @@ * @return void * @access protected */ - protected function OnSetAutoRefreshInterval(kEvent &$event) + protected function OnSetAutoRefreshInterval(kEvent $event) { $refresh_interval = $this->Application->GetVar('refresh_interval'); @@ -1448,7 +1448,7 @@ * @return void * @access protected */ - protected function OnAutoRefreshToggle(kEvent &$event) + protected function OnAutoRefreshToggle(kEvent $event) { $refresh_intervals = $this->Application->ConfigValue('AutoRefreshIntervals'); if ( !$refresh_intervals ) { @@ -1475,7 +1475,7 @@ * @return string * @access protected */ - protected function ItemPrepareQuery(kEvent &$event) + protected function ItemPrepareQuery(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -1498,7 +1498,7 @@ * @return string * @access protected */ - protected function ListPrepareQuery(kEvent &$event) + protected function ListPrepareQuery(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -1516,7 +1516,7 @@ * @return void * @access protected */ - protected function customProcessing(kEvent &$event, $type) + protected function customProcessing(kEvent $event, $type) { } @@ -1530,7 +1530,7 @@ * @return void * @access protected */ - protected function OnCreate(kEvent &$event) + protected function OnCreate(kEvent $event) { $object =& $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ @@ -1566,7 +1566,7 @@ * @return void * @access protected */ - protected function OnUpdate(kEvent &$event) + protected function OnUpdate(kEvent $event) { if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) { $event->status = kEvent::erFAIL; @@ -1585,7 +1585,7 @@ * @return void * @access protected */ - protected function _update(kEvent &$event) + protected function _update(kEvent $event) { $object =& $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ @@ -1618,14 +1618,14 @@ * @return void * @access protected */ - protected function OnDelete(kEvent &$event) + protected function OnDelete(kEvent $event) { if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) { $event->status = kEvent::erFAIL; return; } - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event)); + $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($this->getPassedID($event))); @@ -1638,14 +1638,14 @@ * @return void * @access protected */ - protected function OnDeleteAll(kEvent &$event) + protected function OnDeleteAll(kEvent $event) { $sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . ' FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName'); $ids = $this->Conn->GetCol($sql); if ( $ids ) { - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event)); + $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems($event->Prefix, $event->Special, $ids); @@ -1659,7 +1659,7 @@ * @return void * @access protected */ - protected function OnNew(kEvent &$event) + protected function OnNew(kEvent $event) { $object =& $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ @@ -1687,7 +1687,7 @@ * @return void * @access protected */ - protected function OnCancel(kEvent &$event) + protected function OnCancel(kEvent $event) { $object =& $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ @@ -1697,7 +1697,7 @@ if ( $items_info ) { $delete_ids = Array (); - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event)); + $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ foreach ($items_info as $id => $field_values) { @@ -1725,14 +1725,14 @@ * @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; return ; } - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event)); + $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $ids = $this->StoreSelectedIDs($event); @@ -1755,7 +1755,7 @@ * @return void * @access protected */ - protected function setTempWindowID(kEvent &$event) + protected function setTempWindowID(kEvent $event) { $prefixes = Array ($event->Prefix, $event->getPrefixSpecial(true)); @@ -1778,7 +1778,7 @@ * @return void * @access protected */ - protected function OnEdit(kEvent &$event) + protected function OnEdit(kEvent $event) { $this->setTempWindowID($event); $ids = $this->StoreSelectedIDs($event); @@ -1788,7 +1788,7 @@ $changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix); $this->Application->RemoveVar($changes_var_name); - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event)); + $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->PrepareEdit(); @@ -1806,7 +1806,7 @@ * @return void * @access protected */ - protected function OnSave(kEvent &$event) + protected function OnSave(kEvent $event) { $event->CallSubEvent('OnPreSave'); @@ -1815,7 +1815,7 @@ } $skip_master = false; - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event)); + $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix); @@ -1959,9 +1959,9 @@ * @return void * @access protected */ - protected function OnCancelEdit(kEvent &$event) + protected function OnCancelEdit(kEvent $event) { - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event)); + $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->CancelEdit(); @@ -1982,7 +1982,7 @@ * @return bool * @access public */ - public function isNewItemCreate(kEvent &$event) + public function isNewItemCreate(kEvent $event) { $object =& $event->getObject( Array ('raise_warnings' => 0) ); /* @var $object kDBItem */ @@ -1998,7 +1998,7 @@ * @return void * @access protected */ - protected function OnPreSave(kEvent &$event) + protected function OnPreSave(kEvent $event) { // if there is no id - it means we need to create an item if ( is_object($event->MasterEvent) ) { @@ -2026,7 +2026,7 @@ * @return void * @access protected */ - protected function OnPreSaveSubItem(kEvent &$event) + protected function OnPreSaveSubItem(kEvent $event) { $not_created = $this->isNewItemCreate($event); @@ -2053,7 +2053,7 @@ * @return void * @access protected */ - protected function OnPreSaveAndGo(kEvent &$event) + protected function OnPreSaveAndGo(kEvent $event) { $event->CallSubEvent('OnPreSave'); @@ -2071,7 +2071,7 @@ * @return void * @access protected */ - protected function OnPreSaveAndGoToTab(kEvent &$event) + protected function OnPreSaveAndGoToTab(kEvent $event) { $event->CallSubEvent('OnPreSave'); @@ -2088,7 +2088,7 @@ * @return void * @access protected */ - protected function OnUpdateAndGoToTab(kEvent &$event) + protected function OnUpdateAndGoToTab(kEvent $event) { $event->setPseudoClass('_List'); $event->CallSubEvent('OnUpdate'); @@ -2107,7 +2107,7 @@ * @return void * @access protected */ - protected function OnPreCreate(kEvent &$event) + protected function OnPreCreate(kEvent $event) { $this->setTempWindowID($event); $this->clearSelectedIDs($event); @@ -2116,7 +2116,7 @@ $object =& $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ - $temp_handler =& $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event)); + $temp_handler =& $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->PrepareEdit(); @@ -2139,7 +2139,7 @@ * @return void * @access protected */ - protected function OnPreSaveCreated(kEvent &$event) + protected function OnPreSaveCreated(kEvent $event) { $object =& $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ @@ -2167,7 +2167,7 @@ * @return void * @access protected */ - protected function OnReset(kEvent &$event) + protected function OnReset(kEvent $event) { //do nothing - should reset :) if ( $this->isNewItemCreate($event) ) { @@ -2187,7 +2187,7 @@ * @return void * @access protected */ - protected function iterateItems(kEvent &$event) + protected function iterateItems(kEvent $event) { if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) { $event->status = kEvent::erFAIL; @@ -2249,14 +2249,14 @@ * @return void * @access protected */ - protected function OnMassClone(kEvent &$event) + protected function OnMassClone(kEvent $event) { if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) { $event->status = kEvent::erFAIL; return; } - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event)); + $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $ids = $this->StoreSelectedIDs($event); @@ -2295,7 +2295,7 @@ * @return void * @access protected */ - protected function OnPreSavePopup(kEvent &$event) + protected function OnPreSavePopup(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -2319,7 +2319,7 @@ * @return void * @access protected */ - protected function OnBeforeItemLoad(kEvent &$event) + protected function OnBeforeItemLoad(kEvent $event) { } @@ -2332,7 +2332,7 @@ * @return void * @access protected */ - protected function OnAfterItemLoad(kEvent &$event) + protected function OnAfterItemLoad(kEvent $event) { } @@ -2344,7 +2344,7 @@ * @return void * @access protected */ - protected function OnBeforeItemCreate(kEvent &$event) + protected function OnBeforeItemCreate(kEvent $event) { } @@ -2356,7 +2356,7 @@ * @return void * @access protected */ - protected function OnAfterItemCreate(kEvent &$event) + protected function OnAfterItemCreate(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -2373,7 +2373,7 @@ * @return void * @access protected */ - protected function OnBeforeItemUpdate(kEvent &$event) + protected function OnBeforeItemUpdate(kEvent $event) { } @@ -2385,7 +2385,7 @@ * @return void * @access protected */ - protected function OnAfterItemUpdate(kEvent &$event) + protected function OnAfterItemUpdate(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -2403,7 +2403,7 @@ * @return void * @access protected */ - protected function OnBeforeItemDelete(kEvent &$event) + protected function OnBeforeItemDelete(kEvent $event) { } @@ -2416,7 +2416,7 @@ * @return void * @access protected */ - protected function OnAfterItemDelete(kEvent &$event) + protected function OnAfterItemDelete(kEvent $event) { } @@ -2428,7 +2428,7 @@ * @return void * @access protected */ - protected function OnBeforeItemValidate(kEvent &$event) + protected function OnBeforeItemValidate(kEvent $event) { } @@ -2440,7 +2440,7 @@ * @return void * @access protected */ - protected function OnAfterItemValidate(kEvent &$event) + protected function OnAfterItemValidate(kEvent $event) { } @@ -2453,7 +2453,7 @@ * @return void * @access protected */ - protected function OnAfterCopyToTemp(kEvent &$event) + protected function OnAfterCopyToTemp(kEvent $event) { } @@ -2467,7 +2467,7 @@ * @return void * @access protected */ - protected function OnBeforeDeleteFromLive(kEvent &$event) + protected function OnBeforeDeleteFromLive(kEvent $event) { } @@ -2480,7 +2480,7 @@ * @return void * @access protected */ - protected function OnBeforeCopyToLive(kEvent &$event) + protected function OnBeforeCopyToLive(kEvent $event) { } @@ -2493,7 +2493,7 @@ * @return void * @access protected */ - protected function OnAfterCopyToLive(kEvent &$event) + protected function OnAfterCopyToLive(kEvent $event) { $this->_proccessPendingActions($event); } @@ -2505,7 +2505,7 @@ * @return void * @access protected */ - protected function _proccessPendingActions(kEvent &$event) + protected function _proccessPendingActions(kEvent $event) { $var_name = $this->_getPendingActionVariableName($event); $schedule = $this->Application->RecallVar($var_name); @@ -2530,7 +2530,7 @@ * @return string * @access protected */ - protected function _getPendingActionVariableName(kEvent &$event) + protected function _getPendingActionVariableName(kEvent $event) { $window_id = $this->Application->GetTopmostWid($event->Prefix); @@ -2545,7 +2545,7 @@ * @return void * @access protected */ - protected function OnBeforeClone(kEvent &$event) + protected function OnBeforeClone(kEvent $event) { } @@ -2558,7 +2558,7 @@ * @return void * @access protected */ - protected function OnAfterClone(kEvent &$event) + protected function OnAfterClone(kEvent $event) { } @@ -2570,7 +2570,7 @@ * @return void * @access protected */ - protected function OnAfterListQuery(kEvent &$event) + protected function OnAfterListQuery(kEvent $event) { } @@ -2585,7 +2585,7 @@ * @access protected * @deprecated */ - protected function finalizePopup(kEvent &$event) + protected function finalizePopup(kEvent $event) { $event->SetRedirectParam('opener', 'u'); } @@ -2597,7 +2597,7 @@ * @return void * @access protected */ - protected function OnSearch(kEvent &$event) + protected function OnSearch(kEvent $event) { $event->setPseudoClass('_List'); @@ -2614,7 +2614,7 @@ * @return void * @access protected */ - protected function OnSearchReset(kEvent &$event) + protected function OnSearchReset(kEvent $event) { $search_helper =& $this->Application->recallObject('SearchHelper'); /* @var $search_helper kSearchHelper */ @@ -2630,7 +2630,7 @@ * @access protected * @deprecated */ - protected function OnSetFilter(kEvent &$event) + protected function OnSetFilter(kEvent $event) { $filter_id = $this->Application->GetVar('filter_id'); $filter_value = $this->Application->GetVar('filter_value'); @@ -2650,7 +2650,7 @@ * @return void * @access protected */ - protected function OnSetFilterPattern(kEvent &$event) + protected function OnSetFilterPattern(kEvent $event) { $filters = $this->Application->GetVar($event->getPrefixSpecial(true) . '_filters'); if ( !$filters ) { @@ -2678,7 +2678,7 @@ * @return void * @access protected */ - protected function FilterAction(kEvent &$event) + protected function FilterAction(kEvent $event) { $view_filter = Array (); $filter_menu = $this->Application->getUnitOption($event->Prefix, 'FilterMenu'); @@ -2714,7 +2714,7 @@ * @param kEvent $event * @access protected */ - protected function OnPreSaveAndOpenTranslator(kEvent &$event) + protected function OnPreSaveAndOpenTranslator(kEvent $event) { $this->Application->SetVar('allow_translation', true); @@ -2790,7 +2790,7 @@ * @return void * @access protected */ - protected function OnSelectUser(kEvent &$event) + protected function OnSelectUser(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -2835,7 +2835,7 @@ * @return void * @access protected */ - protected function OnExport(kEvent &$event) + protected function OnExport(kEvent $event) { $selected_ids = $this->StoreSelectedIDs($event); @@ -2874,7 +2874,7 @@ * @return void * @access protected */ - protected function prepareObject(&$object, kEvent &$event) + protected function prepareObject(&$object, kEvent $event) { if ( $event->Special == 'export' || $event->Special == 'import' ) { $export_helper =& $this->Application->recallObject('CatItemExportHelper'); @@ -2891,7 +2891,7 @@ * @return Array * @access public */ - public function getCustomExportColumns(kEvent &$event) + public function getCustomExportColumns(kEvent $event) { return Array(); } @@ -2903,7 +2903,7 @@ * @return void * @access protected */ - protected function OnExportBegin(kEvent &$event) + protected function OnExportBegin(kEvent $event) { $export_helper =& $this->Application->recallObject('CatItemExportHelper'); /* @var $export_helper kCatDBItemExportHelper */ @@ -2918,7 +2918,7 @@ * @return void * @access protected */ - protected function OnExportCancel(kEvent &$event) + protected function OnExportCancel(kEvent $event) { $this->OnGoBack($event); } @@ -2930,7 +2930,7 @@ * @return void * @access protected */ - protected function OnBeforeExportBegin(kEvent &$event) + protected function OnBeforeExportBegin(kEvent $event) { } @@ -2942,7 +2942,7 @@ * @return void * @access protected */ - protected function OnDeleteExportPreset(kEvent &$event) + protected function OnDeleteExportPreset(kEvent $event) { $field_values = $this->getSubmittedFields($event); @@ -2985,7 +2985,7 @@ * @return void * @access protected */ - protected function OnPreSaveAndChangeLanguage(kEvent &$event) + protected function OnPreSaveAndChangeLanguage(kEvent $event) { if ( $this->UseTempTables($event) ) { $event->CallSubEvent('OnPreSave'); @@ -3009,7 +3009,7 @@ * @return void * @access protected */ - protected function OnUploadFile(kEvent &$event) + protected function OnUploadFile(kEvent $event) { $event->status = kEvent::erSTOP; // define('DBG_SKIP_REPORTING', 0); @@ -3113,7 +3113,7 @@ * @param kEvent $event * @return bool */ - protected function _checkFlashUploaderPermission(kEvent &$event) + protected function _checkFlashUploaderPermission(kEvent $event) { // Flash uploader does NOT send correct cookies, so we need to make our own check $cookie_name = 'adm_' . $this->Application->ConfigValue('SessionCookieName'); @@ -3156,7 +3156,7 @@ * @return void * @access protected */ - protected function OnDeleteFile(kEvent &$event) + protected function OnDeleteFile(kEvent $event) { $event->status = kEvent::erSTOP; @@ -3181,7 +3181,7 @@ * @return void * @access protected */ - protected function OnViewFile(kEvent &$event) + protected function OnViewFile(kEvent $event) { $event->status = kEvent::erSTOP; @@ -3240,7 +3240,7 @@ * @return void * @access protected */ - protected function OnValidateMInputFields(kEvent &$event) + protected function OnValidateMInputFields(kEvent $event) { $minput_helper =& $this->Application->recallObject('MInputHelper'); /* @var $minput_helper MInputHelper */ @@ -3255,7 +3255,7 @@ * @return void * @access protected */ - protected function OnValidateField(kEvent &$event) + protected function OnValidateField(kEvent $event) { $event->status = kEvent::erSTOP; $field = $this->Application->GetVar('field'); @@ -3305,7 +3305,7 @@ * @return void * @access protected */ - protected function OnSuggestValues(kEvent &$event) + protected function OnSuggestValues(kEvent $event) { if ( !$this->Application->isAdminUser ) { // very careful here, because this event allows to @@ -3355,7 +3355,7 @@ * @return void * @access protected */ - protected function OnSaveWidths(kEvent &$event) + protected function OnSaveWidths(kEvent $event) { $event->status = kEvent::erSTOP; @@ -3383,7 +3383,7 @@ * @return void * @access protected */ - protected function OnBeforeCSVLineImport(kEvent &$event) + protected function OnBeforeCSVLineImport(kEvent $event) { // abstract, for hooking } @@ -3395,7 +3395,7 @@ * @return void * @access protected */ - protected function OnCloneSubItem(kEvent &$event) + protected function OnCloneSubItem(kEvent $event) { $clones = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Clones'); @@ -3412,7 +3412,7 @@ * @see PriorityEventHandler * @access protected */ - protected function OnGetConstrainInfo(kEvent &$event) + protected function OnGetConstrainInfo(kEvent $event) { $event->setEventParam('constrain_info', Array ('', '')); }