From 881ad935d55dd69876f9c5aee1a9d100242fbbaa Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 23 Oct 2013 21:13:45 +0200 Subject: [ticket/11031] Fix conversion of topic_replies to topic_posts PHPBB3-11031 --- phpBB/install/convertors/functions_phpbb20.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'phpBB/install/convertors/functions_phpbb20.php') diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index a698f0ef13..136ca991ae 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -540,6 +540,15 @@ function phpbb_user_id($user_id) return (int) $user_id; } +/** +* Return correct user id value +* Everyone's id will be one higher to allow the guest/anonymous user to have a positive id as well +*/ +function phpbb_topic_replies_to_posts($num_replies) +{ + return (int) $num_replies + 1; +} + /* Copy additional table fields from old forum to new forum if user wants this (for Mod compatibility for example) function phpbb_copy_table_fields() { -- cgit v1.2.1 From e9f4be9052c3f3874a79c1b68934fc6b256491f1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 25 Oct 2013 12:09:09 +0200 Subject: [ticket/11031] Update extension group names after converting them PHPBB3-11031 --- phpBB/install/convertors/functions_phpbb20.php | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'phpBB/install/convertors/functions_phpbb20.php') diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 136ca991ae..4cb9237daf 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1414,6 +1414,54 @@ function phpbb_attachment_category($cat_id) return ATTACHMENT_CATEGORY_NONE; } +/** +* Convert the attachment extension names +* This is only used if the Attachment MOD was installed +*/ +function phpbb_attachment_extension_group_name() +{ + global $db, $phpbb_root_path, $phpEx; + + // Update file extension group names to use language strings. + $sql = 'SELECT lang_dir + FROM ' . LANG_TABLE; + $result = $db->sql_query($sql); + + $extension_groups_updated = array(); + while ($lang_dir = $db->sql_fetchfield('lang_dir')) + { + $lang_dir = basename($lang_dir); + + if (!file_exists($phpbb_root_path . 'language/' . $lang_dir . '/acp/attachments.' . $phpEx)) + { + continue; + } + + $lang = array(); + include($lang_file); + + foreach ($lang as $lang_key => $lang_val) + { + if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0) + { + continue; + } + + $sql_ary = array( + 'group_name' => substr($lang_key, 10), // Strip off 'EXT_GROUP_' + ); + + $sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " + WHERE group_name = '" . $db->sql_escape($lang_val) . "'"; + $db->sql_query($sql); + + $extension_groups_updated[$lang_key] = true; + } + } + $db->sql_freeresult($result); +} + /** * Obtain list of forums in which different attachment categories can be used */ -- cgit v1.2.1 From 157de2d80dd4f0b298c33819e55fcd05fdfce568 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 25 Oct 2013 13:10:33 +0200 Subject: [ticket/11031] Fix missing variable lang_file from code conversion PHPBB3-11031 --- phpBB/install/convertors/functions_phpbb20.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/install/convertors/functions_phpbb20.php') diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 4cb9237daf..8a06296b16 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1431,8 +1431,9 @@ function phpbb_attachment_extension_group_name() while ($lang_dir = $db->sql_fetchfield('lang_dir')) { $lang_dir = basename($lang_dir); + $lang_file = $phpbb_root_path . 'language/' . $lang_dir . '/acp/attachments.' . $phpEx; - if (!file_exists($phpbb_root_path . 'language/' . $lang_dir . '/acp/attachments.' . $phpEx)) + if (!file_exists($lang_file)) { continue; } -- cgit v1.2.1 From 88f72bd411ef1d5e69415712d225bba778d28d1c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 28 Oct 2013 21:54:43 +0100 Subject: [ticket/11031] Convert timezones to new 3.1 timezone PHPBB3-11031 --- phpBB/install/convertors/functions_phpbb20.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'phpBB/install/convertors/functions_phpbb20.php') diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 8a06296b16..4076fe2a78 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1926,3 +1926,10 @@ function phpbb_check_username_collisions() $drop_sql = 'DROP TABLE ' . USERCONV_TABLE; $db->sql_query($drop_sql); } + +function phpbb_convert_timezone($timezone) +{ + global $config, $db, $phpbb_root_path, $phpEx, $table_prefix; + $timezone_migration = new \phpbb\db\migration\data\v310\timezone($config, $db, new \phpbb\db\tools($db), $phpbb_root_path, $phpEx, $table_prefix); + return $timezone_migration->convert_phpbb30_timezone($timezone, 0); +} -- cgit v1.2.1 From cb8cd50495eb9d75cae8e7f1450033acfdb0b374 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 2 Nov 2013 12:49:28 +0100 Subject: [ticket/11031] Correctly add groups to teampage PHPBB3-11031 --- phpBB/install/convertors/functions_phpbb20.php | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'phpBB/install/convertors/functions_phpbb20.php') diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 4076fe2a78..29e5f7ab09 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1933,3 +1933,43 @@ function phpbb_convert_timezone($timezone) $timezone_migration = new \phpbb\db\migration\data\v310\timezone($config, $db, new \phpbb\db\tools($db), $phpbb_root_path, $phpEx, $table_prefix); return $timezone_migration->convert_phpbb30_timezone($timezone, 0); } + +function phpbb_add_notification_options($user_notify_pm) +{ + global $convert_row, $db; + + $user_id = phpbb_user_id($convert_row['user_id']); + if ($user_id == ANONYMOUS) + { + return; + } + + $rows = array(); + + $rows[] = array( + 'item_type' => 'post', + 'item_id' => 0, + 'user_id' => (int) $user_id, + 'notify' => 1, + 'method' => 'email', + ); + $rows[] = array( + 'item_type' => 'topic', + 'item_id' => 0, + 'user_id' => (int) $user_id, + 'notify' => 1, + 'method' => 'email', + ); + if ($user_notify_pm) + { + $rows[] = array( + 'item_type' => 'pm', + 'item_id' => 0, + 'user_id' => (int) $user_id, + 'notify' => 1, + 'method' => 'email', + ); + } + + $sql = $db->sql_multi_insert(USER_NOTIFICATIONS_TABLE, $rows); +} -- cgit v1.2.1