From 4103c99a8676653a868014a6f58a76e8986bd5ed Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 1 Mar 2012 16:15:11 +0100
Subject: [ticket/10679] Add new permission for changing profile field
 information

The setting is copied from "Can use signature"

PHPBB3-10679
---
 phpBB/install/database_update.php | 48 +++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

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

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index e966756337..f0a16844e9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2731,8 +2731,6 @@ function change_database_data(&$no_updates, $version)
 				$config->set('display_last_subject', '1');
 			}
 
-			$no_updates = false;
-
 			if (!isset($config['assets_version']))
 			{
 				$config->set('assets_version', '1');
@@ -2771,7 +2769,7 @@ function change_database_data(&$no_updates, $version)
 			}
 
 			// PHPBB3-10601: Make inbox default. Add basename to ucp's pm category
-			
+
 			// Get the category wanted while checking, at the same time, if this has already been applied
 			$sql = 'SELECT module_id, module_basename
 					FROM ' . MODULES_TABLE . "
@@ -2788,10 +2786,52 @@ function change_database_data(&$no_updates, $version)
 					SET module_basename = 'ucp_pm'
 					WHERE  module_id = " . (int) $row['module_id'];
 
-				_sql($sql, $errored, $error_ary);		
+				_sql($sql, $errored, $error_ary);
 			}
 			$db->sql_freeresult($result);
 
+			// Add new permission u_chgprofileinfo and duplicate settings from u_sig
+			include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
+			$auth_admin = new auth_admin();
+
+			// Only add the new permission if it does not already exist
+			if (empty($auth_admin->acl_options['id']['u_chgprofileinfo']))
+			{
+				$auth_admin->acl_add_option(array('global' => array('u_chgprofileinfo')));
+
+				// Now the tricky part, filling the permission
+				$old_id = $auth_admin->acl_options['id']['u_sig'];
+				$new_id = $auth_admin->acl_options['id']['u_chgprofileinfo'];
+
+				$tables = array(ACL_GROUPS_TABLE, ACL_ROLES_DATA_TABLE, ACL_USERS_TABLE);
+
+				foreach ($tables as $table)
+				{
+					$sql = 'SELECT *
+						FROM ' . $table . '
+						WHERE auth_option_id = ' . $old_id;
+					$result = _sql($sql, $errored, $error_ary);
+
+					$sql_ary = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$row['auth_option_id'] = $new_id;
+						$sql_ary[] = $row;
+					}
+					$db->sql_freeresult($result);
+
+					if (sizeof($sql_ary))
+					{
+						$db->sql_multi_insert($table, $sql_ary);
+					}
+				}
+
+				// Remove any old permission entries
+				$auth_admin->acl_clear_prefetch();
+			}
+
+			$no_updates = false;
+
 		break;
 	}
 }
-- 
cgit v1.2.1


From 2f490293e4b8d08d6c1008ef5ea324ae259d9993 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Dec 2012 16:33:12 +0100
Subject: [ticket/10679] Use module_auth to limit access to the module

PHPBB3-10679
---
 phpBB/install/database_update.php | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index f0a16844e9..95fd1ca2c2 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2830,6 +2830,14 @@ function change_database_data(&$no_updates, $version)
 				$auth_admin->acl_clear_prefetch();
 			}
 
+			// Update the auth setting for the module
+			$sql = 'UPDATE ' . MODULES_TABLE . "
+				SET module_auth = 'acl_u_chgprofileinfo'
+				WHERE module_class = 'ucp'
+					AND module_basename = 'profile'
+					AND module_mode = 'profile_info'";
+			_sql($sql, $errored, $error_ary);
+
 			$no_updates = false;
 
 		break;
-- 
cgit v1.2.1


From c23d2457e9be616bfa83aebc5e743130b6c69624 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 7 Dec 2012 12:50:21 +0100
Subject: [ticket/10679] Update module basename, we added the xcp_ prefix in
 3.1

PHPBB3-10679
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 95fd1ca2c2..30592b995d 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2834,7 +2834,7 @@ function change_database_data(&$no_updates, $version)
 			$sql = 'UPDATE ' . MODULES_TABLE . "
 				SET module_auth = 'acl_u_chgprofileinfo'
 				WHERE module_class = 'ucp'
-					AND module_basename = 'profile'
+					AND module_basename = 'ucp_profile'
 					AND module_mode = 'profile_info'";
 			_sql($sql, $errored, $error_ary);
 
-- 
cgit v1.2.1