From a759704b39fc1c1353f865a633759b1369589b67 Mon Sep 17 00:00:00 2001 From: Yuriy Rusko Date: Tue, 27 May 2014 20:18:06 +0200 Subject: [ticket/12594] Remove @package tags and update file headers PHPBB3-12594 --- phpBB/install/convertors/convert_phpbb20.php | 10 +++++++--- phpBB/install/convertors/functions_phpbb20.php | 10 +++++++--- phpBB/install/data/confusables.php | 10 +++++++--- phpBB/install/data/new_normalizer.php | 10 +++++++--- phpBB/install/database_update.php | 10 +++++++--- phpBB/install/index.php | 13 +++++++------ phpBB/install/install_convert.php | 12 +++++++----- phpBB/install/install_install.php | 11 +++++++---- phpBB/install/install_main.php | 11 +++++++---- phpBB/install/install_update.php | 14 +++++++++----- 10 files changed, 72 insertions(+), 39 deletions(-) (limited to 'phpBB/install') diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 5f672ca092..ba293f0c76 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -1,9 +1,13 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index b5a69abe93..ff20154d03 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1,9 +1,13 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ diff --git a/phpBB/install/data/confusables.php b/phpBB/install/data/confusables.php index f5d3b11731..e3e8c41e62 100644 --- a/phpBB/install/data/confusables.php +++ b/phpBB/install/data/confusables.php @@ -1,9 +1,13 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ diff --git a/phpBB/install/data/new_normalizer.php b/phpBB/install/data/new_normalizer.php index 380998f530..52652a4f6d 100644 --- a/phpBB/install/data/new_normalizer.php +++ b/phpBB/install/data/new_normalizer.php @@ -1,9 +1,13 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index b1bfbc1839..cf70019035 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1,9 +1,13 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 85fedaddfc..53ddad056c 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -1,9 +1,13 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ @@ -272,9 +276,6 @@ $template->set_filenames(array( $install->page_footer(); -/** -* @package install -*/ class module { var $id = 0; diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 13001426f7..674a1f7dd3 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -1,9 +1,13 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ @@ -31,7 +35,6 @@ if (!empty($setmodules)) /** * Class holding all convertor-specific details. -* @package install */ class convert { @@ -75,7 +78,6 @@ class convert /** * Convert class for conversions -* @package install */ class install_convert extends module { diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index f9d5edc903..576cbba3ca 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1,9 +1,13 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ @@ -36,7 +40,6 @@ if (!empty($setmodules)) /** * Installation -* @package install */ class install_install extends module { diff --git a/phpBB/install/install_main.php b/phpBB/install/install_main.php index 974b006db3..2f37fc3237 100644 --- a/phpBB/install/install_main.php +++ b/phpBB/install/install_main.php @@ -1,9 +1,13 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ @@ -31,7 +35,6 @@ if (!empty($setmodules)) /** * Main Tab - Installation -* @package install */ class install_main extends module { diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 87b7d8d703..1a90efc2b4 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -1,15 +1,20 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * -* @todo check for writable cache/store/files directory */ /** +* @todo check for writable cache/store/files directory */ + if (!defined('IN_INSTALL')) { // Someone has tried to access the file directly. This is not a good idea, so exit @@ -37,7 +42,6 @@ if (!empty($setmodules)) /** * Update Installation -* @package install */ class install_update extends module { -- cgit v1.2.1 From 27f787e5e4e118b77a3e16879d6c684bdaafc303 Mon Sep 17 00:00:00 2001 From: Yuriy Rusko Date: Tue, 27 May 2014 21:25:33 +0200 Subject: [ticket/12594] Update footer credit lines PHPBB3-12594 --- phpBB/install/database_update.php | 2 +- phpBB/install/index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/install') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index cf70019035..44dbe43cf8 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -41,7 +41,7 @@ function phpbb_end_update($cache, $config)
- Powered by phpBB® Forum Software © phpBB Group + Powered by phpBB® Forum Software © phpBB Limited
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 53ddad056c..e683324bdf 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -634,7 +634,7 @@ class module echo ' '; echo ' '; echo '
'; - echo ' Powered by phpBB® Forum Software © phpBB Group'; + echo ' Powered by phpBB® Forum Software © phpBB Limited'; echo '
'; echo ''; echo ''; -- cgit v1.2.1 From 55e1f02151adbe9d66a2d87c00c4f1959739aa36 Mon Sep 17 00:00:00 2001 From: Yuriy Rusko Date: Wed, 28 May 2014 01:05:46 +0200 Subject: [ticket/12594] Replace phpBB Group with phpBB Limited PHPBB3-12594 --- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/install') diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index ba293f0c76..0c2d4ebf74 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', 'phpbb_version' => '3.1.0-b3', - 'author' => 'phpBB Group', + 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, 'dbport' => $dbport, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 0f9976a96b..82cf4d8418 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -461,7 +461,7 @@ INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', 10); # -- phpbb_styles -INSERT INTO phpbb_styles (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '© phpBB Group', 1, 'prosilver', 'kNg=', 0, ''); +INSERT INTO phpbb_styles (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '© phpBB Limited', 1, 'prosilver', 'kNg=', 0, ''); # -- Forums INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts_approved, forum_posts_unapproved, forum_posts_softdeleted, forum_topics_approved, forum_topics_unapproved, forum_topics_softdeleted, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed, forum_parents) VALUES ('{L_FORUMS_FIRST_CATEGORY}', '', 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 'Admin', 'AA0000', 972086460, '', '', '', '', '', '', '', 0, 0, ''); -- cgit v1.2.1