Index: branches/5.2.x/core/units/mailing_lists/mailing_lists_config.php =================================================================== diff -u -N -r15602 -r16388 --- branches/5.2.x/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 15602) +++ branches/5.2.x/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 16388) @@ -1,6 +1,6 @@ 'mailing-list', - 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), - 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), - 'EventHandlerClass' => Array ('class' => 'MailingListEventHandler', 'file' => 'mailing_list_eh.php', 'build_event' => 'OnBuild'), - 'TagProcessorClass' => Array ('class' => 'MailingListTagProcessor', 'file' => 'mailing_list_tp.php', 'build_event' => 'OnBuild'), +$config = Array ( + 'Prefix' => 'mailing-list', + 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'MailingListEventHandler', 'file' => 'mailing_list_eh.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'MailingListTagProcessor', 'file' => 'mailing_list_tp.php', 'build_event' => 'OnBuild'), - 'AutoLoad' => true, + 'AutoLoad' => true, - '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 ( - 'generate_mailing_queue' => Array ('EventName' => 'OnGenerateEmailQueue', 'RunSchedule' => '*/30 * * * *'), - 'process_mailing_queue' => Array ('EventName' => 'OnProcessEmailQueue', 'RunSchedule' => '*/30 * * * *'), - ), + 'ScheduledTasks' => Array ( + 'generate_mailing_queue' => Array ('EventName' => 'OnGenerateEmailQueue', 'RunSchedule' => '*/30 * * * *'), + 'process_mailing_queue' => Array ('EventName' => 'OnProcessEmailQueue', 'RunSchedule' => '*/30 * * * *'), + ), - 'IDField' => 'MailingId', + 'IDField' => 'MailingId', - 'TableName' => TABLE_PREFIX . 'MailingLists', + 'TableName' => TABLE_PREFIX . 'MailingLists', - 'TitlePresets' => Array ( - 'default' => Array ( - 'new_status_labels' => Array ('mailing-list' => '!la_title_AddingMailingList!'), - 'edit_status_labels' => Array ('mailing-list' => '!la_title_ViewingMailingList!'), - ), + 'TitlePresets' => Array ( + 'default' => Array ( + 'new_status_labels' => Array ('mailing-list' => '!la_title_AddingMailingList!'), + 'edit_status_labels' => Array ('mailing-list' => '!la_title_ViewingMailingList!'), + ), - 'mailing_list_list' => Array ( - 'prefixes' => Array ('mailing-list_List'), 'format' => "!la_title_MailingLists!", - 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'cancel', 'view', 'dbl-click'), - ), + 'mailing_list_list' => Array ( + 'prefixes' => Array ('mailing-list_List'), 'format' => "!la_title_MailingLists!", + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'cancel', 'view', 'dbl-click'), + ), - 'mailing_list_edit' => Array ( - 'prefixes' => Array ('mailing-list'), 'format' => "#mailing-list_status#", - 'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), - ), + 'mailing_list_edit' => Array ( + 'prefixes' => Array ('mailing-list'), 'format' => "#mailing-list_status#", + 'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), ), + ), - 'PermSection' => Array('main' => 'in-portal:mailing_lists'), + 'PermSection' => Array ('main' => 'in-portal:mailing_lists'), - 'Sections' => Array ( - 'in-portal:mailing_folder' => Array ( - 'parent' => 'in-portal:users', - 'icon' => 'mailing_list', - 'label' => 'la_title_MailingLists', - 'use_parent_header' => 1, - 'permissions' => Array (), - 'priority' => 5, - 'type' => stTREE, - ), - - 'in-portal:mailing_lists' => Array ( - 'parent' => 'in-portal:mailing_folder', - 'icon' => 'mailing_list', - 'label' => 'la_title_MailingLists', - 'url' => Array('t' => 'mailing_lists/mailing_list_list', 'pass' => 'm'), - 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 5.1, // ., because this section replaces parent in tree - 'type' => stTAB, - ), + 'Sections' => Array ( + 'in-portal:mailing_folder' => Array ( + 'parent' => 'in-portal:users', + 'icon' => 'mailing_list', + 'label' => 'la_title_MailingLists', + 'use_parent_header' => 1, + 'permissions' => Array (), + 'priority' => 5, + 'type' => stTREE, ), - 'ListSQLs' => Array ( - '' => ' SELECT %1$s.* %2$s FROM %1$s', + 'in-portal:mailing_lists' => Array ( + 'parent' => 'in-portal:mailing_folder', + 'icon' => 'mailing_list', + 'label' => 'la_title_MailingLists', + 'url' => Array ('t' => 'mailing_lists/mailing_list_list', 'pass' => 'm'), + 'permissions' => Array ('view', 'add', 'edit', 'delete'), + 'priority' => 5.1, // ., because this section replaces parent in tree + 'type' => stTAB, ), + ), - 'CalculatedFields' => Array ( - '' => Array ( - 'EmailsQueued' => 'CAST(%1$s.EmailsQueuedTotal AS SIGNED) - CAST(%1$s.EmailsSent AS SIGNED)', - ), - ), + 'ListSQLs' => Array ( + '' => ' SELECT %1$s.* %2$s + FROM %1$s', + ), - 'ListSortings' => Array ( - '' => Array ( - 'Sorting' => Array ('MailingId' => 'desc'), - ) + 'CalculatedFields' => Array ( + '' => Array ( + 'EmailsQueued' => 'CAST(%1$s.EmailsQueuedTotal AS SIGNED) - CAST(%1$s.EmailsSent AS SIGNED)', ), + ), - 'Fields' => Array ( - 'MailingId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('MailingId' => 'desc'), + ) + ), - 'PortalUserId' => Array( - 'type' => 'int', - 'formatter' => 'kLEFTFormatter', - 'options' => Array (USER_ROOT => 'root'), - 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE %s', - 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, - 'required' => 1, 'not_null' => 1, 'default' => USER_ROOT, - ), + 'Fields' => Array ( + 'MailingId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'To' => Array ('type' => 'string', 'required' => 1, 'default' => NULL), - 'ToParsed' => Array ('type' => 'string', 'default' => NULL), + 'PortalUserId' => Array ( + 'type' => 'int', + 'formatter' => 'kLEFTFormatter', + 'options' => Array (USER_ROOT => 'root'), + 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE %s', + 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, + 'required' => 1, 'not_null' => 1, 'default' => USER_ROOT, + ), - 'Attachments' => Array ( - 'type' => 'string', - 'formatter' => 'kUploadFormatter', 'upload_dir' => ITEM_FILES_PATH, 'max_size' => 50000000, - 'multiple' => 10, 'direct_links' => true, 'file_types' => '*.*', 'files_description' => '!la_hint_AllFiles!', - 'default' => NULL - ), + 'To' => Array ('type' => 'string', 'required' => 1, 'default' => NULL), + 'ToParsed' => Array ('type' => 'string', 'default' => NULL), - 'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'required' => 1, 'default' => ''), - 'MessageText' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), - 'MessageHtml' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'Attachments' => Array ( + 'type' => 'string', + 'formatter' => 'kUploadFormatter', 'upload_dir' => ITEM_FILES_PATH, 'max_size' => 50000000, + 'multiple' => 10, 'direct_links' => true, 'file_types' => '*.*', 'files_description' => '!la_hint_AllFiles!', + 'default' => NULL + ), - 'Status' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_NotProcessed', 2 => 'la_opt_PartiallyProcessed', 3 => 'la_opt_Processed', 4 => 'la_opt_Cancelled'), 'use_phrases' => 1, - 'not_null' => 1, 'required' => 1, 'default' => 1 - ), + 'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'required' => 1, 'default' => ''), + 'MessageText' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'MessageHtml' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), - 'EmailsQueuedTotal' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'EmailsSent' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'EmailsTotal' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_NotProcessed', 2 => 'la_opt_PartiallyProcessed', 3 => 'la_opt_Processed', 4 => 'la_opt_Cancelled'), 'use_phrases' => 1, + 'not_null' => 1, 'required' => 1, 'default' => 1 ), - 'VirtualFields' => Array ( - 'EmailsQueued' => Array ('type' => 'int', 'default' => 0), - ), + 'EmailsQueuedTotal' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'EmailsSent' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'EmailsTotal' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + ), - 'Grids' => Array ( - 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_item.png'), - 'Fields' => Array ( - 'MailingId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70), - 'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200), - 'MessageText' => Array ('filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, 'hidden' => 1), - 'MessageHtml' => Array ('title' => 'la_col_MessageHtml', 'filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, 'hidden' => 1), - 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100), - 'EmailsQueued' => Array ('filter_block' => 'grid_range_filter', 'width' => 80), - 'EmailsSent' => Array ('filter_block' => 'grid_range_filter', 'width' => 80), - 'EmailsTotal' => Array ('filter_block' => 'grid_range_filter', 'width' => 80), - ), + 'VirtualFields' => Array ( + 'EmailsQueued' => Array ('type' => 'int', 'default' => 0), + ), + + 'Grids' => Array ( + 'Default' => Array ( + 'Icons' => Array ('default' => 'icon16_item.png'), + 'Fields' => Array ( + 'MailingId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70), + 'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200), + 'MessageText' => Array ('filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, 'hidden' => 1), + 'MessageHtml' => Array ('title' => 'la_col_MessageHtml', 'filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, 'hidden' => 1), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100), + 'EmailsQueued' => Array ('filter_block' => 'grid_range_filter', 'width' => 80), + 'EmailsSent' => Array ('filter_block' => 'grid_range_filter', 'width' => 80), + 'EmailsTotal' => Array ('filter_block' => 'grid_range_filter', 'width' => 80), ), ), - ); \ No newline at end of file + ), +);