From 877d852a5290ffddf24fb33a3e8264dd5ccd234c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 24 May 2010 20:12:34 +0200 Subject: [PATCH 1/8] [ticket/9605] Wrong class added to topiclist, when there's no announcement topic. Just added a check whether the type is announcement or higher. PHPBB3-9605 --- phpBB/styles/prosilver/template/viewforum_body.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index cc38ed9d2b..1c9ec7bc4a 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -122,7 +122,7 @@ -
+
  • From c7a25c58b893fc72ffb3746374ece9de1d388531 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 24 May 2010 23:59:28 +0200 Subject: [PATCH 2/8] [ticket/9587] Prosilver overrides reCaptcha class. PHPBB3-9587 --- phpBB/styles/prosilver/theme/forms.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 4db342661c..4516c7fcd2 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -96,6 +96,11 @@ fieldset.fields1 div { margin-bottom: 3px; } +/* Set it back to 0px for the reCaptcha divs: PHPBB3-9587 */ +fieldset.fields1 #recaptcha_widget_div div { + margin-bottom: 0px; +} + /* Specific layout 2 */ fieldset.fields2 dt { width: 15em; From b03a7a2c833037e6924b622b56b79778052ecd73 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 27 Mar 2010 14:21:19 +0100 Subject: [PATCH 3/8] [feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: "" PHPBB3-9625 --- tests/dbal/dbal.php | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/tests/dbal/dbal.php b/tests/dbal/dbal.php index f90b5efeb5..02fe8c29a9 100644 --- a/tests/dbal/dbal.php +++ b/tests/dbal/dbal.php @@ -21,10 +21,7 @@ class phpbb_dbal_test extends phpbb_database_test_case { return array( array('phpbb_users', "username_clean = 'bertie'", array(array('username_clean' => 'bertie'))), - array('phpbb_users', "username_clean = 'phpBB'", array()), array('phpbb_users', 'username_clean syntax_error', false), - array('phpbb_users', 'column_not_exists = 2', false), - array('table_not_exists', 'column_not_exists = 2', false), ); } @@ -103,7 +100,6 @@ class phpbb_dbal_test extends phpbb_database_test_case return array( array('', array('barfoo', 'foobar', 'bertie')), array('user_id = 2', array('foobar')), - array("username_clean = 'bertie'", array('bertie')), ); } @@ -138,7 +134,6 @@ class phpbb_dbal_test extends phpbb_database_test_case array(0, 1, array(array('username_clean' => 'foobar'), array('username_clean' => 'bertie'))), array(1, 0, array(array('username_clean' => 'barfoo'))), - array(1, 1, array(array('username_clean' => 'foobar'))), array(1, 2, array(array('username_clean' => 'bertie'))), array(2, 0, array(array('username_clean' => 'barfoo'), array('username_clean' => 'foobar'))), @@ -180,9 +175,6 @@ class phpbb_dbal_test extends phpbb_database_test_case array('bar*', array(array('username_clean' => 'barfoo'))), array('*bar*', array(array('username_clean' => 'barfoo'), array('username_clean' => 'foobar'))), - array('*b*', array(array('username_clean' => 'barfoo'), - array('username_clean' => 'foobar'), - array('username_clean' => 'bertie'))), array('b*r', array()), array('b*e', array(array('username_clean' => 'bertie'))), array('#b*e', array()), @@ -220,11 +212,11 @@ class phpbb_dbal_test extends phpbb_database_test_case array('username_clean' => 'foobar'))), array('user_id', 3, true, true, array(array('username_clean' => 'barfoo'), array('username_clean' => 'foobar'))), - array('user_id', '3', false, false, array(array('username_clean' => 'bertie'))), - array('user_id', '3', false, true, array(array('username_clean' => 'bertie'))), - array('user_id', '3', true, false, array(array('username_clean' => 'barfoo'), + array('username_clean', 'bertie', false, false, array(array('username_clean' => 'bertie'))), + array('username_clean', 'bertie', false, true, array(array('username_clean' => 'bertie'))), + array('username_clean', 'bertie', true, false, array(array('username_clean' => 'barfoo'), array('username_clean' => 'foobar'))), - array('user_id', '3', true, true, array(array('username_clean' => 'barfoo'), + array('username_clean', 'bertie', true, true, array(array('username_clean' => 'barfoo'), array('username_clean' => 'foobar'))), array('user_id', array(3), false, false, array(array('username_clean' => 'bertie'))), array('user_id', array(3), false, true, array(array('username_clean' => 'bertie'))), @@ -238,12 +230,12 @@ class phpbb_dbal_test extends phpbb_database_test_case array('username_clean' => 'bertie'))), array('user_id', array(1, 3), true, false, array(array('username_clean' => 'foobar'))), array('user_id', array(1, 3), true, true, array(array('username_clean' => 'foobar'))), - array('user_id', '', false, false, array()), - array('user_id', '', false, true, array()), - array('user_id', '', true, false, array(array('username_clean' => 'barfoo'), + array('username_clean', '', false, false, array()), + array('username_clean', '', false, true, array()), + array('username_clean', '', true, false, array(array('username_clean' => 'barfoo'), array('username_clean' => 'foobar'), array('username_clean' => 'bertie'))), - array('user_id', '', true, true, array(array('username_clean' => 'barfoo'), + array('username_clean', '', true, true, array(array('username_clean' => 'barfoo'), array('username_clean' => 'foobar'), array('username_clean' => 'bertie'))), array('user_id', array(), false, true, array()), From 539ae0ffafb7981e5d1918183044487f8a6c3a9e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 13 Apr 2010 20:12:09 +0200 Subject: [PATCH 4/8] [feature/dbal-tests] Insert data PHPBB3-9625 --- tests/dbal/dbal.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/dbal/dbal.php b/tests/dbal/dbal.php index 02fe8c29a9..98f31d9398 100644 --- a/tests/dbal/dbal.php +++ b/tests/dbal/dbal.php @@ -316,5 +316,39 @@ class phpbb_dbal_test extends phpbb_database_test_case $db->sql_freeresult($result); } + + public static function build_array_insert_data() + { + return array( + array(array( + 'config_name' => 'test_version', + 'config_value' => '0.0.0', + 'is_dynamic' => 1, + )), + array(array( + 'config_name' => 'second config', + 'config_value' => '10', + 'is_dynamic' => 0, + )), + ); + } + + /** + * @dataProvider build_array_insert_data + */ + public function test_build_array_insert($sql_ary) + { + $db = $this->new_dbal(); + + $result = $db->sql_query('INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary)); + + $result = $db->sql_query_limit("SELECT * + FROM phpbb_config + WHERE config_name = '" . $sql_ary['config_name'] . "'", 1); + + $this->assertEquals($sql_ary, $db->sql_fetchrow($result)); + + $db->sql_freeresult($result); + } } From c4b0814c62c592c85a4b960f1b62891e640f9a66 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 13 Apr 2010 20:12:54 +0200 Subject: [PATCH 5/8] [feature/dbal-tests] Delete data PHPBB3-9625 --- tests/dbal/dbal.php | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tests/dbal/dbal.php b/tests/dbal/dbal.php index 98f31d9398..2ca352e2c6 100644 --- a/tests/dbal/dbal.php +++ b/tests/dbal/dbal.php @@ -350,5 +350,35 @@ class phpbb_dbal_test extends phpbb_database_test_case $db->sql_freeresult($result); } + + public static function delete_data() + { + return array( + array("WHERE config_name = 'test_version'", array(array( + 'config_name' => 'second config', + 'config_value' => '10', + 'is_dynamic' => 0, + ))), + array('', array()), + ); + } + + /** + * @dataProvider delete_data + */ + public function test_delete($where, $expected) + { + $db = $this->new_dbal(); + + $result = $db->sql_query('DELETE FROM phpbb_config + ' . $where); + + $result = $db->sql_query('SELECT * + FROM phpbb_config'); + + $this->assertEquals($expected, $db->sql_fetchrowset($result)); + + $db->sql_freeresult($result); + } } From d9c2e6cbcf7d7d3938656e4490aaf117a97e3448 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 13 Apr 2010 20:13:41 +0200 Subject: [PATCH 6/8] [feature/dbal-tests] Multi insert PHPBB3-9625 --- tests/dbal/dbal.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/dbal/dbal.php b/tests/dbal/dbal.php index 2ca352e2c6..9db11fb3d5 100644 --- a/tests/dbal/dbal.php +++ b/tests/dbal/dbal.php @@ -380,5 +380,31 @@ class phpbb_dbal_test extends phpbb_database_test_case $db->sql_freeresult($result); } + + public function test_multiple_insert() + { + $db = $this->new_dbal(); + + $batch_ary = array(); + $batch_ary[] = array( + 'config_name' => 'batch one', + 'config_value' => 'b1', + 'is_dynamic' => 0, + ); + $batch_ary[] = array( + 'config_name' => 'batch two', + 'config_value' => 'b2', + 'is_dynamic' => 1, + ); + + $result = $db->sql_multi_insert('phpbb_config', $batch_ary); + + $result = $db->sql_query('SELECT * + FROM phpbb_config'); + + $this->assertEquals($batch_ary, $db->sql_fetchrowset($result)); + + $db->sql_freeresult($result); + } } From e3420de295fdc1e4301882b9b764b9732669a7d0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 13 Apr 2010 20:23:46 +0200 Subject: [PATCH 7/8] [feature/dbal-tests] Update data PHPBB3-9625 --- tests/dbal/dbal.php | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tests/dbal/dbal.php b/tests/dbal/dbal.php index 9db11fb3d5..2eec4363f8 100644 --- a/tests/dbal/dbal.php +++ b/tests/dbal/dbal.php @@ -406,5 +406,47 @@ class phpbb_dbal_test extends phpbb_database_test_case $db->sql_freeresult($result); } + + public static function update_data() + { + return array( + array(array('config_value' => '20', 'is_dynamic' => 0), " WHERE config_name = 'batch one'", array(array( + 'config_name' => 'batch one', + 'config_value' => '20', + 'is_dynamic' => 0, + ), array( + 'config_name' => 'batch two', + 'config_value' => 'b2', + 'is_dynamic' => 1, + ))), + array(array('config_value' => '0', 'is_dynamic' => 1), '', array(array( + 'config_name' => 'batch one', + 'config_value' => '0', + 'is_dynamic' => 1, + ), array( + 'config_name' => 'batch two', + 'config_value' => '0', + 'is_dynamic' => 1, + ))), + ); + } + + /** + * @dataProvider update_data + */ + public function test_update($sql_ary, $where, $expected) + { + $db = $this->new_dbal(); + + $result = $db->sql_query('UPDATE phpbb_config + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where); + + $result = $db->sql_query('SELECT * + FROM phpbb_config'); + + $this->assertEquals($expected, $db->sql_fetchrowset($result)); + + $db->sql_freeresult($result); + } } From ef69f226989442d5fda08fa193f81242e7312ab8 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 17 Jun 2010 15:57:02 +0200 Subject: [PATCH 8/8] [feature/dbal-tests] Follow the coding guidelines and ... resolved a bug caused by a missing order-by. PHPBB3-9625 --- tests/dbal/dbal.php | 138 ++++++++++++++++++++++++++++---------------- 1 file changed, 88 insertions(+), 50 deletions(-) diff --git a/tests/dbal/dbal.php b/tests/dbal/dbal.php index 2eec4363f8..1cce891ca9 100644 --- a/tests/dbal/dbal.php +++ b/tests/dbal/dbal.php @@ -302,10 +302,11 @@ class phpbb_dbal_test extends phpbb_database_test_case $db->sql_return_on_error(true); } - $result = $db->sql_query('SELECT username_clean + $sql = 'SELECT username_clean FROM phpbb_users WHERE ' . $db->sql_build_array('SELECT', $assoc_ary) . ' - ORDER BY user_id ASC'); + ORDER BY user_id ASC'; + $result = $db->sql_query($sql); if ($catch_error) { @@ -340,11 +341,13 @@ class phpbb_dbal_test extends phpbb_database_test_case { $db = $this->new_dbal(); - $result = $db->sql_query('INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary)); + $sql = 'INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary); + $result = $db->sql_query($sql); - $result = $db->sql_query_limit("SELECT * + $sql = "SELECT * FROM phpbb_config - WHERE config_name = '" . $sql_ary['config_name'] . "'", 1); + WHERE config_name = '" . $sql_ary['config_name'] . "'"; + $result = $db->sql_query_limit($sql, 1); $this->assertEquals($sql_ary, $db->sql_fetchrow($result)); @@ -354,12 +357,20 @@ class phpbb_dbal_test extends phpbb_database_test_case public static function delete_data() { return array( - array("WHERE config_name = 'test_version'", array(array( - 'config_name' => 'second config', - 'config_value' => '10', - 'is_dynamic' => 0, - ))), - array('', array()), + array( + "WHERE config_name = 'test_version'", + array( + array( + 'config_name' => 'second config', + 'config_value' => '10', + 'is_dynamic' => 0, + ), + ), + ), + array( + '', + array(), + ), ); } @@ -370,11 +381,13 @@ class phpbb_dbal_test extends phpbb_database_test_case { $db = $this->new_dbal(); - $result = $db->sql_query('DELETE FROM phpbb_config - ' . $where); + $sql = 'DELETE FROM phpbb_config + ' . $where; + $result = $db->sql_query($sql); - $result = $db->sql_query('SELECT * - FROM phpbb_config'); + $sql = 'SELECT * + FROM phpbb_config'; + $result = $db->sql_query($sql); $this->assertEquals($expected, $db->sql_fetchrowset($result)); @@ -385,22 +398,25 @@ class phpbb_dbal_test extends phpbb_database_test_case { $db = $this->new_dbal(); - $batch_ary = array(); - $batch_ary[] = array( - 'config_name' => 'batch one', - 'config_value' => 'b1', - 'is_dynamic' => 0, - ); - $batch_ary[] = array( - 'config_name' => 'batch two', - 'config_value' => 'b2', - 'is_dynamic' => 1, + $batch_ary = array( + array( + 'config_name' => 'batch one', + 'config_value' => 'b1', + 'is_dynamic' => 0, + ), + array( + 'config_name' => 'batch two', + 'config_value' => 'b2', + 'is_dynamic' => 1, + ), ); $result = $db->sql_multi_insert('phpbb_config', $batch_ary); - $result = $db->sql_query('SELECT * - FROM phpbb_config'); + $sql = 'SELECT * + FROM phpbb_config + ORDER BY config_name ASC'; + $result = $db->sql_query($sql); $this->assertEquals($batch_ary, $db->sql_fetchrowset($result)); @@ -410,24 +426,44 @@ class phpbb_dbal_test extends phpbb_database_test_case public static function update_data() { return array( - array(array('config_value' => '20', 'is_dynamic' => 0), " WHERE config_name = 'batch one'", array(array( - 'config_name' => 'batch one', - 'config_value' => '20', - 'is_dynamic' => 0, - ), array( - 'config_name' => 'batch two', - 'config_value' => 'b2', - 'is_dynamic' => 1, - ))), - array(array('config_value' => '0', 'is_dynamic' => 1), '', array(array( - 'config_name' => 'batch one', - 'config_value' => '0', - 'is_dynamic' => 1, - ), array( - 'config_name' => 'batch two', - 'config_value' => '0', - 'is_dynamic' => 1, - ))), + array( + array( + 'config_value' => '20', + 'is_dynamic' => 0, + ), + " WHERE config_name = 'batch one'", + array( + array( + 'config_name' => 'batch one', + 'config_value' => '20', + 'is_dynamic' => 0, + ), + array( + 'config_name' => 'batch two', + 'config_value' => 'b2', + 'is_dynamic' => 1, + ), + ), + ), + array( + array( + 'config_value' => '0', + 'is_dynamic' => 1, + ), + '', + array( + array( + 'config_name' => 'batch one', + 'config_value' => '0', + 'is_dynamic' => 1, + ), + array( + 'config_name' => 'batch two', + 'config_value' => '0', + 'is_dynamic' => 1, + ), + ), + ), ); } @@ -438,15 +474,17 @@ class phpbb_dbal_test extends phpbb_database_test_case { $db = $this->new_dbal(); - $result = $db->sql_query('UPDATE phpbb_config - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where); + $sql = 'UPDATE phpbb_config + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where; + $result = $db->sql_query($sql); - $result = $db->sql_query('SELECT * - FROM phpbb_config'); + $sql = 'SELECT * + FROM phpbb_config + ORDER BY config_name ASC'; + $result = $db->sql_query($sql); $this->assertEquals($expected, $db->sql_fetchrowset($result)); $db->sql_freeresult($result); } } -