Index: branches/5.2.x/units/listings/listings_event_handler.php =================================================================== diff -u -N -r16459 -r16517 --- branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 16459) +++ branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 16517) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ if ( $object->IgnoreValidation ) { $object->UpdateFormattersMasterFields(); @@ -101,8 +101,8 @@ { parent::OnBeforeItemCreate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( $object->IgnoreValidation ) { $object->UpdateFormattersMasterFields(); @@ -122,8 +122,8 @@ { parent::OnBeforeDeleteFromLive($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $sql = 'SELECT * FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . ' @@ -315,8 +315,8 @@ $new_processing = false; $link_id = $listing_type_id = 0; + /** @var kDBItem $object */ $object = $event->getObject( Array('skip_autoload' => true) ); - /* @var $object kDBItem */ switch ($event->Name) { case 'EnhanceLinkAfterOrderApprove': @@ -465,8 +465,8 @@ */ function EnhanceLinkAfterOrderApprove($event) { + /** @var kDBItem $object */ $object = $event->getObject( Array('skip_autoload' => true) ); - /* @var $object kDBItem */ $fields = $event->getEventParam('field_values'); $item_data = unserialize($fields['ItemData']); @@ -518,8 +518,8 @@ */ function ExpireLink($event) { + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $fields = $event->getEventParam('field_values'); $item_data = unserialize($fields['ItemData']); @@ -550,8 +550,8 @@ */ protected function iterateItems(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); @@ -586,8 +586,8 @@ // extend period for pending/renewal links (if owner has agreed) if ( $event->Name == 'OnMassApprove' ) { + /** @var kDBItem $lst_object */ $lst_object = $this->Application->recallObject('lst', null, Array ('skip_autoload' => true)); - /* @var $lst_object kDBItem */ foreach ($ids as $id) { $object->Load($id); @@ -705,8 +705,8 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $object->Load($listing_id); @@ -735,8 +735,8 @@ $expired_listings = $this->Conn->GetCol($sql); if(is_array($expired_listings) && count($expired_listings) > 0) { + /** @var kDBItem $object */ $object = $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true)); - /* @var $object kDBItem */ foreach($expired_listings as $listing_id) { @@ -787,8 +787,8 @@ */ protected function OnMassDelete(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); Index: branches/5.2.x/units/links/links_event_handler.php =================================================================== diff -u -N -r15606 -r16517 --- branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 15606) +++ branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 16517) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBList */ if ( !$this->Application->isAdminUser ) { $object->addFilter('expire_filter', '(Expire > ' . adodb_mktime() . ' OR Expire IS NULL)'); @@ -60,8 +60,8 @@ if ( substr($event->Special, 0, 10) == 'duplicates' ) { $object->removeFilter('category_filter'); + /** @var LinkHelper $link_helper */ $link_helper = $this->Application->recallObject('LinkHelper'); - /* @var $link_helper LinkHelper */ $grouping = $link_helper->getGrouping($event->getPrefixSpecial()); @@ -75,8 +75,8 @@ break; case 'duplicates-sub': + /** @var kDBItem $main_object */ $main_object = $this->Application->recallObject($event->Prefix . '.duplicates'); - /* @var $main_object kDBItem */ foreach ($grouping as $field_index => $group_field) { $object->addFilter('dupe_filter_' . $field_index, '%1$s.`' . $group_field . '` = ' . $this->Conn->qstr($main_object->GetDBField($group_field))); @@ -105,8 +105,8 @@ */ function OnMerge($event) { + /** @var LinkHelper $link_helper */ $link_helper = $this->Application->recallObject('LinkHelper'); - /* @var $link_helper LinkHelper */ $grouping = $link_helper->getGrouping($event->getPrefixSpecial()); @@ -144,8 +144,8 @@ } if ( !$groping_error ) { + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler'); - /* @var $temp_handler kTempTablesHandler */ $categories_sql = ' SELECT main_table.ResourceId, ci.CategoryId, main_table.' . $id_field . ' FROM ' . $table_name . ' main_table @@ -216,8 +216,8 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ // replace 0 id in post with actual created id (used in enhancement process) $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -293,8 +293,8 @@ if (!strlen($field_value) || ($field_value != $this->Application->RecallVar($event->Prefix . '_captcha_code'))) { $this->Application->SetVar('error_'.$field_name, 1); + /** @var kCaptchaHelper $captcha_helper */ $captcha_helper = $this->Application->recallObject('CaptchaHelper'); - /* @var $captcha_helper kCaptchaHelper */ $this->Application->StoreVar($event->Prefix . '_captcha_code', $captcha_helper->GenerateCaptchaCode()); $event->status = kEvent::erFAIL; @@ -318,7 +318,7 @@ } $object = $event->getObject(); // get link object - /* @var $object kDBItem */ + /** @var kDBItem $object */ $send_params = Array( 'from_name' => $this->Application->GetVar('ContactFormFullName'), @@ -389,14 +389,14 @@ return ; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ($object->GetDBField('Url') != $object->GetOriginalField('Url')) { // check only when url was changed + /** @var LinkHelper $link_helper */ $link_helper = $this->Application->recallObject('LinkHelper'); - /* @var $link_helper LinkHelper */ $link_checked = $link_helper->CheckReciprocalURL($object->GetDBField('Url')); @@ -419,11 +419,11 @@ return; } + /** @var kCatDBItem $object */ $object = $event->getObject( Array('skip_autoload' => true) ); - /* @var $object kCatDBItem */ + /** @var LinkHelper $link_helper */ $link_helper = $this->Application->recallObject('LinkHelper'); - /* @var $link_helper LinkHelper */ $id_field = $this->Application->getUnitOption($event->Prefix, 'IDField'); $table_name = $this->Application->getUnitOption($event->Prefix, 'TableName'); @@ -557,8 +557,8 @@ { parent::OnBeforeDeleteOriginal($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $link_id = $event->getEventParam('original_id'); $new_resource_id = $object->GetDBField('ResourceId'); @@ -583,8 +583,8 @@ { parent::OnAfterDeleteOriginal($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $old_resource_id = $this->Application->GetVar('original_resource_id'); $new_resource_id = $object->GetDBField('ResourceId'); Index: branches/5.2.x/install.php =================================================================== diff -u -N -r16486 -r16517 --- branches/5.2.x/install.php (.../install.php) (revision 16486) +++ branches/5.2.x/install.php (.../install.php) (revision 16517) @@ -1,6 +1,6 @@ toolkit; - /* @var $toolkit kInstallToolkit */ } $application =& kApplication::Instance(); Index: branches/5.2.x/units/listings/listings_tag_processor.php =================================================================== diff -u -N -r15157 -r16517 --- branches/5.2.x/units/listings/listings_tag_processor.php (.../listings_tag_processor.php) (revision 15157) +++ branches/5.2.x/units/listings/listings_tag_processor.php (.../listings_tag_processor.php) (revision 16517) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBItem */ return $this->Application->HREF($params['edit_template'],'', Array( 'm_opener' => 'd', @@ -38,8 +38,8 @@ function LinkEditLink($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $sql = 'SELECT '.$this->Application->getUnitOption('l', 'IDField').' FROM '.$this->Application->getUnitOption('l', 'TableName').' @@ -66,11 +66,11 @@ protected function _expirationField($params, $format_field) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ + /** @var kDBItem $listing_type */ $listing_type = $this->Application->recallObject( 'lst', 'lst', $params ); - /* @var $listing_type kDBItem */ $dur_type_mapping = Array ( 1 => 1, 2 => 60, 3 => 3600, 4 => 3600 * 24, @@ -82,8 +82,8 @@ $expiration_interval = $duration * $dur_type_mapping[$duration_type]; $expiration_date = adodb_mktime() + $expiration_interval; + /** @var LanguagesItem $lang */ $lang = $this->Application->recallObject('lang.current'); - /* @var $lang LanguagesItem */ return adodb_date($lang->GetDBField($format_field), $expiration_date); } Index: branches/5.2.x/units/listing_types/listing_types_event_handler.php =================================================================== diff -u -N -r15150 -r16517 --- branches/5.2.x/units/listing_types/listing_types_event_handler.php (.../listing_types_event_handler.php) (revision 15150) +++ branches/5.2.x/units/listing_types/listing_types_event_handler.php (.../listing_types_event_handler.php) (revision 16517) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ $object->setRequired('ShopCartName', $object->GetDBField('EnableBuying')); } Index: branches/5.2.x/units/listing_types/listing_types_tag_processor.php =================================================================== diff -u -N -r15273 -r16517 --- branches/5.2.x/units/listing_types/listing_types_tag_processor.php (.../listing_types_tag_processor.php) (revision 15273) +++ branches/5.2.x/units/listing_types/listing_types_tag_processor.php (.../listing_types_tag_processor.php) (revision 16517) @@ -1,6 +1,6 @@ getObject($params); $params['cat_id'] = $object->GetDBField($params['field']); + /** @var kNavigationBar $navigation_bar */ $navigation_bar = $this->Application->recallObject('kNavigationBar'); - /* @var $navigation_bar kNavigationBar */ return $navigation_bar->build($params); } @@ -37,8 +37,8 @@ { static $listing_type_id = null; + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ if (!isset($listing_type_id)) { $listing_type_id = $object->GetID(); Index: branches/5.2.x/units/links/link_tag_processor.php =================================================================== diff -u -N -r16412 -r16517 --- branches/5.2.x/units/links/link_tag_processor.php (.../link_tag_processor.php) (revision 16412) +++ branches/5.2.x/units/links/link_tag_processor.php (.../link_tag_processor.php) (revision 16517) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBItem */ if ($object->GetDBField('Status') == STATUS_PENDING || $object->GetDBField('Status') == STATUS_PENDING_EDITING) { return false; @@ -77,8 +77,8 @@ */ function EnhancementIsPending($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $status = $this->getListingInfo($object->GetDBField('ResourceId'), 'Status'); @@ -87,8 +87,8 @@ function ListingTypeField($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $lst_id = $this->getListingInfo($object->GetDBField('ResourceId'), 'ListingTypeId'); @@ -100,8 +100,8 @@ function EnhancementField($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $listing_id = $this->getListingInfo($object->GetDBField('ResourceId'), 'ListingId'); @@ -113,8 +113,8 @@ function IsRenewalPeriod($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $listing_info = $this->getListingInfo($object->GetDBField('ResourceId')); @@ -150,8 +150,8 @@ return 0; } + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $listtype_id = $this->getListingInfo($object->GetDBField('ResourceId'), 'ListingTypeId'); @@ -180,16 +180,16 @@ function ListingDescription($params) { + /** @var kDBItem $listing_type */ $listing_type = $this->Application->recallObject('lst'); - /* @var $listing_type kDBItem */ return $listing_type->GetDBField('Description'); } function ListingTypeDetailsLink($params) { + /** @var kDBList $listing_type */ $listing_type = $this->Application->recallObject('lst', null, Array ('raise_warnings' => 0)); - /* @var $listing_type kDBList */ $params['lst_id'] = $listing_type->isLoaded() ? $listing_type->GetID() : $this->Application->Parser->GetParam('key'); @@ -203,8 +203,8 @@ */ function FollowLocation($params) { + /** @var kCatDBItem $object */ $object = $this->getObject($params); - /* @var $object kCatDBItem */ if (!$object->isLoaded()) { throw new Exception('No Link ID for redirect'); @@ -217,8 +217,8 @@ $resource_id = $object->GetDBField('ResourceId'); $user_id = $this->Application->RecallVar('user_id'); + /** @var kDBItem $link_visit */ $link_visit = $this->Application->recallObject('l-visit', null, Array ('skip_autoload' => true)); - /* @var $link_visit kDBItem */ $link_visit->Load( Array ('ResourceId' => $resource_id, 'PortalUserId' => $user_id) ); if ($link_visit->isLoaded()) { @@ -289,8 +289,8 @@ static $link_visited = Array (); + /** @var kDBList $object */ $object = $this->getObject($params); - /* @var $object kDBList */ if (!isset($link_visited[$this->Special])) { $resource_ids = $object->GetCol('ResourceId'); @@ -344,8 +344,8 @@ $fields = explode(',', $fields); + /** @var kDBList $object */ $object = $this->getObject($params); - /* @var $object kDBList */ switch ($condition) { case 'or': @@ -376,8 +376,8 @@ */ function DisplayDetailTemplate($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $template_name = $object->GetDBField('CustomTemplate'); if (!$template_name || !$this->Application->TemplatesCache->TemplateExists($template_name)) { @@ -403,8 +403,8 @@ return ; } + /** @var LinkHelper $link_helper */ $link_helper = $this->Application->recallObject('LinkHelper'); - /* @var $link_helper LinkHelper */ // 1. get current grouping $grouping = $link_helper->getGrouping( $this->getPrefixSpecial() ); @@ -441,8 +441,8 @@ static $grouping = null; if (!isset($grouping)) { + /** @var LinkHelper $link_helper */ $link_helper = $this->Application->recallObject('LinkHelper'); - /* @var $link_helper LinkHelper */ // 1. get current grouping $grouping = $link_helper->getGrouping( $this->getPrefixSpecial() ); Index: branches/5.2.x/units/link_validation/link_validation_eh.php =================================================================== diff -u -N -r16459 -r16517 --- branches/5.2.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 16459) +++ branches/5.2.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 16517) @@ -1,6 +1,6 @@ Application->recallObject('PermissionsHelper'); - /* @var $perm_helper kPermissionsHelper */ $items = $perm_helper->GetCategoryItemData('l', $ids); $check_method = $event->Name == 'OnDeleteLinks' ? 'DeleteCheckPermission' : 'ModifyCheckPermission'; @@ -126,8 +126,8 @@ { parent::SetCustomQuery($event); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $object->addFilter('primary_category_filter', 'ci.PrimaryCat = 1'); @@ -161,8 +161,8 @@ $ids = $this->Conn->GetCol($sql); if ($ids) { + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); - /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems($event->Prefix, $event->Special, $ids); } @@ -319,8 +319,8 @@ function _validateLink($link_id) { + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $sql = 'SELECT Url, ResourceId FROM ' . $this->Application->getUnitOption('l', 'TableName') . ' @@ -338,8 +338,8 @@ $curl_helper->lastHTTPCode = 500; } + /** @var kDBItem $link_validation */ $link_validation = $this->Application->recallObject($this->Prefix . '.-item', null, Array ('skip_autoload' => true)); - /* @var $link_validation kDBItem */ $link_validation->Load($link_id, 'LinkId'); @@ -379,8 +379,8 @@ return ; } + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); - /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems($event->Prefix, $event->Special, $ids); } @@ -435,8 +435,8 @@ return; } + /** @var kCatDBItem $object */ $object = $this->Application->recallObject('l.-item', null, Array ('skip_autoload' => true)); - /* @var $object kCatDBItem */ foreach ($ids as $id) { $object->Load($id); @@ -470,8 +470,8 @@ return ; } + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject('l_TempHandler', 'kTempTablesHandler'); - /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems('l', '', $ids); }