Page MenuHomeIn-Portal Phabricator
Files F1069129

in-portal
No OneTemporary
Actions

File Metadata

Created
Sat, Jul 19, 10:13 AM

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 10842)
+++ branches/RC/core/units/logs/email_logs/email_logs_config.php (revision 10843)
@@ -1,87 +1,88 @@
<?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:email_folder' => Array (
'parent' => 'in-portal:reports',
'icon' => 'in-portal:email_log',
'label' => 'la_tab_EmailLog',
'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 (
+ 'Icons' => Array ('default' => 'icon16_custom.gif'),
'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.2
\ No newline at end of property
+1.1.2.3
\ No newline at end of property
Index: branches/RC/core/units/email_queue/email_queue_tp.php
===================================================================
--- branches/RC/core/units/email_queue/email_queue_tp.php (nonexistent)
+++ branches/RC/core/units/email_queue/email_queue_tp.php (revision 10843)
@@ -0,0 +1,24 @@
+<?php
+
+ class EmailQueueTagProcessor extends kDBTagProcessor {
+
+ function PrintSerializedFields($params)
+ {
+ $object =& $this->getObject($params);
+
+ $field = $this->SelectParam($params, 'field');
+ $data = unserialize( $object->GetDBField($field) );
+
+ $o = '';
+ $std_params['name'] = $params['render_as'];
+ $std_params['field'] = $params['field'];
+ $std_params['pass_params'] = true;
+
+ foreach ($data as $key => $value) {
+ $block_params = array_merge($std_params, Array ('key' => $key, 'value' => $value));
+ $o .= $this->Application->ParseBlock($block_params);
+ }
+
+ return $o;
+ }
+ }
\ No newline at end of file
Property changes on: branches/RC/core/units/email_queue/email_queue_tp.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ 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 (revision 10842)
+++ branches/RC/core/units/email_queue/email_queue_config.php (revision 10843)
@@ -1,79 +1,80 @@
<?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'),
+ 'TagProcessorClass' => Array ('class' => 'EmailQueueTagProcessor', 'file' => 'email_queue_tp.php', '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 (
+ 'Icons' => Array ('default' => 'icon16_custom.gif'),
'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', ),
+ 'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'data_block' => 'grid_headers_td', '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
___________________________________________________________________
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 (revision 10842)
+++ branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl (revision 10843)
@@ -1,79 +1,99 @@
<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 ToolBarButton(
+ 'e-mail',
+ '<inp2:m_phrase label="la_ToolTip_ProcessQueue" escape="1"/>',
+ function() {
+ open_popup('emailmessages', null, 'emails/send_queue');
+ }
+ )
+ );
+
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_DefineElement name="header_element">
+ <strong><inp2:m_Param name="key"/></strong>: <inp2:m_Param name="value"/><br />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_headers_td">
+ <td valign="top" class="text" style="<inp2:m_param name="td_style"/>">
+ <inp2:PrintSerializedFields field="$field" render_as="header_element"/>
+ </td>
+</inp2:m_DefineElement>
+
<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
___________________________________________________________________
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/emails/send_complete.tpl
===================================================================
--- branches/RC/core/admin_templates/emails/send_complete.tpl (revision 10842)
+++ branches/RC/core/admin_templates/emails/send_complete.tpl (revision 10843)
@@ -1,16 +1,26 @@
<inp2:m_include t="incs/header" nobody="yes"/>
<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="emailevents" title_preset="email_send_complete"/>
+<script type="text/javascript">
+ function close_window() {
+ if (window.opener) {
+ window.opener.location.reload();
+ }
+
+ window.close();
+ }
+</script>
+
<table class="edit-form">
<inp2:m_RenderElement name="subsection" title="la_prompt_EmailCompleteMessage"/>
<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
<td colspan="3" align="center">
- <input type="button" value="<inp2:m_phrase name="la_Close"/>" class="button" onclick="window.close();"/>
+ <input type="button" value="<inp2:m_phrase name="la_Close"/>" class="button" onclick="close_window();"/>
</td>
</tr>
-</table>
+</table>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/emails/send_complete.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.3.2.1
\ No newline at end of property

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server