Index: branches/5.2.x/core/units/email_queue/email_queue_config.php =================================================================== diff -u -N -r14585 -r16388 --- branches/5.2.x/core/units/email_queue/email_queue_config.php (.../email_queue_config.php) (revision 14585) +++ branches/5.2.x/core/units/email_queue/email_queue_config.php (.../email_queue_config.php) (revision 16388) @@ -1,6 +1,6 @@ 'email-queue', - 'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), - 'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), - 'EventHandlerClass' => Array ('class' => 'kDBEventHandler', 'file' => '', 'build_event' => 'OnBuild'), - 'TagProcessorClass' => Array ('class' => 'EmailQueueTagProcessor', 'file' => 'email_queue_tp.php', 'build_event' => 'OnBuild'), +$config = Array ( + 'Prefix' => 'email-queue', + 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'kDBEventHandler', 'file' => '', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'EmailQueueTagProcessor', 'file' => 'email_queue_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', + ), - 'IDField' => 'EmailQueueId', + 'IDField' => 'EmailQueueId', - 'TableName' => TABLE_PREFIX . 'EmailQueue', + 'TableName' => TABLE_PREFIX . 'EmailQueue', - 'TitlePresets' => Array ( - 'email_queue_list' => Array ('prefixes' => Array('email-queue_List'), 'format' => '!la_tab_EmailQueue!',), - ), + 'TitlePresets' => Array ( + 'email_queue_list' => Array ('prefixes' => Array ('email-queue_List'), 'format' => '!la_tab_EmailQueue!',), + ), - 'PermSection' => Array ('main' => 'in-portal:email_queue'), + 'PermSection' => Array ('main' => 'in-portal:email_queue'), - 'Sections' => Array ( - 'in-portal:email_queue' => Array ( - 'parent' => 'in-portal:mailing_folder', - 'icon' => 'mailing_list', - 'label' => 'la_tab_EmailQueue', - 'url' => Array('t' => 'logs/email_logs/email_queue_list', 'pass' => 'm'), - 'permissions' => Array ('view', 'delete'), - 'priority' => 5.2, // ., because this section replaces parent in tree - 'type' => stTAB, - ), + 'Sections' => Array ( + 'in-portal:email_queue' => Array ( + 'parent' => 'in-portal:mailing_folder', + 'icon' => 'mailing_list', + 'label' => 'la_tab_EmailQueue', + 'url' => Array ('t' => 'logs/email_logs/email_queue_list', 'pass' => 'm'), + 'permissions' => Array ('view', 'delete'), + 'priority' => 5.2, // ., because this section replaces parent in tree + 'type' => stTAB, ), + ), - 'ListSQLs' => Array ( - '' => ' SELECT %1$s.* %2$s FROM %1$s', - ), + 'ListSQLs' => Array ( + '' => ' SELECT %1$s.* %2$s + FROM %1$s', + ), - 'ListSortings' => Array ( - '' => Array ( - 'Sorting' => Array ('Queued' => 'desc'), - ) - ), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('Queued' => 'desc'), + ) + ), - 'Fields' => Array ( - 'EmailQueueId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'ToEmail' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), - 'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), - 'MessageHeaders' => Array ('type' => 'string', 'default' => NULL), - 'MessageBody' => Array ('type' => 'string', 'default' => NULL), - 'Queued' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), - 'SendRetries' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), - 'MailingId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - ), + 'Fields' => Array ( + 'EmailQueueId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'ToEmail' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), + 'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), + 'MessageHeaders' => Array ('type' => 'string', 'default' => NULL), + 'MessageBody' => Array ('type' => 'string', 'default' => NULL), + 'Queued' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), + 'SendRetries' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), + 'MailingId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + ), - 'Grids' => Array ( - 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_item.png'), - 'Fields' => Array ( - 'EmailQueueId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), - 'MailingId' => Array ('title' => 'la_col_MailingList', 'filter_block' => 'grid_range_filter', 'width' => 70, ), - 'ToEmail' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ), - 'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'data_block' => 'grid_headers_td', 'filter_block' => 'grid_like_filter', 'width' => 130, ), - 'Queued' => Array ('title' => 'la_col_Queued', 'filter_block' => 'grid_date_range_filter', 'width' => 80, ), - 'SendRetries' => Array ('title' => 'la_col_SendRetries', 'filter_block' => 'grid_range_filter', 'width' => 100, ), - 'LastSendRetry' => Array ('title' => 'la_col_LastSendRetry', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), - - ), + 'Grids' => Array ( + 'Default' => Array ( + 'Icons' => Array ('default' => 'icon16_item.png'), + 'Fields' => Array ( + 'EmailQueueId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), + 'MailingId' => Array ('title' => 'la_col_MailingList', 'filter_block' => 'grid_range_filter', 'width' => 70, ), + 'ToEmail' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ), + 'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'data_block' => 'grid_headers_td', 'filter_block' => 'grid_like_filter', 'width' => 130, ), + 'Queued' => Array ('title' => 'la_col_Queued', 'filter_block' => 'grid_date_range_filter', 'width' => 80, ), + 'SendRetries' => Array ('title' => 'la_col_SendRetries', 'filter_block' => 'grid_range_filter', 'width' => 100, ), + 'LastSendRetry' => Array ('title' => 'la_col_LastSendRetry', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), ), ), - ); \ No newline at end of file + ), +); \ No newline at end of file