From fb77cdd0513994dca478c06a3c9ac5912da07872 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 26 Nov 2008 19:58:35 +0000
Subject: Better handling and finer control for custom profile fields
 visibility options. (Patch by Highway of Life)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9127 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/database_update.php | 52 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 48fd4e3ad2..b5839f517a 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -548,6 +548,15 @@ $database_update_info = array(
 
 	// No changes from 3.0.3-RC1 to 3.0.3
 	'3.0.3-RC1'		=> array(),
+
+	// Changes from 3.0.3 to 3.0.4-RC1
+	'3.0.3'			=> array(
+		'add_columns'		=> array(
+			PROFILE_FIELDS_TABLE			=> array(
+				'field_show_profile'		=> array('BOOL', 0),
+			),
+		),
+	),
 );
 
 // Determine mapping database type
@@ -1948,6 +1957,47 @@ function change_database_data(&$no_updates, $version)
 
 			$no_updates = false;
 		break;
+
+		// Changes from 3.0.3 to 3.0.4-RC1
+		case '3.0.3':
+			// Update the Custom Profile Fields based on previous settings to the new format
+			$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
+					FROM ' . PROFILE_FIELDS_TABLE;
+			$result = _sql($sql, $errored, $error_ary);
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$sql_ary = array(
+					'field_required'	=> 0,
+					'field_show_on_reg'	=> 0,
+					'field_hide'		=> 0,
+					'field_show_profile'=> 0,
+				);
+
+				if ($row['field_required'])
+				{
+					$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+				}
+				else if ($row['field_show_on_reg'])
+				{
+					$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+				}
+				else if ($row['field_hide'])
+				{
+					// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
+					$sql_ary['field_hide'] = 1;
+				}
+				else
+				{
+					// equivelant to "none", which is the "Display in user control panel" option
+					$sql_ary['field_show_profile'] = 1;
+				}
+
+				_sql('UPDATE ' . PROFILE_FIELDS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
+			}
+
+			$no_updates = false;
+		break;
 	}
 }
 
@@ -3082,4 +3132,4 @@ function utf8_new_clean_string($text)
 	return trim($text);
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From 481e5c193fa21bd2cb8d7086fcdccd3d6964604d Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 27 Nov 2008 13:44:24 +0000
Subject: extend the style columns (style_id, template_id, imageset_id,
 image_id...) No, not only because of possible style demos. :o

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9129 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/database_update.php | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b5839f517a..a0627a917f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.3';
+$updates_to_version = '3.0.4-RC1';
 
 // Return if we "just include it" to find out for which version the database update is responsible for
 if (defined('IN_PHPBB') && defined('IN_INSTALL'))
@@ -556,6 +556,36 @@ $database_update_info = array(
 				'field_show_profile'		=> array('BOOL', 0),
 			),
 		),
+		'change_columns'	=> array(
+			STYLES_TABLE				=> array(
+				'style_id'				=> array('UINT', NULL, 'auto_increment'),
+				'template_id'			=> array('UINT', 0),
+				'theme_id'				=> array('UINT', 0),
+				'imageset_id'			=> array('UINT', 0),
+			),
+			STYLES_IMAGESET_TABLE		=> array(
+				'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
+			),
+			STYLES_IMAGESET_DATA_TABLE	=> array(
+				'image_id'				=> array('UINT', NULL, 'auto_increment'),
+				'imageset_id'			=> array('UINT', 0),
+			),
+			STYLES_THEME_TABLE			=> array(
+				'theme_id'				=> array('UINT', NULL, 'auto_increment'),
+			),
+			STYLES_TEMPLATE_TABLE		=> array(
+				'template_id'			=> array('UINT', NULL, 'auto_increment'),
+			),
+			STYLES_TEMPLATE_DATA_TABLE	=> array(
+				'template_id'			=> array('UINT', 0),
+			),
+			FORUMS_TABLE				=> array(
+				'forum_style'			=> array('USINT', 0),
+			),
+			USERS_TABLE					=> array(
+				'user_style'			=> array('UINT', 0),
+			),
+		),
 	),
 );
 
-- 
cgit v1.2.1