Index: branches/RC/core/units/sections/sections_config.php =================================================================== diff -u -N -r10839 -r10841 --- branches/RC/core/units/sections/sections_config.php (.../sections_config.php) (revision 10839) +++ branches/RC/core/units/sections/sections_config.php (.../sections_config.php) (revision 10841) @@ -215,16 +215,6 @@ 'type' => stTREE, ), - 'in-portal:emaillog' => Array ( - 'parent' => 'in-portal:reports', - 'icon' => 'in-portal:email_log', - 'label' => 'la_tab_EmailLog', - 'url' => Array ('index_file' => 'logs/email_log.php', 'pass' => 'm'), - 'permissions' => Array ('view', 'delete'), - 'priority' => 4, - 'type' => stTREE, - ), - 'in-portal:visits' => Array ( 'parent' => 'in-portal:reports', 'icon' => 'in-portal:visits', Index: branches/RC/kernel/units/sections/sections_config.php =================================================================== diff -u -N -r10840 -r10841 --- branches/RC/kernel/units/sections/sections_config.php (.../sections_config.php) (revision 10840) +++ branches/RC/kernel/units/sections/sections_config.php (.../sections_config.php) (revision 10841) @@ -215,16 +215,6 @@ 'type' => stTREE, ), - 'in-portal:emaillog' => Array ( - 'parent' => 'in-portal:reports', - 'icon' => 'in-portal:email_log', - 'label' => 'la_tab_EmailLog', - 'url' => Array ('index_file' => 'logs/email_log.php', 'pass' => 'm'), - 'permissions' => Array ('view', 'delete'), - 'priority' => 4, - 'type' => stTREE, - ), - 'in-portal:visits' => Array ( 'parent' => 'in-portal:reports', 'icon' => 'in-portal:visits', Index: branches/RC/core/units/logs/email_logs/email_logs_config.php =================================================================== diff -u -N --- branches/RC/core/units/logs/email_logs/email_logs_config.php (revision 0) +++ branches/RC/core/units/logs/email_logs/email_logs_config.php (revision 10841) @@ -0,0 +1,78 @@ + '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 ( + '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'), + 'priority' => 4, + 'type' => stTREE, + ), + ), + + '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 Index: branches/RC/core/admin_templates/logs/search_logs/search_log_list.tpl =================================================================== diff -u -N -r10840 -r10841 --- branches/RC/core/admin_templates/logs/search_logs/search_log_list.tpl (.../search_log_list.tpl) (revision 10840) +++ branches/RC/core/admin_templates/logs/search_logs/search_log_list.tpl (.../search_log_list.tpl) (revision 10841) @@ -44,7 +44,7 @@ 'in-portal:reset', '', function() { - if (inpConfirm('Are you sure you want to delete all items?')) { + if (inpConfirm('')) { submit_event('search-log', 'OnDeleteAll'); } } Index: branches/RC/core/units/logs/search_logs/search_logs_config.php =================================================================== diff -u -N -r10839 -r10841 --- branches/RC/core/units/logs/search_logs/search_logs_config.php (.../search_logs_config.php) (revision 10839) +++ branches/RC/core/units/logs/search_logs/search_logs_config.php (.../search_logs_config.php) (revision 10841) @@ -4,7 +4,7 @@ 'Prefix' => 'search-log', 'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), 'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), - 'EventHandlerClass' => Array ('class' => 'SearchLogEventHandler', 'file' => 'search_log_eh.php', 'build_event' => 'OnBuild'), + 'EventHandlerClass' => Array ('class' => 'kDBEventHandler', 'file' => '', 'build_event' => 'OnBuild'), 'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'), 'AutoLoad' => true, @@ -21,7 +21,6 @@ 'TableName' => TABLE_PREFIX . 'SearchLog', 'TitlePresets' => Array ( - 'search_log_list' => Array ('prefixes' => Array('search-log_List'), 'format' => '!la_tab_SearchLog! (#search-log_recordcount#)',), ), Index: branches/RC/kernel/units/search_logs/search_logs_config.php =================================================================== diff -u -N -r10839 -r10841 --- branches/RC/kernel/units/search_logs/search_logs_config.php (.../search_logs_config.php) (revision 10839) +++ branches/RC/kernel/units/search_logs/search_logs_config.php (.../search_logs_config.php) (revision 10841) @@ -4,7 +4,7 @@ 'Prefix' => 'search-log', 'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), 'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), - 'EventHandlerClass' => Array ('class' => 'SearchLogEventHandler', 'file' => 'search_log_eh.php', 'build_event' => 'OnBuild'), + 'EventHandlerClass' => Array ('class' => 'kDBEventHandler', 'file' => '', 'build_event' => 'OnBuild'), 'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'), 'AutoLoad' => true, @@ -21,7 +21,6 @@ 'TableName' => TABLE_PREFIX . 'SearchLog', 'TitlePresets' => Array ( - 'search_log_list' => Array ('prefixes' => Array('search-log_List'), 'format' => '!la_tab_SearchLog! (#search-log_recordcount#)',), ), Index: branches/RC/core/admin_templates/logs/email_logs/email_log_tabs.tpl =================================================================== diff -u -N --- branches/RC/core/admin_templates/logs/email_logs/email_log_tabs.tpl (revision 0) +++ branches/RC/core/admin_templates/logs/email_logs/email_log_tabs.tpl (revision 10841) @@ -0,0 +1,12 @@ + + + + +
+ + + + + +
+
\ No newline at end of file Index: branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl =================================================================== diff -u -N --- branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl (revision 0) +++ branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl (revision 10841) @@ -0,0 +1,66 @@ + + + + + + + + + + + +
+ + + + + + +
+ +
+
+ + + + Index: branches/RC/kernel/admin_templates/search_logs/search_log_list.tpl =================================================================== diff -u -N -r10840 -r10841 --- branches/RC/kernel/admin_templates/search_logs/search_log_list.tpl (.../search_log_list.tpl) (revision 10840) +++ branches/RC/kernel/admin_templates/search_logs/search_log_list.tpl (.../search_log_list.tpl) (revision 10841) @@ -44,7 +44,7 @@ 'in-portal:reset', '', function() { - if (inpConfirm('Are you sure you want to delete all items?')) { + if (inpConfirm('')) { submit_event('search-log', 'OnDeleteAll'); } } Index: branches/RC/kernel/units/search_logs/search_log_eh.php =================================================================== diff -u -N --- branches/RC/kernel/units/search_logs/search_log_eh.php (revision 10839) +++ branches/RC/kernel/units/search_logs/search_log_eh.php (revision 0) @@ -1,37 +0,0 @@ - Array ('self' => 'delete'), - ); - - $this->permMapping = array_merge($this->permMapping, $permissions); - } - - /** - * Deletes all records from list - * - * @param kEvent $event - */ - function OnDeleteAll(&$event) - { - $sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . ' - FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName'); - $ids = $this->Conn->GetCol($sql); - - if ($ids) { - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler'); - /* @var $temp_handler kTempTablesHandler */ - - $temp_handler->DeleteItems($event->Prefix, $event->Special, $ids); - } - } - } \ No newline at end of file Index: branches/RC/core/units/logs/search_logs/search_log_eh.php =================================================================== diff -u -N --- branches/RC/core/units/logs/search_logs/search_log_eh.php (revision 10839) +++ branches/RC/core/units/logs/search_logs/search_log_eh.php (revision 0) @@ -1,37 +0,0 @@ - Array ('self' => 'delete'), - ); - - $this->permMapping = array_merge($this->permMapping, $permissions); - } - - /** - * Deletes all records from list - * - * @param kEvent $event - */ - function OnDeleteAll(&$event) - { - $sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . ' - FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName'); - $ids = $this->Conn->GetCol($sql); - - if ($ids) { - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler'); - /* @var $temp_handler kTempTablesHandler */ - - $temp_handler->DeleteItems($event->Prefix, $event->Special, $ids); - } - } - } \ No newline at end of file