diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-10 18:24:07 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-10 18:24:07 +0200 |
| commit | c6d7875b9b76a931e27e8dbf742ad7af25fe19cf (patch) | |
| tree | 07375bcbab50bd4904d903fd6a403cab03c3d8a1 /phpBB/includes/mcp | |
| parent | c5a4ad3d31047f9580b19b3401ef523b0fd53733 (diff) | |
| download | forums-c6d7875b9b76a931e27e8dbf742ad7af25fe19cf.tar forums-c6d7875b9b76a931e27e8dbf742ad7af25fe19cf.tar.gz forums-c6d7875b9b76a931e27e8dbf742ad7af25fe19cf.tar.bz2 forums-c6d7875b9b76a931e27e8dbf742ad7af25fe19cf.tar.xz forums-c6d7875b9b76a931e27e8dbf742ad7af25fe19cf.zip | |
[ticket/10899] Refactoring in \phpbb\log\log_interface
PHPBB3-10899
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_logs.php | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php index c51877002b..be4f7c5650 100644 --- a/phpBB/includes/mcp/mcp_logs.php +++ b/phpBB/includes/mcp/mcp_logs.php @@ -111,33 +111,35 @@ class mcp_logs { if ($deletemark && sizeof($marked)) { - $sql = 'DELETE FROM ' . LOG_TABLE . ' - WHERE log_type = ' . LOG_MOD . ' - AND ' . $db->sql_in_set('forum_id', $forum_list) . ' - AND ' . $db->sql_in_set('log_id', $marked); - $db->sql_query($sql); + $conditions = array( + 'log_type' => LOG_MOD, + 'forum_id' => $forum_list, + 'log_id' => $marked, + ); - add_log('admin', 'LOG_CLEAR_MOD'); + $phpbb_log->delete('mod', $conditions); } else 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; - $sql = 'DELETE FROM ' . LOG_TABLE . ' - WHERE log_type = ' . LOG_MOD . ' - AND ' . $db->sql_in_set('forum_id', $forum_list) . - $where_sql; + $conditions = array( + 'log_type' => LOG_MOD, + 'forum_id' => $forum_list, + 'keywords' => $keywords, + ); + + if ($sort_days) + { + $conditions['log_time'] = array('>=', time() - ($sort_days * 86400)); + } if ($mode == 'topic_logs') { - $sql .= ' AND topic_id = ' . $topic_id; + $conditions['topic_logs'] = $topic_id; } - $db->sql_query($sql); - add_log('admin', 'LOG_CLEAR_MOD'); + $phpbb_log->delete('mod', $conditions); } } else |