Index: branches/5.2.x/core/units/reviews/reviews_event_handler.php =================================================================== diff -u -N -r15608 -r16513 --- branches/5.2.x/core/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 15608) +++ branches/5.2.x/core/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 16513) @@ -1,6 +1,6 @@ Name == 'OnAddReview' || $event->Name == 'OnCreate' ) { + /** @var kPermissionsHelper $perm_helper */ $perm_helper = $this->Application->recallObject('PermissionsHelper'); - /* @var $perm_helper kPermissionsHelper */ $parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix'); + + /** @var kCatDBItem $main_object */ $main_object = $this->Application->recallObject($parent_prefix); - /* @var $main_object kCatDBItem */ $perm_name = $this->getPermPrefix($event).'.REVIEW'; $res = $this->Application->CheckPermission($perm_name, 0, $main_object->GetDBField('CategoryId')) || @@ -70,8 +71,8 @@ if ( in_array($event->Name, $check_events) ) { // check for PRODUCT.VIEW permission + /** @var kPermissionsHelper $perm_helper */ $perm_helper = $this->Application->recallObject('PermissionsHelper'); - /* @var $perm_helper kPermissionsHelper */ $perm_prefix = $this->getPermPrefix($event); @@ -132,8 +133,8 @@ return false; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ // 1. get main item resource id (use object, because of temp tables in admin) $sql = 'SELECT ItemId @@ -179,8 +180,8 @@ { parent::SetCustomQuery($event); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ if ( !$this->Application->isAdminUser ) { $object->addFilter('active', '%1$s.Status = ' . STATUS_ACTIVE); @@ -195,8 +196,8 @@ $object->clearFilters(); $parent_info = $object->getLinkedInfo(); + /** @var kDBItem $parent */ $parent = $this->Application->recallObject($parent_info['ParentPrefix']); - /* @var $parent kDBItem */ $object->addFilter('item_reviews', '%1$s.ItemId = ' . $parent->GetDBField('ResourceId')); break; @@ -243,8 +244,9 @@ function getReviewStatus($event) { $parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix'); + + /** @var kCatDBItem $main_object */ $main_object = $this->Application->recallObject($parent_prefix); - /* @var $main_object kCatDBItem */ $ret = STATUS_DISABLED; $perm_name = $this->getPermPrefix($event).'.REVIEW'; @@ -269,8 +271,8 @@ { parent::OnBeforeItemCreate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $parent_info = $object->getLinkedInfo(); $item_type = $this->Application->getUnitOption($parent_info['ParentPrefix'], 'ItemType'); @@ -284,8 +286,8 @@ return ; } + /** @var SpamHelper $spam_helper */ $spam_helper = $this->Application->recallObject('SpamHelper'); - /* @var $spam_helper SpamHelper */ $spam_helper->InitHelper($parent_info['ParentId'], 'Review', 0); @@ -318,8 +320,8 @@ { parent::OnBeforeItemUpdate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $rating = $object->GetDBField('Rating'); @@ -342,11 +344,11 @@ $this->updateSubitemCounters($event); if ( !$this->Application->isAdminUser ) { + /** @var SpamHelper $spam_helper */ $spam_helper = $this->Application->recallObject('SpamHelper'); - /* @var $spam_helper SpamHelper */ + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $parent_info = $object->getLinkedInfo(); @@ -379,8 +381,8 @@ $this->updateSubitemCounters($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( $this->Application->isAdminUser && !$object->IsTempTable() ) { // send email on review status change from reviews grid in admin @@ -404,15 +406,15 @@ */ function _loadMainObject($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix'); $parent_table_key = $this->Application->getUnitOption($event->Prefix, 'ParentTableKey'); $foreign_key = $this->Application->getUnitOption($event->Prefix, 'ForeignKey'); + /** @var kDBItem $main_object */ $main_object = $this->Application->recallObject($parent_prefix, null, Array ('skip_autoload' => true)); - /* @var $main_object kDBItem */ $main_object->Load($object->GetDBField($foreign_key), $parent_table_key); } @@ -429,8 +431,8 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix'); $parent_table = $this->Application->getUnitOption($parent_prefix, 'TableName'); @@ -537,12 +539,12 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( $this->Application->GetVar('ajax') == 'yes' ) { + /** @var AjaxFormHelper $ajax_form_helper */ $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper'); - /* @var $ajax_form_helper AjaxFormHelper */ $params = Array ('status' => 'OK');