Index: branches/5.2.x/units/l-visits/l-visit_eh.php =================================================================== diff -u -N -r14254 -r15135 --- branches/5.2.x/units/l-visits/l-visit_eh.php (.../l-visit_eh.php) (revision 14254) +++ branches/5.2.x/units/l-visits/l-visit_eh.php (.../l-visit_eh.php) (revision 15135) @@ -1,6 +1,6 @@ MasterEvent->Prefix == 'u' ? 'PortalUserId' : 'ResourceId'; $table_name = $this->Application->getUnitOption($this->Prefix, 'TableName'); Index: branches/5.2.x/units/listing_types/listing_types_event_handler.php =================================================================== diff -u -N -r15062 -r15135 --- branches/5.2.x/units/listing_types/listing_types_event_handler.php (.../listing_types_event_handler.php) (revision 15062) +++ branches/5.2.x/units/listing_types/listing_types_event_handler.php (.../listing_types_event_handler.php) (revision 15135) @@ -1,6 +1,6 @@ getObject(); $selected_ids = $this->Application->GetVar('selected_ids'); @@ -52,7 +52,7 @@ } - function OnPreSaveListingType(&$event) + function OnPreSaveListingType($event) { $event->redirect = false; $object =& $event->getObject( Array('skip_autoload' => true) ); @@ -69,7 +69,7 @@ * @return void * @access protected */ - protected function OnEdit(kEvent &$event) + protected function OnEdit(kEvent $event) { if ( $this->Application->prefixRegistred('p') ) { $this->Application->recallObject('p', null, Array ('skip_autoload' => true)); @@ -85,7 +85,7 @@ * @return void * @access protected */ - protected function OnBeforeItemUpdate(kEvent &$event) + protected function OnBeforeItemUpdate(kEvent $event) { parent::OnBeforeItemUpdate($event); Index: branches/5.2.x/units/link_validation/link_validation_eh.php =================================================================== diff -u -N -r15062 -r15135 --- branches/5.2.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 15062) +++ branches/5.2.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 15135) @@ -1,6 +1,6 @@ _resetValidation($event); @@ -153,7 +153,7 @@ * * @param kEvent $event */ - function _resetValidation(&$event) + function _resetValidation($event) { // 1. delete previous validation results $sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . ' @@ -173,7 +173,7 @@ * * @param kEvent $event */ - function OnValidateSelected(&$event) + function OnValidateSelected($event) { $link_ids = $this->_getSelectedIds($event); if (!$link_ids) { @@ -195,7 +195,7 @@ * * @param kEvent $event */ - function OnContinueValidation(&$event) + function OnContinueValidation($event) { $have_data = $this->_prepareValidation($event); if ($have_data) { @@ -209,7 +209,7 @@ * @param kEvent $event * @param bool $from_ajax */ - function _validate(&$event, $from_ajax = true) + function _validate($event, $from_ajax = true) { $validation_data = unserialize( $this->Application->RecallVar($event->Prefix . '_status') ); @@ -253,7 +253,7 @@ * * @param kEvent $event */ - function OnValidateProgress(&$event) + function OnValidateProgress($event) { $done = $this->_validate($event, true); @@ -362,7 +362,7 @@ * * @param kEvent $event */ - function OnCancelValidation(&$event) + function OnCancelValidation($event) { $this->Application->RemoveVar($event->Prefix . '_status'); } @@ -372,7 +372,7 @@ * * @param kEvent $event */ - function OnResetValidationStatus(&$event) + function OnResetValidationStatus($event) { $ids = $this->_getSelectedIds($event, true); if (!$ids) { @@ -392,7 +392,7 @@ * @param bool $transform convert link ids to link validation ids * @return Array */ - function _getSelectedIds(&$event, $transform = false) + function _getSelectedIds($event, $transform = false) { $ids = Array(); @@ -423,7 +423,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; @@ -465,7 +465,7 @@ * * @param kEvent $event */ - function OnDeleteLinks(&$event) + function OnDeleteLinks($event) { if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) { $event->status = kEvent::erFAIL; @@ -488,7 +488,7 @@ * * @param kEvent $event */ - function OnPrepareLinkEditing(&$event) + function OnPrepareLinkEditing($event) { // hook to OnAfterConfigRead instead of OnEdit, because fake ids should be available in CheckPermission if ($this->Application->GetVar('l_event') != 'OnEdit') { @@ -513,7 +513,7 @@ * * @return bool */ - function _prepareValidation(&$event) + function _prepareValidation($event) { // 2. get ids of all links and put them into validation queue $id_field = $this->Application->getUnitOption('l', 'IDField'); @@ -540,7 +540,7 @@ * * @param kEvent $event */ - function OnCronValidation(&$event) + function OnCronValidation($event) { $this->_resetValidation($event); // remove this for continuing to non validated before links @@ -559,7 +559,7 @@ * @return void * @access protected */ - protected function OnAfterConfigRead(kEvent &$event) + protected function OnAfterConfigRead(kEvent $event) { parent::OnAfterConfigRead($event); Index: branches/5.2.x/units/helpers/helpers_config.php =================================================================== diff -u -N -r14254 -r15135 --- branches/5.2.x/units/helpers/helpers_config.php (.../helpers_config.php) (revision 14254) +++ branches/5.2.x/units/helpers/helpers_config.php (.../helpers_config.php) (revision 15135) @@ -1,6 +1,6 @@ Array ('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'), 'RegisterClasses' => Array ( - Array ('pseudo' => 'LinkHelper', 'class' => 'LinkHelper', 'file' => 'link_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'), + Array ('pseudo' => 'LinkHelper', 'class' => 'LinkHelper', 'file' => 'link_helper.php', 'build_event' => ''), ), ); \ No newline at end of file Index: branches/5.2.x/units/listings/listings_event_handler.php =================================================================== diff -u -N -r15062 -r15135 --- branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 15062) +++ branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 15135) @@ -1,6 +1,6 @@ getObject(); @@ -62,7 +62,7 @@ $this->finalizePopup($event); } - function OnPreSaveListing(&$event) + function OnPreSaveListing($event) { $event->redirect=false; $object =& $event->getObject( Array('skip_autoload' => true) ); @@ -80,7 +80,7 @@ * @return void * @access protected */ - protected function OnBeforeItemUpdate(kEvent &$event) + protected function OnBeforeItemUpdate(kEvent $event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -97,7 +97,7 @@ * @return void * @access protected */ - protected function OnBeforeItemCreate(kEvent &$event) + protected function OnBeforeItemCreate(kEvent $event) { parent::OnBeforeItemCreate($event); @@ -118,7 +118,7 @@ * @return void * @access protected */ - protected function OnBeforeDeleteFromLive(kEvent &$event) + protected function OnBeforeDeleteFromLive(kEvent $event) { parent::OnBeforeDeleteFromLive($event); @@ -269,7 +269,7 @@ * * @param kEvent $event */ - function OnRequestEnhancement(&$event) + function OnRequestEnhancement($event) { if ($this->Application->isModuleEnabled('In-Commerce')) { $l_info = $this->Application->GetVar('l'); @@ -303,7 +303,7 @@ * * @param kEvent $event */ - function OnListingCreate(&$event) + function OnListingCreate($event) { $new_processing = false; $link_id = $listing_type_id = 0; @@ -433,7 +433,7 @@ * * @param kEvent $event */ - function EnhancedLinkOnCompleteOrder(&$event) + function EnhancedLinkOnCompleteOrder($event) { // create enhancement, but pending $this->OnListingCreate($event); @@ -456,7 +456,7 @@ * * @param kEvent $event */ - function EnhanceLinkAfterOrderApprove(&$event) + function EnhanceLinkAfterOrderApprove($event) { $object =& $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ @@ -493,7 +493,7 @@ * * @param kEvent $event */ - function EnhanceLinkAfterOrderDeny(&$event) + function EnhanceLinkAfterOrderDeny($event) { $object =& $event->getObject( Array('skip_autoload' => true) ); $fields = $event->getEventParam('field_values'); @@ -509,7 +509,7 @@ * * @param kEvent $event */ - function ExpireLink(&$event) + function ExpireLink($event) { $object =& $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ @@ -541,7 +541,7 @@ * @return void * @access protected */ - protected function iterateItems(kEvent &$event) + protected function iterateItems(kEvent $event) { $object =& $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ @@ -635,7 +635,7 @@ * @return void * @access protected */ - protected function OnCancel(kEvent &$event) + protected function OnCancel(kEvent $event) { parent::OnCancel($event); @@ -651,7 +651,7 @@ * @param kEvent $event * @return mixed */ - function verifyListingOwner(&$event) + function verifyListingOwner($event) { $link_id = $this->Application->GetVar('l_id'); $user_id = $this->Application->RecallVar('user_id'); @@ -672,7 +672,7 @@ return $this->Conn->GetOne($sql); } - function OnExtendEnhancement(&$event) + function OnExtendEnhancement($event) { $listing_id = $this->verifyListingOwner($event); if (!$listing_id) { @@ -697,7 +697,7 @@ * * @param kEvent $event */ - function OnCancelEnhancement(&$event) + function OnCancelEnhancement($event) { $listing_id = $this->verifyListingOwner($event); if ( !$listing_id ) { @@ -727,7 +727,7 @@ * * @param kEvent $event */ - function OnCheckExpiredPaidListings(&$event) + function OnCheckExpiredPaidListings($event) { $sql = 'SELECT ListingId FROM '.$this->Application->getUnitOption($event->Prefix, 'TableName').' WHERE ExpiresOn < '.adodb_mktime().' AND Status = 1'; @@ -784,7 +784,7 @@ * @return void * @access protected */ - protected function OnMassDelete(kEvent &$event) + protected function OnMassDelete(kEvent $event) { $object =& $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ @@ -807,7 +807,7 @@ * * @param kEvent $event */ - function OnMoveEnhancement(&$event) + function OnMoveEnhancement($event) { $id_field = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'IDField'); $item_table_name = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'TableName'); @@ -834,7 +834,7 @@ * @return void * @access protected */ - protected function OnAfterConfigRead(kEvent &$event) + protected function OnAfterConfigRead(kEvent $event) { parent::OnAfterConfigRead($event); Index: branches/5.2.x/units/links/links_event_handler.php =================================================================== diff -u -N -r15062 -r15135 --- branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 15062) +++ branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 15135) @@ -1,6 +1,6 @@ Application->LinkVar($event->getPrefixSpecial(true).'_dupe_fields', $event->getPrefixSpecial().'_dupe_fields'); } @@ -103,7 +103,7 @@ * * @param kEvent $event */ - function OnMerge(&$event) + function OnMerge($event) { $link_helper =& $this->Application->recallObject('LinkHelper'); /* @var $link_helper LinkHelper */ @@ -194,7 +194,7 @@ * @return void * @access protected */ - protected function OnStoreSelected(kEvent &$event) + protected function OnStoreSelected(kEvent $event) { $this->StoreSelectedIDs($event); @@ -208,7 +208,7 @@ * @return void * @access protected */ - protected function OnCreate(kEvent &$event) + protected function OnCreate(kEvent $event) { parent::OnCreate($event); @@ -241,7 +241,7 @@ * @return void * @access protected */ - protected function OnAfterConfigRead(kEvent &$event) + protected function OnAfterConfigRead(kEvent $event) { parent::OnAfterConfigRead($event); @@ -274,7 +274,7 @@ * * @param kEvent $event */ - function OnContactFormSubmit(&$event) + function OnContactFormSubmit($event) { $fields = Array ( 'ContactFormFullName', 'ContactFormEmail', 'ContactFormSubject', 'ContactFormBody', 'ContactFormCaptcha' @@ -357,7 +357,7 @@ * @return void * @access protected */ - protected function OnBeforeItemCreate(kEvent &$event) + protected function OnBeforeItemCreate(kEvent $event) { parent::OnBeforeItemCreate($event); @@ -371,7 +371,7 @@ * @return void * @access protected */ - protected function OnBeforeItemUpdate(kEvent &$event) + protected function OnBeforeItemUpdate(kEvent $event) { parent::OnBeforeItemUpdate($event); @@ -383,7 +383,7 @@ * * @param kEvent $event */ - function _checkLink(&$event) + function _checkLink($event) { if (!$this->Application->ConfigValue('ReciprocalLinkChecking')) { return ; @@ -413,7 +413,7 @@ * * @param kEvent $event */ - function OnProcessReciprocalLinks(&$event) + function OnProcessReciprocalLinks($event) { if ( !$this->Application->ConfigValue('ReciprocalLinkChecking') ) { return; @@ -481,7 +481,7 @@ * @return int * @access public */ - public function getPassedID(kEvent &$event) + public function getPassedID(kEvent $event) { $id = parent::getPassedID($event); @@ -522,7 +522,7 @@ * @return void * @access protected */ - protected function OnCloneSubItem(kEvent &$event) + protected function OnCloneSubItem(kEvent $event) { parent::OnCloneSubItem($event); @@ -553,7 +553,7 @@ * @return void * @access protected */ - protected function OnBeforeDeleteOriginal(kEvent &$event) + protected function OnBeforeDeleteOriginal(kEvent $event) { parent::OnBeforeDeleteOriginal($event); @@ -579,7 +579,7 @@ * @return void * @access protected */ - protected function OnAfterDeleteOriginal(kEvent &$event) + protected function OnAfterDeleteOriginal(kEvent $event) { parent::OnAfterDeleteOriginal($event); Index: branches/5.2.x/units/links/links_config.php =================================================================== diff -u -N -r15010 -r15135 --- branches/5.2.x/units/links/links_config.php (.../links_config.php) (revision 15010) +++ branches/5.2.x/units/links/links_config.php (.../links_config.php) (revision 15135) @@ -1,6 +1,6 @@ 'l', 'ItemClass' => Array ('class' => 'kCatDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), 'ListClass' => Array ('class' => 'kCatDBList', 'file' => '', 'build_event' => 'OnListBuild'), - 'EventHandlerClass' => Array ('class' => 'LinksEventHandler', 'file' => 'links_event_handler.php', 'require_classes' => Array ('kCatDBEventHandler'), 'build_event' => 'OnBuild'), - 'TagProcessorClass' => Array ('class' => 'LinkTagProcessor', 'file' => 'link_tag_processor.php', 'require_classes' => Array ('kCatDBTagProcessor'), 'build_event' => 'OnBuild'), + 'EventHandlerClass' => Array ('class' => 'LinksEventHandler', 'file' => 'links_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'LinkTagProcessor', 'file' => 'link_tag_processor.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, 'ConfigPriority' => 0,