diff options
Diffstat (limited to 'phpBB')
45 files changed, 588 insertions, 220 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index f7d6688f68..c18bec7035 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -342,12 +342,6 @@ phpbb.ajaxify = function(options) {  			var alert;  			alert = phpbb.alert(dark.attr('data-ajax-error-title'), dark.attr('data-ajax-error-text')); - -			setTimeout(function () { -				dark.fadeOut(phpbb.alert_time, function() { -					alert.hide(); -				}); -			}, 5000);  		}  		// If the element is a form, POST must be used and some extra data must diff --git a/phpBB/common.php b/phpBB/common.php index e99b9edee5..add0b07726 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -71,7 +71,6 @@ require($phpbb_root_path . 'includes/functions_content.' . $phpEx);  require($phpbb_root_path . 'includes/functions_container.' . $phpEx);  require($phpbb_root_path . 'includes/constants.' . $phpEx); -require($phpbb_root_path . 'includes/db/' . ltrim($dbms, 'dbal_') . '.' . $phpEx);  require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);  // Set PHP error handler to ours diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 73b9e0a9f2..8c282e36d7 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -43,7 +43,6 @@ if (isset($_GET['avatar']))  	require($phpbb_root_path . 'includes/class_loader.' . $phpEx); -	require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);  	require($phpbb_root_path . 'includes/constants.' . $phpEx);  	require($phpbb_root_path . 'includes/functions.' . $phpEx);  	require($phpbb_root_path . 'includes/functions_container.' . $phpEx); diff --git a/phpBB/includes/acp/info/acp_extensions.php b/phpBB/includes/acp/info/acp_extensions.php index f5953fb1dd..03d7059165 100644 --- a/phpBB/includes/acp/info/acp_extensions.php +++ b/phpBB/includes/acp/info/acp_extensions.php @@ -16,10 +16,10 @@ class acp_extensions_info  	{  		return array(  			'filename'	=> 'acp_extensions', -			'title'		=> 'ACP_EXTENSIONS', +			'title'		=> 'ACP_EXTENSIONS_MANAGEMENT',  			'version'	=> '1.0.0',  			'modes'		=> array( -				'main'		=> array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_GENERAL_TASKS')), +				'main'		=> array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSIONS_MANAGEMENT')),  			),  		);  	} diff --git a/phpBB/includes/acp/info/acp_language.php b/phpBB/includes/acp/info/acp_language.php index 85dfb119ea..7f33a22fa6 100644 --- a/phpBB/includes/acp/info/acp_language.php +++ b/phpBB/includes/acp/info/acp_language.php @@ -19,7 +19,7 @@ class acp_language_info  			'title'		=> 'ACP_LANGUAGE',  			'version'	=> '1.0.0',  			'modes'		=> array( -				'lang_packs'		=> array('title' => 'ACP_LANGUAGE_PACKS', 'auth' => 'acl_a_language', 'cat' => array('ACP_GENERAL_TASKS')), +				'lang_packs'		=> array('title' => 'ACP_LANGUAGE_PACKS', 'auth' => 'acl_a_language', 'cat' => array('ACP_LANGUAGE')),  			),  		);  	} diff --git a/phpBB/includes/config/db.php b/phpBB/includes/config/db.php index 45f9f1cb21..b18369a479 100644 --- a/phpBB/includes/config/db.php +++ b/phpBB/includes/config/db.php @@ -29,7 +29,7 @@ class phpbb_config_db extends phpbb_config  	/**  	* Database connection -	* @var dbal +	* @var phpbb_db_driver  	*/  	protected $db; @@ -42,11 +42,11 @@ class phpbb_config_db extends phpbb_config  	/**  	* Creates a configuration container with a default set of values  	* -	* @param dbal                         $db    Database connection +	* @param phpbb_db_driver              $db    Database connection  	* @param phpbb_cache_driver_interface $cache Cache instance  	* @param string                       $table Configuration table name  	*/ -	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, $table) +	public function __construct(phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $table)  	{  		$this->db = $db;  		$this->cache = $cache; diff --git a/phpBB/includes/cron/task/core/prune_all_forums.php b/phpBB/includes/cron/task/core/prune_all_forums.php index ee0b5f7626..2c5d38cec0 100644 --- a/phpBB/includes/cron/task/core/prune_all_forums.php +++ b/phpBB/includes/cron/task/core/prune_all_forums.php @@ -37,9 +37,9 @@ class phpbb_cron_task_core_prune_all_forums extends phpbb_cron_task_base  	* @param string $phpbb_root_path The root path  	* @param string $php_ext The PHP extension  	* @param phpbb_config $config The config -	* @param dbal $db The db connection +	* @param phpbb_db_driver $db The db connection  	*/ -	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, dbal $db) +	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_db_driver $db)  	{  		$this->phpbb_root_path = $phpbb_root_path;  		$this->php_ext = $php_ext; diff --git a/phpBB/includes/cron/task/core/prune_forum.php b/phpBB/includes/cron/task/core/prune_forum.php index fa7a761d88..e3c497f072 100644 --- a/phpBB/includes/cron/task/core/prune_forum.php +++ b/phpBB/includes/cron/task/core/prune_forum.php @@ -47,9 +47,9 @@ class phpbb_cron_task_core_prune_forum extends phpbb_cron_task_base implements p  	* @param string $phpbb_root_path The root path  	* @param string $php_ext The PHP extension  	* @param phpbb_config $config The config -	* @param dbal $db The db connection +	* @param phpbb_db_driver $db The db connection  	*/ -	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, dbal $db) +	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_db_driver $db)  	{  		$this->phpbb_root_path = $phpbb_root_path;  		$this->php_ext = $php_ext; diff --git a/phpBB/includes/cron/task/core/tidy_search.php b/phpBB/includes/cron/task/core/tidy_search.php index fdbe31346e..3ec25aa021 100644 --- a/phpBB/includes/cron/task/core/tidy_search.php +++ b/phpBB/includes/cron/task/core/tidy_search.php @@ -38,10 +38,10 @@ class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base  	* @param string $php_ext The PHP extension  	* @param phpbb_auth $auth The auth  	* @param phpbb_config $config The config -	* @param dbal $db The db connection +	* @param phpbb_db_driver $db The db connection  	* @param phpbb_user $user The user  	*/ -	public function __construct($phpbb_root_path, $php_ext, phpbb_auth $auth, phpbb_config $config, dbal $db, phpbb_user $user) +	public function __construct($phpbb_root_path, $php_ext, phpbb_auth $auth, phpbb_config $config, phpbb_db_driver $db, phpbb_user $user)  	{  		$this->phpbb_root_path = $phpbb_root_path;  		$this->php_ext = $php_ext; diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php index 6df3aac9ce..2bb016cebd 100644 --- a/phpBB/includes/db/db_tools.php +++ b/phpBB/includes/db/db_tools.php @@ -300,7 +300,7 @@ class phpbb_db_tools  	/**  	* Constructor. Set DB Object and set {@link $return_statements return_statements}.  	* -	* @param phpbb_dbal	$db					DBAL object +	* @param phpbb_db_driver	$db					Database connection  	* @param bool		$return_statements	True if only statements should be returned and no SQL being executed  	*/  	function phpbb_db_tools(&$db, $return_statements = false) diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/driver/driver.php index ef1dd7d14d..25daa7243d 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/driver/driver.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))  * Database Abstraction Layer  * @package dbal  */ -class dbal +class phpbb_db_driver  {  	var $db_connect_id;  	var $query_result; @@ -72,17 +72,17 @@ class dbal  	/**  	* Constructor  	*/ -	function dbal() +	function __construct()  	{  		$this->num_queries = array( -			'cached'		=> 0, -			'normal'		=> 0, -			'total'			=> 0, +			'cached'	=> 0, +			'normal'	=> 0, +			'total'		=> 0,  		);  		// Fill default sql layer based on the class being called.  		// This can be changed by the specified layer itself later if needed. -		$this->sql_layer = substr(get_class($this), 5); +		$this->sql_layer = substr(get_class($this), strlen('phpbb_db_driver_'));  		// Do not change this please! This variable is used to easy the use of it - and is hardcoded.  		$this->any_char = chr(0) . '%'; @@ -1042,8 +1042,3 @@ class dbal  		return $rows_total;  	}  } - -/** -* This variable holds the class name to use later -*/ -$sql_db = (!empty($dbms)) ? 'dbal_' . basename($dbms) : 'dbal'; diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/driver/firebird.php index 5728eb901c..a55175c345 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/driver/firebird.php @@ -15,14 +15,12 @@ if (!defined('IN_PHPBB'))  	exit;  } -include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); -  /**  * Firebird/Interbase Database Abstraction Layer  * Minimum Requirement is Firebird 2.1  * @package dbal  */ -class dbal_firebird extends dbal +class phpbb_db_driver_firebird extends phpbb_db_driver  {  	var $last_query_text = '';  	var $service_handle = false; diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/driver/mssql.php index 235c48d3f0..ac957e7698 100644 --- a/phpBB/includes/db/mssql.php +++ b/phpBB/includes/db/driver/mssql.php @@ -15,14 +15,12 @@ if (!defined('IN_PHPBB'))  	exit;  } -include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); -  /**  * MSSQL Database Abstraction Layer  * Minimum Requirement is MSSQL 2000+  * @package dbal  */ -class dbal_mssql extends dbal +class phpbb_db_driver_mssql extends phpbb_db_driver  {  	var $connect_error = ''; diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/driver/mssql_odbc.php index 2194de4a5e..13e74e66d4 100644 --- a/phpBB/includes/db/mssql_odbc.php +++ b/phpBB/includes/db/driver/mssql_odbc.php @@ -15,8 +15,6 @@ if (!defined('IN_PHPBB'))  	exit;  } -include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); -  /**  * Unified ODBC functions  * Unified ODBC functions support any database having ODBC driver, for example Adabas D, IBM DB2, iODBC, Solid, Sybase SQL Anywhere... @@ -28,7 +26,7 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);  *  * @package dbal  */ -class dbal_mssql_odbc extends dbal +class phpbb_db_driver_mssql_odbc extends phpbb_db_driver  {  	var $last_query_text = '';  	var $connect_error = ''; diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/driver/mssqlnative.php index 4a969828e7..4b1639aba2 100644 --- a/phpBB/includes/db/mssqlnative.php +++ b/phpBB/includes/db/driver/mssqlnative.php @@ -19,8 +19,6 @@ if (!defined('IN_PHPBB'))  	exit;  } -include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); -  /**   * Prior to version 1.1 the SQL Server Native PHP driver didn't support sqlsrv_num_rows, or cursor based seeking so we recall all rows into an array   * and maintain our own cursor index into that array. @@ -193,7 +191,7 @@ class result_mssqlnative  /**  * @package dbal  */ -class dbal_mssqlnative extends dbal +class phpbb_db_driver_mssqlnative extends phpbb_db_driver  {  	var $m_insert_id = NULL;  	var $last_query_text = ''; diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/driver/mysql.php index dcdeec0401..6fc6fab483 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/driver/mysql.php @@ -15,8 +15,6 @@ if (!defined('IN_PHPBB'))  	exit;  } -include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); -  /**  * MySQL4 Database Abstraction Layer  * Compatible with: @@ -26,7 +24,7 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);  * MySQL 5.0+  * @package dbal  */ -class dbal_mysql extends dbal +class phpbb_db_driver_mysql extends phpbb_db_driver  {  	var $multi_insert = true;  	var $connect_error = ''; diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/driver/mysqli.php index 5713b1992c..be28a95715 100644 --- a/phpBB/includes/db/mysqli.php +++ b/phpBB/includes/db/driver/mysqli.php @@ -15,15 +15,13 @@ if (!defined('IN_PHPBB'))  	exit;  } -include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); -  /**  * MySQLi Database Abstraction Layer  * mysqli-extension has to be compiled with:  * MySQL 4.1+ or MySQL 5.0+  * @package dbal  */ -class dbal_mysqli extends dbal +class phpbb_db_driver_mysqli extends phpbb_db_driver  {  	var $multi_insert = true;  	var $connect_error = ''; diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/driver/oracle.php index 4a2b107865..6263ea8414 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/driver/oracle.php @@ -15,13 +15,11 @@ if (!defined('IN_PHPBB'))  	exit;  } -include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); -  /**  * Oracle Database Abstraction Layer  * @package dbal  */ -class dbal_oracle extends dbal +class phpbb_db_driver_oracle extends phpbb_db_driver  {  	var $last_query_text = '';  	var $connect_error = ''; diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/driver/postgres.php index 8dfbfc3b60..147ecd04d9 100644 --- a/phpBB/includes/db/postgres.php +++ b/phpBB/includes/db/driver/postgres.php @@ -15,19 +15,12 @@ if (!defined('IN_PHPBB'))  	exit;  } -include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); - -if (!class_exists('phpbb_error_collector')) -{ -	include($phpbb_root_path . 'includes/error_collector.' . $phpEx); -} -  /**  * PostgreSQL Database Abstraction Layer  * Minimum Requirement is Version 7.3+  * @package dbal  */ -class dbal_postgres extends dbal +class phpbb_db_driver_postgres extends phpbb_db_driver  {  	var $last_query_text = '';  	var $connect_error = ''; diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/driver/sqlite.php index 06e368d586..6b9cc64d89 100644 --- a/phpBB/includes/db/sqlite.php +++ b/phpBB/includes/db/driver/sqlite.php @@ -15,14 +15,12 @@ if (!defined('IN_PHPBB'))  	exit;  } -include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); -  /**  * Sqlite Database Abstraction Layer  * Minimum Requirement: 2.8.2+  * @package dbal  */ -class dbal_sqlite extends dbal +class phpbb_db_driver_sqlite extends phpbb_db_driver  {  	var $connect_error = ''; diff --git a/phpBB/includes/di/extension/config.php b/phpBB/includes/di/extension/config.php index fb5ca90070..97a6290066 100644 --- a/phpBB/includes/di/extension/config.php +++ b/phpBB/includes/di/extension/config.php @@ -43,8 +43,8 @@ class phpbb_di_extension_config extends Extension  		require($this->config_file);  		$container->setParameter('core.table_prefix', $table_prefix); -		$container->setParameter('cache.driver.class', $this->fix_acm_type($acm_type)); -		$container->setParameter('dbal.driver.class', 'dbal_'.$dbms); +		$container->setParameter('cache.driver.class', $this->convert_30_acm_type($acm_type)); +		$container->setParameter('dbal.driver.class', phpbb_convert_30_dbms_to_31($dbms));  		$container->setParameter('dbal.dbhost', $dbhost);  		$container->setParameter('dbal.dbuser', $dbuser);  		$container->setParameter('dbal.dbpasswd', $dbpasswd); @@ -66,12 +66,12 @@ class phpbb_di_extension_config extends Extension  	}  	/** -	* Convert old (3.0) values to 3.1 class names +	* Convert 3.0 ACM type to 3.1 cache driver class name  	* -	* @param style $acm_type ACM type -	* @return ACM type class +	* @param string $acm_type ACM type +	* @return cache driver class  	*/ -	protected function fix_acm_type($acm_type) +	protected function convert_30_acm_type($acm_type)  	{  		if (preg_match('#^[a-z]+$#', $acm_type))  		{ diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index bfd4edde93..67cc81e407 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -34,7 +34,7 @@ class phpbb_extension_manager  	/**  	* Creates a manager and loads information from database  	* -	* @param dbal $db A database connection +	* @param phpbb_db_driver $db A database connection  	* @param phpbb_config $config phpbb_config  	* @param string $extension_table The name of the table holding extensions  	* @param string $phpbb_root_path Path to the phpbb includes directory. @@ -42,7 +42,7 @@ class phpbb_extension_manager  	* @param phpbb_cache_driver_interface $cache A cache instance or null  	* @param string $cache_name The name of the cache variable, defaults to _ext  	*/ -	public function __construct(dbal $db, phpbb_config $config, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext') +	public function __construct(phpbb_db_driver $db, phpbb_config $config, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')  	{  		$this->phpbb_root_path = $phpbb_root_path;  		$this->db = $db; diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php index ea85bd3c4e..36b0f8b184 100644 --- a/phpBB/includes/extension/metadata_manager.php +++ b/phpBB/includes/extension/metadata_manager.php @@ -34,12 +34,12 @@ class phpbb_extension_metadata_manager  	/**  	* Creates the metadata manager  	* -	* @param dbal $db A database connection +	* @param phpbb_db_driver $db A database connection  	* @param string $extension_manager An instance of the phpbb extension manager  	* @param string $phpbb_root_path Path to the phpbb includes directory.  	* @param string $phpEx php file extension  	*/ -	public function __construct($ext_name, dbal $db, phpbb_extension_manager $extension_manager, $phpbb_root_path, $phpEx = '.php', phpbb_template $template, phpbb_config $config) +	public function __construct($ext_name, phpbb_db_driver $db, phpbb_extension_manager $extension_manager, $phpbb_root_path, $phpEx = '.php', phpbb_template $template, phpbb_config $config)  	{  		$this->phpbb_root_path = $phpbb_root_path;  		$this->db = $db; diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e492f97022..8ef5284134 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5550,6 +5550,52 @@ function phpbb_to_numeric($input)  }  /** +* Convert either 3.0 dbms or 3.1 db driver class name to 3.1 db driver class name. +* +* If $dbms is a valid 3.1 db driver class name, returns it unchanged. +* Otherwise prepends phpbb_db_driver_ to the dbms to convert a 3.0 dbms +* to 3.1 db driver class name. +* +* @param string $dbms dbms parameter +* @return db driver class +*/ +function phpbb_convert_30_dbms_to_31($dbms) +{ +	// Note: this check is done first because mysqli extension +	// supplies a mysqli class, and class_exists($dbms) would return +	// true for mysqli class. +	// However, per the docblock any valid 3.1 driver name should be +	// recognized by this function, and have priority over 3.0 dbms. +	if (class_exists('phpbb_db_driver_' . $dbms)) +	{ +		return 'phpbb_db_driver_' . $dbms; +	} + +	if (class_exists($dbms)) +	{ +		// Additionally we could check that $dbms extends phpbb_db_driver. +		// http://php.net/manual/en/class.reflectionclass.php +		// Beware of possible performance issues: +		// http://stackoverflow.com/questions/294582/php-5-reflection-api-performance +		// We could check for interface implementation in all paths or +		// only when we do not prepend phpbb_db_driver_. + +		/* +		$reflection = new \ReflectionClass($dbms); +   	  +		if ($reflection->isSubclassOf('phpbb_db_driver')) +		{ +			return $dbms; +		} +		*/ + +		return $dbms; +	} + +	throw new \RuntimeException("You have specified an invalid dbms driver: $dbms"); +} + +/**  * Create a Symfony Request object from phpbb_request object  *  * @param phpbb_request $request Request object diff --git a/phpBB/includes/functions_database_helper.php b/phpBB/includes/functions_database_helper.php new file mode 100644 index 0000000000..1b508e6a02 --- /dev/null +++ b/phpBB/includes/functions_database_helper.php @@ -0,0 +1,206 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* Updates rows in given table from a set of values to a new value. +* If this results in rows violating uniqueness constraints, the duplicate +* rows are eliminated. +* +* The only supported table is bookmarks. +* +* @param phpbb_db_driver $db Database object +* @param string $table Table on which to perform the update +* @param string $column Column whose values to change +* @param array $from_values An array of values that should be changed +* @param int $to_value The new value +* @return null +*/ +function phpbb_update_rows_avoiding_duplicates(phpbb_db_driver $db, $table, $column, $from_values, $to_value) +{ +	$sql = "SELECT $column, user_id +		FROM $table +		WHERE " . $db->sql_in_set($column, $from_values); +	$result = $db->sql_query($sql); + +	$old_user_ids = array(); +	while ($row = $db->sql_fetchrow($result)) +	{ +		$old_user_ids[$row[$column]][] = (int) $row['user_id']; +	} +	$db->sql_freeresult($result); + +	$sql = "SELECT $column, user_id +		FROM $table +		WHERE $column = " . (int) $to_value; +	$result = $db->sql_query($sql); + +	$new_user_ids = array(); +	while ($row = $db->sql_fetchrow($result)) +	{ +		$new_user_ids[$row[$column]][] = (int) $row['user_id']; +	} +	$db->sql_freeresult($result); + +	$queries = array(); +	foreach ($from_values as $from_value) +	{ +		if (!isset($old_user_ids[$from_value])) +		{ +			continue; +		} +		if (empty($new_user_ids)) +		{ +			$sql = "UPDATE $table +				SET $column = " . (int) $to_value . " +				WHERE $column = '" . $db->sql_escape($from_value) . "'"; +			$queries[] = $sql; +		} +		else +		{ +			$different_user_ids = array_diff($old_user_ids[$from_value], $new_user_ids[$to_value]); +			if (!empty($different_user_ids)) +			{ +				$sql = "UPDATE $table +					SET $column = " . (int) $to_value . " +					WHERE $column = '" . $db->sql_escape($from_value) . "' +					AND " . $db->sql_in_set('user_id', $different_user_ids); +				$queries[] = $sql; +			} +		} +	} + +	if (!empty($queries)) +	{ +		$db->sql_transaction('begin'); + +		foreach ($queries as $sql) +		{ +			$db->sql_query($sql); +		} + +		$sql = "DELETE FROM $table +			WHERE " . $db->sql_in_set($column, $from_values); +		$db->sql_query($sql); + +		$db->sql_transaction('commit'); +	} +} + +/** +* Updates rows in given table from a set of values to a new value. +* If this results in rows violating uniqueness constraints, the duplicate +* rows are merged respecting notify_status (0 takes precedence over 1). +* +* The only supported table is topics_watch. +* +* @param phpbb_db_driver $db Database object +* @param string $table Table on which to perform the update +* @param string $column Column whose values to change +* @param array $from_values An array of values that should be changed +* @param int $to_value The new value +* @return null +*/ +function phpbb_update_rows_avoiding_duplicates_notify_status(phpbb_db_driver $db, $table, $column, $from_values, $to_value) +{ +	$sql = "SELECT $column, user_id, notify_status +		FROM $table +		WHERE " . $db->sql_in_set($column, $from_values); +	$result = $db->sql_query($sql); + +	$old_user_ids = array(); +	while ($row = $db->sql_fetchrow($result)) +	{ +		$old_user_ids[(int) $row['notify_status']][$row[$column]][] = (int) $row['user_id']; +	} +	$db->sql_freeresult($result); + +	$sql = "SELECT $column, user_id +		FROM $table +		WHERE $column = " . (int) $to_value; +	$result = $db->sql_query($sql); + +	$new_user_ids = array(); +	while ($row = $db->sql_fetchrow($result)) +	{ +		$new_user_ids[$row[$column]][] = (int) $row['user_id']; +	} +	$db->sql_freeresult($result); + +	$queries = array(); +	$extra_updates = array( +		0 => 'notify_status = 0', +		1 => '', +	); +	foreach ($from_values as $from_value) +	{ +		foreach ($extra_updates as $notify_status => $extra_update) +		{ +			if (!isset($old_user_ids[$notify_status][$from_value])) +			{ +				continue; +			} +			if (empty($new_user_ids)) +			{ +				$sql = "UPDATE $table +					SET $column = " . (int) $to_value . " +					WHERE $column = '" . $db->sql_escape($from_value) . "'"; +				$queries[] = $sql; +			} +			else +			{ +				$different_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $new_user_ids[$to_value]); +				if (!empty($different_user_ids)) +				{ +					$sql = "UPDATE $table +						SET $column = " . (int) $to_value . " +						WHERE $column = '" . $db->sql_escape($from_value) . "' +						AND " . $db->sql_in_set('user_id', $different_user_ids); +					$queries[] = $sql; +				} + +				if ($extra_update) +				{ +					$same_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $different_user_ids); +					if (!empty($same_user_ids)) +					{ +						$sql = "UPDATE $table +							SET $extra_update +							WHERE $column = '" . (int) $to_value . "' +							AND " . $db->sql_in_set('user_id', $same_user_ids); +						$queries[] = $sql; +					} +				} +			} +		} +	} + +	if (!empty($queries)) +	{ +		$db->sql_transaction('begin'); + +		foreach ($queries as $sql) +		{ +			$db->sql_query($sql); +		} + +		$sql = "DELETE FROM $table +			WHERE " . $db->sql_in_set($column, $from_values); +		$db->sql_query($sql); + +		$db->sql_transaction('commit'); +	} +} diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index fc6f1cc762..9ae647d806 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -596,7 +596,7 @@ function phpbb_parse_range_request($request_array, $filesize)  /**  * Increments the download count of all provided attachments  * -* @param dbal $db The database object +* @param phpbb_db_driver $db The database object  * @param array|int $ids The attach_id of each attachment  *  * @return null @@ -617,7 +617,7 @@ function phpbb_increment_downloads($db, $ids)  /**  * Handles authentication when downloading attachments from a post or topic  * -* @param dbal $db The database object +* @param phpbb_db_driver $db The database object  * @param phpbb_auth $auth The authentication object  * @param int $topic_id The id of the topic that we are downloading from  * @@ -651,7 +651,7 @@ function phpbb_download_handle_forum_auth($db, $auth, $topic_id)  /**  * Handles authentication when downloading attachments from PMs  * -* @param dbal $db The database object +* @param phpbb_db_driver $db The database object  * @param phpbb_auth $auth The authentication object  * @param int $user_id The user id  * @param int $msg_id The id of the PM that we are downloading from @@ -678,7 +678,7 @@ function phpbb_download_handle_pm_auth($db, $auth, $user_id, $msg_id)  /**  * Checks whether a user can download from a particular PM  * -* @param dbal $db The database object +* @param phpbb_db_driver $db The database object  * @param int $user_id The user id  * @param int $msg_id The id of the PM that we are downloading from  * diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index ab6b3ea009..2b4b7eb10d 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -28,7 +28,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20  			'SCHEMA'		=> 'firebird',  			'MODULE'		=> 'interbase',  			'DELIM'			=> ';;', -			'DRIVER'		=> 'firebird', +			'DRIVER'		=> 'phpbb_db_driver_firebird',  			'AVAILABLE'		=> true,  			'2.0.x'			=> false,  		), @@ -37,7 +37,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20  			'SCHEMA'		=> 'mysql_41',  			'MODULE'		=> 'mysqli',  			'DELIM'			=> ';', -			'DRIVER'		=> 'mysqli', +			'DRIVER'		=> 'phpbb_db_driver_mysqli',  			'AVAILABLE'		=> true,  			'2.0.x'			=> true,  		), @@ -46,7 +46,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20  			'SCHEMA'		=> 'mysql',  			'MODULE'		=> 'mysql',  			'DELIM'			=> ';', -			'DRIVER'		=> 'mysql', +			'DRIVER'		=> 'phpbb_db_driver_mysql',  			'AVAILABLE'		=> true,  			'2.0.x'			=> true,  		), @@ -55,7 +55,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20  			'SCHEMA'		=> 'mssql',  			'MODULE'		=> 'mssql',  			'DELIM'			=> 'GO', -			'DRIVER'		=> 'mssql', +			'DRIVER'		=> 'phpbb_db_driver_mssql',  			'AVAILABLE'		=> true,  			'2.0.x'			=> true,  		), @@ -64,7 +64,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20  			'SCHEMA'		=> 'mssql',  			'MODULE'		=> 'odbc',  			'DELIM'			=> 'GO', -			'DRIVER'		=> 'mssql_odbc', +			'DRIVER'		=> 'phpbb_db_driver_mssql_odbc',  			'AVAILABLE'		=> true,  			'2.0.x'			=> true,  		), @@ -73,7 +73,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20  			'SCHEMA'		=> 'mssql',  			'MODULE'		=> 'sqlsrv',  			'DELIM'			=> 'GO', -			'DRIVER'		=> 'mssqlnative', +			'DRIVER'		=> 'phpbb_db_driver_mssqlnative',  			'AVAILABLE'		=> true,  			'2.0.x'			=> false,  		), @@ -82,7 +82,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20  			'SCHEMA'		=> 'oracle',  			'MODULE'		=> 'oci8',  			'DELIM'			=> '/', -			'DRIVER'		=> 'oracle', +			'DRIVER'		=> 'phpbb_db_driver_oracle',  			'AVAILABLE'		=> true,  			'2.0.x'			=> false,  		), @@ -91,7 +91,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20  			'SCHEMA'		=> 'postgres',  			'MODULE'		=> 'pgsql',  			'DELIM'			=> ';', -			'DRIVER'		=> 'postgres', +			'DRIVER'		=> 'phpbb_db_driver_postgres',  			'AVAILABLE'		=> true,  			'2.0.x'			=> true,  		), @@ -100,7 +100,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20  			'SCHEMA'		=> 'sqlite',  			'MODULE'		=> 'sqlite',  			'DELIM'			=> ';', -			'DRIVER'		=> 'sqlite', +			'DRIVER'		=> 'phpbb_db_driver_sqlite',  			'AVAILABLE'		=> true,  			'2.0.x'			=> false,  		), @@ -205,26 +205,19 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,  	$dbms = $dbms_details['DRIVER']; -	if ($load_dbal) -	{ -		// Include the DB layer -		include($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); -	} -  	// Instantiate it and set return on error true -	$sql_db = 'dbal_' . $dbms; -	$db = new $sql_db(); +	$db = new $dbms();  	$db->sql_return_on_error(true);  	// Check that we actually have a database name before going any further..... -	if ($dbms_details['DRIVER'] != 'sqlite' && $dbms_details['DRIVER'] != 'oracle' && $dbname === '') +	if ($dbms_details['DRIVER'] != 'phpbb_db_driver_sqlite' && $dbms_details['DRIVER'] != 'phpbb_db_driver_oracle' && $dbname === '')  	{  		$error[] = $lang['INST_ERR_DB_NO_NAME'];  		return false;  	}  	// Make sure we don't have a daft user who thinks having the SQLite database in the forum directory is a good idea -	if ($dbms_details['DRIVER'] == 'sqlite' && stripos(phpbb_realpath($dbhost), phpbb_realpath('../')) === 0) +	if ($dbms_details['DRIVER'] == 'phpbb_db_driver_sqlite' && stripos(phpbb_realpath($dbhost), phpbb_realpath('../')) === 0)  	{  		$error[] = $lang['INST_ERR_DB_FORUM_PATH'];  		return false; @@ -233,8 +226,8 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,  	// Check the prefix length to ensure that index names are not too long and does not contain invalid characters  	switch ($dbms_details['DRIVER'])  	{ -		case 'mysql': -		case 'mysqli': +		case 'phpbb_db_driver_mysql': +		case 'phpbb_db_driver_mysqli':  			if (strspn($table_prefix, '-./\\') !== 0)  			{  				$error[] = $lang['INST_ERR_PREFIX_INVALID']; @@ -243,22 +236,22 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,  		// no break; -		case 'postgres': +		case 'phpbb_db_driver_postgres':  			$prefix_length = 36;  		break; -		case 'mssql': -		case 'mssql_odbc': -		case 'mssqlnative': +		case 'phpbb_db_driver_mssql': +		case 'phpbb_db_driver_mssql_odbc': +		case 'phpbb_db_driver_mssqlnative':  			$prefix_length = 90;  		break; -		case 'sqlite': +		case 'phpbb_db_driver_sqlite':  			$prefix_length = 200;  		break; -		case 'firebird': -		case 'oracle': +		case 'phpbb_db_driver_firebird': +		case 'phpbb_db_driver_oracle':  			$prefix_length = 6;  		break;  	} @@ -296,21 +289,21 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,  		// Make sure that the user has selected a sensible DBAL for the DBMS actually installed  		switch ($dbms_details['DRIVER'])  		{ -			case 'mysqli': +			case 'phpbb_db_driver_mysqli':  				if (version_compare(mysqli_get_server_info($db->db_connect_id), '4.1.3', '<'))  				{  					$error[] = $lang['INST_ERR_DB_NO_MYSQLI'];  				}  			break; -			case 'sqlite': +			case 'phpbb_db_driver_sqlite':  				if (version_compare(sqlite_libversion(), '2.8.2', '<'))  				{  					$error[] = $lang['INST_ERR_DB_NO_SQLITE'];  				}  			break; -			case 'firebird': +			case 'phpbb_db_driver_firebird':  				// check the version of FB, use some hackery if we can't get access to the server info  				if ($db->service_handle !== false && function_exists('ibase_server_info'))  				{ @@ -391,7 +384,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,  				}  			break; -			case 'oracle': +			case 'phpbb_db_driver_oracle':  				if ($unicode_check)  				{  					$sql = "SELECT * @@ -413,7 +406,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,  				}  			break; -			case 'postgres': +			case 'phpbb_db_driver_postgres':  				if ($unicode_check)  				{  					$sql = "SHOW server_encoding;"; diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index a33d7f0aa3..d0a02567ad 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -210,7 +210,7 @@ class messenger  		{  			$style_resource_locator = new phpbb_style_resource_locator();  			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider()); -			$tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $extension_manager); +			$tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);  			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);  			$this->tpl_msg[$template_lang . $template_file] = $tpl; diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index b467aa93d1..4f31a85e83 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -70,7 +70,7 @@ class filespec  			$this->mimetype = 'application/octetstream';  		} -		$this->extension = strtolower($this->get_extension($this->realname)); +		$this->extension = strtolower(self::get_extension($this->realname));  		// Try to get real filesize from temporary folder (not always working) ;)  		$this->filesize = (@filesize($this->filename)) ? @filesize($this->filename) : $this->filesize; @@ -187,8 +187,11 @@ class filespec  	/**  	* Get file extension +	* +	* @param string Filename that needs to be checked +	* @return string Extension of the supplied filename  	*/ -	function get_extension($filename) +	static public function get_extension($filename)  	{  		if (strpos($filename, '.') === false)  		{ @@ -369,7 +372,7 @@ class filespec  				}  				// Check image type -				$types = $this->upload->image_types(); +				$types = fileupload::image_types();  				if (!isset($types[$this->image_info[2]]) || !in_array($this->extension, $types[$this->image_info[2]]))  				{ @@ -1019,9 +1022,11 @@ class fileupload  	}  	/** -	* Return image type/extension mapping +	* Get image type/extension mapping +	* +	* @return array Array containing the image types and their extensions  	*/ -	function image_types() +	static public function image_types()  	{  		return array(  			IMAGETYPE_GIF		=> array('gif'), diff --git a/phpBB/includes/lock/db.php b/phpBB/includes/lock/db.php index 6e94dd5a85..ccdaed0b28 100644 --- a/phpBB/includes/lock/db.php +++ b/phpBB/includes/lock/db.php @@ -48,7 +48,7 @@ class phpbb_lock_db  	/**  	* A database connection -	* @var dbal +	* @var phpbb_db_driver  	*/  	private $db; @@ -59,9 +59,9 @@ class phpbb_lock_db  	*  	* @param	string	$config_name	A config variable to be used for locking  	* @param	array	$config			The phpBB configuration -	* @param	dbal	$db				A database connection +	* @param	phpbb_db_driver	$db				A database connection  	*/ -	public function __construct($config_name, phpbb_config $config, dbal $db) +	public function __construct($config_name, phpbb_config $config, phpbb_db_driver $db)  	{  		$this->config_name = $config_name;  		$this->config = $config; diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 4dd5e5856a..0fad9e2a22 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -430,13 +430,16 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)  		// Message and return links  		$success_msg = 'POSTS_MERGED_SUCCESS'; -		// If the topic no longer exist, we will update the topic watch table. -		// To not let it error out on users watching both topics, we just return on an error... -		$db->sql_return_on_error(true); -		$db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); -		$db->sql_return_on_error(false); +		if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status')) +		{ +			include($phpbb_root_path . 'includes/functions_database_helper.' . $phpEx); +		} + +		// Update the topic watch table. +		phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id); -		$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); +		// Update the bookmarks table. +		phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $topic_ids, $to_topic_id);  		// Link to the new topic  		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&t=' . $to_topic_id) . '">', '</a>'); diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 95ca7c2e1b..c28b466bcf 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -1080,6 +1080,7 @@ function mcp_fork_topic($topic_ids)  				}  			} +			// Copy topic subscriptions to new topic  			$sql = 'SELECT user_id, notify_status  				FROM ' . TOPICS_WATCH_TABLE . '  				WHERE topic_id = ' . $topic_id; @@ -1100,6 +1101,27 @@ function mcp_fork_topic($topic_ids)  			{  				$db->sql_multi_insert(TOPICS_WATCH_TABLE, $sql_ary);  			} + +			// Copy bookmarks to new topic +			$sql = 'SELECT user_id +				FROM ' . BOOKMARKS_TABLE . ' +				WHERE topic_id = ' . $topic_id; +			$result = $db->sql_query($sql); + +			$sql_ary = array(); +			while ($row = $db->sql_fetchrow($result)) +			{ +				$sql_ary[] = array( +					'topic_id'		=> (int) $new_topic_id, +					'user_id'		=> (int) $row['user_id'], +				); +			} +			$db->sql_freeresult($result); + +			if (sizeof($sql_ary)) +			{ +				$db->sql_multi_insert(BOOKMARKS_TABLE, $sql_ary); +			}  		}  		// Sync new topics, parent forums and board stats diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 63ff7bed72..e3dd5a6b57 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -521,6 +521,49 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)  			WHERE post_id = {$post_id_list[0]}";  		$db->sql_query($sql); +		// Copy topic subscriptions to new topic +		$sql = 'SELECT user_id, notify_status +			FROM ' . TOPICS_WATCH_TABLE . ' +			WHERE topic_id = ' . $topic_id; +		$result = $db->sql_query($sql); + +		$sql_ary = array(); +		while ($row = $db->sql_fetchrow($result)) +		{ +			$sql_ary[] = array( +				'topic_id'		=> (int) $to_topic_id, +				'user_id'		=> (int) $row['user_id'], +				'notify_status'	=> (int) $row['notify_status'], +			); +		} +		$db->sql_freeresult($result); + +		if (sizeof($sql_ary)) +		{ +			$db->sql_multi_insert(TOPICS_WATCH_TABLE, $sql_ary); +		} + +		// Copy bookmarks to new topic +		$sql = 'SELECT user_id +			FROM ' . BOOKMARKS_TABLE . ' +			WHERE topic_id = ' . $topic_id; +		$result = $db->sql_query($sql); + +		$sql_ary = array(); +		while ($row = $db->sql_fetchrow($result)) +		{ +			$sql_ary[] = array( +				'topic_id'		=> (int) $to_topic_id, +				'user_id'		=> (int) $row['user_id'], +			); +		} +		$db->sql_freeresult($result); + +		if (sizeof($sql_ary)) +		{ +			$db->sql_multi_insert(BOOKMARKS_TABLE, $sql_ary); +		} +  		$success_msg = 'TOPIC_SPLIT_SUCCESS';  		// Update forum statistics @@ -623,13 +666,16 @@ function merge_posts($topic_id, $to_topic_id)  		}  		else  		{ +			if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status')) +			{ +				include($phpbb_root_path . 'includes/functions_database_helper.' . $phpEx); +			} +  			// If the topic no longer exist, we will update the topic watch table. -			// To not let it error out on users watching both topics, we just return on an error... -			$db->sql_return_on_error(true); -			$db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id); -			$db->sql_return_on_error(false); +			phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id); -			$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE topic_id = ' . (int) $topic_id); +			// If the topic no longer exist, we will update the bookmarks table. +			phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $topic_id, $to_topic_id);  		}  		// Link to the new topic diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 1cd2a46fa1..44960dd78d 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -702,17 +702,6 @@ class bbcode_firstpass extends bbcode  	{  		global $config, $user; -		/** -		* If you change this code, make sure the cases described within the following reports are still working: -		* #3572 - [quote="[test]test"]test [ test[/quote] - (correct: parsed) -		* #14667 - [quote]test[/quote] test ] and [ test [quote]test[/quote] (correct: parsed) -		* #14770 - [quote="["]test[/quote] (correct: parsed) -		* [quote="[i]test[/i]"]test[/quote] (correct: parsed) -		* [quote="[quote]test[/quote]"]test[/quote] (correct: parsed - Username displayed as [quote]test[/quote]) -		* #20735 - [quote]test[/[/b]quote] test [/quote][/quote] test - (correct: quoted: "test[/[/b]quote] test" / non-quoted: "[/quote] test" - also failed if layout distorted) -		* #40565 - [quote="a"]a[/quote][quote="a]a[/quote] (correct: first quote tag parsed, second quote tag unparsed) -		*/ -  		$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));  		if (!$in) diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php index 2d29fe978e..6f2727a38c 100644 --- a/phpBB/includes/questionnaire/questionnaire.php +++ b/phpBB/includes/questionnaire/questionnaire.php @@ -260,6 +260,8 @@ class phpbb_questionnaire_phpbb_data_provider  		include("{$phpbb_root_path}config.$phpEx");  		unset($dbhost, $dbport, $dbname, $dbuser, $dbpasswd); // Just a precaution +		$dbms = phpbb_convert_30_dbms_to_31($dbms); +  		// Only send certain config vars  		$config_vars = array(  			'active_sessions' => true, diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index ff2e24aa05..324c214e91 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -41,8 +41,8 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base  	protected $config;  	/** -	 * DBAL object -	 * @var dbal +	 * Database connection +	 * @var phpbb_db_driver  	 */  	protected $db; diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index 4623326fc7..53df8348ae 100644 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -85,8 +85,8 @@ class phpbb_search_fulltext_native extends phpbb_search_base  	protected $config;  	/** -	 * DBAL object -	 * @var dbal +	 * Database connection +	 * @var phpbb_db_driver  	 */  	protected $db; diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php index 2880610655..f22ee2ca16 100644 --- a/phpBB/includes/search/fulltext_postgres.php +++ b/phpBB/includes/search/fulltext_postgres.php @@ -66,8 +66,8 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base  	protected $config;  	/** -	 * DBAL object -	 * @var dbal +	 * Database connection +	 * @var phpbb_db_driver  	 */  	protected $db; diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php index dd5634b623..4bacf74f93 100644 --- a/phpBB/includes/search/fulltext_sphinx.php +++ b/phpBB/includes/search/fulltext_sphinx.php @@ -84,8 +84,8 @@ class phpbb_search_fulltext_sphinx  	protected $config;  	/** -	 * DBAL object -	 * @var dbal +	 * Database connection +	 * @var phpbb_db_driver  	 */  	protected $db; @@ -875,7 +875,7 @@ class phpbb_search_fulltext_sphinx  		</dl>  		<dl>  			<dt><label for="fulltext_sphinx_indexer_mem_limit">' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'] . '</span></dt> -			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" />' . $this->user->lang['MIB'] . '</dd> +			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" /> ' . $this->user->lang['MIB'] . '</dd>  		</dl>  		<dl>  			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</dt> diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 68acea02b3..5f30625980 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -24,6 +24,8 @@ if (!defined('IN_PHPBB'))  include($phpbb_root_path . 'config.' . $phpEx);  unset($dbpasswd); +$dbms = phpbb_convert_30_dbms_to_31($dbms); +  /**  * $convertor_data provides some basic information about this convertor which is  * used on the initial list of convertors and to populate the default settings diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 30592b995d..19d0d35fc0 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -83,7 +83,6 @@ phpbb_require_updated('includes/functions_content.' . $phpEx, true);  require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);  require($phpbb_root_path . 'includes/constants.' . $phpEx); -require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);  require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);  phpbb_require_updated('includes/db/db_tools.' . $phpEx); @@ -818,6 +817,70 @@ function _add_modules($modules_to_install)  	$_module->remove_cache_file();  } +/** +* Add a new permission, optionally copy permission setting from another +* +* @param auth_admin $auth_admin auth_admin object +* @param phpbb_db_driver $db Database object +* @param string $permission_name Name of the permission to add +* @param bool $is_global True is global, false is local +* @param string $copy_from Optional permission name from which to copy +* @return bool true on success, false on failure +*/ +function _add_permission(auth_admin $auth_admin, phpbb_db_driver $db, $permission_name, $is_global = true, $copy_from = '') +{ +	// Only add a permission that don't already exist +	if (!empty($auth_admin->acl_options['id'][$permission_name])) +	{ +		return true; +	} + +	$permission_scope = $is_global ? 'global' : 'local'; + +	$result = $auth_admin->acl_add_option(array( +		$permission_scope => array($permission_name), +	)); + +	if (!$result) +	{ +		return $result; +	} + +	// The permission has been added, now we can copy it if needed +	if ($copy_from && isset($auth_admin->acl_options['id'][$copy_from])) +	{ +		$old_id = $auth_admin->acl_options['id'][$copy_from]; +		$new_id = $auth_admin->acl_options['id'][$permission_name]; + +		$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); +			} +		} + +		$auth_admin->acl_clear_prefetch(); +	} + +	return true; +} +  /****************************************************************************  * ADD YOUR DATABASE SCHEMA CHANGES HERE										*  *****************************************************************************/ @@ -2459,6 +2522,12 @@ function change_database_data(&$no_updates, $version)  				unset($next_legend);  			} +			// Rename styles module to Customise +			$sql = 'UPDATE ' . MODULES_TABLE . " +				SET module_langname = 'ACP_CAT_CUSTOMISE' +				WHERE module_langname = 'ACP_CAT_STYLES'"; +			_sql($sql, $errored, $error_ary); +  			// Install modules  			$modules_to_install = array(  				'position'	=> array( @@ -2496,10 +2565,67 @@ function change_database_data(&$no_updates, $version)  					'auth'		=> '',  					'cat'		=> 'UCP_PROFILE',  				), +				// To add a category, the mode and basename must be empty +				// The mode is taken from the array key +				'' => array( +					'base'		=> '', +					'class'		=> 'acp', +					'title'		=> 'ACP_EXTENSION_MANAGEMENT', +					'auth'		=> 'acl_a_extensions', +					'cat'		=> 'ACP_CAT_CUSTOMISE', +				), +				'extensions'    => array( +					'base'		=> 'acp_extensions', +					'class'		=> 'acp', +					'title'		=> 'ACP_EXTENSIONS', +					'auth'		=> 'acl_a_extensions', +					'cat'		=> 'ACP_EXTENSION_MANAGEMENT', +				), +			); + +			_add_modules($modules_to_install); + +			// We need a separate array for the new language sub heading +			// because it requires another empty key +			$modules_to_install = array( +				'' => array( +					'base'	=> '', +					'class'	=> 'acp', +					'title'	=> 'ACP_LANGUAGE', +					'auth'	=> 'acl_a_language', +					'cat'	=> 'ACP_CAT_CUSTOMISE', +				),  			);  			_add_modules($modules_to_install); +			// Move language management to new location in the Customise tab +			// First get language module id +			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . " +				WHERE module_basename = 'acp_language'"; +			$result = $db->sql_query($sql); +			$language_module_id = $db->sql_fetchfield('module_id'); +			$db->sql_freeresult($result); +			// Next get language management module id of the one just created +			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . " +				WHERE module_langname = 'ACP_LANGUAGE'"; +			$result = $db->sql_query($sql); +			$language_management_module_id = $db->sql_fetchfield('module_id'); +			$db->sql_freeresult($result); + +			if (!class_exists('acp_modules')) +			{ +				include($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx); +			} +			// acp_modules calls adm_back_link, which is undefined at this point +			if (!function_exists('adm_back_link')) +			{ +				include($phpbb_root_path . 'includes/functions_acp.' . $phpEx); +			} +			$module_manager = new acp_modules(); +			$module_manager->module_class = 'acp'; +			$module_manager->move_module($language_module_id, $language_management_module_id); +  			$sql = 'DELETE FROM ' . MODULES_TABLE . "  				WHERE (module_basename = 'styles' OR module_basename = 'acp_styles') AND (module_mode = 'imageset' OR module_mode = 'theme' OR module_mode = 'template')";  			_sql($sql, $errored, $error_ary); @@ -2790,45 +2916,12 @@ function change_database_data(&$no_updates, $version)  			}  			$db->sql_freeresult($result); -			// Add new permission u_chgprofileinfo and duplicate settings from u_sig +			// Add new permissions  			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(); -			} +			_add_permission($auth_admin, $db, 'u_chgprofileinfo', true, 'u_sig'); +			_add_permission($auth_admin, $db, 'a_extensions', true, 'a_styles');  			// Update the auth setting for the module  			$sql = 'UPDATE ' . MODULES_TABLE . " diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 41de9de44c..9afe341ffa 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -121,10 +121,11 @@ class install_convert extends module  				require($phpbb_root_path . 'config.' . $phpEx);  				require($phpbb_root_path . 'includes/constants.' . $phpEx); -				require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);  				require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); -				$db = new $sql_db(); +				$dbms = phpbb_convert_30_dbms_to_31($dbms); + +				$db = new $dbms();  				$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);  				unset($dbpasswd); @@ -209,10 +210,11 @@ class install_convert extends module  				require($phpbb_root_path . 'config.' . $phpEx);  				require($phpbb_root_path . 'includes/constants.' . $phpEx); -				require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);  				require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); -				$db = new $sql_db(); +				$dbms = phpbb_convert_30_dbms_to_31($dbms); + +				$db = new $dbms();  				$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);  				unset($dbpasswd); @@ -332,10 +334,11 @@ class install_convert extends module  		require($phpbb_root_path . 'config.' . $phpEx);  		require($phpbb_root_path . 'includes/constants.' . $phpEx); -		require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);  		require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); -		$db = new $sql_db(); +		$dbms = phpbb_convert_30_dbms_to_31($dbms); + +		$db = new $dbms();  		$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);  		unset($dbpasswd); @@ -425,8 +428,7 @@ class install_convert extends module  				if ($src_dbms != $dbms || $src_dbhost != $dbhost || $src_dbport != $dbport || $src_dbname != $dbname || $src_dbuser != $dbuser)  				{ -					$sql_db = 'dbal_' . $src_dbms; -					$src_db = new $sql_db(); +					$src_db = new $src_dbms();  					$src_db->sql_connect($src_dbhost, $src_dbuser, htmlspecialchars_decode($src_dbpasswd), $src_dbname, $src_dbport, false, true);  					$same_db = false;  				} @@ -575,10 +577,11 @@ class install_convert extends module  		require($phpbb_root_path . 'config.' . $phpEx);  		require($phpbb_root_path . 'includes/constants.' . $phpEx); -		require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);  		require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); -		$db = new $sql_db(); +		$dbms = phpbb_convert_30_dbms_to_31($dbms); + +		$db = new $dbms();  		$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);  		unset($dbpasswd); @@ -639,12 +642,8 @@ class install_convert extends module  		$src_db = $same_db = null;  		if ($convert->src_dbms != $dbms || $convert->src_dbhost != $dbhost || $convert->src_dbport != $dbport || $convert->src_dbname != $dbname || $convert->src_dbuser != $dbuser)  		{ -			if ($convert->src_dbms != $dbms) -			{ -				require($phpbb_root_path . 'includes/db/' . $convert->src_dbms . '.' . $phpEx); -			} -			$sql_db = 'dbal_' . $convert->src_dbms; -			$src_db = new $sql_db(); +			$dbms = $convert->src_dbms; +			$src_db = new $dbms();  			$src_db->sql_connect($convert->src_dbhost, $convert->src_dbuser, htmlspecialchars_decode($convert->src_dbpasswd), $convert->src_dbname, $convert->src_dbport, false, true);  			$same_db = false;  		} diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 4b2fa046bc..14f6ca30fb 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1118,11 +1118,8 @@ class install_install extends module  		$dbms = $available_dbms[$data['dbms']]['DRIVER']; -		// Load the appropriate database class if not already loaded -		include($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); -  		// Instantiate the database -		$db = new $sql_db(); +		$db = new $dbms();  		$db->sql_connect($data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport'], false, false);  		// NOTE: trigger_error does not work here. @@ -1418,11 +1415,8 @@ class install_install extends module  		$dbms = $available_dbms[$data['dbms']]['DRIVER']; -		// Load the appropriate database class if not already loaded -		include($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); -  		// Instantiate the database -		$db = new $sql_db(); +		$db = new $dbms();  		$db->sql_connect($data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport'], false, false);  		// NOTE: trigger_error does not work here. @@ -2095,9 +2089,10 @@ class install_install extends module  				'ACP_PERMISSION_ROLES',  				'ACP_PERMISSION_MASKS',  			), -			'ACP_CAT_STYLES'		=> array( +			'ACP_CAT_CUSTOMISE'		=> array(  				'ACP_STYLE_MANAGEMENT', -				'ACP_STYLE_COMPONENTS', +				'ACP_EXTENSIONS_MANAGEMENT', +				'ACP_LANGUAGE',  			),  			'ACP_CAT_MAINTENANCE'	=> array(  				'ACP_FORUM_LOGS', diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index d71752f9c6..53f9c52556 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -83,7 +83,6 @@ class install_update extends module  		// Init DB  		require($phpbb_root_path . 'config.' . $phpEx); -		require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);  		require($phpbb_root_path . 'includes/constants.' . $phpEx);  		// Special options for conflicts/modified files @@ -92,7 +91,9 @@ class install_update extends module  		define('MERGE_NEW_FILE', 3);  		define('MERGE_MOD_FILE', 4); -		$db = new $sql_db(); +		$dbms = phpbb_convert_30_dbms_to_31($dbms); + +		$db = new $dbms();  		// Connect to DB  		$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false); diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 5eb10d50b3..427e4f4d98 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -59,6 +59,7 @@ $lang = array_merge($lang, array(  	'ACP_CAPTCHA'				=> 'CAPTCHA', +	'ACP_CAT_CUSTOMISE'			=> 'Customise',  	'ACP_CAT_DATABASE'			=> 'Database',  	'ACP_CAT_DOT_MODS'			=> '.MODs',  	'ACP_CAT_FORUMS'			=> 'Forums', @@ -80,8 +81,10 @@ $lang = array_merge($lang, array(  	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',  	'ACP_EMAIL_SETTINGS'		=> 'Email settings', -	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups', -	'ACP_EXTENSIONS'			=> 'Manage board extensions', +	'ACP_EXTENSION_GROUPS'		=> 'Manage attachment extension groups', +	'ACP_EXTENSION_MANAGEMENT'	=> 'Extension management', +	'ACP_EXTENSIONS'			=> 'Extensions', +  	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',  	'ACP_FORUM_LOGS'				=> 'Forum logs', @@ -119,7 +122,7 @@ $lang = array_merge($lang, array(  	'ACP_MANAGE_ATTACHMENTS'			=> 'Manage attachments',  	'ACP_MANAGE_ATTACHMENTS_EXPLAIN'	=> 'Here you can list and delete files attached to posts and private messages.', -	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions', +	'ACP_MANAGE_EXTENSIONS'		=> 'Manage attachment extensions',  	'ACP_MANAGE_FORUMS'			=> 'Manage forums',  	'ACP_MANAGE_RANKS'			=> 'Manage ranks',  	'ACP_MANAGE_REASONS'		=> 'Manage report/denial reasons', @@ -166,7 +169,6 @@ $lang = array_merge($lang, array(  	'ACP_SERVER_SETTINGS'		=> 'Server settings',  	'ACP_SIGNATURE_SETTINGS'	=> 'Signature settings',  	'ACP_SMILIES'				=> 'Smilies', -	'ACP_STYLE_COMPONENTS'		=> 'Style components',  	'ACP_STYLE_MANAGEMENT'		=> 'Style management',  	'ACP_STYLES'				=> 'Styles',  	'ACP_STYLES_CACHE'			=> 'Purge Cache',  | 
