Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

Conflicts: phpBB/install/schemas/mssql_schema.sql phpBB/report.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
author: Nathaniel Guse <nathaniel.guse@gmail.com> 2012-11-10 10:58:44 -0600
committer: Nathaniel Guse <nathaniel.guse@gmail.com> 2012-11-10 10:58:44 -0600
commit: 68363e362d4b6d3fe717a8ffae95ab13eb374e9f (patch)
tree: eea655f80184a3cee5a95abec5da1437c6e9aa5a /phpBB/install/database_update.php
parent: 6c8c54d4d2575cd40fe873cd2108b031ae5830a6 (diff)
parent: f5ed04f8ff0c65e1bfe6a4953b974315dd2790d7 (diff)
download: forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar
forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.gz
forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.bz2
forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.xz
forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.zip
1 files changed, 70 insertions, 14 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9e884b0a37..17135f4a66 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -63,8 +63,6 @@ $updates_to_version = UPDATES_TO_VERSION;
 $debug_from_version = DEBUG_FROM_VERSION;
 $oldest_from_version = OLDEST_FROM_VERSION;
 
-error_reporting(E_ALL);
-
 @set_time_limit(0);
 
 // Include essential scripts
@@ -75,17 +73,6 @@ if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
 	die("Please read: <a href='../docs/INSTALL.html'>INSTALL.html</a> before attempting to update.");
 }
 
-// Load Extensions
-if (!empty($load_extensions) && function_exists('dl'))
-{
-	$load_extensions = explode(',', $load_extensions);
-
-	foreach ($load_extensions as $extension)
-	{
-		@dl(trim($extension));
-	}
-}
-
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 
@@ -1101,6 +1088,8 @@ function database_update_info()
 		),
 		// No changes from 3.0.11-RC2 to 3.0.11
 		'3.0.11-RC2'	=> array(),
+		// No changes from 3.0.11 to 3.0.12-RC1
+		'3.0.11'		=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 
@@ -1175,7 +1164,9 @@ function database_update_info()
 					'style_parent_tree'		=> array('TEXT', ''),
 				),
 				REPORTS_TABLE		=> array(
-					'reported_post_text'	=> array('MTEXT_UNI', ''),
+					'reported_post_text'		=> array('MTEXT_UNI', ''),
+					'reported_post_uid'			=> array('VCHAR:8', ''),
+					'reported_post_bitfield'	=> array('VCHAR:255', ''),
 				),
 			),
 			'change_columns'	=> array(
@@ -2291,6 +2282,71 @@ function change_database_data(&$no_updates, $version)
 		case '3.0.11-RC2':
 		break;
 
+		// Changes from 3.0.11 to 3.0.12-RC1
+		case '3.0.11':
+			$sql = 'UPDATE ' . MODULES_TABLE . '
+				SET module_auth = \'acl_u_sig\'
+				WHERE module_class = \'ucp\'
+					AND module_basename = \'profile\'
+					AND module_mode = \'signature\'';
+			_sql($sql, $errored, $error_ary);
+
+			// Update bots
+			if (!function_exists('user_delete'))
+			{
+				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+			}
+
+			$bots_updates = array(
+				// Bot Deletions
+				'NG-Search [Bot]'		=> false,
+				'Nutch/CVS [Bot]'		=> false,
+				'OmniExplorer [Bot]'	=> false,
+				'Seekport [Bot]'		=> false,
+				'Synoo [Bot]'			=> false,
+				'WiseNut [Bot]'			=> false,
+
+				// Bot Updates
+				// Bot name to bot user agent map
+				'Baidu [Spider]'	=> 'Baiduspider',
+				'Exabot [Bot]'		=> 'Exabot',
+				'Voyager [Bot]'		=> 'voyager/',
+				'W3C [Validator]'	=> 'W3C_Validator',
+			);
+
+			foreach ($bots_updates as $bot_name => $bot_agent)
+			{
+				$sql = 'SELECT user_id
+					FROM ' . USERS_TABLE . '
+					WHERE user_type = ' . USER_IGNORE . "
+						AND username_clean = '" . $db->sql_escape(utf8_clean_string($bot_name)) . "'";
+				$result = $db->sql_query($sql);
+				$bot_user_id = (int) $db->sql_fetchfield('user_id');
+				$db->sql_freeresult($result);
+
+				if ($bot_user_id)
+				{
+					if ($bot_agent === false)
+					{
+						$sql = 'DELETE FROM ' . BOTS_TABLE . "
+							WHERE user_id = $bot_user_id";
+						_sql($sql, $errored, $error_ary);
+
+						user_delete('remove', $bot_user_id);
+					}
+					else
+					{
+						$sql = 'UPDATE ' . BOTS_TABLE . "
+							SET bot_agent = '" .  $db->sql_escape($bot_agent) . "'
+							WHERE user_id = $bot_user_id";
+						_sql($sql, $errored, $error_ary);
+					}
+				}
+			}
+
+			$no_updates = false;
+		break;
+
 		// Changes from 3.1.0-dev to 3.1.0-A1
 		case '3.1.0-dev':
author	Nathaniel Guse <nathaniel.guse@gmail.com>	2012-11-10 10:58:44 -0600
committer	Nathaniel Guse <nathaniel.guse@gmail.com>	2012-11-10 10:58:44 -0600
commit	68363e362d4b6d3fe717a8ffae95ab13eb374e9f (patch)
tree	eea655f80184a3cee5a95abec5da1437c6e9aa5a /phpBB/install/database_update.php
parent	6c8c54d4d2575cd40fe873cd2108b031ae5830a6 (diff)
parent	f5ed04f8ff0c65e1bfe6a4953b974315dd2790d7 (diff)
download	forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.gz forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.bz2 forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.xz forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.zip