mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/10899] Refactoring in \phpbb\log\log_interface

Browse Source 
PHPBB3-10899
This commit is contained in:
Tristan Darricau
2014-05-10 18:24:07 +02:00
parent c5a4ad3d31
commit c6d7875b9b
5 changed files with 100 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
phpBB/includes/acp/acp_logs.php
View File

@@ -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
{

34
phpBB/includes/mcp/mcp_logs.php
View File

@@ -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