Index: branches/5.2.x/units/listing_types/listing_types_event_handler.php =================================================================== diff -u -N -r14678 -r14987 --- branches/5.2.x/units/listing_types/listing_types_event_handler.php (.../listing_types_event_handler.php) (revision 14678) +++ branches/5.2.x/units/listing_types/listing_types_event_handler.php (.../listing_types_event_handler.php) (revision 14987) @@ -1,6 +1,6 @@ Array('self' => true), + + $permissions = Array ( + 'OnItemBuild' => Array ('self' => true), ); $this->permMapping = array_merge($this->permMapping, $permissions); Index: branches/5.2.x/units/link_validation/link_validation_eh.php =================================================================== diff -u -N -r14877 -r14987 --- branches/5.2.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 14877) +++ branches/5.2.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 14987) @@ -1,6 +1,6 @@ permMapping = array_merge($this->permMapping, $permissions); } - function mapEvents() + /** + * Define alternative event processing method names + * + * @return void + * @see kEventHandler::$eventMethods + * @access protected + */ + protected function mapEvents() { parent::mapEvents(); @@ -56,28 +66,29 @@ * @return bool * @access public */ - public function CheckPermission(&$event) + public function CheckPermission(kEvent &$event) { $check_events = Array ('OnApproveLinks', 'OnDeclineLinks', 'OnDeleteLinks'); - if (in_array($event->Name, $check_events)) { + + if ( in_array($event->Name, $check_events) ) { $ids = $this->_getSelectedIds($event); $perm_value = true; - if ($ids) { + if ( $ids ) { $perm_helper =& $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ $items = $perm_helper->GetCategoryItemData('l', $ids); $check_method = $event->Name == 'OnDeleteLinks' ? 'DeleteCheckPermission' : 'ModifyCheckPermission'; foreach ($items as $item_id => $item_data) { - if ($perm_helper->$check_method($item_data['CreatedById'], $item_data['CategoryId'], 'l') == 0) { + if ( $perm_helper->$check_method($item_data['CreatedById'], $item_data['CategoryId'], 'l') == 0 ) { // one of items selected has no permission $perm_value = false; break; } } - if (!$perm_value) { + if ( !$perm_value ) { $event->status = kEvent::erPERM_FAIL; } } @@ -96,11 +107,11 @@ * @return void * @access protected */ - protected function prepareObject(&$object, &$event) + protected function prepareObject(&$object, kEvent &$event) { parent::prepareObject($object, $event); - $object->addCalculatedField('CachedNavbar', 'c.l'.$this->Application->GetVar('m_lang').'_CachedNavbar'); + $object->addCalculatedField('CachedNavbar', 'c.l' . $this->Application->GetVar('m_lang') . '_CachedNavbar'); } /** @@ -111,14 +122,16 @@ * @access protected * @see kDBEventHandler::OnListBuild() */ - protected function SetCustomQuery(&$event) + protected function SetCustomQuery(kEvent &$event) { + parent::SetCustomQuery($event); + $object =& $event->getObject(); /* @var $object kDBList */ $object->addFilter('primary_category_filter', 'ci.PrimaryCat = 1'); - if ($event->Special == 'invalid') { + if ( $event->Special == 'invalid' ) { $object->addFilter('status_filter', '%1$s.ValidationStatus = ' . LINK_VALIDATION_INVALID); } } Index: branches/5.2.x/units/listings/listings_event_handler.php =================================================================== diff -u -N -r14850 -r14987 --- branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 14850) +++ branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 14987) @@ -1,6 +1,6 @@ Array ('self' => true), - 'OnCancelEnhancement' => Array ('self' => true), - 'OnExtendEnhancement' => Array ('self' => true), + // front + 'OnRequestEnhancement' => Array ('self' => true), + 'OnCancelEnhancement' => Array ('self' => true), + 'OnExtendEnhancement' => Array ('self' => true), + ); - ); $this->permMapping = array_merge($this->permMapping, $permissions); } Index: branches/5.2.x/units/links/links_event_handler.php =================================================================== diff -u -N -r14914 -r14987 --- branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 14914) +++ branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 14987) @@ -1,6 +1,6 @@ Array('self' => true), - 'OnProcessReciprocalLinks' => Array('self' => true), - 'OnSetGrouping' => Array('self' => 'view'), - 'OnStoreSelected' => Array('self' => 'view'), - 'OnMerge' => Array('self' => 'edit'), + + $permissions = Array ( + 'OnContactFormSubmit' => Array ('self' => true), + 'OnProcessReciprocalLinks' => Array ('self' => true), + 'OnSetGrouping' => Array ('self' => 'view'), + 'OnStoreSelected' => Array ('self' => 'view'), + 'OnMerge' => Array ('self' => 'edit'), ); + $this->permMapping = array_merge($this->permMapping, $permissions); } @@ -41,7 +46,7 @@ * @access protected * @see kDBEventHandler::OnListBuild() */ - protected function SetCustomQuery(&$event) + protected function SetCustomQuery(kEvent &$event) { parent::SetCustomQuery($event); @@ -186,8 +191,10 @@ * Stores ids, that were selected in duplicate checker * * @param kEvent $event + * @return void + * @access protected */ - function OnStoreSelected(&$event) + protected function OnStoreSelected(kEvent &$event) { $this->StoreSelectedIDs($event); @@ -467,13 +474,14 @@ * * @param kEvent $event * @return int + * @access public */ - function getPassedID(&$event) + public function getPassedID(kEvent &$event) { $id = parent::getPassedID($event); - if (($event->Special == 'duplicates') && !is_numeric($id)) { - $load_keys = unserialize( base64_decode($id) ); + if ( ($event->Special == 'duplicates') && !is_numeric($id) ) { + $load_keys = unserialize(base64_decode($id)); // can't return $load_keys as $id, because "kCatDBItem::GetKeyClause" will ignore them foreach ($load_keys as $field => $value) {