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

[ticket/9687] Fix code style and tests

PHPBB3-9687
This commit is contained in:
Oliver Schramm
2018-10-01 23:40:15 +02:00
committed by Marc Alexander
parent 64ab1fc24c
commit e7015bf1dd
17 changed files with 78 additions and 55 deletions

View File

@@ -33,8 +33,8 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
false, false, false, false, /* should be banned? -> */ false),
array('Matching values in the database, should be banned',
4, '127.0.0.1', 'bar@example.org', true, /* should be banned? -> */ true),
array('IP Banned, should be banned',
false, '127.1.1.1', false, false, /* should be banned? -> */ true),
array('IP Banned, should not be banned',
false, '127.1.1.1', false, false, /* should be banned? -> */ false),
);
}

View File

@@ -26,34 +26,46 @@
<value>1</value>
</row>
</table>
<table name="phpbb_banlist">
<table name="phpbb_bans">
<column>ban_id</column>
<column>ban_userid</column>
<column>ban_ip</column>
<column>ban_email</column>
<column>ban_mode</column>
<column>ban_item</column>
<column>ban_start</column>
<column>ban_end</column>
<column>ban_exclude</column>
<column>ban_reason</column>
<column>ban_give_reason</column>
<column>ban_reason_display</column>
<row>
<value>2</value>
<value>4</value>
<value>ip</value>
<value>127.0.0.1</value>
<value>bar@example.org</value>
<value>1111</value>
<value>0</value>
<value>0</value>
<value>HAHAHA</value>
<value>1</value>
</row>
<row>
<value>3</value>
<value>0</value>
<value>ip</value>
<value>127.1.1.1</value>
<value></value>
<value>1111</value>
<value>0</value>
<value>HAHAHA</value>
<value>1</value>
</row>
<row>
<value>4</value>
<value>user</value>
<value>4</value>
<value>1111</value>
<value>0</value>
<value>HAHAHA</value>
<value>1</value>
</row>
<row>
<value>5</value>
<value>email</value>
<value>bar@example.org</value>
<value>1111</value>
<value>0</value>
<value>HAHAHA</value>
<value>1</value>

View File

@@ -30,11 +30,13 @@
<column>session_ip</column>
<column>session_browser</column>
</table>
<table name="phpbb_banlist">
<table name="phpbb_bans">
<column>ban_id</column>
<column>ban_userid</column>
<column>ban_email</column>
<column>ban_mode</column>
<column>ban_item</column>
<column>ban_start</column>
<column>ban_end</column>
<column>ban_reason</column>
<column>ban_give_reason</column>
<column>ban_reason_display</column>
</table>
</dataset>