Index: branches/5.2.x/core/kernel/db/db_event_handler.php =================================================================== diff -u -N -r16457 -r16513 --- branches/5.2.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 16457) +++ branches/5.2.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 16513) @@ -1,6 +1,6 @@ Special == 'previous' || $event->Special == 'next' ) { + /** @var kDBItem $object */ $object = $this->Application->recallObject($event->getEventParam('item')); - /* @var $object kDBItem */ + /** @var ListHelper $list_helper */ $list_helper = $this->Application->recallObject('ListHelper'); - /* @var $list_helper ListHelper */ $select_clause = $this->Application->getUnitOption($object->Prefix, 'NavigationSelectClause', NULL); @@ -230,8 +230,8 @@ if ( preg_match('/^auto-(.*)/', $event->Special, $regs) && $this->Application->prefixRegistred($regs[1]) ) { // - returns field DateFormat value from language (LanguageId is extracted from current phrase object) + /** @var kDBItem $main_object */ $main_object = $this->Application->recallObject($regs[1]); - /* @var $main_object kDBItem */ $id_field = $this->Application->getUnitOption($event->Prefix, 'IDField'); return $main_object->GetDBField($id_field); @@ -493,8 +493,8 @@ $status_field = array_shift($status_fields); if ( $status_field == 'Status' || $status_field == 'Enabled' ) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( !$object->isLoaded() ) { return true; @@ -539,8 +539,8 @@ */ protected function OnItemBuild(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->dbBuild($object, $event); @@ -584,8 +584,8 @@ } } + /** @var Params $actions */ $actions = $this->Application->recallObject('kActions'); - /* @var $actions Params */ $actions->Set($event->getPrefixSpecial() . '_GoTab', ''); $actions->Set($event->getPrefixSpecial() . '_GoId', ''); @@ -645,11 +645,11 @@ */ protected function OnTempHandlerBuild(kEvent $event) { + /** @var kTempTablesHandler $object */ $object = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler'); - /* @var $object kTempTablesHandler */ + /** @var kEvent $parent_event */ $parent_event = $event->getEventParam('parent_event'); - /* @var $parent_event kEvent */ if ( is_object($parent_event) ) { $object->setParentEvent($parent_event); @@ -682,8 +682,8 @@ */ protected function LoadItem(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $id = $this->getPassedID($event); @@ -693,8 +693,8 @@ } if ( $object->Load($id) ) { + /** @var Params $actions */ $actions = $this->Application->recallObject('kActions'); - /* @var $actions Params */ $actions->Set($event->getPrefixSpecial() . '_id', $object->GetID()); } @@ -713,8 +713,8 @@ */ protected function OnListBuild(kEvent $event) { + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ /*if ( $this->Application->isDebugMode() ) { $event_params = http_build_query($event->getEventParams()); @@ -748,8 +748,8 @@ $this->SetPagination($event); $this->SetSorting($event); + /** @var Params $actions */ $actions = $this->Application->recallObject('kActions'); - /* @var $actions Params */ $actions->Set('remove_specials[' . $event->getPrefixSpecial() . ']', '0'); $actions->Set($event->getPrefixSpecial() . '_GoTab', ''); @@ -808,8 +808,8 @@ $event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial()); if ( !$this->Application->isAdminUser ) { + /** @var ListHelper $list_helper */ $list_helper = $this->Application->recallObject('ListHelper'); - /* @var $list_helper ListHelper */ $this->_passListParams($event, 'per_page'); } @@ -845,8 +845,8 @@ { $param_names = array_diff(Array ('page', 'per_page', 'sort_by'), Array ($skip_var)); + /** @var ListHelper $list_helper */ $list_helper = $this->Application->recallObject('ListHelper'); - /* @var $list_helper ListHelper */ foreach ($param_names as $param_name) { $value = $this->Application->GetVar($param_name); @@ -868,8 +868,9 @@ case 'sort_by': $event->setPseudoClass('_List'); + + /** @var kDBList $object */ $object = $event->getObject(Array ('main_list' => 1)); - /* @var $object kDBList */ if ( $list_helper->hasUserSorting($object) ) { $event->SetRedirectParam('sort_by', $value); @@ -889,8 +890,8 @@ */ protected function SetPagination(kEvent $event) { + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ // get PerPage (forced -> session -> config -> 10) $object->SetPerPage($this->getPerPage($event)); @@ -946,8 +947,8 @@ */ protected function getPerPage(kEvent $event) { + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $per_page = $event->getEventParam('per_page'); @@ -1004,8 +1005,8 @@ if ( !$per_page ) { // per page wan't found in request/session/persistent session + /** @var ListHelper $list_helper */ $list_helper = $this->Application->recallObject('ListHelper'); - /* @var $list_helper ListHelper */ // allow to override default per-page value from tag $default_per_page = $event->getEventParam('default_per_page'); @@ -1032,8 +1033,8 @@ { $event->setPseudoClass('_List'); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ if ( $object->isMainList() ) { $sort_by = $this->Application->GetVar('sort_by'); @@ -1093,8 +1094,8 @@ } // always add forced sorting before any user sorting fields + /** @var Array $forced_sorting */ $forced_sorting = getArrayValue($list_sortings, 'ForcedSorting'); - /* @var $forced_sorting Array */ if ( $forced_sorting ) { foreach ($forced_sorting as $field => $dir) { @@ -1203,8 +1204,8 @@ */ protected function AddFilters(kEvent $event) { + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $edit_mark = rtrim($this->Application->GetSID() . '_' . $this->Application->GetTopmostWid($event->Prefix), '_'); @@ -1248,8 +1249,8 @@ if ( $view_filter ) { $view_filter = unserialize($view_filter); + /** @var kMultipleFilter $temp_filter */ $temp_filter = $this->Application->makeClass('kMultipleFilter'); - /* @var $temp_filter kMultipleFilter */ $filter_menu = $this->Application->getUnitOption($event->Prefix, 'FilterMenu'); @@ -1296,8 +1297,8 @@ return; } + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $where_clause = Array ( 'ItemPrefix = ' . $this->Conn->qstr($object->Prefix), @@ -1414,11 +1415,11 @@ $event->setPseudoClass('_List'); $this->Application->SetVar('sort_by', $field . ',' . $dir); + /** @var kDBList $object */ $object = $event->getObject(Array ('main_list' => 1)); - /* @var $object kDBList */ + /** @var ListHelper $list_helper */ $list_helper = $this->Application->recallObject('ListHelper'); - /* @var $list_helper ListHelper */ $this->_passListParams($event, 'sort_by'); @@ -1501,8 +1502,8 @@ */ protected function ItemPrepareQuery(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $sqls = $object->getFormOption('ItemSQLs', Array ()); $special = isset($sqls[$event->Special]) ? $event->Special : ''; @@ -1524,8 +1525,8 @@ */ protected function ListPrepareQuery(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $sqls = $object->getFormOption('ListSQLs', Array ()); @@ -1556,8 +1557,8 @@ */ protected function OnCreate(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -1612,8 +1613,8 @@ */ protected function _update(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); @@ -1651,8 +1652,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, Array ($this->getPassedID($event))); } @@ -1671,8 +1672,8 @@ $ids = $this->Conn->GetCol($sql); if ( $ids ) { + /** @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); } @@ -1687,8 +1688,8 @@ */ protected function OnNew(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $object->Clear(0); $this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate'); @@ -1715,16 +1716,16 @@ */ protected function OnCancel(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); if ( $items_info ) { $delete_ids = Array (); + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); - /* @var $temp_handler kTempTablesHandler */ foreach ($items_info as $id => $field_values) { $object->Load($id); @@ -1758,8 +1759,8 @@ return ; } + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); - /* @var $temp_handler kTempTablesHandler */ $ids = $this->StoreSelectedIDs($event); @@ -1809,16 +1810,16 @@ $this->setTempWindowID($event); $ids = $this->StoreSelectedIDs($event); + /** @var kDBItem $object */ $object = $event->getObject(Array('skip_autoload' => true)); - /* @var $object kDBItem */ $object->setPendingActions(null, true); $changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix); $this->Application->RemoveVar($changes_var_name); + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); - /* @var $temp_handler kTempTablesHandler */ $temp_handler->PrepareEdit(); @@ -1850,8 +1851,9 @@ } $skip_master = false; + + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); - /* @var $temp_handler kTempTablesHandler */ $changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix); @@ -1870,8 +1872,8 @@ $this->StoreSelectedIDs($event, $live_ids); } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->SaveLoggedChanges($changes_var_name, $object->ShouldLogChanges()); } @@ -1996,8 +1998,8 @@ */ protected function OnCancelEdit(kEvent $event) { + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); - /* @var $temp_handler kTempTablesHandler */ $temp_handler->CancelEdit(); $this->clearSelectedIDs($event); @@ -2019,8 +2021,8 @@ */ public function isNewItemCreate(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject( Array ('raise_warnings' => 0) ); - /* @var $object kDBItem */ return !$object->isLoaded(); } @@ -2063,8 +2065,8 @@ */ protected function OnPreSaveAjax(kEvent $event) { + /** @var AjaxFormHelper $ajax_form_helper */ $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper'); - /* @var $ajax_form_helper AjaxFormHelper */ $ajax_form_helper->transitEvent($event, 'OnPreSave'); } @@ -2082,8 +2084,8 @@ $event->CallSubEvent($not_created ? 'OnCreate' : 'OnUpdate'); if ( $event->status == kEvent::erSUCCESS ) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->Application->SetVar($event->getPrefixSpecial() . '_id', $object->GetID()); } @@ -2163,11 +2165,11 @@ $this->clearSelectedIDs($event); $this->Application->SetVar('m_lang', $this->Application->GetDefaultLanguageId()); + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); - /* @var $temp_handler kTempTablesHandler */ $temp_handler->PrepareEdit(); @@ -2191,8 +2193,8 @@ */ protected function OnPreSaveCreated(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject( Array('skip_autoload' => true) ); - /* @var $object kDBItem */ $object->setID(0); $field_values = $this->getSubmittedFields($event); @@ -2222,8 +2224,8 @@ //do nothing - should reset :) if ( $this->isNewItemCreate($event) ) { // just reset id to 0 in case it was create + /** @var kDBItem $object */ $object = $event->getObject( Array ('skip_autoload' => true) ); - /* @var $object kDBItem */ $object->setID(0); $this->Application->SetVar($event->getPrefixSpecial() . '_id', 0); @@ -2244,8 +2246,8 @@ return ; } + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); @@ -2299,8 +2301,8 @@ return; } + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); - /* @var $temp_handler kTempTablesHandler */ $ids = $this->StoreSelectedIDs($event); @@ -2340,8 +2342,8 @@ */ protected function OnPreSavePopup(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->RemoveRequiredFields($object); $event->CallSubEvent('OnPreSave'); @@ -2400,8 +2402,8 @@ */ protected function OnAfterItemCreate(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( !$object->IsTempTable() ) { $this->_processPendingActions($event); @@ -2429,8 +2431,8 @@ */ protected function OnAfterItemUpdate(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( !$object->IsTempTable() ) { $this->_processPendingActions($event); @@ -2462,14 +2464,14 @@ */ protected function OnAfterItemDelete(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ // 1. delete direct subscriptions to item, that was deleted $this->_deleteSubscriptions($event->Prefix, 'ItemId', $object->GetID()); + /** @var Array $sub_items */ $sub_items = $this->Application->getUnitOption($event->Prefix, 'SubItems', Array ()); - /* @var $sub_items Array */ // 2. delete this item sub-items subscriptions, that reference item, that was deleted foreach ($sub_items as $sub_prefix) { @@ -2507,8 +2509,8 @@ return; } + /** @var kTempTablesHandler $temp_handler */ $temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler'); - /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems('system-event-subscription', '', $ids); } @@ -2587,8 +2589,8 @@ */ protected function OnAfterCopyToLive(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(array('skip_autoload' => true)); - /* @var $object kDBItem */ $object->SwitchToLive(); $object->Load($event->getEventParam('id')); @@ -2605,8 +2607,8 @@ */ protected function _processPendingActions(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $update_required = false; $temp_id = $event->getEventParam('temp_id'); @@ -2619,8 +2621,8 @@ break; case 'make_live': + /** @var FileHelper $file_helper */ $file_helper = $this->Application->recallObject('FileHelper'); - /* @var $file_helper FileHelper */ if ( !file_exists($data['file']) ) { // file removal was requested too @@ -2714,8 +2716,8 @@ { $event->setPseudoClass('_List'); + /** @var kSearchHelper $search_helper */ $search_helper = $this->Application->recallObject('SearchHelper'); - /* @var $search_helper kSearchHelper */ $search_helper->performSearch($event); } @@ -2729,8 +2731,8 @@ */ protected function OnSearchReset(kEvent $event) { + /** @var kSearchHelper $search_helper */ $search_helper = $this->Application->recallObject('SearchHelper'); - /* @var $search_helper kSearchHelper */ $search_helper->resetSearch($event); } @@ -2831,8 +2833,8 @@ { $this->Application->SetVar('allow_translation', true); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->RemoveRequiredFields($object); $event->CallSubEvent('OnPreSave'); @@ -2843,8 +2845,8 @@ if ( $resource_id ) { $t_prefixes = explode(',', $this->Application->GetVar('translator_prefixes')); + /** @var kDBItem $cdata */ $cdata = $this->Application->recallObject($t_prefixes[1], NULL, Array ('skip_autoload' => true)); - /* @var $cdata kDBItem */ $cdata->Load($resource_id, 'ResourceId'); @@ -2905,8 +2907,8 @@ */ protected function OnSelectUser(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $items_info = $this->Application->GetVar('u'); @@ -2983,8 +2985,8 @@ protected function prepareObject(&$object, kEvent $event) { if ( $event->Special == 'export' || $event->Special == 'import' ) { + /** @var kCatDBItemExportHelper $export_helper */ $export_helper = $this->Application->recallObject('CatItemExportHelper'); - /* @var $export_helper kCatDBItemExportHelper */ $export_helper->prepareExportColumns($event); } @@ -3011,8 +3013,8 @@ */ protected function OnExportBegin(kEvent $event) { + /** @var kCatDBItemExportHelper $export_helper */ $export_helper = $this->Application->recallObject('CatItemExportHelper'); - /* @var $export_helper kCatDBItemExportHelper */ $export_helper->OnExportBegin($event); } @@ -3233,8 +3235,8 @@ */ protected function OnValidateMInputFields(kEvent $event) { + /** @var MInputHelper $minput_helper */ $minput_helper = $this->Application->recallObject('MInputHelper'); - /* @var $minput_helper MInputHelper */ $minput_helper->OnValidateMInputFields($event); } @@ -3255,8 +3257,8 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -3281,8 +3283,8 @@ $response['status'] = $object->GetErrorMsg($error_field, false); } + /** @var AjaxFormHelper $ajax_form_helper */ $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper'); - /* @var $ajax_form_helper AjaxFormHelper */ $response['other_errors'] = $ajax_form_helper->getErrorMessages($object); $response['uploader_info'] = $ajax_form_helper->getUploaderInfo($object, array_keys($field_values)); @@ -3359,8 +3361,8 @@ */ protected function getAutoCompleteSuggestions(kEvent $event, $term) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $field = $this->Application->GetVar('field');