mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +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

57
phpBB/phpbb/log/log.php
View File

@@ -329,6 +329,54 @@ class log implements \phpbb\log\log_interface
return $this->db->sql_nextid();
}
/**
* {@inheritDoc}
*/
public function delete($mode, $conditions = array())
{
$sql_where = '';
$started = false;
foreach ($conditions as $field => $field_value)
{
if ($started)
{
$sql_where .= ' AND ';
}
else
{
$sql_where = 'WHERE ';
$started = true;
}
if ($field == 'keywords')
{
$sql_where .= $this->generate_sql_keyword($field_value, '', '');
}
else
{
if (is_array($field_value) && sizeof($field_value) == 2)
{
$sql_where .= $field . ' ' . $field_value[0] . ' ' . $field_value[1];
}
else if (is_array($field_value) && sizeof($field_value) > 2)
{
$sql_where .= $this->db->sql_in_set($field, $field_value);;
}
else
{
$sql_where .= $field . ' = ' . $field_value;
}
}
}
$sql = 'DELETE FROM ' . LOG_TABLE . "
$sql_where";
$this->db->sql_query($sql);
$this->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_CLEAR_' . strtoupper($mode));
}
/**
* Grab the logs from the database
*
@@ -636,12 +684,13 @@ class log implements \phpbb\log\log_interface
/**
* Generates a sql condition for the specified keywords
*
* @param string $keywords The keywords the user specified to search for
* @param string $table_alias The alias of the logs' table ('l.' by default)
* @param string $keywords The keywords the user specified to search for
* @param string $table_alias The alias of the logs' table ('l.' by default)
* @param string $statement_operator The operator used to prefix the statement ('AND' by default)
*
* @return string Returns the SQL condition searching for the keywords
*/
public function generate_sql_keyword($keywords, $table_alias = 'l.')
protected function generate_sql_keyword($keywords, $table_alias = 'l.', $statement_operator = 'AND')
{
// Use no preg_quote for $keywords because this would lead to sole
// backslashes being added. We also use an OR connection here for
@@ -686,7 +735,7 @@ class log implements \phpbb\log\log_interface
}
}
$sql_keywords = 'AND (';
$sql_keywords = $statement_operator . ' (';
if (!empty($operations))
{
$sql_keywords .= $this->db->sql_in_set($table_alias . 'log_operation', $operations) . ' OR ';

12
phpBB/phpbb/log/log_interface.php
View File

@@ -66,6 +66,18 @@ interface log_interface
*/
public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array());
/**
* Delete entries in the logs
*
* @param string $mode The mode defines which log_type is used and from which log the entries are deleted
* @param array $conditions An array of conditions, 3 different forms are accepted
* 1) <key> => 'value> transformed into 'AND <key> = <value>' (value should be an integer)
* 2) <key> => array(<operator>, <value>) transformed into 'AND <key> <operator> <value>' (value should be an integer)
* 3) <key> => array(<values>) transformed into 'AND <key> IN <values>'
* A special field, keywords, can also be defined. In this case only the log entries that have the keywords in log_operation or log_data will be deleted.
*/
public function delete($mode, $conditions = array());
/**
* Grab the logs from the database
*

7
phpBB/phpbb/log/null.php
View File

@@ -46,6 +46,13 @@ class null implements log_interface
return false;
}
/**
* {@inheritdoc}
*/
public function delete($mode, $conditions = array())
{
}
/**
* {@inheritdoc}
*/