Index: branches/5.3.x/units/listings/listings_config.php =================================================================== diff -u -N -r15486 -r15657 --- branches/5.3.x/units/listings/listings_config.php (.../listings_config.php) (revision 15486) +++ branches/5.3.x/units/listings/listings_config.php (.../listings_config.php) (revision 15657) @@ -1,6 +1,6 @@ 'ls', - 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), - 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), - 'EventHandlerClass' => Array ('class' => 'ListingsEventHandler', 'file' => 'listings_event_handler.php', 'build_event' => 'OnBuild'), - 'TagProcessorClass' => Array ('class' => 'ListingsTagProcessor', 'file' => 'listings_tag_processor.php', 'build_event' => 'OnBuild'), - 'AutoLoad' => true, +$config = Array ( + 'Prefix' => 'ls', + 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'ListingsEventHandler', 'file' => 'listings_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'ListingsTagProcessor', 'file' => 'listings_tag_processor.php', 'build_event' => 'OnBuild'), + 'AutoLoad' => true, - 'Hooks' => Array ( - Array ( - 'Mode' => hAFTER, - 'Conditional' => false, - 'HookToPrefix' => 'l', - 'HookToSpecial' => '*', - 'HookToEvent' => Array ('OnBeforeDeleteOriginal'), - 'DoPrefix' => '', - 'DoSpecial' => '*', - 'DoEvent' => 'OnMoveEnhancement', - ), - ), + 'Hooks' => Array ( + Array ( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => 'l', + 'HookToSpecial' => '*', + 'HookToEvent' => Array ('OnBeforeDeleteOriginal'), + 'DoPrefix' => '', + 'DoSpecial' => '*', + 'DoEvent' => 'OnMoveEnhancement', + ), + ), - 'QueryString' => Array ( - 1 => 'id', - 2 => 'Page', - 3 => 'PerPage', - 4 => 'event', - 5 => 'mode', - ), + 'QueryString' => Array ( + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', + ), - 'ScheduledTasks' => Array ( - 'listings_expiration' => Array ('EventName' => 'OnCheckExpiredPaidListings', 'RunSchedule' => '*/30 * * * *'), - ), + 'ScheduledTasks' => Array ( + 'listings_expiration' => Array ('EventName' => 'OnCheckExpiredPaidListings', 'RunSchedule' => '*/30 * * * *'), + ), - 'IDField' => 'ListingId', - 'StatusField' => Array ('Status', 'PendingRenewal'), - 'TitleField' => 'LinkName', + 'IDField' => 'ListingId', + 'StatusField' => Array ('Status', 'PendingRenewal'), + 'TitleField' => 'LinkName', - 'TitlePresets' => Array ( - 'default' => Array ( 'new_status_labels' => Array ('ls' => '!la_title_AddingListing!'), - 'edit_status_labels' => Array ('ls' => '!la_title_EditingListing!'), - 'new_titlefield' => Array ('ls' => '!la_title_NewListing!'), - ), + 'TitlePresets' => Array ( + 'default' => Array ( + 'new_status_labels' => Array ('ls' => '!la_title_AddingListing!'), + 'edit_status_labels' => Array ('ls' => '!la_title_EditingListing!'), + 'new_titlefield' => Array ('ls' => '!la_title_NewListing!'), + ), - 'listing_list' => Array ('prefixes' => Array ('ls_List'), 'format' => "!la_title_PaidListings!",), - 'listing_edit' => Array ('prefixes' => Array ('ls'), 'format' => "#ls_status# '#ls_titlefield#' - !la_title_General!",), - ), + 'listing_list' => Array ('prefixes' => Array ('ls_List'), 'format' => "!la_title_PaidListings!",), + 'listing_edit' => Array ('prefixes' => Array ('ls'), 'format' => "#ls_status# '#ls_titlefield#' - !la_title_General!",), + ), - 'PermSection' => Array ('main' => 'in-link:paid_listings'), + 'PermSection' => Array ('main' => 'in-link:paid_listings'), - 'Sections' => Array ( - 'in-link:paid_listings_folder' => Array ( - 'parent' => 'in-link', - 'icon' => 'paid_listings', - 'label' => 'la_tab_PaidListings', - 'use_parent_header' => 1, - 'permissions' => Array (), - 'priority' => 1, - 'type' => stTREE, - ), + 'Sections' => Array ( + 'in-link:paid_listings_folder' => Array ( + 'parent' => 'in-link', + 'icon' => 'paid_listings', + 'label' => 'la_tab_PaidListings', + 'use_parent_header' => 1, + 'permissions' => Array (), + 'priority' => 1, + 'type' => stTREE, + ), - 'in-link:paid_listings' => Array ( - 'parent' => 'in-link:paid_listings_folder', - 'icon' => 'paid_listings', - 'label' => 'la_tab_Listings', - 'url' => Array ('t' => 'in-link/paid_listings/paid_listings_list', 'pass' => 'm'), - 'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline'), - 'priority' => 1.1, // ., because this section replaces parent in tree - 'type' => stTAB, - ), - ), + 'in-link:paid_listings' => Array ( + 'parent' => 'in-link:paid_listings_folder', + 'icon' => 'paid_listings', + 'label' => 'la_tab_Listings', + 'url' => Array ('t' => 'in-link/paid_listings/paid_listings_list', 'pass' => 'm'), + 'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline'), + 'priority' => 1.1, // ., because this section replaces parent in tree + 'type' => stTAB, + ), + ), - 'TableName' => TABLE_PREFIX.'Listings', + 'TableName' => TABLE_PREFIX.'Listings', - 'ListSQLs' => Array ( '' => ' SELECT %1$s.* %2$s - FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'Link item_table ON item_table.ResourceId = %1$s.ItemResourceId - LEFT JOIN '.TABLE_PREFIX.'Users u ON u.PortalUserId = item_table.CreatedById'), + 'ListSQLs' => Array ( + '' => ' SELECT %1$s.* %2$s + FROM %1$s + LEFT JOIN '.TABLE_PREFIX.'Link item_table ON item_table.ResourceId = %1$s.ItemResourceId + LEFT JOIN '.TABLE_PREFIX.'Users u ON u.PortalUserId = item_table.CreatedById' + ), - 'ItemSQLs' => Array ( '' => ' SELECT %1$s.* %2$s - FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'Link item_table ON item_table.ResourceId = %1$s.ItemResourceId - LEFT JOIN '.TABLE_PREFIX.'Users u ON u.PortalUserId = item_table.CreatedById'), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('PurchasedOn' => 'desc'), + ) + ), - 'ListSortings' => Array ( - '' => Array ( - 'Sorting' => Array ('PurchasedOn' => 'desc'), - ) - ), + 'CalculatedFields' => Array ( + '' => Array ( + 'LinkName' => 'CONCAT(item_table.Name, " (", item_table.Url, ")")', + 'LinkOwner' => 'IF (ISNULL(u.Username), IF (item_table.CreatedById = ' . USER_ROOT . ', "root", IF (item_table.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)', + ), + ), - 'CalculatedFields' => Array ( - '' => Array ( - 'LinkName' => 'CONCAT(item_table.Name, " (", item_table.Url, ")")', - 'LinkOwner' => 'IF (ISNULL(u.Username), IF (item_table.CreatedById = ' . USER_ROOT . ', "root", IF (item_table.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)', - ), - ), - 'Fields' => Array ( - 'ListingId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'ListingTypeId' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options_sql' => 'SELECT %s - FROM '.TABLE_PREFIX.'ListingTypes - ORDER BY Name', - 'option_key_field' => 'ListingTypeId', 'option_title_field' => 'Name', - 'default' => 0, - ), - 'ItemResourceId' => Array ( - 'type' => 'int', - 'required' => 1, 'unique' => Array ('ItemResourceId'), 'default' => null, - 'error_field' => 'LinkName', - ), - 'PurchasedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'ExpiresOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#', 'required' =>1), - 'Status' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, - 'not_null' => 1, 'default' => 2, - ), - 'PendingRenewal' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array (0 => 'la_NotPendingRenewal', 1 => 'la_PendingRenewal'), 'use_phrases' => 1, - 'not_null' => 1, 'default' => 0, - ), - 'RenewalReminderSent' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - ), + 'Fields' => Array ( + 'ListingId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'ListingTypeId' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options_sql' => 'SELECT %s + FROM '.TABLE_PREFIX.'ListingTypes + ORDER BY Name', + 'option_key_field' => 'ListingTypeId', 'option_title_field' => 'Name', + 'default' => 0, + ), + 'ItemResourceId' => Array ( + 'type' => 'int', + 'required' => 1, 'unique' => Array ('ItemResourceId'), 'default' => null, + 'error_field' => 'LinkName', + ), + 'PurchasedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'ExpiresOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#', 'required' =>1), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 2, + ), + 'PendingRenewal' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_NotPendingRenewal', 1 => 'la_PendingRenewal'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'RenewalReminderSent' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + ), - 'VirtualFields' => Array ( - 'LinkName' => Array ('type' => 'string', 'default' => ''), - 'LinkOwner' => Array ('type' => 'string', 'default' => ''), - ), + 'VirtualFields' => Array ( + 'LinkName' => Array ('type' => 'string', 'default' => ''), + 'LinkOwner' => Array ('type' => 'string', 'default' => ''), + ), - 'Grids' => Array ( - 'Default' => Array ( - 'Icons' => Array ( - 'default' => 'icon16_item.png', - '1_0' => 'icon16_link.png', - '0_0' => 'icon16_link_disabled.png', - '2_0' => 'icon16_link_pending.png', - '1_1' => 'icon16_link_pending.png', - '0_1' => 'icon16_link_disabled.png', - '2_1' => 'icon16_link_pending.png'), - 'module' => 'core', + 'Grids' => Array ( + 'Default' => Array ( + 'Icons' => Array ( + 'default' => 'icon16_item.png', + '1_0' => 'icon16_link.png', + '0_0' => 'icon16_link_disabled.png', + '2_0' => 'icon16_link_pending.png', + '1_1' => 'icon16_link_pending.png', + '0_1' => 'icon16_link_disabled.png', + '2_1' => 'icon16_link_pending.png' + ), - 'Fields' => Array ( - 'ListingId' => Array ( 'title' => 'column:la_fld_Id' , 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'LinkName' => Array ('data_block' => 'link_td', 'filter_block' => 'grid_like_filter', 'width' => 170, ), - 'ListingTypeId' => Array ( 'title' => 'column:la_fld_ListingTypeName' , 'data_block' => 'listing_type_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'LinkOwner' => Array ('filter_block' => 'grid_like_filter', 'width' => 115, ), - 'PendingRenewal' => Array ('filter_block' => 'grid_options_filter', 'width' => 143, ), - 'PurchasedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'ExpiresOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'Status' => Array ('filter_block' => 'grid_options_filter'), - ), - ), - ), + 'module' => 'core', - ); \ No newline at end of file + 'Fields' => Array ( + 'ListingId' => Array ( 'title' => 'column:la_fld_Id' , 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'LinkName' => Array ('data_block' => 'link_td', 'filter_block' => 'grid_like_filter', 'width' => 170, ), + 'ListingTypeId' => Array ( 'title' => 'column:la_fld_ListingTypeName' , 'data_block' => 'listing_type_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'LinkOwner' => Array ('filter_block' => 'grid_like_filter', 'width' => 115, ), + 'PendingRenewal' => Array ('filter_block' => 'grid_options_filter', 'width' => 143, ), + 'PurchasedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'ExpiresOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'Status' => Array ('filter_block' => 'grid_options_filter'), + ), + ), + ), +); \ No newline at end of file