From 3703de63dd5208e0431d89e29affe3bf39cdd25a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 10 Jun 2013 16:45:27 +0200 Subject: [PATCH 01/12] [ticket/11600] Increase code test coverage of avatar manager Currently, not all methods and their possible behaviors are tested with unit tests. Add them for better code coverage. PHPBB3-11600 --- tests/avatar/manager_test.php | 114 +++++++++++++++++++++++++++------- 1 file changed, 92 insertions(+), 22 deletions(-) diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index cb895b521a..d8ab1f38ae 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -11,6 +11,8 @@ require_once dirname(__FILE__) . '/driver/foobar.php'; class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase { + protected $user; + public function setUp() { global $phpbb_root_path, $phpEx; @@ -19,24 +21,35 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase $this->phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); $this->phpbb_container->expects($this->any()) ->method('get') - ->with('avatar.driver.foobar')->will($this->returnValue('avatar.driver.foobar')); + ->will($this->returnArgument(0)); // Prepare dependencies for avatar manager and driver $config = new phpbb_config(array()); $request = $this->getMock('phpbb_request'); $cache = $this->getMock('phpbb_cache_driver_interface'); + // $this->avatar_foobar will be needed later on $this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache)); $this->avatar_foobar->expects($this->any()) - ->method('get_name') - ->will($this->returnValue('avatar.driver.foobar')); + ->method('get_name') + ->will($this->returnValue('avatar.driver.foobar')); + // barfoo driver can't be mocked with constructor arguments $this->avatar_barfoo = $this->getMock('phpbb_avatar_driver_barfoo', array('get_name')); $this->avatar_barfoo->expects($this->any()) - ->method('get_name') - ->will($this->returnValue('avatar.driver.barfoo')); - + ->method('get_name') + ->will($this->returnValue('avatar.driver.barfoo')); $avatar_drivers = array($this->avatar_foobar, $this->avatar_barfoo); + foreach ($this->avatar_drivers() as $driver) + { + $cur_avatar = $this->getMock('phpbb_avatar_driver_' . $driver, array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache)); + $cur_avatar->expects($this->any()) + ->method('get_name') + ->will($this->returnValue('avatar.driver.' . $driver)); + $config['allow_avatar_' . get_class($cur_avatar)] = false; + $avatar_drivers[] = $cur_avatar; + } + $config['allow_avatar_' . get_class($this->avatar_foobar)] = true; $config['allow_avatar_' . get_class($this->avatar_barfoo)] = false; @@ -44,28 +57,27 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase $this->manager = new phpbb_avatar_manager($config, $avatar_drivers, $this->phpbb_container); } - public function test_get_driver() + protected function avatar_drivers() { - $driver = $this->manager->get_driver('avatar.driver.foobar', false); - $this->assertEquals('avatar.driver.foobar', $driver); - - $driver = $this->manager->get_driver('avatar.driver.foo_wrong', false); - $this->assertNull($driver); - - $driver = $this->manager->get_driver('avatar.driver.foobar'); - $this->assertEquals('avatar.driver.foobar', $driver); - - $driver = $this->manager->get_driver('avatar.driver.foo_wrong'); - $this->assertNull($driver); + return array( + 'local', + 'upload', + 'remote', + 'gravatar', + ); } public function test_get_all_drivers() { $drivers = $this->manager->get_all_drivers(); - $this->assertArrayHasKey('avatar.driver.foobar', $drivers); - $this->assertArrayHasKey('avatar.driver.barfoo', $drivers); - $this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']); - $this->assertEquals('avatar.driver.barfoo', $drivers['avatar.driver.barfoo']); + $this->assertEquals(array( + 'avatar.driver.barfoo' => 'avatar.driver.barfoo', + 'avatar.driver.foobar' => 'avatar.driver.foobar', + 'avatar.driver.local' => 'avatar.driver.local', + 'avatar.driver.remote' => 'avatar.driver.remote', + 'avatar.driver.upload' => 'avatar.driver.upload', + 'avatar.driver.gravatar' => 'avatar.driver.gravatar', + ), $drivers); } public function test_get_enabled_drivers() @@ -76,6 +88,30 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase $this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']); } + public function get_driver_data() + { + return array( + array('avatar.driver.foobar', 'avatar.driver.foobar', false), + array('avatar.driver.foo_wrong', NULL, false), + array('avatar.driver.foobar', 'avatar.driver.foobar'), + array('avatar.driver.foo_wrong', NULL), + array('avatar.driver.local', 'avatar.driver.local', false), + array(AVATAR_GALLERY, 'avatar.driver.local', false), + array(AVATAR_UPLOAD, 'avatar.driver.upload', false), + array(AVATAR_REMOTE, 'avatar.driver.remote', false), + array(AVATAR_GALLERY, NULL), + ); + } + + /** + * @dataProvider get_driver_data + */ + public function test_get_driver($driver_name, $expected, $enabled_only = true) + { + $driver = $this->manager->get_driver($driver_name, $enabled_only); + $this->assertEquals($expected, $driver); + } + public function test_get_avatar_settings() { $avatar_settings = $this->manager->get_avatar_settings($this->avatar_foobar); @@ -157,4 +193,38 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase $this->assertArrayHasKey($key, $cleaned_row); } } + + public function test_clean_driver_name() + { + $this->assertEquals('avatar.driver.local', $this->manager->clean_driver_name('avatar_driver_local')); + } + + public function test_prepare_driver_name() + { + $this->assertEquals('avatar_driver_local', $this->manager->prepare_driver_name('avatar.driver.local')); + } + + public function test_localize_errors() + { + $this->user = $this->getMock('phpbb_user'); + $lang_array = array( + array('FOOBAR_OFF', 'foobar_off'), + array('FOOBAR_EXPLAIN', 'FOOBAR_EXPLAIN %s'), + ); + $this->user->expects($this->any()) + ->method('lang') + ->will($this->returnValueMap($lang_array)); + + // Pass error as string + $this->assertEquals(array('foobar_off'), $this->manager->localize_errors($this->user, array('FOOBAR_OFF'))); + + // Pass error as array for vsprintf() + $this->assertEquals(array('FOOBAR_EXPLAIN foo'), $this->manager->localize_errors($this->user, array(array('FOOBAR_EXPLAIN', 'foo')))); + + // Pass both types + $this->assertEquals(array('foobar_off', 'FOOBAR_EXPLAIN foo'), $this->manager->localize_errors($this->user, array( + 'FOOBAR_OFF', + array('FOOBAR_EXPLAIN', 'foo'), + ))); + } } From 25acf3f74cd5ea42dbdf23f5743feb17014c22a0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 25 Jun 2013 11:31:15 +0200 Subject: [PATCH 02/12] =?UTF-8?q?[=C5=A7icket/11600]=20Split=20get=20drive?= =?UTF-8?q?r=20tests=20into=20tests=20for=20all=20and=20only=20enabled=20o?= =?UTF-8?q?nes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PHPBB3-11600 --- tests/avatar/manager_test.php | 44 +++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index d8ab1f38ae..58cad06c5d 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -88,27 +88,51 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase $this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']); } - public function get_driver_data() + public function get_driver_data_enabled() { return array( - array('avatar.driver.foobar', 'avatar.driver.foobar', false), - array('avatar.driver.foo_wrong', NULL, false), array('avatar.driver.foobar', 'avatar.driver.foobar'), array('avatar.driver.foo_wrong', NULL), - array('avatar.driver.local', 'avatar.driver.local', false), - array(AVATAR_GALLERY, 'avatar.driver.local', false), - array(AVATAR_UPLOAD, 'avatar.driver.upload', false), - array(AVATAR_REMOTE, 'avatar.driver.remote', false), + array('avatar.driver.foobar', 'avatar.driver.foobar'), + array('avatar.driver.foo_wrong', NULL), + array('avatar.driver.local', NULL), + array(AVATAR_GALLERY, NULL), + array(AVATAR_UPLOAD, NULL), + array(AVATAR_REMOTE, NULL), array(AVATAR_GALLERY, NULL), ); } /** - * @dataProvider get_driver_data + * @dataProvider get_driver_data_enabled */ - public function test_get_driver($driver_name, $expected, $enabled_only = true) + public function test_get_driver_enabled($driver_name, $expected) { - $driver = $this->manager->get_driver($driver_name, $enabled_only); + $driver = $this->manager->get_driver($driver_name); + $this->assertEquals($expected, $driver); + } + + public function get_driver_data_all() + { + return array( + array('avatar.driver.foobar', 'avatar.driver.foobar'), + array('avatar.driver.foo_wrong', NULL), + array('avatar.driver.foobar', 'avatar.driver.foobar'), + array('avatar.driver.foo_wrong', NULL), + array('avatar.driver.local', 'avatar.driver.local'), + array(AVATAR_GALLERY, 'avatar.driver.local'), + array(AVATAR_UPLOAD, 'avatar.driver.upload'), + array(AVATAR_REMOTE, 'avatar.driver.remote'), + array(AVATAR_GALLERY, 'avatar.driver.local'), + ); + } + + /** + * @dataProvider get_driver_data_all + */ + public function test_get_driver_all($driver_name, $expected) + { + $driver = $this->manager->get_driver($driver_name, false); $this->assertEquals($expected, $driver); } From 72377075f465119241026728874e35791bbd1f0a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 25 Jun 2013 11:35:04 +0200 Subject: [PATCH 03/12] [ticket/11600] Use local variable for $user in test_localize_errors PHPBB3-11600 --- tests/avatar/manager_test.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index 58cad06c5d..4d332e6b0d 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -11,8 +11,6 @@ require_once dirname(__FILE__) . '/driver/foobar.php'; class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase { - protected $user; - public function setUp() { global $phpbb_root_path, $phpEx; @@ -230,23 +228,23 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase public function test_localize_errors() { - $this->user = $this->getMock('phpbb_user'); + $user = $this->getMock('phpbb_user'); $lang_array = array( array('FOOBAR_OFF', 'foobar_off'), array('FOOBAR_EXPLAIN', 'FOOBAR_EXPLAIN %s'), ); - $this->user->expects($this->any()) + $user->expects($this->any()) ->method('lang') ->will($this->returnValueMap($lang_array)); // Pass error as string - $this->assertEquals(array('foobar_off'), $this->manager->localize_errors($this->user, array('FOOBAR_OFF'))); + $this->assertEquals(array('foobar_off'), $this->manager->localize_errors($user, array('FOOBAR_OFF'))); // Pass error as array for vsprintf() - $this->assertEquals(array('FOOBAR_EXPLAIN foo'), $this->manager->localize_errors($this->user, array(array('FOOBAR_EXPLAIN', 'foo')))); + $this->assertEquals(array('FOOBAR_EXPLAIN foo'), $this->manager->localize_errors($user, array(array('FOOBAR_EXPLAIN', 'foo')))); // Pass both types - $this->assertEquals(array('foobar_off', 'FOOBAR_EXPLAIN foo'), $this->manager->localize_errors($this->user, array( + $this->assertEquals(array('foobar_off', 'FOOBAR_EXPLAIN foo'), $this->manager->localize_errors($user, array( 'FOOBAR_OFF', array('FOOBAR_EXPLAIN', 'foo'), ))); From 6fc997924c2c9792c8151db67e3273202951de3e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 25 Jun 2013 11:44:37 +0200 Subject: [PATCH 04/12] [ticket/11600] Use lowercase null and remove duplicate test cases PHPBB3-11600 --- tests/avatar/manager_test.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index 4d332e6b0d..ec2cba3f53 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -90,14 +90,12 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase { return array( array('avatar.driver.foobar', 'avatar.driver.foobar'), - array('avatar.driver.foo_wrong', NULL), - array('avatar.driver.foobar', 'avatar.driver.foobar'), - array('avatar.driver.foo_wrong', NULL), - array('avatar.driver.local', NULL), - array(AVATAR_GALLERY, NULL), - array(AVATAR_UPLOAD, NULL), - array(AVATAR_REMOTE, NULL), - array(AVATAR_GALLERY, NULL), + array('avatar.driver.foo_wrong', null), + array('avatar.driver.local', null), + array(AVATAR_GALLERY, null), + array(AVATAR_UPLOAD, null), + array(AVATAR_REMOTE, null), + array(AVATAR_GALLERY, null), ); } @@ -114,9 +112,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase { return array( array('avatar.driver.foobar', 'avatar.driver.foobar'), - array('avatar.driver.foo_wrong', NULL), - array('avatar.driver.foobar', 'avatar.driver.foobar'), - array('avatar.driver.foo_wrong', NULL), + array('avatar.driver.foo_wrong', null), array('avatar.driver.local', 'avatar.driver.local'), array(AVATAR_GALLERY, 'avatar.driver.local'), array(AVATAR_UPLOAD, 'avatar.driver.upload'), From 5afcb1d5f4f642d3ad6d8c1a98295e6b115d9a77 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 4 Jul 2013 21:15:02 +0200 Subject: [PATCH 05/12] [ticket/11600] Remove duplicate test case PHPBB3-11600 --- tests/avatar/manager_test.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index ec2cba3f53..4ebe79c9cd 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -95,7 +95,6 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase array(AVATAR_GALLERY, null), array(AVATAR_UPLOAD, null), array(AVATAR_REMOTE, null), - array(AVATAR_GALLERY, null), ); } @@ -117,7 +116,6 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase array(AVATAR_GALLERY, 'avatar.driver.local'), array(AVATAR_UPLOAD, 'avatar.driver.upload'), array(AVATAR_REMOTE, 'avatar.driver.remote'), - array(AVATAR_GALLERY, 'avatar.driver.local'), ); } From 600d3bd1f61c83c339be56eac0aa5ee8e9353fbb Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 23 May 2013 11:02:29 +0300 Subject: [PATCH 06/12] [ticket/11553] Move bulletin points to pseudo class Move bulletin points for .linklist lists to pseudo class Group pseudo classes for .linklist.bulletin and .icon-notification PHPBB3-11553 --- phpBB/styles/prosilver/template/forum_fn.js | 19 +++++++++++ .../styles/prosilver/template/index_body.html | 11 +++++-- .../prosilver/template/overall_footer.html | 23 +++++++------ .../prosilver/template/overall_header.html | 15 +++++---- phpBB/styles/prosilver/theme/buttons.css | 14 ++------ phpBB/styles/prosilver/theme/common.css | 32 +++++++++++++++++++ 6 files changed, 85 insertions(+), 29 deletions(-) diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index bb29f00490..019536ef86 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -385,3 +385,22 @@ function apply_onkeypress_event() { } jQuery(document).ready(apply_onkeypress_event); + +/** +* Adjust HTML code for IE8 and older versions +*/ +(function($) { + $(document).ready(function() { + var test = document.createElement('div'), + oldBrowser = (typeof test.style.borderRadius == 'undefined'); + delete test; + + if (!oldBrowser) { + return; + } + + // Fix .linkslist.bulletin lists + $('ul.linklist.bulletin li:first-child, ul.linklist.bulletin li.rightside:last-child').addClass('no-bulletin'); + }); +})(jQuery); + diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 57ad540a4a..e0a9279738 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -4,9 +4,16 @@

{CURRENT_TIME}
[ {L_MCP} ]

{CURRENT_TIME}

- -
    + diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 09021c771f..9336dd09f8 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -97,17 +97,9 @@ a.sendemail { padding: 1px 0 0 17px; } -.icon-notification:before, .icon-notification:after { - display: inline; - font: inherit; -} - -.icon-notification:before { - content: '['; -} - -.icon-notification:after { - content: ']'; +ul.linklist.bulletin li.icon-home:before, ul.linklist.bulletin li.icon-ucp:before, +ul.linklist.bulletin li.icon-bookmark:before, ul.linklist.bulletin li.icon-bump:before, ul.linklist.bulletin li.icon-subscribe:before, ul.linklist.bulletin li.icon-unsubscribe:before { + display: none; } /* Poster profile icons diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 89b3ab7ada..e0c8208fcf 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -356,6 +356,38 @@ ul.rightside { text-align: right; } +/* Bulletin icons for list items +----------------------------------------*/ +ul.linklist.bulletin li:before { + display: inline-block; + content: '•'; + font-size: inherit; + line-height: inherit; + padding-right: 4px; +} + +ul.linklist.bulletin li:first-child:before, ul.linklist.bulletin li.rightside:last-child:before { + display: none; +} + +ul.linklist.bulletin li.no-bulletin:before { + display: none; +} + +.icon-notification:before, ul.linklist.bulletin li.icon-notification:before, .icon-notification:after { + display: inline; + font: inherit; +} + +.icon-notification:before, ul.linklist.bulletin li.icon-notification:before { + content: '['; + padding-right: 0; +} + +.icon-notification:after { + content: ']'; +} + /* Table styles ----------------------------------------*/ table.table1 { From 5362f2a1c1a1071e6bad968fea70163943748fd6 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 11 Jul 2013 11:11:05 -0400 Subject: [PATCH 07/12] [ticket/11553] Replace bullet with unicode PHPBB3-11553 --- phpBB/styles/prosilver/theme/common.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e0c8208fcf..334d383f3e 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1,4 +1,4 @@ -/* CSS Reset http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 +f/* CSS Reset http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 ---------------------------------------- */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, @@ -360,7 +360,7 @@ ul.rightside { ----------------------------------------*/ ul.linklist.bulletin li:before { display: inline-block; - content: '•'; + content: "\2022"; font-size: inherit; line-height: inherit; padding-right: 4px; From 9b194ddb1efaa3351d9c8ba3df7db69e7636027e Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 11 Jul 2013 13:18:01 -0400 Subject: [PATCH 08/12] [ticket/11553] Typo PHPBB3-11553 --- phpBB/styles/prosilver/theme/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 334d383f3e..e58386de45 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1,4 +1,4 @@ -f/* CSS Reset http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 +/* CSS Reset http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 ---------------------------------------- */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, From 6bfa2fc0551af7e4eb99c1452031a2f423611a6f Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Sat, 13 Jul 2013 12:06:05 -0500 Subject: [PATCH 09/12] [ticket/11686] Not checking for phpBB Debug errors on functional tests PHPBB3-11686 --- tests/test_framework/phpbb_functional_test_case.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 684d7a84cb..66af0db2b1 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -577,6 +577,7 @@ class phpbb_functional_test_case extends phpbb_test_case // Any output before the doc type means there was an error $content = self::$client->getResponse()->getContent(); + self::assertNotContains('[phpBB Debug]', $content); self::assertStringStartsWith(' Date: Sat, 13 Jul 2013 14:57:31 -0400 Subject: [PATCH 10/12] [ticket/9649] Display information on index for moderators on unapproved posts PHPBB3-9649 --- phpBB/includes/functions_display.php | 10 +++++++++- phpBB/styles/prosilver/template/forumlist_body.html | 6 +++++- phpBB/styles/subsilver2/template/forumlist_body.html | 9 ++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 143813e4ed..b1dac64bec 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -215,8 +215,9 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod $forum_tracking_info[$forum_id] = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate']) : $user->data['user_lastmark']; } - // Count the difference of real to public topics, so we can display an information to moderators + // Lets check whether there are unapproved topics/posts, so we can display an information to moderators $row['forum_id_unapproved_topics'] = ($auth->acl_get('m_approve', $forum_id) && $row['forum_topics_unapproved']) ? $forum_id : 0; + $row['forum_id_unapproved_posts'] = ($auth->acl_get('m_approve', $forum_id) && $row['forum_posts_unapproved']) ? $forum_id : 0; $row['forum_posts'] = $phpbb_content_visibility->get_count('forum_posts', $row, $forum_id); $row['forum_topics'] = $phpbb_content_visibility->get_count('forum_topics', $row, $forum_id); @@ -281,6 +282,11 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod $forum_rows[$parent_id]['forum_id_unapproved_topics'] = $forum_id; } + if (!$forum_rows[$parent_id]['forum_id_unapproved_posts'] && $row['forum_id_unapproved_posts']) + { + $forum_rows[$parent_id]['forum_id_unapproved_posts'] = $forum_id; + } + $forum_rows[$parent_id]['forum_topics'] += $row['forum_topics']; // Do not list redirects in LINK Forums as Posts. @@ -548,6 +554,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'L_MODERATOR_STR' => $l_moderator, 'U_UNAPPROVED_TOPICS' => ($row['forum_id_unapproved_topics']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=unapproved_topics&f=' . $row['forum_id_unapproved_topics']) : '', + 'U_UNAPPROVED_POSTS' => ($row['forum_id_unapproved_posts']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=unapproved_posts&f=' . $row['forum_id_unapproved_posts']) : '', 'U_VIEWFORUM' => $u_viewforum, 'U_LAST_POSTER' => get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), 'U_LAST_POST' => $last_post_url, @@ -587,6 +594,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'L_SUBFORUM' => ($visible_forums == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS'], 'LAST_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_LATEST_POST'), 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'TOPICS_UNAPPROVED'), + 'UNAPPROVED_POST_IMG' => $user->img('icon_topic_unapproved', 'POSTS_UNAPPROVED'), )); if ($return_moderators) diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html index 0c67de76ec..9fb6b3d951 100644 --- a/phpBB/styles/prosilver/template/forumlist_body.html +++ b/phpBB/styles/prosilver/template/forumlist_body.html @@ -50,7 +50,11 @@
    {forumrow.TOPICS} {L_TOPICS}
    {forumrow.POSTS} {L_POSTS}
    - {UNAPPROVED_IMG} + + {UNAPPROVED_IMG} + + {UNAPPROVED_POST_IMG} + {L_LAST_POST} diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html index 3e30561f3a..a222607ae8 100644 --- a/phpBB/styles/subsilver2/template/forumlist_body.html +++ b/phpBB/styles/subsilver2/template/forumlist_body.html @@ -64,7 +64,14 @@

    {forumrow.LAST_POST_SUBJECT_TRUNCATED}

    -

    {UNAPPROVED_IMG} {forumrow.LAST_POST_TIME}

    +

    + + {UNAPPROVED_IMG}  + + {UNAPPROVED_POST_IMG}  + + {forumrow.LAST_POST_TIME} +

    {forumrow.LAST_POSTER_FULL} {LAST_POST_IMG}

    From 9f5ee08bae0bd13352dd7a5e59ec959bc17702d4 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sat, 13 Jul 2013 16:44:38 -0400 Subject: [PATCH 11/12] [ticket/11690] Old module class names may get autoloaded by class_exists PHPBB3-11690 --- phpBB/includes/acp/acp_modules.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index ab416fb406..a1e681b29c 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -575,13 +575,20 @@ class acp_modules // format. phpbb_acp_info_acp_foo needs to be turned into // acp_foo_info and the respective file has to be included // manually because it does not support auto loading - if (!class_exists($info_class)) + $old_info_class_file = str_replace("phpbb_{$module_class}_info_", '', $cur_module); + $old_info_class = $old_info_class_file . '_info'; + + if (class_exists($old_info_class)) { - $info_class_file = str_replace("phpbb_{$module_class}_info_", '', $cur_module); - $info_class = $info_class_file . '_info'; - if (!class_exists($info_class) && file_exists($directory . $info_class_file . '.' . $phpEx)) + $info_class = $old_info_class; + } + else if (!class_exists($info_class)) + { + $info_class = $old_info_class; + // need to check class exists again because previous checks triggered autoloading + if (!class_exists($info_class) && file_exists($directory . $old_info_class_file . '.' . $phpEx)) { - include($directory . $info_class_file . '.' . $phpEx); + include($directory . $old_info_class_file . '.' . $phpEx); } } From e9cc1e9cd276fa6222e52c7c41feb6ef4829f6e3 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Sat, 13 Jul 2013 16:25:08 -0500 Subject: [PATCH 12/12] [ticket/11675] Fix template loop PHPBB3-11675 --- phpBB/adm/style/permission_roles_mask.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html index 277310edbf..42a7fc3e4e 100644 --- a/phpBB/adm/style/permission_roles_mask.html +++ b/phpBB/adm/style/permission_roles_mask.html @@ -25,7 +25,7 @@ {role_mask.groups.GROUP_NAME} :: {L_GROUPS_NOT_ASSIGNED} - +