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

Merge pull request #2526 from Nicofuma/ticket/12639

Browse Source 
[ticket/12639] Delete entry in admin-log leads to mysql-error

* Nicofuma/ticket/12639:
  [ticket/12639] Add a space in the code generated by generate_sql_keyword()
  [ticket/12639] Handle $conditions['keywords'] outside of the loop
  [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs
  [ticket/12639] Send a correct IN entry when deleting marked logs
  [ticket/12639] Use assertSame
  [ticket/12639] Remove old commented tests
  [ticket/12639] Order the results correctly in the test
  [ticket/12639] Fix tests on postgres
  [ticket/12639] Update tests to use a dataProvider
  [ticket/12639] Add a test case with an empty keywords list
  [ticket/12639] Delete entry in admin-log leads to mysql-error
This commit is contained in:
Andreas Fischer 2014-06-04 23:59:20 +02:00
commit f9c0a6b96e
4 changed files with 143 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,13 +58,7 @@ class acp_logs
if ($deletemark && sizeof($marked))
{
$sql_in = array();
foreach ($marked as $mark)
{
$sql_in[] = $mark;
}
$conditions['log_id'] = $sql_in;
unset($sql_in);
$conditions['log_id'] = array('IN' => $marked);
}
if ($deleteall)
@ -78,8 +72,6 @@ class acp_logs
$conditions['keywords'] = $keywords;
}
$conditions['log_type'] = $this->log_type;
$phpbb_log = $phpbb_container->get('log');
$phpbb_log->delete($mode, $conditions);
}

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

@ -115,9 +115,8 @@ class mcp_logs
if ($deletemark && sizeof($marked))
{
$conditions = array(
'log_type' => LOG_MOD,
'forum_id' => $forum_list,
'log_id' => $marked,
'log_id' => array('IN' => $marked),
);
$phpbb_log->delete('mod', $conditions);
@ -127,7 +126,6 @@ class mcp_logs
$keywords = utf8_normalize_nfc(request_var('keywords', '', true));
$conditions = array(
'log_type' => LOG_MOD,
'forum_id' => $forum_list,
'keywords' => $keywords,
);

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

@ -391,28 +391,29 @@ class log implements \phpbb\log\log_interface
}
$sql_where = 'WHERE log_type = ' . $log_type;
if (isset($conditions['keywords']))
{
$sql_where .= $this->generate_sql_keyword($conditions['keywords'], '');
unset($conditions['keywords']);
}
foreach ($conditions as $field => $field_value)
{
$sql_where .= ' AND ';
if ($field == 'keywords')
if (is_array($field_value) && sizeof($field_value) == 2 && !is_array($field_value[1]))
{
$sql_where .= $this->generate_sql_keyword($field_value, '', '');
$sql_where .= $field . ' ' . $field_value[0] . ' ' . $field_value[1];
}
else if (is_array($field_value) && isset($field_value['IN']) && is_array($field_value['IN']))
{
$sql_where .= $this->db->sql_in_set($field, $field_value['IN']);
}
else
{
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) && isset($field_value['IN']) && is_array($field_value['IN']))
{
$sql_where .= $this->db->sql_in_set($field, $field_value['IN']);
}
else
{
$sql_where .= $field . ' = ' . $field_value;
}
$sql_where .= $field . ' = ' . $field_value;
}
}
@ -781,7 +782,7 @@ class log implements \phpbb\log\log_interface
}
}
$sql_keywords = $statement_operator . ' (';
$sql_keywords = ' ' . $statement_operator . ' (';
if (!empty($operations))
{
$sql_keywords .= $this->db->sql_in_set($table_alias . 'log_operation', $operations) . ' OR ';

153
tests/log/delete_test.php
View File

@ -1,9 +1,13 @@
<?php
/**
*
* @package testing
* @copyright (c) 2012 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
@ -13,48 +17,141 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
class phpbb_log_delete_test extends phpbb_database_test_case
{
protected $log;
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/delete_log.xml');
}
public function test_log_delete()
protected function setUp()
{
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);
$this->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'));
parent::setUp();
}
// 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'));
public function log_delete_data()
{
return array(
array(
array(1, 2),
array(16),
array(),
'admin',
false,
0,
0,
0,
0,
0,
0,
'l.log_id ASC',
'',
),
array(
array(11),
array(),
array('keywords' => 'guest'),
'mod',
false,
0,
0,
0,
0,
0,
0,
'l.log_id ASC',
'guest',
),
array(
array(4, 5, 7),
array(),
array('forum_id' => 12, 'user_id' => 1),
'mod',
false,
0,
0,
12,
0,
1,
0,
'l.log_id ASC',
'',
),
array(
array(12, 13),
array(),
array('forum_id' => array('IN' => array(14, 13))),
'mod',
false,
0,
0,
array(13, 14),
0,
0,
0,
'l.log_id ASC',
'',
),
array(
array(3, 14, 15),
array(3),
array('user_id' => array('>', 1)),
'critical',
false,
0,
0,
0,
0,
0,
0,
'l.log_id ASC',
'',
),
array(
array(3, 14, 15),
array(),
array('keywords' => ''),
'critical',
false,
0,
0,
0,
0,
0,
0,
'l.log_id ASC',
'',
),
);
}
// 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'));
/**
* @dataProvider log_delete_data
*/
public function test_log_delete($expected_before, $expected_after, $delete_conditions, $mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $log_time, $sort_by, $keywords)
{
$this->assertSame($expected_before, $this->get_ids($this->log->get_logs($mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $log_time, $sort_by, $keywords)), 'before');
$this->log->delete($mode, $delete_conditions);
$this->assertSame($expected_after, $this->get_ids($this->log->get_logs($mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $log_time, $sort_by, $keywords)), 'after');
}
// 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'));
public function get_ids($logs)
{
$ids = array();
foreach ($logs as $log_entry)
{
$ids[] = (int) $log_entry['id'];
}
return $ids;
}
}