From c5a4ad3d31047f9580b19b3401ef523b0fd53733 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sat, 10 May 2014 16:58:11 +0200 Subject: [ticket/10899] Using Delete All in log viewer with keyword search https://tracker.phpbb.com/browse/PHPBB3-10899 PHPBB3-10899 --- phpBB/includes/acp/acp_logs.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/acp/acp_logs.php') diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index 2c795bb77b..4e5db058fb 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -26,7 +26,7 @@ class acp_logs { global $db, $user, $auth, $template, $cache, $phpbb_container; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; - global $request; + global $request, $phpbb_log; $user->add_lang('mcp'); @@ -66,7 +66,15 @@ class acp_logs unset($sql_in); } - if ($where_sql || $deleteall) + if ($deleteall) + { + $where_sql = ($sort_days) ? 'AND log_time >= ' . (time() - ($sort_days * 86400)) : ''; + $keywords = utf8_normalize_nfc(request_var('keywords', '', true)); + $keywords_where = $phpbb_log->generate_sql_keyword($keywords, ''); + $where_sql .= ' ' . $keywords_where; + } + + if ($where_sql) { $sql = 'DELETE FROM ' . LOG_TABLE . " WHERE log_type = {$this->log_type} -- cgit v1.2.1 From c6d7875b9b76a931e27e8dbf742ad7af25fe19cf Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sat, 10 May 2014 18:24:07 +0200 Subject: [ticket/10899] Refactoring in \phpbb\log\log_interface PHPBB3-10899 --- phpBB/includes/acp/acp_logs.php | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'phpBB/includes/acp/acp_logs.php') diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index 4e5db058fb..11d911151b 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -53,7 +53,7 @@ class acp_logs { if (confirm_box(true)) { - $where_sql = ''; + $conditions = array(); if ($deletemark && sizeof($marked)) { @@ -62,27 +62,23 @@ class acp_logs { $sql_in[] = $mark; } - $where_sql = ' AND ' . $db->sql_in_set('log_id', $sql_in); + $conditions['log_id'] = $sql_in; unset($sql_in); } if ($deleteall) { - $where_sql = ($sort_days) ? 'AND log_time >= ' . (time() - ($sort_days * 86400)) : ''; + if ($sort_days) + { + $conditions['log_time'] = array('>=', time() - ($sort_days * 86400)); + } + $keywords = utf8_normalize_nfc(request_var('keywords', '', true)); - $keywords_where = $phpbb_log->generate_sql_keyword($keywords, ''); - $where_sql .= ' ' . $keywords_where; + $conditions['keywords'] = $keywords; } - if ($where_sql) - { - $sql = 'DELETE FROM ' . LOG_TABLE . " - WHERE log_type = {$this->log_type} - $where_sql"; - $db->sql_query($sql); - - add_log('admin', 'LOG_CLEAR_' . strtoupper($mode)); - } + $conditions['log_type'] = $this->log_type; + $phpbb_log->delete($mode, $conditions); } else { -- cgit v1.2.1 From ac1eb2d789d81381fd2298c03a1960707e1c90c3 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 27 May 2014 19:57:25 +0200 Subject: [ticket/10899] Get $phpbb_log from the container PHPBB3-10899 --- phpBB/includes/acp/acp_logs.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/includes/acp/acp_logs.php') diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index 11d911151b..c5443ef5ee 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -26,7 +26,7 @@ class acp_logs { global $db, $user, $auth, $template, $cache, $phpbb_container; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; - global $request, $phpbb_log; + global $request; $user->add_lang('mcp'); @@ -78,6 +78,8 @@ class acp_logs } $conditions['log_type'] = $this->log_type; + + $phpbb_log = $phpbb_container->get('log'); $phpbb_log->delete($mode, $conditions); } else -- cgit v1.2.1