Index: branches/5.3.x/units/listing_types/listing_types_event_handler.php =================================================================== diff -u -N -r15486 -r16523 --- branches/5.3.x/units/listing_types/listing_types_event_handler.php (.../listing_types_event_handler.php) (revision 15486) +++ branches/5.3.x/units/listing_types/listing_types_event_handler.php (.../listing_types_event_handler.php) (revision 16523) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ $object->setRequired('ShopCartName', $object->GetDBField('EnableBuying')); } Index: branches/5.3.x/units/listings/listings_tag_processor.php =================================================================== diff -u -N -r15926 -r16523 --- branches/5.3.x/units/listings/listings_tag_processor.php (.../listings_tag_processor.php) (revision 15926) +++ branches/5.3.x/units/listings/listings_tag_processor.php (.../listings_tag_processor.php) (revision 16523) @@ -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 */ $links_config = $this->Application->getUnitConfig('l'); @@ -68,11 +68,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, @@ -84,8 +84,8 @@ $expiration_interval = $duration * $dur_type_mapping[$duration_type]; $expiration_date = time() + $expiration_interval; + /** @var LanguagesItem $lang */ $lang = $this->Application->recallObject('lang.current'); - /* @var $lang LanguagesItem */ return date($lang->GetDBField($format_field), $expiration_date); } Index: branches/5.3.x/units/links/link_tag_processor.php =================================================================== diff -u -N -r16107 -r16523 --- branches/5.3.x/units/links/link_tag_processor.php (.../link_tag_processor.php) (revision 16107) +++ branches/5.3.x/units/links/link_tag_processor.php (.../link_tag_processor.php) (revision 16523) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBItem */ if ($object->GetDBField('Status') == STATUS_PENDING || $object->GetDBField('Status') == STATUS_PENDING_EDITING) { return false; @@ -78,8 +78,8 @@ */ function EnhancementIsPending($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $status = $this->getListingInfo($object->GetDBField('ResourceId'), 'Status'); @@ -88,8 +88,8 @@ function ListingTypeField($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $lst_id = $this->getListingInfo($object->GetDBField('ResourceId'), 'ListingTypeId'); @@ -101,8 +101,8 @@ function EnhancementField($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $listing_id = $this->getListingInfo($object->GetDBField('ResourceId'), 'ListingId'); @@ -114,8 +114,8 @@ function IsRenewalPeriod($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $listing_info = $this->getListingInfo($object->GetDBField('ResourceId')); @@ -151,8 +151,8 @@ return 0; } + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $listtype_id = $this->getListingInfo($object->GetDBField('ResourceId'), 'ListingTypeId'); @@ -181,16 +181,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'); @@ -204,8 +204,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'); @@ -218,8 +218,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()) { @@ -290,8 +290,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'); @@ -346,8 +346,8 @@ $fields = explode(',', $fields); + /** @var kDBList $object */ $object = $this->getObject($params); - /* @var $object kDBList */ switch ($condition) { case 'or': @@ -378,8 +378,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)) { @@ -405,8 +405,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() ); @@ -445,8 +445,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.3.x/install.php =================================================================== diff -u -N -r16507 -r16523 --- branches/5.3.x/install.php (.../install.php) (revision 16507) +++ branches/5.3.x/install.php (.../install.php) (revision 16523) @@ -1,6 +1,6 @@ toolkit; - /* @var $toolkit kInstallToolkit */ } $application =& kApplication::Instance(); Index: branches/5.3.x/units/listings/listings_event_handler.php =================================================================== diff -u -N -r16507 -r16523 --- branches/5.3.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 16507) +++ branches/5.3.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 16523) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ if ( $object->IgnoreValidation ) { $object->UpdateFormattersMasterFields(); @@ -105,8 +105,8 @@ { parent::OnBeforeItemCreate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( $object->IgnoreValidation ) { $object->UpdateFormattersMasterFields(); @@ -126,8 +126,8 @@ { parent::OnBeforeDeleteFromLive($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $sql = 'SELECT * FROM ' . $event->getUnitConfig()->getTableName() . ' @@ -322,8 +322,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': @@ -473,8 +473,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']); @@ -528,8 +528,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']); @@ -560,8 +560,8 @@ */ protected function iterateItems(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); $links_config = $this->Application->getUnitConfig('l'); @@ -592,8 +592,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); @@ -702,8 +702,8 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $object->Load($listing_id); @@ -731,8 +731,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) { @@ -786,8 +786,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.3.x/units/link_validation/link_validation_eh.php =================================================================== diff -u -N -r16507 -r16523 --- branches/5.3.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 16507) +++ branches/5.3.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 16523) @@ -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'); @@ -163,8 +163,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); } @@ -324,8 +324,8 @@ function _validateLink($link_id) { + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $link_config = $this->Application->getUnitConfig('l'); @@ -345,8 +345,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'); @@ -387,8 +387,8 @@ return ; } + /** @var kTempTablesHandler $temp_handler */ $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); } @@ -446,8 +446,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); @@ -481,8 +481,8 @@ return ; } + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject('l_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); - /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems('l', '', $ids); } Index: branches/5.3.x/units/links/links_event_handler.php =================================================================== diff -u -N -r15937 -r16523 --- branches/5.3.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 15937) +++ branches/5.3.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 16523) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBList */ if ( !$this->Application->isAdminUser ) { $object->addFilter('expire_filter', '(Expire > ' . time() . ' 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()); @@ -146,8 +146,8 @@ } if ( !$groping_error ) { + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); - /* @var $temp_handler kTempTablesHandler */ $categories_sql = ' SELECT main_table.ResourceId, ci.CategoryId, main_table.' . $id_field . ' FROM ' . $table_name . ' main_table @@ -218,8 +218,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)); @@ -296,8 +296,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; @@ -321,7 +321,7 @@ } $object = $event->getObject(); // get link object - /* @var $object kDBItem */ + /** @var kDBItem $object */ $send_params = $object->getEmailParams(Array( 'from_name' => $this->Application->GetVar('ContactFormFullName'), @@ -392,14 +392,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')); @@ -422,11 +422,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 */ $config = $event->getUnitConfig(); $id_field = $config->getIDField(); @@ -565,8 +565,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'); @@ -592,8 +592,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'); @@ -618,4 +618,4 @@ $this->Conn->doUpdate($fields_hash, $table_name, $field . ' = ' . $old_resource_id); } - } \ No newline at end of file + } Index: branches/5.3.x/units/listing_types/listing_types_tag_processor.php =================================================================== diff -u -N -r15486 -r16523 --- branches/5.3.x/units/listing_types/listing_types_tag_processor.php (.../listing_types_tag_processor.php) (revision 15486) +++ branches/5.3.x/units/listing_types/listing_types_tag_processor.php (.../listing_types_tag_processor.php) (revision 16523) @@ -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();