1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/10899] Update doc block
  [ticket/10899] Use isset($field_value['IN'])
  [ticket/10899] Add event core.delete_log
  [ticket/10899] Remove trailing ;
  [ticket/10899] Fix typo in the class name
  [ticket/10899] Add unit tests
  [ticket/10899] Get $phpbb_log from the container
  [ticket/10899] Remove extra ';'
  [ticket/10899] Typo
  [ticket/10899] Refactoring in \phpbb\log\log_interface
  [ticket/10899] Using Delete All in log viewer with keyword search
This commit is contained in:
Joas Schilling
2014-05-30 23:13:09 +02:00
7 changed files with 445 additions and 26 deletions

60
tests/log/delete_test.php Normal file
View File

@@ -0,0 +1,60 @@
<?php
/**
*
* @package testing
* @copyright (c) 2012 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
class phpbb_log_delete_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/delete_log.xml');
}
public function test_log_delete()
{
global $phpbb_root_path, $phpEx, $db, $phpbb_dispatcher, $auth;
$db = $this->new_dbal();
$cache = new phpbb_mock_cache;
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$user = $this->getMock('\phpbb\user');
$user->data['user_id'] = 1;
$auth = $this->getMock('\phpbb\auth\auth');
$log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
// Delete all admin logs
$this->assertCount(2, $log->get_logs('admin'));
$log->delete('admin');
// One entry is added to the admin log when the logs are purged
$this->assertCount(1, $log->get_logs('admin'));
// Delete with keyword
$this->assertCount(1, $log->get_logs('mod', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC', 'guest'));
$log->delete('mod', array('keywords' => 'guest'));
$this->assertEmpty($log->get_logs('mod', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC', 'guest'));
// Delete with simples conditions
$this->assertCount(3, $log->get_logs('mod', false, 0, 0, 12, 0, 1, 0, 'l.log_time DESC'));
$log->delete('mod', array('forum_id' => 12, 'user_id' => 1));
$this->assertEmpty($log->get_logs('mod', false, 0, 0, 12, 0, 1, 0, 'l.log_time DESC'));
// Delete with IN condition
$this->assertCount(2, $log->get_logs('mod', false, 0, 0, array(13, 14), 0, 0, 0, 'l.log_time DESC'));
$log->delete('mod', array('forum_id' => array('IN' => array(14, 13))));
$this->assertEmpty($log->get_logs('mod', false, 0, 0, array(13, 14), 0, 0, 0, 'l.log_time DESC'));
// Delete with a custom condition (ie: WHERE x >= 10)
$this->assertCount(3, $log->get_logs('critical', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC'));
$log->delete('critical', array('user_id' => array('>', 1)));
$this->assertCount(1, $log->get_logs('critical', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC'));
}
}

View File

@@ -0,0 +1,232 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_log">
<column>log_id</column>
<column>log_type</column>
<column>user_id</column>
<column>forum_id</column>
<column>topic_id</column>
<column>reportee_id</column>
<column>log_ip</column>
<column>log_time</column>
<column>log_operation</column>
<column>log_data</column>
<row>
<value>1</value>
<value>0</value>
<value>1</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value>LOG_INSTALL_INSTALLED</value>
<value>a:1:{i:0;s:9:"3.1.0-dev";}</value>
</row>
<row>
<value>2</value>
<value>0</value>
<value>1</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value>LOG_KEY_NOT_EXISTS</value>
<value>a:1:{i:0;s:15:"additional_data";}</value>
</row>
<row>
<value>3</value>
<value>2</value>
<value>1</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value>LOG_CRITICAL</value>
<value>a:1:{i:0;s:13:"critical data";}</value>
</row>
<row>
<value>4</value>
<value>1</value>
<value>1</value>
<value>12</value>
<value>34</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value>LOG_MOD</value>
<value></value>
</row>
<row>
<value>5</value>
<value>1</value>
<value>1</value>
<value>12</value>
<value>45</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value>LOG_MOD</value>
<value></value>
</row>
<row>
<value>6</value>
<value>1</value>
<value>1</value>
<value>23</value>
<value>56</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value>LOG_MOD</value>
<value></value>
</row>
<row>
<value>7</value>
<value>1</value>
<value>1</value>
<value>12</value>
<value>45</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value>LOG_MOD2</value>
<value></value>
</row>
<row>
<value>8</value>
<value>3</value>
<value>1</value>
<value>0</value>
<value>0</value>
<value>2</value>
<value>127.0.0.1</value>
<value>1</value>
<value>LOG_USER</value>
<value>a:1:{i:0;s:5:"admin";}</value>
</row>
<row>
<value>9</value>
<value>3</value>
<value>1</value>
<value>0</value>
<value>0</value>
<value>1</value>
<value>127.0.0.1</value>
<value>1</value>
<value>LOG_USER</value>
<value>a:1:{i:0;s:5:"guest";}</value>
</row>
<row>
<value>10</value>
<value>3</value>
<value>1</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value>LOG_SINGULAR_PLURAL</value>
<value>a:1:{i:0;i:2;}</value>
</row>
<row>
<value>11</value>
<value>1</value>
<value>1</value>
<value>15</value>
<value>3</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value>LOG_MOD3</value>
<value>a:1:{i:0;s:5:"guest";}</value>
</row>
<row>
<value>12</value>
<value>1</value>
<value>1</value>
<value>13</value>
<value>0</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value></value>
<value></value>
</row>
<row>
<value>13</value>
<value>1</value>
<value>1</value>
<value>14</value>
<value>0</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value></value>
<value></value>
</row>
<row>
<value>14</value>
<value>2</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value></value>
<value></value>
</row>
<row>
<value>15</value>
<value>2</value>
<value>2</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>127.0.0.1</value>
<value>1</value>
<value></value>
<value></value>
</row>
</table>
<table name="phpbb_users">
<column>user_id</column>
<column>username</column>
<column>username_clean</column>
<column>user_permissions</column>
<column>user_sig</column>
<row>
<value>1</value>
<value>Anonymous</value>
<value>Anonymous</value>
<value></value>
<value></value>
</row>
<row>
<value>2</value>
<value>admin</value>
<value>admin</value>
<value></value>
<value></value>
</row>
</table>
<table name="phpbb_topics">
<column>topic_id</column>
<column>forum_id</column>
<row>
<value>34</value>
<value>12</value>
</row>
<row>
<value>45</value>
<value>12</value>
</row>
<row>
<value>56</value>
<value>23</value>
</row>
</table>
</dataset>