diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-28 23:20:50 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-28 23:20:50 +0200 |
| commit | 59f39273d42bb863ffa0d46e017919bdbe39d8d5 (patch) | |
| tree | fdac34bafc989f25d667a5d9c96f32300499b5a7 /phpBB | |
| parent | d3f4dbedde157c316fe5a675de923e9b1e73d6f2 (diff) | |
| download | forums-59f39273d42bb863ffa0d46e017919bdbe39d8d5.tar forums-59f39273d42bb863ffa0d46e017919bdbe39d8d5.tar.gz forums-59f39273d42bb863ffa0d46e017919bdbe39d8d5.tar.bz2 forums-59f39273d42bb863ffa0d46e017919bdbe39d8d5.tar.xz forums-59f39273d42bb863ffa0d46e017919bdbe39d8d5.zip | |
[ticket/10899] Add event core.delete_log
PHPBB3-10899
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/log/log.php | 29 | ||||
| -rw-r--r-- | phpBB/phpbb/log/log_interface.php | 4 |
2 files changed, 28 insertions, 5 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 206a665283..6c0c160b58 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -360,6 +360,29 @@ class log implements \phpbb\log\log_interface $log_type = false; } + /** + * Allows to modify log data before we delete it from the database + * + * NOTE: if sql_ary does not contain a log_type value, the entry will + * not be deleted in the database. So ensure to set it, if needed. + * + * @event core.add_log + * @var string mode Mode of the entry we log + * @var string log_type Type ID of the log (should be different than false) + * @var 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>' (values can't be an array) + * 3) <key> => array('IN' => 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. + * @since 3.1.0-b4 + */ + $vars = array( + 'mode', + 'log_type', + 'conditions', + ); + extract($this->dispatcher->trigger_event('core.delete_log', compact($vars))); + if ($log_type === false) { return; @@ -376,13 +399,13 @@ class log implements \phpbb\log\log_interface } else { - if (is_array($field_value) && sizeof($field_value) == 2 && is_string($field_value[0])) + if (is_array($field_value) && sizeof($field_value) == 2 && !is_array($field_value[1])) { $sql_where .= $field . ' ' . $field_value[0] . ' ' . $field_value[1]; } - else if (is_array($field_value)) + else if (is_array($field_value) && sizeof($field_value) == 1 && is_array($field_value['IN'])) { - $sql_where .= $this->db->sql_in_set($field, $field_value); + $sql_where .= $this->db->sql_in_set($field, $field_value['IN']); } else { diff --git a/phpBB/phpbb/log/log_interface.php b/phpBB/phpbb/log/log_interface.php index 165eeaeed2..eb3f700953 100644 --- a/phpBB/phpbb/log/log_interface.php +++ b/phpBB/phpbb/log/log_interface.php @@ -72,8 +72,8 @@ interface log_interface * @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>' + * 2) <key> => array(<operator>, <value>) transformed into 'AND <key> <operator> <value>' (values can't be an array) + * 3) <key> => array('IN' => 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()); |