Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F1068617
in-portal
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Fri, Jul 18, 4:17 PM
Size
11 KB
Mime Type
text/x-diff
Expires
Sun, Jul 20, 4:17 PM (1 d, 9 h)
Engine
blob
Format
Raw Data
Handle
691637
Attached To
rINP In-Portal
in-portal
View Options
Index: branches/RC/core/units/logs/email_logs/email_logs_config.php
===================================================================
--- branches/RC/core/units/logs/email_logs/email_logs_config.php (revision 10841)
+++ branches/RC/core/units/logs/email_logs/email_logs_config.php (revision 10842)
@@ -1,78 +1,87 @@
<?php
$config = Array (
'Prefix' => 'email-log',
'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' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
'AutoLoad' => true,
'QueryString' => Array (
1 => 'id',
2 => 'Page',
3 => 'event',
4 => 'mode',
),
'IDField' => 'EmailLogId',
'TableName' => TABLE_PREFIX . 'EmailLog',
'TitlePresets' => Array (
'email_log_list' => Array ('prefixes' => Array('email-log_List'), 'format' => '!la_tab_EmailLog! (#email-log_recordcount#)',),
),
'PermSection' => Array ('main' => 'in-portal:emaillog'),
'Sections' => Array (
- 'in-portal:emaillog' => Array (
+ 'in-portal:email_folder' => Array (
'parent' => 'in-portal:reports',
'icon' => 'in-portal:email_log',
'label' => 'la_tab_EmailLog',
- 'url' => Array('t' => 'logs/email_logs/email_log_list', 'pass' => 'm'),
- 'permissions' => Array ('view', 'delete'),
+ 'permissions' => Array (),
'priority' => 4,
'type' => stTREE,
),
+
+ 'in-portal:emaillog' => Array (
+ 'parent' => 'in-portal:email_folder',
+ 'icon' => 'in-portal:email_log',
+ 'label' => 'la_tab_EmailLog',
+ 'url' => Array('t' => 'logs/email_logs/email_log_list', 'pass' => 'm'),
+ 'permissions' => Array ('view', 'delete'),
+ 'priority' => 1,
+ 'type' => stTAB,
+ ),
),
'ListSQLs' => Array (
'' => ' SELECT %1$s.* %2$s FROM %1$s',
),
'ListSortings' => Array (
'' => Array (
'Sorting' => Array ('timestamp' => 'desc'),
)
),
'Fields' => Array (
'EmailLogId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
'fromuser' => Array ('type' => 'string', 'max_len' => 200, 'default' => NULL),
'addressto' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
'subject' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
'timestamp' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
'event' => Array ('type' => 'string', 'max_len' => 100, 'default' => NULL),
'EventParams' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
),
'Grids' => Array (
'Default' => Array (
'Fields' => Array (
'EmailLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter',),
'fromuser' => Array ('title' => 'la_prompt_FromUsername', 'filter_block' => 'grid_like_filter', ),
'addressto' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', ),
'subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', ),
'event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', ),
'timestamp' => Array ('title' => 'la_prompt_SentOn', 'filter_block' => 'grid_date_range_filter', ),
// 'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter', ),
),
),
),
'ConfigMapping' => Array(
'PerPage' => 'Perpage_EmailsL',
),
);
\ No newline at end of file
Property changes on: branches/RC/core/units/logs/email_logs/email_logs_config.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.1
\ No newline at end of property
+1.1.2.2
\ No newline at end of property
Index: branches/RC/core/units/email_queue/email_queue_config.php
===================================================================
--- branches/RC/core/units/email_queue/email_queue_config.php (nonexistent)
+++ branches/RC/core/units/email_queue/email_queue_config.php (revision 10842)
@@ -0,0 +1,79 @@
+<?php
+
+ $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' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+
+ 'AutoLoad' => true,
+
+ 'QueryString' => Array (
+ 1 => 'id',
+ 2 => 'Page',
+ 3 => 'event',
+ 4 => 'mode',
+ ),
+
+ 'IDField' => 'EmailQueueId',
+
+ 'TableName' => TABLE_PREFIX . 'EmailQueue',
+
+ 'TitlePresets' => Array (
+ 'email_queue_list' => Array ('prefixes' => Array('email-queue_List'), 'format' => '!la_tab_EmailQueue! (#email-queue_recordcount#)',),
+ ),
+
+ 'PermSection' => Array ('main' => 'in-portal:email_queue'),
+
+ 'Sections' => Array (
+ 'in-portal:email_queue' => Array (
+ 'parent' => 'in-portal:email_folder',
+ 'icon' => 'in-portal:email_log',
+ 'label' => 'la_tab_EmailQueue',
+ 'url' => Array('t' => 'logs/email_logs/email_queue_list', 'pass' => 'm'),
+ 'permissions' => Array ('view', 'delete'),
+ 'priority' => 2,
+ 'type' => stTAB,
+ ),
+ ),
+
+ 'ListSQLs' => Array (
+ '' => ' SELECT %1$s.* %2$s FROM %1$s',
+ ),
+
+ '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', 'not_null' => 1, 'default' => 0),
+ 'SendRetries' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+ 'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),
+ ),
+
+ 'Grids' => Array (
+ 'Default' => Array (
+ 'Fields' => Array (
+ 'EmailQueueId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter',),
+ 'ToEmail' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', ),
+ 'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', ),
+ 'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'filter_block' => 'grid_like_filter', ),
+ 'Queued' => Array ('title' => 'la_col_Queued', 'filter_block' => 'grid_date_range_filter', ),
+ 'SendRetries' => Array ('title' => 'la_col_SendRetries', 'filter_block' => 'grid_range_filter', ),
+ 'LastSendRetry' => Array ('title' => 'la_col_LastSendRetry', 'filter_block' => 'grid_date_range_filter', ),
+ ),
+ ),
+ ),
+
+ 'ConfigMapping' => Array(
+ 'PerPage' => 'Perpage_EmailsL',
+ ),
+ );
\ No newline at end of file
Property changes on: branches/RC/core/units/email_queue/email_queue_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Index: branches/RC/core/admin_templates/logs/email_logs/email_log_tabs.tpl
===================================================================
--- branches/RC/core/admin_templates/logs/email_logs/email_log_tabs.tpl (revision 10841)
+++ branches/RC/core/admin_templates/logs/email_logs/email_log_tabs.tpl (revision 10842)
@@ -1,12 +1,11 @@
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td align="right" width="100%">
<table cellpadding="0" cellspacing="0" border="0" height="23">
<tr>
- <inp2:m_RenderElement name="tab_direct" title="la_tab_EmailLog" t="logs/email_logs/email_log_list"/>
- <inp2:m_RenderElement name="tab_direct" title="la_tab_EmailQueue" t="logs/email_logs/email_queue_list"/>
+ <inp2:adm_ListTabs render_as="tab_direct" section_name="in-portal:email_folder"/>
</tr>
</table>
</td>
</tr>
</table>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/logs/email_logs/email_log_tabs.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.1
\ No newline at end of property
+1.1.2.2
\ No newline at end of property
Index: branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl
===================================================================
--- branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl (nonexistent)
+++ branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl (revision 10842)
@@ -0,0 +1,79 @@
+<inp2:m_include t="incs/header" />
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:email_queue" prefix="email-queue" title_preset="email_queue_list" tabs="logs/email_logs/email_log_tabs" pagination="1"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+ <tr>
+ <td>
+ <table width="100%" cellpadding="0" cellspacing="0">
+ <tr>
+ <td >
+ <script type="text/javascript">
+ a_toolbar = new ToolBar();
+
+
+ function edit()
+ {
+
+ }
+
+ a_toolbar.AddButton(
+ new ToolBarButton(
+ 'refresh',
+ '<inp2:m_phrase label="la_ToolTip_Refresh" escape="1"/>',
+ function() {
+ window.location.href = window.location.href;
+ }
+ )
+ );
+
+ a_toolbar.AddButton(
+ new ToolBarButton(
+ 'delete',
+ '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+ function() {
+ std_delete_items('email-queue');
+ }
+ )
+ );
+
+ a_toolbar.AddButton(
+ new ToolBarButton(
+ 'in-portal:reset',
+ '<inp2:m_phrase label="la_ToolTip_DeleteAll" escape="1"/>',
+ function() {
+ if (inpConfirm('<inp2:m_Phrase name="la_Delete_Confirm" escape="1"/>')) {
+ submit_event('email-queue', 'OnDeleteAll');
+ }
+ }
+ )
+ );
+
+ a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+
+ a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function(id) {
+ show_viewmenu(a_toolbar,'view');
+ }
+ ) );
+
+ a_toolbar.Render();
+ </script>
+ </td>
+
+ <inp2:m_RenderElement name="search_main_toolbar" prefix="email-queue" grid="Default"/>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</tbody>
+</table>
+
+<inp2:m_ParseBlock name="grid" PrefixSpecial="email-queue" IdField="EmailQueueId" grid="Default"/>
+<script type="text/javascript">
+ Grids['email-queue'].SetDependantToolbarButtons( new Array('delete') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
Property changes on: branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Event Timeline
Log In to Comment