From b93636d42d63bd396a31ff7cf699f8add006d765 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 12 Jul 2013 20:56:55 +0200 Subject: [PATCH 001/242] [develop-olympus] Increment version number to 3.0.13-dev. --- phpBB/includes/constants.php | 2 +- phpBB/install/database_update.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 0a853adb9b..8d09fe4d9b 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -25,7 +25,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.0.12-RC1'); +define('PHPBB_VERSION', '3.0.13-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5cb410bf29..757fc6499f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -define('UPDATES_TO_VERSION', '3.0.12-RC1'); +define('UPDATES_TO_VERSION', '3.0.13-dev'); // Enter any version to update from to test updates. The version within the db will not be updated. define('DEBUG_FROM_VERSION', false); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 04b92b19c6..e1b36e64a2 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.12-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.13-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 3375f41ef1eaca8edca344372a31d4aafb739c87 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Fri, 12 Jul 2013 16:14:16 -0400 Subject: [PATCH 002/242] [ticket/11668] Move lint test to the end for travis PHPBB3-11668 --- travis/phpunit-mysql-travis.xml | 4 ++++ travis/phpunit-postgres-travis.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml index 179a2a358e..e99f8d6cee 100644 --- a/travis/phpunit-mysql-travis.xml +++ b/travis/phpunit-mysql-travis.xml @@ -15,6 +15,10 @@ ../tests/ tests/functional + tests/lint_test.php + + + tests/lint_test.php ../tests/functional diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index 12e20547ba..3d1b574716 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-travis.xml @@ -15,6 +15,10 @@ ../tests/ tests/functional + tests/lint_test.php + + + tests/lint_test.php ../tests/functional From 6bfa2fc0551af7e4eb99c1452031a2f423611a6f Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Sat, 13 Jul 2013 12:06:05 -0500 Subject: [PATCH 003/242] [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: Sun, 14 Jul 2013 19:48:41 +0200 Subject: [PATCH 004/242] [ticket/11704] Correctly escape " PHPBB3-11704 --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index a418f40b53..cee8160eff 100644 --- a/build/build.xml +++ b/build/build.xml @@ -171,7 +171,7 @@ From da1ee75140608220b13908c74f5157033689db8c Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 14 Jul 2013 19:48:55 +0200 Subject: [PATCH 005/242] [ticket/11704] Use the correct directory for dependency checking. PHPBB3-11704 --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index cee8160eff..bb88bd3cfa 100644 --- a/build/build.xml +++ b/build/build.xml @@ -170,7 +170,7 @@ checkreturn="true" /> - From 43538fdca15b9b6cd1d64a7808b4e4a4d2027221 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 22 Jul 2013 12:23:53 -0500 Subject: [PATCH 006/242] [ticket/11726] Don't run lint tests on Travis on postgres PHPBB3-11726 --- travis/phpunit-postgres-travis.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index 3d1b574716..aa829f4d30 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-travis.xml @@ -17,9 +17,6 @@ tests/functional tests/lint_test.php - - tests/lint_test.php - ../tests/functional From 5af63a7860678ac55f84201cf7dbbdf82dcdc8e8 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Wed, 24 Jul 2013 18:15:03 +0200 Subject: [PATCH 007/242] [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version PHPBB3-10917 --- phpBB/install/install_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index c18a0fb4ec..5393040061 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -204,7 +204,7 @@ class install_update extends module } // Check if the update files stored are for the latest version... - if ($this->latest_version != $this->update_info['version']['to']) + if (version_compare(strtolower($this->latest_version), strtolower($this->update_info['version']['to']), '>')) { $this->unequal_version = true; From e80503696350d7410e82e63e9d108d65e3c35696 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Wed, 24 Jul 2013 19:08:49 +0200 Subject: [PATCH 008/242] [ticket/10917] Using phpbb wrapper PHPBB3-10917 --- phpBB/install/install_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 5393040061..5419e3edf1 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -204,7 +204,7 @@ class install_update extends module } // Check if the update files stored are for the latest version... - if (version_compare(strtolower($this->latest_version), strtolower($this->update_info['version']['to']), '>')) + if (phpbb_version_compare($this->latest_version, $this->update_info['version']['to'], '>')) { $this->unequal_version = true; From a9f05775025f010339fee5607df9b890abf472f8 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Thu, 25 Jul 2013 12:29:25 +0200 Subject: [PATCH 009/242] [ticket/11062] Load new strings from user's language file if provided PHPBB3-11062 --- phpBB/install/install_update.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index c18a0fb4ec..0afd6b07bb 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -232,6 +232,13 @@ class install_update extends module } // What about the language file? Got it updated? + if (in_array('language/' . $language . '/install.' . $phpEx, $this->update_info['files'])) + { + $lang = array(); + include($this->new_location . 'language/' . $language . '/install.' . $phpEx); + // this is the user's language.. just merge it + $user->lang = array_merge($user->lang, $lang); + } if (in_array('language/en/install.' . $phpEx, $this->update_info['files'])) { $lang = array(); From 7304ac9c3ca817716f14bb8817a201b149e5ebef Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Thu, 25 Jul 2013 13:10:45 +0200 Subject: [PATCH 010/242] [ticket/11062] If user's language is english there is no further work needed PHPBB3-11062 --- phpBB/install/install_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 0afd6b07bb..9823703f0a 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -239,7 +239,7 @@ class install_update extends module // this is the user's language.. just merge it $user->lang = array_merge($user->lang, $lang); } - if (in_array('language/en/install.' . $phpEx, $this->update_info['files'])) + if ($language != 'en' && in_array('language/en/install.' . $phpEx, $this->update_info['files'])) { $lang = array(); include($this->new_location . 'language/en/install.' . $phpEx); From 866e475f9644dd3575ed62bfb0e7dde0338fd5cc Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Thu, 25 Jul 2013 15:47:55 +0200 Subject: [PATCH 011/242] [ticket/10037] Apply attached patch with a few changes PHPBB3-10037 --- phpBB/includes/ucp/ucp_profile.php | 3 ++ .../prosilver/template/posting_smilies.html | 4 +-- .../subsilver2/template/posting_smilies.html | 4 +-- .../template/ucp_profile_signature.html | 35 ++++++++++++++++++- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index d35d13b6c1..847311058b 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -548,6 +548,9 @@ class ucp_profile // Build custom bbcodes array display_custom_bbcodes(); + // Generate smiley listing + generate_smilies('inline', 0); + break; case 'avatar': diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html index 86ac24aa53..d45b185ed3 100644 --- a/phpBB/styles/prosilver/template/posting_smilies.html +++ b/phpBB/styles/prosilver/template/posting_smilies.html @@ -2,8 +2,8 @@ diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html index fcab578bd9..d2224887bc 100644 --- a/phpBB/styles/subsilver2/template/posting_smilies.html +++ b/phpBB/styles/subsilver2/template/posting_smilies.html @@ -2,8 +2,8 @@ diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html index a33726e166..8588a99438 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_signature.html @@ -5,9 +5,11 @@ {L_TITLE} + {L_SIGNATURE_EXPLAIN} + @@ -23,7 +25,33 @@ var text_name = 'signature'; // ]]> - + + + + + + +
+ {L_SIGNATURE_EXPLAIN} + + + + + + + + + + + + + +
{L_SMILIES}
+ + {smiley.SMILEY_CODE} + +
{L_MORE_SMILIES}
+ + 		+ @@ -47,6 +75,11 @@
+ +
+ From d8584877a19ece5b5d6cd1d0ec752905ef8501e7 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Sat, 27 Jul 2013 22:37:44 +0200 Subject: [PATCH 012/242] [ticket/10917] Revert use of phpbb wrapper PHPBB3-10917 --- phpBB/install/install_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 9ac17e7579..e8fcabfc2d 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -204,7 +204,7 @@ class install_update extends module } // Check if the update files stored are for the latest version... - if (phpbb_version_compare($this->latest_version, $this->update_info['version']['to'], '>')) + if (version_compare(strtolower($this->latest_version), strtolower($this->update_info['version']['to']), '>')) { $this->unequal_version = true; From dd875f13e875a726c9ea4654a90a74878658e423 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Sun, 28 Jul 2013 02:35:01 +0200 Subject: [PATCH 013/242] [ticket/10917] Variable used only once so delete it The variable $this->unequal_version was only used once and only to display the version the package updates to. To display the version it updates to makes no sense when the update files just aren't meant to update from the current version. (It's already shown in an error message) So I deleted the variable from there. Furthermore the use of version_compare makes the variable useless in that context which is why I deleted the variable from the whole file and replaced it in the relevant if statement with the old comparison. PHPBB3-10917 --- phpBB/install/install_update.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index e8fcabfc2d..2f3ee1c55a 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -58,7 +58,6 @@ class install_update extends module var $new_location; var $latest_version; var $current_version; - var $unequal_version; var $update_to_version; @@ -76,7 +75,6 @@ class install_update extends module $this->tpl_name = 'install_update'; $this->page_title = 'UPDATE_INSTALLATION'; - $this->unequal_version = false; $this->old_location = $phpbb_root_path . 'install/update/old/'; $this->new_location = $phpbb_root_path . 'install/update/new/'; @@ -195,8 +193,6 @@ class install_update extends module // Check if the update files are actually meant to update from the current version if ($this->current_version != $this->update_info['version']['from']) { - $this->unequal_version = true; - $template->assign_vars(array( 'S_ERROR' => true, 'ERROR_MSG' => sprintf($user->lang['INCOMPATIBLE_UPDATE_FILES'], $this->current_version, $this->update_info['version']['from'], $this->update_info['version']['to']), @@ -206,8 +202,6 @@ class install_update extends module // Check if the update files stored are for the latest version... if (version_compare(strtolower($this->latest_version), strtolower($this->update_info['version']['to']), '>')) { - $this->unequal_version = true; - $template->assign_vars(array( 'S_WARNING' => true, 'WARNING_MSG' => sprintf($user->lang['OLD_UPDATE_FILES'], $this->update_info['version']['from'], $this->update_info['version']['to'], $this->latest_version)) @@ -294,7 +288,7 @@ class install_update extends module ); // Print out version the update package updates to - if ($this->unequal_version) + if ($this->latest_version != $this->update_info['version']['to']) { $template->assign_var('PACKAGE_VERSION', $this->update_info['version']['to']); } From 6f883b6791e1bc9b168c98d4a95e9bbed6731a74 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Wed, 31 Jul 2013 14:04:50 +0200 Subject: [PATCH 014/242] [ticket/10037] Fix table in subsilver2 Thanks, nickvergessen! ;-) PHPBB3-10037 --- .../template/ucp_profile_signature.html | 42 ++++++++----------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html index 8588a99438..54e8aaa723 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_signature.html @@ -1,5 +1,12 @@ + + @@ -18,20 +25,10 @@ - From 8a02db317ef3c2d3c4e3dcfc5f8b85397f7ebb4a Mon Sep 17 00:00:00 2001 From: s9e Date: Sat, 3 Aug 2013 12:20:52 +0200 Subject: [PATCH 015/242] [ticket/11762] Use the === operator to distinguish "0" from "" PHPBB3-11762 --- phpBB/includes/functions_content.php | 4 +-- .../generate_text_for_display.php | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 tests/text_processing/generate_text_for_display.php diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index b7650ecd6a..6213d2fd24 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -413,7 +413,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags) { static $bbcode; - if (!$text) + if ($text === '') { return ''; } @@ -459,7 +459,7 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb $uid = $bitfield = ''; $flags = (($allow_bbcode) ? OPTION_FLAG_BBCODE : 0) + (($allow_smilies) ? OPTION_FLAG_SMILIES : 0) + (($allow_urls) ? OPTION_FLAG_LINKS : 0); - if (!$text) + if ($text === '') { return; } diff --git a/tests/text_processing/generate_text_for_display.php b/tests/text_processing/generate_text_for_display.php new file mode 100644 index 0000000000..4088e33f30 --- /dev/null +++ b/tests/text_processing/generate_text_for_display.php @@ -0,0 +1,36 @@ +optionset('viewcensors', false); + } + + public function test_empty_string() + { + $this->assertSame('', generate_text_for_display('', '', '', 0)); + } + + public function test_zero_string() + { + $this->assertSame('0', generate_text_for_display('0', '', '', 0)); + } +} From 68aa974a207b444199fabe9d754f403d27d700ad Mon Sep 17 00:00:00 2001 From: s9e Date: Sat, 3 Aug 2013 12:29:23 +0200 Subject: [PATCH 016/242] [ticket/11762] Fixed test's filename PHPBB3-11762 --- ...te_text_for_display.php => generate_text_for_display_test.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/text_processing/{generate_text_for_display.php => generate_text_for_display_test.php} (100%) diff --git a/tests/text_processing/generate_text_for_display.php b/tests/text_processing/generate_text_for_display_test.php similarity index 100% rename from tests/text_processing/generate_text_for_display.php rename to tests/text_processing/generate_text_for_display_test.php From 9db1728b4b976c99f5811e578619e37c69e306cd Mon Sep 17 00:00:00 2001 From: s9e Date: Sat, 3 Aug 2013 14:05:40 +0200 Subject: [PATCH 017/242] [ticket/11762] Added call to test class's parent::setUp(). Added call to test class's parent::setUp(). Updated copyright year. PHPBB3-11762 --- tests/text_processing/generate_text_for_display_test.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/text_processing/generate_text_for_display_test.php b/tests/text_processing/generate_text_for_display_test.php index 4088e33f30..a157fe7d9a 100644 --- a/tests/text_processing/generate_text_for_display_test.php +++ b/tests/text_processing/generate_text_for_display_test.php @@ -2,7 +2,7 @@ /** * * @package testing -* @copyright (c) 2011 phpBB Group +* @copyright (c) 2013 phpBB Group * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ @@ -18,6 +18,8 @@ class phpbb_text_processing_generate_text_for_display_test extends phpbb_test_ca { global $cache, $user; + parent::setUp(); + $cache = new phpbb_mock_cache; $user = new phpbb_mock_user; From 9c299b0e8367ec8f9bb631e637b2492483ab3b8a Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Wed, 14 Aug 2013 19:09:27 +0300 Subject: [PATCH 018/242] [ticket/11789] Remove colors from HTML code PHPBB3-11789 --- phpBB/styles/subsilver2/template/overall_header.html | 2 +- phpBB/styles/subsilver2/template/ucp_header.html | 4 ++-- phpBB/styles/subsilver2/template/ucp_pm_history.html | 2 +- phpBB/styles/subsilver2/theme/stylesheet.css | 10 +++++++++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 62ed79ed39..7eb736aa32 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -160,7 +160,7 @@ function marklist(id, name, state)
- - - - - + - -
- {L_SIGNATURE_EXPLAIN} - - + + -
+ {L_SIGNATURE_EXPLAIN} + @@ -47,11 +44,13 @@ -
{L_SMILIES}
{L_MORE_SMILIES}
- - 		- +
+ 		+ + + + @@ -75,11 +74,6 @@
- -
-
* {L_LOGIN_LOGOUT}   * {L_RESTORE_PERMISSIONS} -  {L_BOARD_DISABLED} +  {L_BOARD_DISABLED}  * {PRIVATE_MESSAGE_INFO}, {PRIVATE_MESSAGE_INFO_UNREAD} diff --git a/phpBB/styles/subsilver2/template/ucp_header.html b/phpBB/styles/subsilver2/template/ucp_header.html index 1566a15929..4ad27738fa 100644 --- a/phpBB/styles/subsilver2/template/ucp_header.html +++ b/phpBB/styles/subsilver2/template/ucp_header.html @@ -123,7 +123,7 @@
- {L_FRIENDS_ONLINE} + {L_FRIENDS_ONLINE}
    @@ -139,7 +139,7 @@
    - {L_FRIENDS_OFFLINE} + {L_FRIENDS_OFFLINE}
      diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html index bf20108f7b..e27417ea3f 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_history.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_history.html @@ -25,7 +25,7 @@
- style="background-color:lightblue"> + class="current">
{L_PM_SUBJECT}: {history_row.SUBJECT}
{L_FOLDER}: {history_row.FOLDER}
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 177a988e93..29db8f2d47 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -292,7 +292,11 @@ p.topicdetails { text-decoration: none; } -.error { +.online { + color: green; +} + +.offline, .error { color: red; } @@ -360,6 +364,10 @@ td.profile { background-color: #D1D7DC; } +.current { + background-color: lightblue; +} + hr { height: 1px; border-width: 0; From 48f6f4559c9d3df49b56f0831a89b516f0f2f34f Mon Sep 17 00:00:00 2001 From: rechosen Date: Fri, 16 Aug 2013 17:48:36 +0200 Subject: [PATCH 019/242] [ticket/11794] Add missing array element commas to docs/coding-guidelines.html Even though the coding guidelines document prescribes "commas after every array element", it contains several example code fragments with array elements not terminated by a comma. This commit fixes that. PHPBB3-11794 --- phpBB/docs/coding-guidelines.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index a541fe8866..f3d161589b 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -728,7 +728,7 @@ $sql = 'SELECT * $sql_ary = array( 'somedata' => $my_string, 'otherdata' => $an_int, - 'moredata' => $another_int + 'moredata' => $another_int, ); $db->sql_query('INSERT INTO ' . SOME_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); @@ -740,7 +740,7 @@ $db->sql_query('INSERT INTO ' . SOME_TABLE . ' ' . $db->sql_build_array('I $sql_ary = array( 'somedata' => $my_string, 'otherdata' => $an_int, - 'moredata' => $another_int + 'moredata' => $another_int, ); $sql = 'UPDATE ' . SOME_TABLE . ' @@ -833,20 +833,20 @@ $sql_array = array( 'FROM' => array( FORUMS_WATCH_TABLE => 'fw', - FORUMS_TABLE => 'f' + FORUMS_TABLE => 'f', ), 'LEFT_JOIN' => array( array( 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), - 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id' - ) + 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id', + ), ), 'WHERE' => 'fw.user_id = ' . $user->data['user_id'] . ' AND f.forum_id = fw.forum_id', - 'ORDER_BY' => 'left_id' + 'ORDER_BY' => 'left_id', ); $sql = $db->sql_build_query('SELECT', $sql_array); @@ -860,13 +860,13 @@ $sql_array = array( 'FROM' => array( FORUMS_WATCH_TABLE => 'fw', - FORUMS_TABLE => 'f' + FORUMS_TABLE => 'f', ), 'WHERE' => 'fw.user_id = ' . $user->data['user_id'] . ' AND f.forum_id = fw.forum_id', - 'ORDER_BY' => 'left_id' + 'ORDER_BY' => 'left_id', ); if ($config['load_db_lastread']) @@ -874,8 +874,8 @@ if ($config['load_db_lastread']) $sql_array['LEFT_JOIN'] = array( array( 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), - 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id' - ) + 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id', + ), ); $sql_array['SELECT'] .= ', ft.mark_time '; From 6f566fdaf0cfa131d077c05e486f1d2dc022030f Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sun, 18 Aug 2013 10:56:16 +0300 Subject: [PATCH 020/242] [ticket/11789] Remove inline color in memberlist_view PHPBB3-11789 --- phpBB/styles/subsilver2/template/memberlist_view.html | 2 +- phpBB/styles/subsilver2/theme/stylesheet.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index 434d795895..7898e9b235 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -18,7 +18,7 @@ - + diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 29db8f2d47..92b723062a 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -296,7 +296,7 @@ p.topicdetails { color: green; } -.offline, .error { +.offline, .error, .inactive { color: red; } From f61db86b8d0890f41800fac17ef7ecbdb408d5f0 Mon Sep 17 00:00:00 2001 From: Prosk8er Date: Mon, 19 Aug 2013 13:31:30 -0400 Subject: [PATCH 021/242] [ticket/11801] removed some whitespace and added missing semi colon's in css PHPBB3-11801 --- phpBB/styles/prosilver/theme/colours.css | 32 ++++++++++---------- phpBB/styles/subsilver2/theme/stylesheet.css | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index b9e4491feb..ef345e5113 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -1,4 +1,4 @@ -/* +/* -------------------------------------------------------------- Colours and backgrounds for common.css -------------------------------------------------------------- */ @@ -81,7 +81,7 @@ hr.dashed { } .bg1 { background-color: #ECF3F7; } -.bg2 { background-color: #e1ebf2; } +.bg2 { background-color: #e1ebf2; } .bg3 { background-color: #cadceb; } .ucprowbg { @@ -234,7 +234,7 @@ p.rules { background-image: none; } -/* +/* -------------------------------------------------------------- Colours and backgrounds for links.css -------------------------------------------------------------- */ @@ -327,7 +327,7 @@ a.topictitle:active { color: #105289; } -/* Profile searchresults */ +/* Profile searchresults */ .search .postprofile a { color: #105289; } @@ -346,10 +346,10 @@ a.top2 { } /* Arrow links */ -a.up { background-image: url("{T_THEME_PATH}/images/arrow_up.gif") } -a.down { background-image: url("{T_THEME_PATH}/images/arrow_down.gif") } -a.left { background-image: url("{T_THEME_PATH}/images/arrow_left.gif") } -a.right { background-image: url("{T_THEME_PATH}/images/arrow_right.gif") } +a.up { background-image: url("{T_THEME_PATH}/images/arrow_up.gif"); } +a.down { background-image: url("{T_THEME_PATH}/images/arrow_down.gif"); } +a.left { background-image: url("{T_THEME_PATH}/images/arrow_left.gif"); } +a.right { background-image: url("{T_THEME_PATH}/images/arrow_right.gif"); } a.up:hover { background-color: transparent; @@ -364,7 +364,7 @@ a.right:hover { } -/* +/* -------------------------------------------------------------- Colours and backgrounds for content.css -------------------------------------------------------------- */ @@ -655,7 +655,7 @@ fieldset.polls dd div { background-image: url("{IMG_ICON_USER_ONLINE_SRC}"); } -/* +/* -------------------------------------------------------------- Colours and backgrounds for buttons.css -------------------------------------------------------------- */ @@ -664,9 +664,9 @@ Colours and backgrounds for buttons.css .reply-icon span { background-image: url("{IMG_BUTTON_TOPIC_REPLY_SRC}"); } .post-icon span { background-image: url("{IMG_BUTTON_TOPIC_NEW_SRC}"); } .locked-icon span { background-image: url("{IMG_BUTTON_TOPIC_LOCKED_SRC}"); } -.pmreply-icon span { background-image: url("{IMG_BUTTON_PM_REPLY_SRC}") ;} -.newpm-icon span { background-image: url("{IMG_BUTTON_PM_NEW_SRC}") ;} -.forwardpm-icon span { background-image: url("{IMG_BUTTON_PM_FORWARD_SRC}") ;} +.pmreply-icon span { background-image: url("{IMG_BUTTON_PM_REPLY_SRC}"); } +.newpm-icon span { background-image: url("{IMG_BUTTON_PM_NEW_SRC}"); } +.forwardpm-icon span { background-image: url("{IMG_BUTTON_PM_FORWARD_SRC}"); } a.print { background-image: url("{T_THEME_PATH}/images/icon_print.gif"); @@ -714,7 +714,7 @@ a.fontsize { .info-icon, .info-icon a { background-image: url("{IMG_ICON_POST_INFO_SRC}"); } .warn-icon, .warn-icon a { background-image: url("{IMG_ICON_USER_WARN_SRC}"); } /* Need updated warn icon */ -/* +/* -------------------------------------------------------------- Colours and backgrounds for cp.css -------------------------------------------------------------- */ @@ -916,7 +916,7 @@ dl.mini dt { background-color: #EEE; } -/* +/* -------------------------------------------------------------- Colours and backgrounds for forms.css -------------------------------------------------------------- */ @@ -967,7 +967,7 @@ fieldset.quick-login input.inputbox { /* Input field styles ---------------------------------------- */ .inputbox { - background-color: #FFFFFF; + background-color: #FFFFFF; border-color: #B4BAC0; color: #333333; } diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 92b723062a..abfdf568e7 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -181,7 +181,7 @@ p.datetime { p.searchbar { padding: 2px 0; white-space: nowrap; -} +} p.searchbarreg { margin: 0; @@ -463,7 +463,7 @@ textarea { background-color: #FAFAFA; color: #333333; font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 1.3em; + font-size: 1.3em; line-height: 1.4em; font-weight: normal; border: 1px solid #A9B8C2; From 5f81d66c2f666c1825950228e87e7ac6c6b4ca2c Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 23 Aug 2013 03:55:26 +0200 Subject: [PATCH 022/242] [ticket/11799] Send anti abuse headers in "new password" emails. PHPBB3-11799 --- phpBB/includes/ucp/ucp_remind.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php index cb89ad99be..bcb21cbedc 100644 --- a/phpBB/includes/ucp/ucp_remind.php +++ b/phpBB/includes/ucp/ucp_remind.php @@ -98,6 +98,8 @@ class ucp_remind $messenger->to($user_row['user_email'], $user_row['username']); $messenger->im($user_row['user_jabber'], $user_row['username']); + $messenger->anti_abuse_headers($config, $user); + $messenger->assign_vars(array( 'USERNAME' => htmlspecialchars_decode($user_row['username']), 'PASSWORD' => htmlspecialchars_decode($user_password), From 48825975d1e5cb8139757273df8ce9a654efe7bd Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 2 Sep 2013 11:41:31 +0200 Subject: [PATCH 023/242] [ticket/11821] Fix comma usage next to "You are receiving this notification". This is a partial backport of 31502cdd6c3a5bac5164ec30530e5b4bf63f3196. PHPBB3-11821 --- phpBB/language/en/email/forum_notify.txt | 2 +- phpBB/language/en/email/newtopic_notify.txt | 2 +- phpBB/language/en/email/topic_notify.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index 490780a0a6..66f3a68689 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -2,7 +2,7 @@ Subject: Forum post notification - "{FORUM_NAME}" Hello {USERNAME}, -You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. +You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. {U_NEWEST_POST} diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index eda1370938..d4f5cae620 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}" Hello {USERNAME}, -You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic by {AUTHOR_NAME} since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. +You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic by {AUTHOR_NAME} since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. {U_FORUM} diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index fcfbcc2abd..fa2481dd9a 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because you are watching the topic, "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply by {AUTHOR_NAME} since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. +You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply by {AUTHOR_NAME} since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. If you want to view the newest post made since your last visit, click the following link: {U_NEWEST_POST} From f317d6d8c5062d35062ce8737b8ac3c50e6c7615 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 2 Sep 2013 14:33:19 -0700 Subject: [PATCH 024/242] [ticket/11823] Set up nginx server to match PHP files with characters after .php PHPBB3-11823 --- travis/setup-webserver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index beb04b0fef..95fc4ec1f8 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -42,7 +42,7 @@ server { root $PHPBB_ROOT_PATH/; index index.php index.html; - location ~ \.php$ { + location ~ \.php { fastcgi_pass unix:$PHP_FPM_SOCK; include fastcgi_params; } From 77845e366e8a5578ad740186cf71d75be32694bc Mon Sep 17 00:00:00 2001 From: rechosen Date: Wed, 4 Sep 2013 13:37:39 +0200 Subject: [PATCH 025/242] [ticket/11829] Use report_closed to determine status in MCP report_details Instead of using post_reported of the post or message_reported of the pm, use report_closed of the report itself to reliably determine whether this particular report is closed or not in the report_details view of the MCP. This fixes a bug where the report_details view would not show that the report shown was closed and display a "Close report" button that had no effect. PHPBB3-11829 --- phpBB/includes/mcp/mcp_pm_reports.php | 1 + phpBB/includes/mcp/mcp_reports.php | 1 + phpBB/styles/prosilver/template/mcp_post.html | 4 ++-- phpBB/styles/subsilver2/template/mcp_post.html | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php index 77bc7680e6..0a33c80a90 100644 --- a/phpBB/includes/mcp/mcp_pm_reports.php +++ b/phpBB/includes/mcp/mcp_pm_reports.php @@ -166,6 +166,7 @@ class mcp_pm_reports 'S_CLOSE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&mode=pm_report_details&r=' . $report_id), 'S_CAN_VIEWIP' => $auth->acl_getf_global('m_info'), 'S_POST_REPORTED' => $pm_info['message_reported'], + 'S_REPORT_CLOSED' => $report['report_closed'], 'S_USER_NOTES' => true, 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&mode=pm_report_details&r=' . $report_id), diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index def5422be2..b13c8b20c6 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -192,6 +192,7 @@ class mcp_reports 'S_POST_REPORTED' => $post_info['post_reported'], 'S_POST_UNAPPROVED' => !$post_info['post_approved'], 'S_POST_LOCKED' => $post_info['post_edit_locked'], + 'S_REPORT_CLOSED' => $report['report_closed'], 'S_USER_NOTES' => true, 'U_EDIT' => ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f={$post_info['forum_id']}&p={$post_info['post_id']}") : '', diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index f8403ffccd..11f63a3ea2 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -13,7 +13,7 @@

{L_REPORT_REASON}: {REPORT_REASON_TITLE}

{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} « {REPORT_DATE}

- +

{L_REPORT_CLOSED}

@@ -31,7 +31,7 @@
- +   diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html index 6fb68ca680..d026ac22c0 100644 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ b/phpBB/styles/subsilver2/template/mcp_post.html @@ -28,7 +28,7 @@
- +
{L_USER_IS_INACTIVE}
{L_INACTIVE_REASON}: {USER_INACTIVE_REASON}

{L_USER_IS_INACTIVE}
{L_INACTIVE_REASON}: {USER_INACTIVE_REASON}
{L_REPORT_CLOSED}   {L_REPORT_CLOSED}  
From b7eca27f2adfc9742f98166991a2f2546a6c5e73 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 6 Sep 2013 12:28:46 -0500 Subject: [PATCH 026/242] [ticket/11831] Update fabpot/goutte to 1.0.* PHPBB3-11831 --- phpBB/composer.json | 2 +- phpBB/composer.lock | 458 +++++++++++++++++++++++++++++--------------- 2 files changed, 302 insertions(+), 158 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 9e73936322..4b3fe8ebb3 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -1,6 +1,6 @@ { "require-dev": { - "fabpot/goutte": "v0.1.0", + "fabpot/goutte": "1.0.*", "phpunit/dbunit": "1.2.*", "phpunit/phpunit": "3.7.*", "phing/phing": "2.4.*" diff --git a/phpBB/composer.lock b/phpBB/composer.lock index c7194c2fb5..61ba0fdebc 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -3,34 +3,38 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "ef6d05965cca4e390fff7ce63e9d2d49", + "hash": "ec5fbbc971057677b452c4600e7501c6", "packages": [ ], "packages-dev": [ { "name": "fabpot/goutte", - "version": "v0.1.0", + "version": "v1.0.3", "source": { "type": "git", - "url": "https://github.com/fabpot/Goutte", - "reference": "v0.1.0" + "url": "https://github.com/fabpot/Goutte.git", + "reference": "75c9f23c4122caf4ea3e87a42a00b471366e707f" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Goutte/archive/v0.1.0.zip", - "reference": "v0.1.0", + "url": "https://api.github.com/repos/fabpot/Goutte/zipball/75c9f23c4122caf4ea3e87a42a00b471366e707f", + "reference": "75c9f23c4122caf4ea3e87a42a00b471366e707f", "shasum": "" }, "require": { "ext-curl": "*", - "guzzle/guzzle": "3.0.*", + "guzzle/http": ">=3.0.5,<3.8-dev", "php": ">=5.3.0", - "symfony/browser-kit": "2.1.*", - "symfony/css-selector": "2.1.*", - "symfony/dom-crawler": "2.1.*", - "symfony/finder": "2.1.*", - "symfony/process": "2.1.*" + "symfony/browser-kit": "~2.1", + "symfony/css-selector": "~2.1", + "symfony/dom-crawler": "~2.1", + "symfony/finder": "~2.1", + "symfony/process": "~2.1" + }, + "require-dev": { + "guzzle/plugin-history": ">=3.0.5,<3.8-dev", + "guzzle/plugin-mock": ">=3.0.5,<3.8-dev" }, "type": "application", "extra": { @@ -58,70 +62,85 @@ "keywords": [ "scraper" ], - "time": "2012-12-02 13:44:35" + "time": "2013-08-16 06:03:22" }, { - "name": "guzzle/guzzle", - "version": "v3.0.7", + "name": "guzzle/common", + "version": "v3.7.2", + "target-dir": "Guzzle/Common", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle", - "reference": "v3.0.7" + "url": "https://github.com/guzzle/common.git", + "reference": "70c8e8a624e2ef1657ce0045d845bee9f46a325e" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/guzzle/archive/v3.0.7.zip", - "reference": "v3.0.7", + "url": "https://api.github.com/repos/guzzle/common/zipball/70c8e8a624e2ef1657ce0045d845bee9f46a325e", + "reference": "70c8e8a624e2ef1657ce0045d845bee9f46a325e", "shasum": "" }, "require": { - "ext-curl": "*", "php": ">=5.3.2", "symfony/event-dispatcher": ">=2.1" }, - "replace": { - "guzzle/batch": "self.version", - "guzzle/cache": "self.version", - "guzzle/common": "self.version", - "guzzle/http": "self.version", - "guzzle/inflection": "self.version", - "guzzle/iterator": "self.version", - "guzzle/log": "self.version", - "guzzle/parser": "self.version", - "guzzle/plugin": "self.version", - "guzzle/plugin-async": "self.version", - "guzzle/plugin-backoff": "self.version", - "guzzle/plugin-cache": "self.version", - "guzzle/plugin-cookie": "self.version", - "guzzle/plugin-curlauth": "self.version", - "guzzle/plugin-history": "self.version", - "guzzle/plugin-log": "self.version", - "guzzle/plugin-md5": "self.version", - "guzzle/plugin-mock": "self.version", - "guzzle/plugin-oauth": "self.version", - "guzzle/service": "self.version", - "guzzle/stream": "self.version" - }, - "require-dev": { - "doctrine/common": "*", - "monolog/monolog": "1.*", - "phpunit/phpunit": "3.7.*", - "symfony/class-loader": "*", - "zend/zend-cache1": "1.12", - "zend/zend-log1": "1.12", - "zendframework/zend-cache": "2.0.*", - "zendframework/zend-log": "2.0.*" - }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.7-dev" } }, "autoload": { "psr-0": { - "Guzzle\\Tests": "tests/", - "Guzzle": "src/" + "Guzzle\\Common": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Common libraries used by Guzzle", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "collection", + "common", + "event", + "exception" + ], + "time": "2013-08-02 18:31:05" + }, + { + "name": "guzzle/http", + "version": "v3.7.2", + "target-dir": "Guzzle/Http", + "source": { + "type": "git", + "url": "https://github.com/guzzle/http.git", + "reference": "a18954489d8af2e04ee9e3bafd3bf703b55459ff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/http/zipball/a18954489d8af2e04ee9e3bafd3bf703b55459ff", + "reference": "a18954489d8af2e04ee9e3bafd3bf703b55459ff", + "shasum": "" + }, + "require": { + "guzzle/common": "self.version", + "guzzle/parser": "self.version", + "guzzle/stream": "self.version", + "php": ">=5.3.2" + }, + "suggest": { + "ext-curl": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.7-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle\\Http": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -133,37 +152,128 @@ "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" - }, - { - "name": "Guzzle Community", - "homepage": "https://github.com/guzzle/guzzle/contributors" } ], - "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients", + "description": "HTTP libraries used by Guzzle", "homepage": "http://guzzlephp.org/", "keywords": [ + "Guzzle", "client", "curl", - "framework", "http", - "http client", - "rest", - "web service" + "http client" ], - "time": "2012-12-19 23:06:35" + "time": "2013-07-30 22:07:23" + }, + { + "name": "guzzle/parser", + "version": "v3.7.2", + "target-dir": "Guzzle/Parser", + "source": { + "type": "git", + "url": "https://github.com/guzzle/parser.git", + "reference": "a25c2ddda1c52fb69a4ee56eb530b13ddd9573c2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/parser/zipball/a25c2ddda1c52fb69a4ee56eb530b13ddd9573c2", + "reference": "a25c2ddda1c52fb69a4ee56eb530b13ddd9573c2", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.7-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle\\Parser": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Interchangeable parsers used by Guzzle", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "URI Template", + "cookie", + "http", + "message", + "url" + ], + "time": "2013-07-11 22:46:03" + }, + { + "name": "guzzle/stream", + "version": "v3.7.2", + "target-dir": "Guzzle/Stream", + "source": { + "type": "git", + "url": "https://github.com/guzzle/stream.git", + "reference": "a86111d9ac7db31d65a053c825869409fe8fc83f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/stream/zipball/a86111d9ac7db31d65a053c825869409fe8fc83f", + "reference": "a86111d9ac7db31d65a053c825869409fe8fc83f", + "shasum": "" + }, + "require": { + "guzzle/common": "self.version", + "php": ">=5.3.2" + }, + "suggest": { + "guzzle/http": "To convert Guzzle request objects to PHP streams" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.7-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle\\Stream": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle stream wrapper component", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "Guzzle", + "component", + "stream" + ], + "time": "2013-07-30 22:07:23" }, { "name": "phing/phing", "version": "2.4.14", "source": { "type": "git", - "url": "https://github.com/phingofficial/phing", - "reference": "2.4.14" + "url": "https://github.com/phingofficial/phing.git", + "reference": "41075d93ca254f1c90c79ec7ce81be2b2629e138" }, "dist": { "type": "zip", - "url": "https://github.com/phingofficial/phing/archive/2.4.14.zip", - "reference": "2.4.14", + "url": "https://api.github.com/repos/phingofficial/phing/zipball/41075d93ca254f1c90c79ec7ce81be2b2629e138", + "reference": "41075d93ca254f1c90c79ec7ce81be2b2629e138", "shasum": "" }, "require": { @@ -210,12 +320,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/dbunit.git", - "reference": "1.2.3" + "reference": "8386782a2d55153e44a06eb1a9d13d6ed35d9c2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/1.2.3", - "reference": "1.2.3", + "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/8386782a2d55153e44a06eb1a9d13d6ed35d9c2d", + "reference": "8386782a2d55153e44a06eb1a9d13d6ed35d9c2d", "shasum": "" }, "require": { @@ -268,12 +378,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "1.2.12" + "reference": "0e9958c459d675fb497d8dc5001c91d335734e48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.12", - "reference": "1.2.12", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e9958c459d675fb497d8dc5001c91d335734e48", + "reference": "0e9958c459d675fb497d8dc5001c91d335734e48", "shasum": "" }, "require": { @@ -328,13 +438,13 @@ "version": "1.3.3", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "1.3.3" + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "16a78140ed2fc01b945cfa539665fadc6a038029" }, "dist": { "type": "zip", - "url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3", - "reference": "1.3.3", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/16a78140ed2fc01b945cfa539665fadc6a038029", + "reference": "16a78140ed2fc01b945cfa539665fadc6a038029", "shasum": "" }, "require": { @@ -366,20 +476,20 @@ "filesystem", "iterator" ], - "time": "2012-10-11 04:44:38" + "time": "2012-10-11 11:44:38" }, { "name": "phpunit/php-text-template", "version": "1.1.4", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/php-text-template.git", - "reference": "1.1.4" + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5180896f51c5b3648ac946b05f9ec02be78a0b23" }, "dist": { "type": "zip", - "url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.4", - "reference": "1.1.4", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5180896f51c5b3648ac946b05f9ec02be78a0b23", + "reference": "5180896f51c5b3648ac946b05f9ec02be78a0b23", "shasum": "" }, "require": { @@ -410,20 +520,20 @@ "keywords": [ "template" ], - "time": "2012-10-31 11:15:28" + "time": "2012-10-31 18:15:28" }, { "name": "phpunit/php-timer", - "version": "1.0.4", + "version": "1.0.5", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/php-timer.git", - "reference": "1.0.4" + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c" }, "dist": { "type": "zip", - "url": "https://github.com/sebastianbergmann/php-timer/zipball/1.0.4", - "reference": "1.0.4", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c", "shasum": "" }, "require": { @@ -450,24 +560,24 @@ } ], "description": "Utility class for timing", - "homepage": "http://www.phpunit.de/", + "homepage": "https://github.com/sebastianbergmann/php-timer/", "keywords": [ "timer" ], - "time": "2012-10-11 04:45:58" + "time": "2013-08-02 07:42:54" }, { "name": "phpunit/php-token-stream", - "version": "1.1.5", + "version": "1.2.0", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/php-token-stream.git", - "reference": "1.1.5" + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "31babf400e5b5868573bf49a000a3519d3978233" }, "dist": { "type": "zip", - "url": "https://github.com/sebastianbergmann/php-token-stream/zipball/1.1.5", - "reference": "1.1.5", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/31babf400e5b5868573bf49a000a3519d3978233", + "reference": "31babf400e5b5868573bf49a000a3519d3978233", "shasum": "" }, "require": { @@ -475,6 +585,11 @@ "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, "autoload": { "classmap": [ "PHP/" @@ -495,24 +610,24 @@ } ], "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "http://www.phpunit.de/", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", "keywords": [ "tokenizer" ], - "time": "2012-10-11 04:47:14" + "time": "2013-08-04 05:57:48" }, { "name": "phpunit/phpunit", - "version": "3.7.22", + "version": "3.7.24", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3.7.22" + "reference": "af7b77ccb5c64458bdfca95665d29558d1df7d08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.22", - "reference": "3.7.22", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/af7b77ccb5c64458bdfca95665d29558d1df7d08", + "reference": "af7b77ccb5c64458bdfca95665d29558d1df7d08", "shasum": "" }, "require": { @@ -524,7 +639,7 @@ "phpunit/php-code-coverage": "~1.2.1", "phpunit/php-file-iterator": ">=1.3.1", "phpunit/php-text-template": ">=1.1.1", - "phpunit/php-timer": "~1.0.2", + "phpunit/php-timer": ">=1.0.4", "phpunit/phpunit-mock-objects": "~1.2.0", "symfony/yaml": "~2.0" }, @@ -573,20 +688,20 @@ "testing", "xunit" ], - "time": "2013-07-06 06:29:15" + "time": "2013-08-09 06:58:24" }, { "name": "phpunit/phpunit-mock-objects", "version": "1.2.3", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "1.2.3" + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875" }, "dist": { "type": "zip", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip", - "reference": "1.2.3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875", + "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875", "shasum": "" }, "require": { @@ -626,34 +741,39 @@ }, { "name": "symfony/browser-kit", - "version": "v2.1.11", + "version": "v2.3.4", "target-dir": "Symfony/Component/BrowserKit", "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "v2.1.11" + "reference": "2639dc4eec81f92760e05396a93bb78000b4f5ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.11", - "reference": "v2.1.11", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/2639dc4eec81f92760e05396a93bb78000b4f5ca", + "reference": "2639dc4eec81f92760e05396a93bb78000b4f5ca", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/dom-crawler": "2.1.*" + "symfony/dom-crawler": "~2.0" }, "require-dev": { - "symfony/css-selector": "2.1.*", - "symfony/process": "2.1.*" + "symfony/css-selector": "~2.0", + "symfony/process": "~2.0" }, "suggest": { - "symfony/process": "2.1.*" + "symfony/process": "" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\BrowserKit": "" + "Symfony\\Component\\BrowserKit\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -672,30 +792,35 @@ ], "description": "Symfony BrowserKit Component", "homepage": "http://symfony.com", - "time": "2013-04-29 20:22:06" + "time": "2013-07-21 12:12:18" }, { "name": "symfony/css-selector", - "version": "v2.1.11", + "version": "v2.3.4", "target-dir": "Symfony/Component/CssSelector", "source": { "type": "git", "url": "https://github.com/symfony/CssSelector.git", - "reference": "v2.1.11" + "reference": "885544201cb24e79754da1dbd61bd779c2e4353e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.11", - "reference": "v2.1.11", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/885544201cb24e79754da1dbd61bd779c2e4353e", + "reference": "885544201cb24e79754da1dbd61bd779c2e4353e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\CssSelector": "" + "Symfony\\Component\\CssSelector\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -710,40 +835,49 @@ { "name": "Symfony Community", "homepage": "http://symfony.com/contributors" + }, + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" } ], "description": "Symfony CssSelector Component", "homepage": "http://symfony.com", - "time": "2013-05-17 00:31:34" + "time": "2013-07-21 12:12:18" }, { "name": "symfony/dom-crawler", - "version": "v2.1.11", + "version": "v2.3.4", "target-dir": "Symfony/Component/DomCrawler", "source": { "type": "git", "url": "https://github.com/symfony/DomCrawler.git", - "reference": "v2.1.11" + "reference": "e05e07fe8958a304b5e135f8e65d4ae6148cf59b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.1.11", - "reference": "v2.1.11", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/e05e07fe8958a304b5e135f8e65d4ae6148cf59b", + "reference": "e05e07fe8958a304b5e135f8e65d4ae6148cf59b", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/css-selector": "2.1.*" + "symfony/css-selector": "~2.0" }, "suggest": { - "symfony/css-selector": "2.1.*" + "symfony/css-selector": "" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\DomCrawler": "" + "Symfony\\Component\\DomCrawler\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -762,28 +896,28 @@ ], "description": "Symfony DomCrawler Component", "homepage": "http://symfony.com", - "time": "2013-05-16 00:06:15" + "time": "2013-07-21 12:12:18" }, { "name": "symfony/event-dispatcher", - "version": "v2.3.1", + "version": "v2.3.4", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "v2.3.1" + "reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.3.1", - "reference": "v2.3.1", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/41c9826457c65fa3cf746f214985b7ca9cba42f8", + "reference": "41c9826457c65fa3cf746f214985b7ca9cba42f8", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": ">=2.0,<3.0" + "symfony/dependency-injection": "~2.0" }, "suggest": { "symfony/dependency-injection": "", @@ -816,30 +950,35 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "http://symfony.com", - "time": "2013-05-13 14:36:40" + "time": "2013-07-21 12:12:18" }, { "name": "symfony/finder", - "version": "v2.1.11", + "version": "v2.3.4", "target-dir": "Symfony/Component/Finder", "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "v2.1.11" + "reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/v2.1.11", - "reference": "v2.1.11", + "url": "https://api.github.com/repos/symfony/Finder/zipball/4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1", + "reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\Finder": "" + "Symfony\\Component\\Finder\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -858,30 +997,35 @@ ], "description": "Symfony Finder Component", "homepage": "http://symfony.com", - "time": "2013-05-25 15:47:15" + "time": "2013-08-13 20:18:00" }, { "name": "symfony/process", - "version": "v2.1.11", + "version": "v2.3.4", "target-dir": "Symfony/Component/Process", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "v2.1.11" + "reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.11", - "reference": "v2.1.11", + "url": "https://api.github.com/repos/symfony/Process/zipball/1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b", + "reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\Process": "" + "Symfony\\Component\\Process\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -900,21 +1044,21 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2013-05-06 10:21:56" + "time": "2013-08-22 06:42:25" }, { "name": "symfony/yaml", - "version": "v2.3.1", + "version": "v2.3.4", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "v2.3.1" + "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.3.1", - "reference": "v2.3.1", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a279f1b5f5e1045a6c432354d9ea727ff3a9847", + "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847", "shasum": "" }, "require": { @@ -947,7 +1091,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2013-05-10 18:12:13" + "time": "2013-08-24 15:26:22" } ], "aliases": [ From b17d15276f87073f22fe861f7c04edcb3138e582 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 6 Sep 2013 12:36:40 -0500 Subject: [PATCH 027/242] [ticket/11831] getAttribute was replaced with attr PHPBB3-11831 --- tests/test_framework/phpbb_functional_test_case.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 1ced462c76..00b31212b2 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -661,7 +661,7 @@ class phpbb_functional_test_case extends phpbb_test_case $hidden_fields = array( $crawler->filter('[type="hidden"]')->each(function ($node, $i) { - return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value')); + return array('name' => $node->attr('name'), 'value' => $node->attr('value')); }), ); From 3cd445d055a9236db1476f41b8cadad08f7e5cf7 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sun, 25 Aug 2013 10:11:33 +0300 Subject: [PATCH 028/242] [ticket/11811] Remove outline on :focus PHPBB3-11811 --- phpBB/adm/style/admin.css | 10 ++++++++++ phpBB/styles/prosilver/theme/forms.css | 10 ++++++++++ phpBB/styles/subsilver2/theme/stylesheet.css | 3 +++ 3 files changed, 23 insertions(+) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index b9996fd1d1..a0e14d65a1 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -731,6 +731,10 @@ optgroup, select { color: #000; } +select:focus { + outline-style: none; +} + optgroup { font-size: 1.00em; font-weight: bold; @@ -976,6 +980,7 @@ input:focus, textarea:focus { border: 1px solid #BC2A4D; background-color: #E9E9E2; color: #BC2A4D; + outline-style: none; } /* Submit button fieldset or paragraph @@ -1070,6 +1075,11 @@ input.disabled { color: #666666; } +/* Focus states */ +input.button1:focus, input.button2:focus, input.button3:focus { + outline-style: none; +} + /* Pagination ---------------------------------------- */ .pagination { diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 43888733cc..3926da7139 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -29,6 +29,10 @@ select { font-size: 1em; } +select:focus { + outline-style: none; +} + option { padding-right: 1em; } @@ -298,6 +302,7 @@ fieldset.submit-buttons input { .inputbox:focus { border: 1px solid #eaeaea; color: #4b4b4b; + outline-style: none; } input.inputbox { width: 85%; } @@ -369,6 +374,11 @@ input.disabled { color: #666666; } +/* Focus states */ +input.button1:focus, input.button2:focus, input.button3:focus { + outline-style: none; +} + /* Topic and forum Search */ .search-box { margin-top: 3px; diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index abfdf568e7..ec36baa251 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -543,6 +543,9 @@ input.radio { border-style: none; } +input:focus, select:focus, textarea:focus { + outline-style: none; +} /* BBCode ------------ */ From 6c3f3ec893b6b5b90bf10016df297e6ba07dc85d Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 23 Sep 2013 14:10:21 +0200 Subject: [PATCH 029/242] [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax. PHPBB3-11860 --- phpBB/.htaccess | 56 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/phpBB/.htaccess b/phpBB/.htaccess index 474f9774c2..ad5e24d642 100644 --- a/phpBB/.htaccess +++ b/phpBB/.htaccess @@ -8,12 +8,50 @@ #RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L] # - -Order Allow,Deny -Deny from All - - - -Order Allow,Deny -Deny from All - +# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from +# module mod_authz_host to a new module called mod_access_compat (which may be +# disabled) and a new "Require" syntax has been introduced to mod_authz_host. +# We could just conditionally provide both versions, but unfortunately Apache +# does not explicitly tell us its version if the module mod_version is not +# available. In this case, we check for the availability of module +# mod_authz_core (which should be on 2.4 or higher only) as a best guess. + + + + Order Allow,Deny + Deny from All + + + Order Allow,Deny + Deny from All + + + = 2.4> + + Require all denied + + + Require all denied + + + + + + + Order Allow,Deny + Deny from All + + + Order Allow,Deny + Deny from All + + + + + Require all denied + + + Require all denied + + + From c654e9d24751f803e779ed3ce62b45734ca6b091 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 25 Sep 2013 13:35:08 +0200 Subject: [PATCH 030/242] [ticket/11864] Do not call exit after display_progress_bar in acp_forums The progress bar is called with the method display_progress_bar() in the acp_forums files. This method then call adm_page_footer() which also calls exit_handler(). Therefore, the exit; in acp_forums after $this->display_progress_bar() is obsolete and shouldn't exist in the first place. PHPBB3-11864 --- phpBB/includes/acp/acp_forums.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 50e12a0f15..dc2e6b75fb 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -56,7 +56,6 @@ class acp_forums $total = request_var('total', 0); $this->display_progress_bar($start, $total); - exit; break; case 'delete': From 50f6af2a207dc18c1e76b08201a5c9ea640e921f Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 27 Sep 2013 01:33:08 +0200 Subject: [PATCH 031/242] [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag. --- build/build.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build.xml b/build/build.xml index e2f69a139c..7b87830da3 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + From ac4736db0887e986a322f7f92429430333525a24 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 30 Sep 2013 17:04:14 +0200 Subject: [PATCH 032/242] [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index 7b87830da3..40d875cb95 100644 --- a/build/build.xml +++ b/build/build.xml @@ -3,7 +3,7 @@ - + From da9756ba2553abdcc87130ec892e589ded1c1256 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 30 Sep 2013 18:04:38 +0200 Subject: [PATCH 033/242] [ticket/11876] Move checksum generation from build PHP files to phing build.xml This also removes paths from the checksum files. PHPBB3-11876 --- build/build.xml | 18 ++++++++++++++++++ build/build_diff.php | 3 --- build/package.php | 12 ------------ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/build/build.xml b/build/build.xml index 40d875cb95..a861ebc205 100644 --- a/build/build.xml +++ b/build/build.xml @@ -149,6 +149,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/build/build_diff.php b/build/build_diff.php index 0824b53caa..d264ecf493 100755 --- a/build/build_diff.php +++ b/build/build_diff.php @@ -83,9 +83,6 @@ if (!$echo_changes) // Build Package run_command("$compress_command ./../../new_version/release_files/{$code_changes_filename}.{$extension} *"); - - // Build MD5 Sum - run_command("md5sum ./../../new_version/release_files/{$code_changes_filename}.{$extension} > ./../../new_version/release_files/{$code_changes_filename}.{$extension}.md5"); flush(); } } diff --git a/build/package.php b/build/package.php index 48f42b3572..22ea4e52af 100755 --- a/build/package.php +++ b/build/package.php @@ -285,9 +285,6 @@ if (sizeof($package->old_packages)) // Build Package $package->run_command($compress_command . ' ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' *'); - - // Build MD5 Sum - $package->run_command('md5sum ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' > ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . '.md5'); } // Build Files Package @@ -319,8 +316,6 @@ if (sizeof($package->old_packages)) chdir('./release'); $package->run_command("$compress_command ../../release_files/" . $package->get('release_filename') . '-files.' . $extension . ' *'); - // Build MD5 Sum - $package->run_command('md5sum ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . ' > ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . '.md5'); chdir('..'); $package->run_command('rm -Rv ' . $package->get('files_directory') . '/release'); @@ -363,9 +358,6 @@ if (sizeof($package->old_packages)) // Copy last package over... $package->run_command('rm -v ../release_files/phpBB-' . $last_version . ".$extension"); $package->run_command("$compress_command ../../release_files/phpBB-$last_version.$extension *"); - - // Build MD5 Sum - $package->run_command("md5sum ../../release_files/phpBB-$last_version.$extension > ../../release_files/phpBB-$last_version.$extension.md5"); chdir('..'); } @@ -388,9 +380,6 @@ foreach ($compress_programs as $extension => $compress_command) // Build Package $package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name')); - - // Build MD5 Sum - $package->run_command('md5sum ./release_files/' . $package->get('release_filename') . '.' . $extension . ' > ./release_files/' . $package->get('release_filename') . '.' . $extension . '.md5'); } // Microsoft Web PI packaging @@ -398,7 +387,6 @@ $package->begin_status('Packaging phpBB for Microsoft WebPI'); $file = './release_files/' . $package->get('release_filename') . '.webpi.zip'; $package->run_command('cp -p ./release_files/' . $package->get('release_filename') . ".zip $file"); $package->run_command('cd ./../webpi && ' . $compress_programs['zip'] . " ./../new_version/$file *"); -$package->run_command("md5sum $file > $file.md5"); // verify results chdir($package->locations['root']); From 0cf9d657b7c56e602248d5998a49b7d392b16d39 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 30 Sep 2013 18:09:27 +0200 Subject: [PATCH 034/242] [ticket/11876] Replace MD5 with SHA256. PHPBB3-11876 --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index a861ebc205..f0962e67eb 100644 --- a/build/build.xml +++ b/build/build.xml @@ -166,7 +166,7 @@ - + From dbd0380c3fb9edeaa6ec32b4f2348eca26955831 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 1 Oct 2013 16:13:10 +0200 Subject: [PATCH 035/242] [ticket/11877] Create package links and checksums for announcement via script. PHPBB3-11877 --- build/build.xml | 12 +++++ build/build_announcement.php | 98 ++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100755 build/build_announcement.php diff --git a/build/build.xml b/build/build.xml index f0962e67eb..018f7b91a2 100644 --- a/build/build.xml +++ b/build/build.xml @@ -169,6 +169,18 @@ + + + + + + + + Date: Wed, 2 Oct 2013 11:12:41 +0300 Subject: [PATCH 036/242] [ticket/11879] Replace .live() with .on() PHPBB3-11879 --- phpBB/styles/prosilver/template/forum_fn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 240fe7e51d..6a65caf6f6 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -403,7 +403,7 @@ function apply_onkeypress_event() // jQuery code in case jQuery is used if (jquery_present) { - jQuery('form input[type=text], form input[type=password]').live('keypress', function (e) + jQuery('form input[type=text], form input[type=password]').on('keypress', function (e) { var default_button = jQuery(this).parents('form').find('input[type=submit].default-submit-action'); From 2b959e3331f9bb585c115911e027844afe54d1e6 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Sat, 5 Oct 2013 21:09:52 +0530 Subject: [PATCH 037/242] [ticket/11288] Handle +,- without preceeding whitespace characters PHPBB3-11288 --- phpBB/includes/search/fulltext_native.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index dc961f3c8a..7fff83db58 100644 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -233,6 +233,12 @@ class fulltext_native extends search_backend } unset($exact_words); + // Handle +, - without preceeding whitespace character + $match = array('#(\S)\+#', '#(\S)-#'); + $replace = array('$1 +', '$1 +'); + + $keywords = preg_replace($match, $replace, $keywords); + // now analyse the search query, first split it using the spaces $query = explode(' ', $keywords); From cdaea7a4062c463e9536b3ca52207c013d8af408 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 15 Oct 2013 16:28:59 +0200 Subject: [PATCH 038/242] [ticket/11920] Add MariaDB environment to Travis-CI. PHPBB3-11920 --- .travis.yml | 3 ++- travis/phpunit-mariadb-travis.xml | 41 +++++++++++++++++++++++++++++++ travis/setup-mariadb.sh | 26 ++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 travis/phpunit-mariadb-travis.xml create mode 100755 travis/setup-mariadb.sh diff --git a/.travis.yml b/.travis.yml index 5e2569dd22..03bc7fb945 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,14 @@ php: - 5.5 env: + - DB=mariadb - DB=mysql - DB=postgres before_script: - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" - - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" + - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; phpenv rehash; fi" - cd phpBB - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev --no-interaction --prefer-source; fi" diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml new file mode 100644 index 0000000000..d49118b0f8 --- /dev/null +++ b/travis/phpunit-mariadb-travis.xml @@ -0,0 +1,41 @@ + + + + + ../tests/ + tests/functional + tests/lint_test.php + + + ../tests/functional + + + + + + slow + + + + + + + + + + + + + + diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh new file mode 100755 index 0000000000..68359e400a --- /dev/null +++ b/travis/setup-mariadb.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# @copyright (c) 2013 phpBB Group +# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +# +set -e + +# MariaDB Series +VERSION='5.5' + +# Operating system codename, e.g. "precise" +OS_CODENAME=$(lsb_release --codename --short) + +if ! which add-apt-repository > /dev/null +then + sudo apt-get update -qq + sudo apt-get install -qq python-software-properties +fi + +sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db +sudo add-apt-repository "deb http://ftp.osuosl.org/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" +sudo apt-get update -qq + +sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd" +sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd" +sudo apt-get install -qq mariadb-server From 55e24eb4f87523c83e74a7174555a48b2a90b7a7 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 15 Oct 2013 16:57:16 +0200 Subject: [PATCH 039/242] [ticket/11920] Have to use empty root password otherwise db creation fails. PHPBB3-11920 --- travis/phpunit-mariadb-travis.xml | 2 +- travis/setup-mariadb.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml index d49118b0f8..1eaee5b7d8 100644 --- a/travis/phpunit-mariadb-travis.xml +++ b/travis/phpunit-mariadb-travis.xml @@ -34,7 +34,7 @@ - + diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 68359e400a..2e974da8eb 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -24,3 +24,10 @@ sudo apt-get update -qq sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd" sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd" sudo apt-get install -qq mariadb-server + +# Set root password to empty string. +echo " +USE mysql; +UPDATE user SET Password = PASSWORD('') where User = 'root'; +FLUSH PRIVILEGES; +" | mysql -u root -prootpasswd From 878cb836f59afffca333b6d42e11c1bc0a4bc16f Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 15 Oct 2013 22:44:49 +0200 Subject: [PATCH 040/242] [ticket/11920] Actually call travis/setup-mariadb.sh. PHPBB3-11920 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 03bc7fb945..ecaf43c4b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ env: before_script: - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" + - sh -c "if [ '$DB' = 'mariadb' ]; then travis/setup-mariadb.sh; fi" - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; phpenv rehash; fi" - cd phpBB From 0f64f0edc409ecea94159bb365b7f7efbd311195 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 16 Oct 2013 00:24:44 +0200 Subject: [PATCH 041/242] [ticket/11920] Manually purge mysql-common. PHPBB3-11920 --- travis/setup-mariadb.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 2e974da8eb..6742d27263 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -11,6 +11,9 @@ VERSION='5.5' # Operating system codename, e.g. "precise" OS_CODENAME=$(lsb_release --codename --short) +# Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf) +sudo apt-get purge -qq mysql-common + if ! which add-apt-repository > /dev/null then sudo apt-get update -qq From 5a481bb1763477edbacf530de7c64a729a796084 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 16 Oct 2013 00:25:07 +0200 Subject: [PATCH 042/242] [ticket/11920] Print MariaDB version after successful setup. PHPBB3-11920 --- travis/setup-mariadb.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 6742d27263..02520b1c2c 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -34,3 +34,5 @@ USE mysql; UPDATE user SET Password = PASSWORD('') where User = 'root'; FLUSH PRIVILEGES; " | mysql -u root -prootpasswd + +mysql --version From 6de519431db33e22fee845c36179f1c65ad02110 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 19 Oct 2013 23:05:27 +0200 Subject: [PATCH 043/242] [ticket/11951] Add MariaDB to supported DBMSes in requirement section. PHPBB3-11951 --- phpBB/docs/INSTALL.html | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 3fa0597fc8..74c017ecff 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -139,6 +139,7 @@
  • A SQL database system, one of:
    • MySQL 3.23 or above (MySQLi supported)
      • +
    • MariaDB 5.1 or above
    • PostgreSQL 7.3+
    • SQLite 2.8.2+ (SQLite 3 is not supported)
    • Firebird 2.1+
      • From 7df35a288a639102fa0f908f052d3eb06a1728b6 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 19 Oct 2013 23:08:04 +0200 Subject: [PATCH 044/242] [ticket/11951] Add MariaDB to platforms we test on. PHPBB3-11951 --- phpBB/docs/README.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 89f573de04..d54c58eca6 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -329,7 +329,7 @@

      Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.

      -

      This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 4.3.3 to 5.4.x without problem.

      +

      This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 4.3.3 to 5.4.x without problem.

      7.i. Notice on PHP security issues

      From 98a6f10ce7e69d31ca71528e8cf516bccf0e4cc7 Mon Sep 17 00:00:00 2001 From: Falk Seidel Date: Wed, 23 Oct 2013 15:59:31 +0200 Subject: [PATCH 045/242] [task/github-readme/travis] Fix Travis-Badge and link PHPBB3-11968 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f6ef523e17..22d826f4bc 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the dev ## AUTOMATED TESTING We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis build below. -develop - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop)](http://travis-ci.org/phpbb/phpbb3) -develop-olympus - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop-olympus)](http://travis-ci.org/phpbb/phpbb3) +develop - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=develop)](http://travis-ci.org/phpbb/phpbb) +develop-olympus - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=develop-olympus)](http://travis-ci.org/phpbb/phpbb) ## LICENSE From acc6e440d019787f3f0aaedd775576805e6fc76d Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 25 Oct 2013 13:20:09 +0200 Subject: [PATCH 046/242] [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL. PHPBB3-11920 --- travis/setup-mariadb.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 02520b1c2c..d9a88edb24 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -20,10 +20,20 @@ then sudo apt-get install -qq python-software-properties fi +MIRROR_DOMAIN='ftp.osuosl.org' sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db -sudo add-apt-repository "deb http://ftp.osuosl.org/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" +sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" sudo apt-get update -qq +# Pin repository in order to avoid conflicts with MySQL from distribution +# repository. See https://mariadb.com/kb/en/installing-mariadb-deb-files +# section "Version Mismatch Between MariaDB and Ubuntu/Debian Repositories" +echo " +Package: * +Pin: origin $MIRROR_DOMAIN +Pin-Priority: 1000 +" | sudo tee /etc/apt/preferences.d/mariadb + sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd" sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd" sudo apt-get install -qq mariadb-server From 3c135ccab2ca20af52e7fd0e7af03fdff828446c Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 25 Oct 2013 00:07:39 +0200 Subject: [PATCH 047/242] [ticket/11970] Add set -x to Travis setup scripts. Output is hidden by Travis by default and this will allow easier debugging. PHPBB3-11970 --- travis/setup-mariadb.sh | 1 + travis/setup-webserver.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index d9a88edb24..7e5c4e7d42 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -4,6 +4,7 @@ # @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 # set -e +set -x # MariaDB Series VERSION='5.5' diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 95fc4ec1f8..4cb2d3ed89 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -4,6 +4,7 @@ # @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 # set -e +set -x sudo apt-get update -qq sudo apt-get install -qq nginx realpath From e65483ac3249c87aa147e99ad612b7fb211ce9c5 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 25 Oct 2013 00:33:19 +0200 Subject: [PATCH 048/242] [ticket/11970] Make apt-get less quiet. PHPBB3-11970 --- travis/setup-mariadb.sh | 10 +++++----- travis/setup-webserver.sh | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 7e5c4e7d42..aceb6af7ee 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -13,18 +13,18 @@ VERSION='5.5' OS_CODENAME=$(lsb_release --codename --short) # Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf) -sudo apt-get purge -qq mysql-common +sudo apt-get purge -y mysql-common if ! which add-apt-repository > /dev/null then - sudo apt-get update -qq - sudo apt-get install -qq python-software-properties + sudo apt-get update + sudo apt-get install -y python-software-properties fi MIRROR_DOMAIN='ftp.osuosl.org' sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" -sudo apt-get update -qq +sudo apt-get update # Pin repository in order to avoid conflicts with MySQL from distribution # repository. See https://mariadb.com/kb/en/installing-mariadb-deb-files @@ -37,7 +37,7 @@ Pin-Priority: 1000 sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd" sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd" -sudo apt-get install -qq mariadb-server +sudo apt-get install -y mariadb-server # Set root password to empty string. echo " diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 4cb2d3ed89..f1bf69c575 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -6,8 +6,8 @@ set -e set -x -sudo apt-get update -qq -sudo apt-get install -qq nginx realpath +sudo apt-get update +sudo apt-get install -y nginx realpath sudo service nginx stop From f833a42e7e6266fd946e5a739bfbf528c672a387 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Thu, 14 Nov 2013 07:55:17 -0800 Subject: [PATCH 049/242] [ticket/11814] Remove redundant text from the topic reply email notification. PHPBB3-11814 --- phpBB/language/en/email/topic_notify.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index 99865494ac..f52ce9395d 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply by {AUTHOR_NAME} since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. +You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply by {AUTHOR_NAME} since your last visit. No more notifications will be sent until you visit the topic. If you want to view the newest post made since your last visit, click the following link: {U_NEWEST_POST} @@ -14,7 +14,6 @@ If you want to view the forum, click the following link: {U_FORUM} If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link: - {U_STOP_WATCHING_TOPIC} {EMAIL_SIG} \ No newline at end of file From e111d7bd13edae6bb8d010da8ef3cecab0c68a28 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Mon, 25 Nov 2013 12:38:53 -0800 Subject: [PATCH 050/242] [ticket/12037] Fix hard-coded text in acp_inactive.html. PHPBB3-12037 --- phpBB/adm/style/acp_inactive.html | 2 +- phpBB/language/en/memberlist.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index 3b20043dd9..b8e46a6e53 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -53,7 +53,7 @@
      - {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} Users per page: + {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} {L_USERS_PER_PAGE}:
      diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 7dc5e6b74a..f59efd3b95 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -138,6 +138,7 @@ $lang = array_merge($lang, array( ), 'USER_ONLINE' => 'Online', 'USER_PRESENCE' => 'Board presence', + 'USERS_PER_PAGE' => 'Users per page', 'VIEWING_PROFILE' => 'Viewing profile - %s', 'VISITED' => 'Last visited', From 97b1d70a37f77e54315197c7ad582890cf144b9f Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 29 Nov 2013 10:50:38 +0100 Subject: [PATCH 051/242] [ticket/11699] Exclude build/new_version and build/old_versions from lint. PHPBB3-11699 --- tests/lint_test.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/lint_test.php b/tests/lint_test.php index 905067072d..5b5d8975e8 100644 --- a/tests/lint_test.php +++ b/tests/lint_test.php @@ -23,6 +23,8 @@ class phpbb_lint_test extends phpbb_test_case } self::$exclude = array( + dirname(__FILE__) . '/../build/new_version', + dirname(__FILE__) . '/../build/old_versions', // PHP Fatal error: Cannot declare class Container because the name is already in use in /var/www/projects/phpbb3/tests/../phpBB/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php on line 20 // https://gist.github.com/e003913ffd493da63cbc dirname(__FILE__) . '/../phpBB/vendor', From 4171ef9ed79d71f8e2ba0253c5e6bed15f08712b Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 29 Nov 2013 13:53:11 +0100 Subject: [PATCH 052/242] [ticket/12046] Use PHP_BINARY environment variable in PHP lint test. PHPBB3-12046 --- tests/lint_test.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/tests/lint_test.php b/tests/lint_test.php index 905067072d..d83ac0c652 100644 --- a/tests/lint_test.php +++ b/tests/lint_test.php @@ -9,17 +9,30 @@ class phpbb_lint_test extends phpbb_test_case { + static protected $php_binary; static protected $exclude; static public function setUpBeforeClass() { + // Try to use PHP_BINARY constant if available so lint tests are run + // using the same php binary as phpunit. If not available (pre PHP + // 5.4), assume binary is called 'php' and is in PATH. + self::$php_binary = defined('PHP_BINARY') ? escapeshellcmd(PHP_BINARY) : 'php'; + $output = array(); $status = 1; - exec('(php -v) 2>&1', $output, $status); + exec(sprintf('(%s --version) 2>&1', self::$php_binary), $output, $status); if ($status) { $output = implode("\n", $output); - self::markTestSkipped("php is not in PATH or broken: $output"); + if (self::$php_binary === 'php') + { + self::markTestSkipped(sprintf('php is not in PATH or broken. Output: %s', $output)); + } + else + { + self::markTestSkipped(sprintf('Could not run PHP_BINARY %s. Output: %s', self::$php_binary, $output)); + } } self::$exclude = array( @@ -61,13 +74,12 @@ class phpbb_lint_test extends phpbb_test_case } else if (substr($filename, strlen($filename)-4) == '.php') { - // assume php binary is called php and it is in PATH - $cmd = '(php -l ' . escapeshellarg($path) . ') 2>&1'; + $cmd = sprintf('(%s -l %s) 2>&1', self::$php_binary, escapeshellarg($path)); $output = array(); $status = 1; exec($cmd, $output, $status); $output = implode("\n", $output); - $this->assertEquals(0, $status, "php -l failed for $path:\n$output"); + $this->assertEquals(0, $status, "PHP lint failed for $path:\n$output"); } } } From 0834a749e72e6239ed22113e25dd4778a44bb976 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 29 Nov 2013 14:00:55 +0100 Subject: [PATCH 053/242] [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix. PHPBB3-11699 --- tests/lint_test.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/lint_test.php b/tests/lint_test.php index 5b5d8975e8..6951ee5ef7 100644 --- a/tests/lint_test.php +++ b/tests/lint_test.php @@ -23,6 +23,7 @@ class phpbb_lint_test extends phpbb_test_case } self::$exclude = array( + dirname(__FILE__) . '/../.git', dirname(__FILE__) . '/../build/new_version', dirname(__FILE__) . '/../build/old_versions', // PHP Fatal error: Cannot declare class Container because the name is already in use in /var/www/projects/phpbb3/tests/../phpBB/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php on line 20 @@ -47,7 +48,7 @@ class phpbb_lint_test extends phpbb_test_case $dh = opendir($root); while (($filename = readdir($dh)) !== false) { - if ($filename == '.' || $filename == '..' || $filename == 'git') + if ($filename == '.' || $filename == '..') { continue; } From 981df153d2fbeba5f9aa6a677e11f1df15b3ea15 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 29 Nov 2013 14:02:50 +0100 Subject: [PATCH 054/242] [ticket/11699] Also exclude the phpBB/cache directory. PHPBB3-11699 --- tests/lint_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/lint_test.php b/tests/lint_test.php index 6951ee5ef7..eba117839b 100644 --- a/tests/lint_test.php +++ b/tests/lint_test.php @@ -26,6 +26,7 @@ class phpbb_lint_test extends phpbb_test_case dirname(__FILE__) . '/../.git', dirname(__FILE__) . '/../build/new_version', dirname(__FILE__) . '/../build/old_versions', + dirname(__FILE__) . '/../phpBB/cache', // PHP Fatal error: Cannot declare class Container because the name is already in use in /var/www/projects/phpbb3/tests/../phpBB/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php on line 20 // https://gist.github.com/e003913ffd493da63cbc dirname(__FILE__) . '/../phpBB/vendor', From eef1b586d5b89acda9e18b2d7b2c051e10d18ef8 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Mon, 2 Dec 2013 00:53:42 -0800 Subject: [PATCH 055/242] [ticket/12048] Fix the regexp for language keys in custom bbcodes. PHPBB3-12048 --- phpBB/includes/bbcode.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 9356e3e9b4..f587e111f3 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -376,7 +376,7 @@ class bbcode } // Replace {L_*} lang strings - $bbcode_tpl = preg_replace('/{L_([A-Z_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $bbcode_tpl); + $bbcode_tpl = preg_replace('/{L_([A-Z0-9_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $bbcode_tpl); if (!empty($rowset[$bbcode_id]['second_pass_replace'])) { @@ -480,7 +480,7 @@ class bbcode 'email' => array('{EMAIL}' => '$1', '{DESCRIPTION}' => '$2') ); - $tpl = preg_replace('/{L_([A-Z_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $tpl); + $tpl = preg_replace('/{L_([A-Z0-9_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $tpl); if (!empty($replacements[$tpl_name])) { From e41cd384f533b8caa27fba10fedb89f9713c32b5 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 4 Dec 2013 13:22:47 +0100 Subject: [PATCH 056/242] [ticket/12056] Fix failure due to "Creating default object from empty value". PHPBB3-12056 --- tests/functions/obtain_online_test.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/functions/obtain_online_test.php b/tests/functions/obtain_online_test.php index b3beb55a96..de6451a0db 100644 --- a/tests/functions/obtain_online_test.php +++ b/tests/functions/obtain_online_test.php @@ -22,8 +22,9 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case { parent::setUp(); - global $config, $db; + global $config, $db, $user; + $user = new StdClass; $db = $this->db = $this->new_dbal(); $config = array( 'load_online_time' => 5, From 204d6781d80b6f88a45723bafe3de23cac0d72f7 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Fri, 6 Dec 2013 19:59:33 +0100 Subject: [PATCH 057/242] [ticket/12061] Fix keyboard shortcut in firefox PHPBB3-12061 --- phpBB/styles/prosilver/template/overall_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 25b60be6e1..fc6a37cbe3 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -6,7 +6,7 @@
        -
      • {L_INDEX}
        • +
      • {L_INDEX}
      • class="icon-unsubscribe"class="icon-subscribe">{S_WATCH_FORUM_TITLE}
      • class="icon-unsubscribe"class="icon-subscribe">{L_WATCH_TOPIC}
        • From e6b91de17b52d71b982b6bf809e322e56402b023 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Tue, 10 Dec 2013 23:10:31 +0100 Subject: [PATCH 058/242] [ticket/10023] Make password change notification more noticeable PHPBB3-10023 --- phpBB/styles/prosilver/template/ucp_profile_reg_details.html | 4 ++-- phpBB/styles/subsilver2/template/ucp_profile_reg_details.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html index 5eb55dc71c..2f24601645 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html +++ b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html @@ -7,7 +7,7 @@
        -

        {L_FORCE_PASSWORD_EXPLAIN}

        +

        {L_FORCE_PASSWORD_EXPLAIN}

        @@ -60,4 +60,4 @@
        - \ No newline at end of file + diff --git a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html index 09f60ad5a7..2eca7a93c8 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html @@ -6,7 +6,7 @@ - {L_FORCE_PASSWORD_EXPLAIN} + {L_FORCE_PASSWORD_EXPLAIN} @@ -50,4 +50,4 @@ - \ No newline at end of file + From 5bf472619537c29f381d91ae564324562ef1f022 Mon Sep 17 00:00:00 2001 From: erangamapa Date: Thu, 14 Mar 2013 01:11:36 +0530 Subject: [PATCH 059/242] [ticket/11271] Displaying in-line attached images in ATOM feed. In-line attached images are not displaying as they are not parsing. Included 'parse_attachments' column name for data fetching queries in feed.php. Checked weather feeds have in-line attachments and parsed them by using parse_attachments() method. PHPBB3-11271 --- phpBB/feed.php | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/phpBB/feed.php b/phpBB/feed.php index 9816f0f303..9f0f0b2294 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -19,6 +19,7 @@ define('IN_PHPBB', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); +include($phpbb_root_path . 'includes/functions_display.' . $phpEx); if (!$config['feed_enable']) { @@ -106,7 +107,7 @@ while ($row = $feed->get_item()) 'title' => censor_text($title), 'category' => ($config['feed_item_statistics'] && !empty($row['forum_id'])) ? $board_url . '/viewforum.' . $phpEx . '?f=' . $row['forum_id'] : '', 'category_name' => ($config['feed_item_statistics'] && isset($row['forum_name'])) ? $row['forum_name'] : '', - 'description' => censor_text(feed_generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options)), + 'description' => censor_text(feed_generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options, $row['forum_id'], $row['post_id'], $row['post_attachment'])), 'statistics' => '', ); @@ -273,9 +274,9 @@ function feed_format_date($time) /** * Generate text content **/ -function feed_generate_content($content, $uid, $bitfield, $options) +function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $post_id, $post_attachment) { - global $user, $config, $phpbb_root_path, $phpEx, $board_url; + global $user, $db, $config, $phpbb_root_path, $phpEx, $board_url; if (empty($content)) { @@ -322,6 +323,25 @@ function feed_generate_content($content, $uid, $bitfield, $options) // Remove some specials html tag, because somewhere there are a mod to allow html tags ;) $content = preg_replace( '#<(script|iframe)([^[]+)\1>#siU', ' $1 ', $content); + // Parse inline images to display with the feed + if ($post_attachment) + { + $sql = 'SELECT * + FROM ' . ATTACHMENTS_TABLE . ' + WHERE post_msg_id = ' . $post_id . ' + AND in_message = 0 + ORDER BY filetime DESC, post_msg_id ASC'; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $attachments[$row['post_msg_id']][] = $row; + } + $db->sql_freeresult($result); + $update_count = array(); + parse_attachments($forum_id, $content, $attachments[$post_id], $update_count); + } + // Remove Comments from inline attachments [ia] $content = preg_replace('#
        (.*?)(.*?)(.*?)
        #si','$4',$content); @@ -795,7 +815,7 @@ class phpbb_feed_overall extends phpbb_feed_post_base // Get the actual data $this->sql = array( 'SELECT' => 'f.forum_id, f.forum_name, ' . - 'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' . + 'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.post_attachment, ' . 'u.username, u.user_id', 'FROM' => array( USERS_TABLE => 'u', @@ -927,7 +947,7 @@ class phpbb_feed_forum extends phpbb_feed_post_base } $this->sql = array( - 'SELECT' => 'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' . + 'SELECT' => 'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.post_attachment, ' . 'u.username, u.user_id', 'FROM' => array( POSTS_TABLE => 'p', @@ -1092,7 +1112,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base global $auth, $db; $this->sql = array( - 'SELECT' => 'p.post_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' . + 'SELECT' => 'p.post_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.post_attachment, ' . 'u.username, u.user_id', 'FROM' => array( POSTS_TABLE => 'p', @@ -1257,7 +1277,7 @@ class phpbb_feed_news extends phpbb_feed_topic_base $this->sql = array( 'SELECT' => 'f.forum_id, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_replies, t.topic_replies_real, t.topic_views, t.topic_time, t.topic_last_post_time, - p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url', + p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.post_attachment', 'FROM' => array( TOPICS_TABLE => 't', POSTS_TABLE => 'p', @@ -1330,7 +1350,7 @@ class phpbb_feed_topics extends phpbb_feed_topic_base $this->sql = array( 'SELECT' => 'f.forum_id, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_replies, t.topic_replies_real, t.topic_views, t.topic_time, t.topic_last_post_time, - p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url', + p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.post_attachment', 'FROM' => array( TOPICS_TABLE => 't', POSTS_TABLE => 'p', @@ -1427,7 +1447,7 @@ class phpbb_feed_topics_active extends phpbb_feed_topic_base 'SELECT' => 'f.forum_id, f.forum_name, t.topic_id, t.topic_title, t.topic_replies, t.topic_replies_real, t.topic_views, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_post_time, - p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url', + p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.post_attachment', 'FROM' => array( TOPICS_TABLE => 't', POSTS_TABLE => 'p', From a41e2ca380d0d4a142229f1655db4d429f109e50 Mon Sep 17 00:00:00 2001 From: erangamapa Date: Thu, 14 Mar 2013 01:38:24 +0530 Subject: [PATCH 060/242] [ticket/11271] Removed in-line attachment comments properly. Added a new regex to remove in-line attachment comments. PHPBB3-11271 --- phpBB/feed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/feed.php b/phpBB/feed.php index 9f0f0b2294..5a42ca6c37 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -343,7 +343,7 @@ function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $ } // Remove Comments from inline attachments [ia] - $content = preg_replace('#
        (.*?)(.*?)(.*?)
        #si','$4',$content); + $content = preg_replace('#
        (.*?)
        #','',$content); // Replace some entities with their unicode counterpart $entities = array( From 91a14a9e636e761ef18632e850518d4ba5b7eb90 Mon Sep 17 00:00:00 2001 From: erangamapa Date: Sun, 17 Mar 2013 02:17:52 +0530 Subject: [PATCH 061/242] [ticket/11271] Fetched feed attachments before loop. Fetched feed attachments before looping through feed items and send them to method 'feed_generate_content' for each feed item. PHPBB3-11271 --- phpBB/feed.php | 54 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/phpBB/feed.php b/phpBB/feed.php index 5a42ca6c37..570240fe93 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -72,6 +72,40 @@ if ($feed === false) trigger_error('NO_FEED'); } +$sql_array = array( + 'SELECT' => 'a.*', + 'FROM' => array( + ATTACHMENTS_TABLE => 'a' + ), + 'WHERE' => 'a.in_message = 0 ', + 'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC' + ); + +if ($topic_id) +{ + $sql_array['WHERE'] .= 'AND a.topic_id = ' . $topic_id; +} +else if ($forum_id) +{ + $sql_array['LEFT_JOIN'] = array( + array( + 'FROM' => array(TOPICS_TABLE => 't'), + 'ON' => 'a.topic_id = t.topic_id' + ) + ); + $sql_array['WHERE'] .= 'AND t.forum_id = ' . $forum_id; +} + +$sql = $db->sql_build_query('SELECT', $sql_array); +$result = $db->sql_query($sql); + +// Set attachments in feed items +while ($row = $db->sql_fetchrow($result)) +{ + $attachments[$row['post_msg_id']][] = $row; +} +$db->sql_freeresult($result); + // Open Feed $feed->open(); @@ -107,7 +141,7 @@ while ($row = $feed->get_item()) 'title' => censor_text($title), 'category' => ($config['feed_item_statistics'] && !empty($row['forum_id'])) ? $board_url . '/viewforum.' . $phpEx . '?f=' . $row['forum_id'] : '', 'category_name' => ($config['feed_item_statistics'] && isset($row['forum_name'])) ? $row['forum_name'] : '', - 'description' => censor_text(feed_generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options, $row['forum_id'], $row['post_id'], $row['post_attachment'])), + 'description' => censor_text(feed_generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options, $row['forum_id'], (($row['post_attachment']) ? $attachments[$row['post_id']] : null))), 'statistics' => '', ); @@ -274,7 +308,7 @@ function feed_format_date($time) /** * Generate text content **/ -function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $post_id, $post_attachment) +function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $post_attachments) { global $user, $db, $config, $phpbb_root_path, $phpEx, $board_url; @@ -324,22 +358,10 @@ function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $ $content = preg_replace( '#<(script|iframe)([^[]+)\1>#siU', ' $1 ', $content); // Parse inline images to display with the feed - if ($post_attachment) + if ($post_attachments != null) { - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . ' - WHERE post_msg_id = ' . $post_id . ' - AND in_message = 0 - ORDER BY filetime DESC, post_msg_id ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $attachments[$row['post_msg_id']][] = $row; - } - $db->sql_freeresult($result); $update_count = array(); - parse_attachments($forum_id, $content, $attachments[$post_id], $update_count); + parse_attachments($forum_id, $content, $post_attachments, $update_count); } // Remove Comments from inline attachments [ia] From 85861711872c0f9a9064e0043764f6c752a915d7 Mon Sep 17 00:00:00 2001 From: erangamapa Date: Sat, 6 Apr 2013 20:13:46 +0530 Subject: [PATCH 062/242] [ticket/11271] Separated attachment fetching query Removed external query used to fetch related attachments. Added attachments fetching method with database query to post based feed. PHPBB3-11271 --- phpBB/feed.php | 79 ++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/phpBB/feed.php b/phpBB/feed.php index 570240fe93..6a83bba562 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -72,39 +72,8 @@ if ($feed === false) trigger_error('NO_FEED'); } -$sql_array = array( - 'SELECT' => 'a.*', - 'FROM' => array( - ATTACHMENTS_TABLE => 'a' - ), - 'WHERE' => 'a.in_message = 0 ', - 'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC' - ); - -if ($topic_id) -{ - $sql_array['WHERE'] .= 'AND a.topic_id = ' . $topic_id; -} -else if ($forum_id) -{ - $sql_array['LEFT_JOIN'] = array( - array( - 'FROM' => array(TOPICS_TABLE => 't'), - 'ON' => 'a.topic_id = t.topic_id' - ) - ); - $sql_array['WHERE'] .= 'AND t.forum_id = ' . $forum_id; -} - -$sql = $db->sql_build_query('SELECT', $sql_array); -$result = $db->sql_query($sql); - -// Set attachments in feed items -while ($row = $db->sql_fetchrow($result)) -{ - $attachments[$row['post_msg_id']][] = $row; -} -$db->sql_freeresult($result); +// Get attachments for this feed +$feed->fetch_attachments(); // Open Feed $feed->open(); @@ -141,7 +110,7 @@ while ($row = $feed->get_item()) 'title' => censor_text($title), 'category' => ($config['feed_item_statistics'] && !empty($row['forum_id'])) ? $board_url . '/viewforum.' . $phpEx . '?f=' . $row['forum_id'] : '', 'category_name' => ($config['feed_item_statistics'] && isset($row['forum_name'])) ? $row['forum_name'] : '', - 'description' => censor_text(feed_generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options, $row['forum_id'], (($row['post_attachment']) ? $attachments[$row['post_id']] : null))), + 'description' => censor_text(feed_generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options, $row['forum_id'], (($row['post_attachment']) ? $feed->attachments[$row['post_id']] : null))), 'statistics' => '', ); @@ -358,7 +327,7 @@ function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $ $content = preg_replace( '#<(script|iframe)([^[]+)\1>#siU', ' $1 ', $content); // Parse inline images to display with the feed - if ($post_attachments != null) + if (count($post_attachments) > 0) { $update_count = array(); parse_attachments($forum_id, $content, $post_attachments, $update_count); @@ -702,6 +671,7 @@ class phpbb_feed_base class phpbb_feed_post_base extends phpbb_feed_base { var $num_items = 'feed_limit_post'; + var $attachments = array(); function set_keys() { @@ -735,6 +705,45 @@ class phpbb_feed_post_base extends phpbb_feed_base . (($this->is_moderator_approve_forum($row['forum_id']) && !$row['post_approved']) ? ' ' . $this->separator_stats . ' ' . $user->lang['POST_UNAPPROVED'] : ''); } } + + function fetch_attachments() + { + global $db; + + $sql_array = array( + 'SELECT' => 'a.*', + 'FROM' => array( + ATTACHMENTS_TABLE => 'a' + ), + 'WHERE' => 'a.in_message = 0 ', + 'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC' + ); + + if (isset($this->topic_id)) + { + $sql_array['WHERE'] .= 'AND a.topic_id = ' . $this->topic_id; + } + else if (isset($this->forum_id)) + { + $sql_array['LEFT_JOIN'] = array( + array( + 'FROM' => array(TOPICS_TABLE => 't'), + 'ON' => 'a.topic_id = t.topic_id' + ) + ); + $sql_array['WHERE'] .= 'AND t.forum_id = ' . $this->forum_id; + } + + $sql = $db->sql_build_query('SELECT', $sql_array); + $result = $db->sql_query($sql); + + // Set attachments in feed items + while ($row = $db->sql_fetchrow($result)) + { + $this->attachments[$row['post_msg_id']][] = $row; + } + $db->sql_freeresult($result); + } } /** From cca4067694137f32dd08705e239e62bd5b0980ee Mon Sep 17 00:00:00 2001 From: erangamapa Date: Sat, 6 Apr 2013 22:29:32 +0530 Subject: [PATCH 063/242] [ticket/11271] Removing unnecessary database object Removed unnecessary global database object from 'feed_generate_content' Method. PHPBB3-11271 --- phpBB/feed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/feed.php b/phpBB/feed.php index 6a83bba562..1b854c1705 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -279,7 +279,7 @@ function feed_format_date($time) **/ function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $post_attachments) { - global $user, $db, $config, $phpbb_root_path, $phpEx, $board_url; + global $user, $config, $phpbb_root_path, $phpEx, $board_url; if (empty($content)) { From 08d69de933e2ca9ef40a6bf4f9273bae88de0199 Mon Sep 17 00:00:00 2001 From: erangamapa Date: Mon, 8 Apr 2013 08:10:36 +0530 Subject: [PATCH 064/242] [ticket/11271] Formatting code and removing null assignment. Formatted code and replaced null assignment with empty array assignment to attachments parameter in method 'feed_generate_content'. PHPBB3-11271 --- phpBB/feed.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 phpBB/feed.php diff --git a/phpBB/feed.php b/phpBB/feed.php old mode 100644 new mode 100755 index 1b854c1705..d19aa48f17 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -110,7 +110,7 @@ while ($row = $feed->get_item()) 'title' => censor_text($title), 'category' => ($config['feed_item_statistics'] && !empty($row['forum_id'])) ? $board_url . '/viewforum.' . $phpEx . '?f=' . $row['forum_id'] : '', 'category_name' => ($config['feed_item_statistics'] && isset($row['forum_name'])) ? $row['forum_name'] : '', - 'description' => censor_text(feed_generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options, $row['forum_id'], (($row['post_attachment']) ? $feed->attachments[$row['post_id']] : null))), + 'description' => censor_text(feed_generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options, $row['forum_id'], (($row['post_attachment']) ? $feed->attachments[$row['post_id']] : array()))), 'statistics' => '', ); @@ -334,7 +334,7 @@ function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $ } // Remove Comments from inline attachments [ia] - $content = preg_replace('#
        (.*?)
        #','',$content); + $content = preg_replace('#
        (.*?)
        #','',$content); // Replace some entities with their unicode counterpart $entities = array( @@ -709,7 +709,7 @@ class phpbb_feed_post_base extends phpbb_feed_base function fetch_attachments() { global $db; - + $sql_array = array( 'SELECT' => 'a.*', 'FROM' => array( @@ -718,7 +718,7 @@ class phpbb_feed_post_base extends phpbb_feed_base 'WHERE' => 'a.in_message = 0 ', 'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC' ); - + if (isset($this->topic_id)) { $sql_array['WHERE'] .= 'AND a.topic_id = ' . $this->topic_id; @@ -736,7 +736,7 @@ class phpbb_feed_post_base extends phpbb_feed_base $sql = $db->sql_build_query('SELECT', $sql_array); $result = $db->sql_query($sql); - + // Set attachments in feed items while ($row = $db->sql_fetchrow($result)) { From 62263c13d4ab5fd0cdb44edec1d93350e8cddaa3 Mon Sep 17 00:00:00 2001 From: erangamapa Date: Thu, 11 Apr 2013 08:59:40 +0530 Subject: [PATCH 065/242] [ticket/11271] Changed executable bit. Changed executable bit value from 755 to 644. PHPBB3-11271 --- phpBB/feed.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 phpBB/feed.php diff --git a/phpBB/feed.php b/phpBB/feed.php old mode 100755 new mode 100644 From dc37f3a0e352a13ba029b45643d1babacc6aa477 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Sun, 15 Sep 2013 20:40:32 +0530 Subject: [PATCH 066/242] [ticket/11271] Use absolute path for displaying inline attachments in feeds PHPBB3-11271 --- phpBB/feed.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpBB/feed.php b/phpBB/feed.php index d19aa48f17..64850c0109 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -352,6 +352,9 @@ function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $ // Other control characters $content = preg_replace('#(?:[\x00-\x1F\x7F]+|(?:\xC2[\x80-\x9F])+)#', '', $content); + // Convert attachments' relative path to absolute path + $content = str_replace($phpbb_root_path . 'download', $board_url . '/download', $content); + return $content; } From 3bae72d164455e8dacd3033540e36d1e1bd313d0 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Fri, 4 Oct 2013 20:51:17 +0530 Subject: [PATCH 067/242] [ticket/11271] Typecast forum and topic id to integer PHPBB3-11271 --- phpBB/feed.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/feed.php b/phpBB/feed.php index 64850c0109..602b7f90b3 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -724,7 +724,7 @@ class phpbb_feed_post_base extends phpbb_feed_base if (isset($this->topic_id)) { - $sql_array['WHERE'] .= 'AND a.topic_id = ' . $this->topic_id; + $sql_array['WHERE'] .= 'AND a.topic_id = ' . (int) $this->topic_id; } else if (isset($this->forum_id)) { @@ -734,7 +734,7 @@ class phpbb_feed_post_base extends phpbb_feed_base 'ON' => 'a.topic_id = t.topic_id' ) ); - $sql_array['WHERE'] .= 'AND t.forum_id = ' . $this->forum_id; + $sql_array['WHERE'] .= 'AND t.forum_id = ' . (int) $this->forum_id; } $sql = $db->sql_build_query('SELECT', $sql_array); From 6611329d837b1698f24d9d0713cdad9c60007e4f Mon Sep 17 00:00:00 2001 From: Dhruv Date: Fri, 8 Nov 2013 16:19:18 +0530 Subject: [PATCH 068/242] [ticket/11271] Remove unnecessary inclusion of functions_display PHPBB3-11271 --- phpBB/feed.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/feed.php b/phpBB/feed.php index 602b7f90b3..86d74bc3b7 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -19,7 +19,6 @@ define('IN_PHPBB', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); -include($phpbb_root_path . 'includes/functions_display.' . $phpEx); if (!$config['feed_enable']) { From f7c764986f9578c703258943404f7cadda3bd858 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Thu, 26 Dec 2013 23:59:26 +0530 Subject: [PATCH 069/242] [ticket/11271] Fix tabs and use !empty( ) instead of count( ) PHPBB3-11271 --- phpBB/feed.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/phpBB/feed.php b/phpBB/feed.php index 86d74bc3b7..a3528ddd71 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -326,7 +326,7 @@ function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $ $content = preg_replace( '#<(script|iframe)([^[]+)\1>#siU', ' $1 ', $content); // Parse inline images to display with the feed - if (count($post_attachments) > 0) + if (!empty($post_attachments)) { $update_count = array(); parse_attachments($forum_id, $content, $post_attachments, $update_count); @@ -713,13 +713,13 @@ class phpbb_feed_post_base extends phpbb_feed_base global $db; $sql_array = array( - 'SELECT' => 'a.*', - 'FROM' => array( - ATTACHMENTS_TABLE => 'a' - ), - 'WHERE' => 'a.in_message = 0 ', - 'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC' - ); + 'SELECT' => 'a.*', + 'FROM' => array( + ATTACHMENTS_TABLE => 'a' + ), + 'WHERE' => 'a.in_message = 0 ', + 'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC', + ); if (isset($this->topic_id)) { @@ -728,11 +728,11 @@ class phpbb_feed_post_base extends phpbb_feed_base else if (isset($this->forum_id)) { $sql_array['LEFT_JOIN'] = array( - array( - 'FROM' => array(TOPICS_TABLE => 't'), - 'ON' => 'a.topic_id = t.topic_id' - ) - ); + array( + 'FROM' => array(TOPICS_TABLE => 't'), + 'ON' => 'a.topic_id = t.topic_id', + ) + ); $sql_array['WHERE'] .= 'AND t.forum_id = ' . (int) $this->forum_id; } From a71625ca76344098a6e207928b839de576cdabb6 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Fri, 27 Dec 2013 00:38:42 +0530 Subject: [PATCH 070/242] [ticket/11271] Add docblock of feed_generate_content( ) PHPBB3-11271 --- phpBB/feed.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/phpBB/feed.php b/phpBB/feed.php index a3528ddd71..ccc1c6ec1e 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -275,6 +275,14 @@ function feed_format_date($time) /** * Generate text content +* +* @param string $content is feed text content +* @param string $uid is bbcode_uid +* @param string $bitfield is bbcode bitfield +* @param int $options bbcode flag options +* @param int $forum_id is the forum id +* @param array $post_attachments is an array containing the attachments and their respective info +* @return string the html content to be printed for the feed **/ function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $post_attachments) { From 1aa27f400cc6ece19775c5851c2e86db1a657df8 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Fri, 27 Dec 2013 03:31:28 +0530 Subject: [PATCH 071/242] [ticket/11271] Make path conversion more precise PHPBB3-11271 --- phpBB/feed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/feed.php b/phpBB/feed.php index ccc1c6ec1e..04bb0f40ea 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -360,7 +360,7 @@ function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $ $content = preg_replace('#(?:[\x00-\x1F\x7F]+|(?:\xC2[\x80-\x9F])+)#', '', $content); // Convert attachments' relative path to absolute path - $content = str_replace($phpbb_root_path . 'download', $board_url . '/download', $content); + $content = str_replace($phpbb_root_path . 'download/file.' . $phpEx, $board_url . '/download/file.' . $phpEx, $content); return $content; } From a672d983c99bd65753df954dd71578557b8c5b35 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Jan 2014 17:36:17 +0100 Subject: [PATCH 072/242] [ticket/12120] Add prototech to authors PHPBB3-12120 --- phpBB/docs/AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index 5995bd2ab4..3b1dfba2e8 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -27,6 +27,7 @@ phpBB Developers: bantu (Andreas Fischer) dhruv.goel92 (Dhruv Goel) imkingdavid (David King) nickvergessen (Joas Schilling) + prototech (Cesar Gallegos) Contributions by: leviatan21 (Gabriel Vazquez) Raimon (Raimon Meuldijk) From 42e4566fe441b3405317ba4e31df5a4795e986c6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Jan 2014 17:44:59 +0100 Subject: [PATCH 073/242] [ticket/12120] Restore alphabetic order PHPBB3-12120 --- phpBB/docs/AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index 3b1dfba2e8..465c4de397 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -23,8 +23,8 @@ involved in phpBB. phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: bantu (Andreas Fischer) - EXreaction (Nathan Guse) dhruv.goel92 (Dhruv Goel) + EXreaction (Nathan Guse) imkingdavid (David King) nickvergessen (Joas Schilling) prototech (Cesar Gallegos) From 43ccfbc6f46ce8926bd37eeddc7bd33b7e93c165 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Sat, 25 Jan 2014 15:37:33 -0800 Subject: [PATCH 074/242] [ticket/12093] Check that document.selection is supported. PHPBB3-12093 --- phpBB/adm/style/editor.js | 2 +- phpBB/styles/prosilver/template/editor.js | 2 +- phpBB/styles/subsilver2/template/editor.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js index 217aa699e2..cad01aa9f2 100644 --- a/phpBB/adm/style/editor.js +++ b/phpBB/adm/style/editor.js @@ -292,7 +292,7 @@ function mozWrap(txtarea, open, close) */ function storeCaret(textEl) { - if (textEl.createTextRange) + if (textEl.createTextRange && document.selection) { textEl.caretPos = document.selection.createRange().duplicate(); } diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index c16b0ef703..42be70be92 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -347,7 +347,7 @@ function mozWrap(txtarea, open, close) */ function storeCaret(textEl) { - if (textEl.createTextRange) + if (textEl.createTextRange && document.selection) { textEl.caretPos = document.selection.createRange().duplicate(); } diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js index 151cf53ff1..103a271a71 100644 --- a/phpBB/styles/subsilver2/template/editor.js +++ b/phpBB/styles/subsilver2/template/editor.js @@ -351,7 +351,7 @@ function mozWrap(txtarea, open, close) */ function storeCaret(textEl) { - if (textEl.createTextRange) + if (textEl.createTextRange && document.selection) { textEl.caretPos = document.selection.createRange().duplicate(); } From cb7a0d6f2af9a5d613232a9dbeacf603474012f8 Mon Sep 17 00:00:00 2001 From: Marcus Vinicius Date: Sun, 26 Jan 2014 03:19:43 -0300 Subject: [PATCH 075/242] [ticket/12118] Add noindex meta tag to subsilver2 view-print templates PHPBB3-12118 --- phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 1 + phpBB/styles/subsilver2/template/viewtopic_print.html | 1 + 2 files changed, 2 insertions(+) diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html index cd55c16a50..085e26ecd2 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html @@ -4,6 +4,7 @@ + {SITENAME} :: {PAGE_TITLE}