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/phpbb | |
| 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/phpbb')
| -rw-r--r-- | phpBB/phpbb/log/log.php | 57 | ||||
| -rw-r--r-- | phpBB/phpbb/log/log_interface.php | 12 | ||||
| -rw-r--r-- | phpBB/phpbb/log/null.php | 7 |
3 files changed, 72 insertions, 4 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index e3a0fa0261..a0d399ccee 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -330,6 +330,54 @@ class log implements \phpbb\log\log_interface } /** + * {@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 * * {@inheritDoc} @@ -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 '; diff --git a/phpBB/phpbb/log/log_interface.php b/phpBB/phpbb/log/log_interface.php index 420ba79691..dff43b946a 100644 --- a/phpBB/phpbb/log/log_interface.php +++ b/phpBB/phpbb/log/log_interface.php @@ -67,6 +67,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 * * @param string $mode The mode defines which log_type is used and ifrom which log the entry is retrieved diff --git a/phpBB/phpbb/log/null.php b/phpBB/phpbb/log/null.php index 77d0fbe2d7..2a79e74bbd 100644 --- a/phpBB/phpbb/log/null.php +++ b/phpBB/phpbb/log/null.php @@ -49,6 +49,13 @@ class null implements log_interface /** * {@inheritdoc} */ + public function delete($mode, $conditions = array()) + { + } + + /** + * {@inheritdoc} + */ public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '') { return array(); |