diff options
55 files changed, 680 insertions, 485 deletions
| diff --git a/.travis.yml b/.travis.yml index a4e8bdedd3..88c902cd4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ install:  before_script:    - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"    - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" +  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' -a '$DB' = 'mysql' ]; then mysql -e 'SET GLOBAL storage_engine=MyISAM;'; fi"    - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"  script: diff --git a/build/build.xml b/build/build.xml index 1c6cbe5f25..10ff242ab9 100644 --- a/build/build.xml +++ b/build/build.xml @@ -255,7 +255,7 @@  							command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"  							checkreturn="true" />  						<exec dir="${dir}" -							command="php composer.phar install" +							command="php composer.phar install --no-dev"  							checkreturn="true"  							passthru="true" />  						<delete file="${dir}/composer.phar" /> diff --git a/composer.phar b/composer.pharBinary files differ index a035fdc911..1e9ca731cd 100755 --- a/composer.phar +++ b/composer.phar diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html index 5141acd9fc..6aff4b29cc 100644 --- a/phpBB/adm/style/acp_ext_details.html +++ b/phpBB/adm/style/acp_ext_details.html @@ -41,8 +41,8 @@  		</dl>  		<!-- ENDIF -->  		<dl> -			<dt><label>{L_LICENCE}{L_COLON}</label></dt> -			<dd><span id="meta_license">{META_LICENCE}</span></dd> +			<dt><label>{L_LICENSE}{L_COLON}</label></dt> +			<dd><span id="meta_license">{META_LICENSE}</span></dd>  		</dl>  	</fieldset> diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 5ef278d493..dcbe5ec66d 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -20,7 +20,6 @@ if (!is_writable($schema_path))  define('IN_PHPBB', true); -require(dirname(__FILE__) . '/../includes/db/schema_data.php');  require(dirname(__FILE__) . '/../phpbb/db/tools.php');  $dbms_type_map = phpbb\db\tools::get_dbms_type_map(); @@ -31,6 +30,19 @@ $supported_dbms = array('firebird', 'mssql', 'mysql_40', 'mysql_41', 'oracle', '  foreach ($supported_dbms as $dbms)  { +	include(dirname(__FILE__) . '/../includes/db/schema_data.php'); +	if ($dbms == 'mssql') +	{ +		foreach ($schema_data as $table_name => $table_data) +		{ +			if (!isset($table_data['PRIMARY_KEY'])) +			{ +				$schema_data[$table_name]['COLUMNS']['mssqlindex'] = array('UINT', NULL, 'auto_increment'); +				$schema_data[$table_name]['PRIMARY_KEY'] = 'mssqlindex'; +			} +		} +	} +  	$fp = fopen($schema_path . $dbms . '_schema.sql', 'wb');  	$line = ''; @@ -346,7 +358,7 @@ foreach ($supported_dbms as $dbms)  			case 'mssql':  				$line = substr($line, 0, -2); -				$line .= "\n) ON [PRIMARY]" . (($textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '') . "\n"; +				$line .= "\n)";// ON [PRIMARY]" . (($textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '') . "\n";  				$line .= "GO\n\n";  			break;  		} @@ -383,7 +395,7 @@ foreach ($supported_dbms as $dbms)  					$line .= "\tCONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED \n";  					$line .= "\t(\n";  					$line .= "\t\t[" . implode("],\n\t\t[", $table_data['PRIMARY_KEY']) . "]\n"; -					$line .= "\t)  ON [PRIMARY] \n"; +					$line .= "\t)\n";  					$line .= "GO\n\n";  				break; @@ -478,7 +490,7 @@ foreach ($supported_dbms as $dbms)  					case 'mssql':  						$line .= ($key_data[0] == 'INDEX') ? 'CREATE  INDEX' : '';  						$line .= ($key_data[0] == 'UNIQUE') ? 'CREATE  UNIQUE  INDEX' : ''; -						$line .= " [{$key_name}] ON [{$table_name}]([" . implode('], [', $key_data[1]) . "]) ON [PRIMARY]\n"; +						$line .= " [{$key_name}] ON [{$table_name}]([" . implode('], [', $key_data[1]) . "])\n";  						$line .= "GO\n\n";  					break; diff --git a/phpBB/faq.php b/phpBB/faq.php index 052f78816e..53de850195 100644 --- a/phpBB/faq.php +++ b/phpBB/faq.php @@ -76,7 +76,7 @@ $template->assign_vars(array(  	'SWITCH_COLUMN_MANUALLY'	=> (!$found_switch) ? true : false,  )); -page_header($l_title, false); +page_header($l_title);  $template->set_filenames(array(  	'body' => 'faq_body.html') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ebd676b17a..aa868c5431 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2679,7 +2679,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo  	}  	else  	{ -		page_header(((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]), false); +		page_header((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]);  	}  	$template->set_filenames(array( @@ -2956,7 +2956,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa  		'PASSWORD_CREDENTIAL'	=> ($admin) ? 'password_' . $credential : 'password',  	)); -	page_header($user->lang['LOGIN'], false); +	page_header($user->lang['LOGIN']);  	$template->set_filenames(array(  		'body' => 'login_body.html') @@ -3032,7 +3032,7 @@ function login_forum_box($forum_data)  		$template->assign_var('LOGIN_ERROR', $user->lang['WRONG_PASSWORD']);  	} -	page_header($user->lang['LOGIN'], false); +	page_header($user->lang['LOGIN']);  	$template->assign_vars(array(  		'FORUM_NAME'			=> isset($forum_data['forum_name']) ? $forum_data['forum_name'] : '', @@ -3945,7 +3945,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)  				}  				else  				{ -					page_header($msg_title, false); +					page_header($msg_title);  				}  			} @@ -4622,7 +4622,7 @@ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null)  /**  * Generate page header  */ -function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum') +function page_header($page_title = '', $display_online_list = false, $item_id = 0, $item = 'forum')  {  	global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path;  	global $phpbb_dispatcher, $request, $phpbb_container, $phpbb_admin_path; @@ -4883,7 +4883,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0  		'U_SEARCH_UNREAD'		=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unreadposts'),  		'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'),  		'U_DELETE_COOKIES'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=delete_cookies'), -		'U_TEAM'				=> ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=leaders'), +		'U_TEAM'				=> ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'),  		'U_TERMS_USE'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),  		'U_PRIVACY'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),  		'U_RESTORE_PERMISSIONS'	=> ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '', diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index b31b268db7..81a381b326 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2920,8 +2920,24 @@ function get_database_size()  		case 'mssql':  		case 'mssql_odbc':  		case 'mssqlnative': +			$sql = 'SELECT @@VERSION AS mssql_version'; +			$result = $db->sql_query($sql); +			$row = $db->sql_fetchrow($result); +			$db->sql_freeresult($result); +			  			$sql = 'SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize  				FROM sysfiles'; + +			if ($row) +			{ +				// Azure stats are stored elsewhere +				if (strpos($row['mssql_version'], 'SQL Azure') !== false) +				{ +					$sql = 'SELECT ((SUM(reserved_page_count) * 8.0) * 1024.0) as dbsize  +					FROM sys.dm_db_partition_stats'; +				} +			} +  			$result = $db->sql_query($sql, 7200);  			$database_size = ($row = $db->sql_fetchrow($result)) ? $row['dbsize'] : false;  			$db->sql_freeresult($result); diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index e043883145..ef2e009a6e 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -956,7 +956,7 @@ class p_master  	/**  	* Display module  	*/ -	function display($page_title, $display_online_list = true) +	function display($page_title, $display_online_list = false)  	{  		global $template, $user; diff --git a/phpBB/index.php b/phpBB/index.php index c363781667..49baf33392 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -193,7 +193,7 @@ $vars = array('page_title');  extract($phpbb_dispatcher->trigger_event('core.index_modify_page_title', compact($vars)));  // Output page -page_header($page_title); +page_header($page_title, true);  $template->set_filenames(array(  	'body' => 'index_body.html') diff --git a/phpBB/install/index.php b/phpBB/install/index.php index b18a9dce1b..66c8559e98 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -720,8 +720,9 @@ class module  				$size = (int) $tpl_type[1];  				$maxlength = (int) $tpl_type[2]; +				$autocomplete = (isset($options['autocomplete']) && $options['autocomplete'] == 'off') ? ' autocomplete="off"' : ''; -				$tpl = '<input id="' . $name . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $value . '" />'; +				$tpl = '<input id="' . $name . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '"' . $autocomplete . ' value="' . $value . '" />';  			break;  			case 'textarea': diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 72e6f6affa..009f0dfa33 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -2017,8 +2017,8 @@ class install_install extends module  		'smtp_delivery'			=> array('lang' => 'USE_SMTP',			'type' => 'radio:yes_no', 'explain' => true),  		'smtp_host'				=> array('lang' => 'SMTP_SERVER',		'type' => 'text:25:50', 'explain' => false),  		'smtp_auth'				=> array('lang' => 'SMTP_AUTH_METHOD',	'type' => 'select', 'options' => '$this->module->mail_auth_select(\'{VALUE}\')', 'explain' => true), -		'smtp_user'				=> array('lang' => 'SMTP_USERNAME',		'type' => 'text:25:255', 'explain' => true), -		'smtp_pass'				=> array('lang' => 'SMTP_PASSWORD',		'type' => 'password:25:255', 'explain' => true), +		'smtp_user'				=> array('lang' => 'SMTP_USERNAME',		'type' => 'text:25:255', 'explain' => true, 'options' => array('autocomplete' => 'off')), +		'smtp_pass'				=> array('lang' => 'SMTP_PASSWORD',		'type' => 'password:25:255', 'explain' => true, 'options' => array('autocomplete' => 'off')),  		'legend2'				=> 'SERVER_URL_SETTINGS',  		'cookie_secure'			=> array('lang' => 'COOKIE_SECURE',		'type' => 'radio:enabled_disabled', 'explain' => true), diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 66e64cf651..d8d414a4c2 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -25,29 +25,28 @@ CREATE TABLE [phpbb_attachments] (  	[filesize] [int] DEFAULT (0) NOT NULL ,  	[filetime] [int] DEFAULT (0) NOT NULL ,  	[thumbnail] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_attachments] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_attachments] PRIMARY KEY  CLUSTERED   	(  		[attach_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [filetime] ON [phpbb_attachments]([filetime]) ON [PRIMARY] +CREATE  INDEX [filetime] ON [phpbb_attachments]([filetime])  GO -CREATE  INDEX [post_msg_id] ON [phpbb_attachments]([post_msg_id]) ON [PRIMARY] +CREATE  INDEX [post_msg_id] ON [phpbb_attachments]([post_msg_id])  GO -CREATE  INDEX [topic_id] ON [phpbb_attachments]([topic_id]) ON [PRIMARY] +CREATE  INDEX [topic_id] ON [phpbb_attachments]([topic_id])  GO -CREATE  INDEX [poster_id] ON [phpbb_attachments]([poster_id]) ON [PRIMARY] +CREATE  INDEX [poster_id] ON [phpbb_attachments]([poster_id])  GO -CREATE  INDEX [is_orphan] ON [phpbb_attachments]([is_orphan]) ON [PRIMARY] +CREATE  INDEX [is_orphan] ON [phpbb_attachments]([is_orphan])  GO @@ -59,17 +58,24 @@ CREATE TABLE [phpbb_acl_groups] (  	[forum_id] [int] DEFAULT (0) NOT NULL ,  	[auth_option_id] [int] DEFAULT (0) NOT NULL ,  	[auth_role_id] [int] DEFAULT (0) NOT NULL , -	[auth_setting] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] +	[auth_setting] [int] DEFAULT (0) NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_acl_groups] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_acl_groups] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  INDEX [group_id] ON [phpbb_acl_groups]([group_id]) ON [PRIMARY] +CREATE  INDEX [group_id] ON [phpbb_acl_groups]([group_id])  GO -CREATE  INDEX [auth_opt_id] ON [phpbb_acl_groups]([auth_option_id]) ON [PRIMARY] +CREATE  INDEX [auth_opt_id] ON [phpbb_acl_groups]([auth_option_id])  GO -CREATE  INDEX [auth_role_id] ON [phpbb_acl_groups]([auth_role_id]) ON [PRIMARY] +CREATE  INDEX [auth_role_id] ON [phpbb_acl_groups]([auth_role_id])  GO @@ -82,17 +88,16 @@ CREATE TABLE [phpbb_acl_options] (  	[is_global] [int] DEFAULT (0) NOT NULL ,  	[is_local] [int] DEFAULT (0) NOT NULL ,  	[founder_only] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_acl_options] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_acl_options] PRIMARY KEY  CLUSTERED   	(  		[auth_option_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  UNIQUE  INDEX [auth_option] ON [phpbb_acl_options]([auth_option]) ON [PRIMARY] +CREATE  UNIQUE  INDEX [auth_option] ON [phpbb_acl_options]([auth_option])  GO @@ -105,20 +110,19 @@ CREATE TABLE [phpbb_acl_roles] (  	[role_description] [varchar] (4000) DEFAULT ('') NOT NULL ,  	[role_type] [varchar] (10) DEFAULT ('') NOT NULL ,  	[role_order] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_acl_roles] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_acl_roles] PRIMARY KEY  CLUSTERED   	(  		[role_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [role_type] ON [phpbb_acl_roles]([role_type]) ON [PRIMARY] +CREATE  INDEX [role_type] ON [phpbb_acl_roles]([role_type])  GO -CREATE  INDEX [role_order] ON [phpbb_acl_roles]([role_order]) ON [PRIMARY] +CREATE  INDEX [role_order] ON [phpbb_acl_roles]([role_order])  GO @@ -129,18 +133,17 @@ CREATE TABLE [phpbb_acl_roles_data] (  	[role_id] [int] DEFAULT (0) NOT NULL ,  	[auth_option_id] [int] DEFAULT (0) NOT NULL ,  	[auth_setting] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_acl_roles_data] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_acl_roles_data] PRIMARY KEY  CLUSTERED   	(  		[role_id],  		[auth_option_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [ath_op_id] ON [phpbb_acl_roles_data]([auth_option_id]) ON [PRIMARY] +CREATE  INDEX [ath_op_id] ON [phpbb_acl_roles_data]([auth_option_id])  GO @@ -152,17 +155,24 @@ CREATE TABLE [phpbb_acl_users] (  	[forum_id] [int] DEFAULT (0) NOT NULL ,  	[auth_option_id] [int] DEFAULT (0) NOT NULL ,  	[auth_role_id] [int] DEFAULT (0) NOT NULL , -	[auth_setting] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] +	[auth_setting] [int] DEFAULT (0) NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_acl_users] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_acl_users] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  INDEX [user_id] ON [phpbb_acl_users]([user_id]) ON [PRIMARY] +CREATE  INDEX [user_id] ON [phpbb_acl_users]([user_id])  GO -CREATE  INDEX [auth_option_id] ON [phpbb_acl_users]([auth_option_id]) ON [PRIMARY] +CREATE  INDEX [auth_option_id] ON [phpbb_acl_users]([auth_option_id])  GO -CREATE  INDEX [auth_role_id] ON [phpbb_acl_users]([auth_role_id]) ON [PRIMARY] +CREATE  INDEX [auth_role_id] ON [phpbb_acl_users]([auth_role_id])  GO @@ -179,26 +189,25 @@ CREATE TABLE [phpbb_banlist] (  	[ban_exclude] [int] DEFAULT (0) NOT NULL ,  	[ban_reason] [varchar] (255) DEFAULT ('') NOT NULL ,  	[ban_give_reason] [varchar] (255) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_banlist] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_banlist] PRIMARY KEY  CLUSTERED   	(  		[ban_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [ban_end] ON [phpbb_banlist]([ban_end]) ON [PRIMARY] +CREATE  INDEX [ban_end] ON [phpbb_banlist]([ban_end])  GO -CREATE  INDEX [ban_user] ON [phpbb_banlist]([ban_userid], [ban_exclude]) ON [PRIMARY] +CREATE  INDEX [ban_user] ON [phpbb_banlist]([ban_userid], [ban_exclude])  GO -CREATE  INDEX [ban_email] ON [phpbb_banlist]([ban_email], [ban_exclude]) ON [PRIMARY] +CREATE  INDEX [ban_email] ON [phpbb_banlist]([ban_email], [ban_exclude])  GO -CREATE  INDEX [ban_ip] ON [phpbb_banlist]([ban_ip], [ban_exclude]) ON [PRIMARY] +CREATE  INDEX [ban_ip] ON [phpbb_banlist]([ban_ip], [ban_exclude])  GO @@ -216,17 +225,16 @@ CREATE TABLE [phpbb_bbcodes] (  	[first_pass_replace] [text] DEFAULT ('') NOT NULL ,  	[second_pass_match] [text] DEFAULT ('') NOT NULL ,  	[second_pass_replace] [text] DEFAULT ('') NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_bbcodes] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_bbcodes] PRIMARY KEY  CLUSTERED   	(  		[bbcode_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [display_on_post] ON [phpbb_bbcodes]([display_on_posting]) ON [PRIMARY] +CREATE  INDEX [display_on_post] ON [phpbb_bbcodes]([display_on_posting])  GO @@ -236,15 +244,14 @@ GO  CREATE TABLE [phpbb_bookmarks] (  	[topic_id] [int] DEFAULT (0) NOT NULL ,  	[user_id] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_bookmarks] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_bookmarks] PRIMARY KEY  CLUSTERED   	(  		[topic_id],  		[user_id] -	)  ON [PRIMARY]  +	)  GO @@ -258,17 +265,16 @@ CREATE TABLE [phpbb_bots] (  	[user_id] [int] DEFAULT (0) NOT NULL ,  	[bot_agent] [varchar] (255) DEFAULT ('') NOT NULL ,  	[bot_ip] [varchar] (255) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_bots] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_bots] PRIMARY KEY  CLUSTERED   	(  		[bot_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [bot_active] ON [phpbb_bots]([bot_active]) ON [PRIMARY] +CREATE  INDEX [bot_active] ON [phpbb_bots]([bot_active])  GO @@ -279,17 +285,16 @@ CREATE TABLE [phpbb_config] (  	[config_name] [varchar] (255) DEFAULT ('') NOT NULL ,  	[config_value] [varchar] (255) DEFAULT ('') NOT NULL ,  	[is_dynamic] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_config] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_config] PRIMARY KEY  CLUSTERED   	(  		[config_name] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [is_dynamic] ON [phpbb_config]([is_dynamic]) ON [PRIMARY] +CREATE  INDEX [is_dynamic] ON [phpbb_config]([is_dynamic])  GO @@ -299,14 +304,13 @@ GO  CREATE TABLE [phpbb_config_text] (  	[config_name] [varchar] (255) DEFAULT ('') NOT NULL ,  	[config_value] [text] DEFAULT ('') NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_config_text] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_config_text] PRIMARY KEY  CLUSTERED   	(  		[config_name] -	)  ON [PRIMARY]  +	)  GO @@ -320,18 +324,17 @@ CREATE TABLE [phpbb_confirm] (  	[code] [varchar] (8) DEFAULT ('') NOT NULL ,  	[seed] [int] DEFAULT (0) NOT NULL ,  	[attempts] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_confirm] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_confirm] PRIMARY KEY  CLUSTERED   	(  		[session_id],  		[confirm_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [confirm_type] ON [phpbb_confirm]([confirm_type]) ON [PRIMARY] +CREATE  INDEX [confirm_type] ON [phpbb_confirm]([confirm_type])  GO @@ -341,14 +344,13 @@ GO  CREATE TABLE [phpbb_disallow] (  	[disallow_id] [int] IDENTITY (1, 1) NOT NULL ,  	[disallow_username] [varchar] (255) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_disallow] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_disallow] PRIMARY KEY  CLUSTERED   	(  		[disallow_id] -	)  ON [PRIMARY]  +	)  GO @@ -363,17 +365,16 @@ CREATE TABLE [phpbb_drafts] (  	[save_time] [int] DEFAULT (0) NOT NULL ,  	[draft_subject] [varchar] (255) DEFAULT ('') NOT NULL ,  	[draft_message] [text] DEFAULT ('') NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_drafts] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_drafts] PRIMARY KEY  CLUSTERED   	(  		[draft_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [save_time] ON [phpbb_drafts]([save_time]) ON [PRIMARY] +CREATE  INDEX [save_time] ON [phpbb_drafts]([save_time])  GO @@ -383,11 +384,18 @@ GO  CREATE TABLE [phpbb_ext] (  	[ext_name] [varchar] (255) DEFAULT ('') NOT NULL ,  	[ext_active] [int] DEFAULT (0) NOT NULL , -	[ext_state] [varchar] (8000) DEFAULT ('') NOT NULL  -) ON [PRIMARY] +	[ext_state] [varchar] (8000) DEFAULT ('') NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_ext] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_ext] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  UNIQUE  INDEX [ext_name] ON [phpbb_ext]([ext_name]) ON [PRIMARY] +CREATE  UNIQUE  INDEX [ext_name] ON [phpbb_ext]([ext_name])  GO @@ -398,14 +406,13 @@ CREATE TABLE [phpbb_extensions] (  	[extension_id] [int] IDENTITY (1, 1) NOT NULL ,  	[group_id] [int] DEFAULT (0) NOT NULL ,  	[extension] [varchar] (100) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_extensions] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_extensions] PRIMARY KEY  CLUSTERED   	(  		[extension_id] -	)  ON [PRIMARY]  +	)  GO @@ -422,14 +429,13 @@ CREATE TABLE [phpbb_extension_groups] (  	[max_filesize] [int] DEFAULT (0) NOT NULL ,  	[allowed_forums] [varchar] (8000) DEFAULT ('') NOT NULL ,  	[allow_in_pm] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_extension_groups] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_extension_groups] PRIMARY KEY  CLUSTERED   	(  		[group_id] -	)  ON [PRIMARY]  +	)  GO @@ -482,20 +488,19 @@ CREATE TABLE [phpbb_forums] (  	[prune_days] [int] DEFAULT (0) NOT NULL ,  	[prune_viewed] [int] DEFAULT (0) NOT NULL ,  	[prune_freq] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_forums] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_forums] PRIMARY KEY  CLUSTERED   	(  		[forum_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [left_right_id] ON [phpbb_forums]([left_id], [right_id]) ON [PRIMARY] +CREATE  INDEX [left_right_id] ON [phpbb_forums]([left_id], [right_id])  GO -CREATE  INDEX [forum_lastpost_id] ON [phpbb_forums]([forum_last_post_id]) ON [PRIMARY] +CREATE  INDEX [forum_lastpost_id] ON [phpbb_forums]([forum_last_post_id])  GO @@ -506,8 +511,7 @@ CREATE TABLE [phpbb_forums_access] (  	[forum_id] [int] DEFAULT (0) NOT NULL ,  	[user_id] [int] DEFAULT (0) NOT NULL ,  	[session_id] [char] (32) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_forums_access] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_forums_access] PRIMARY KEY  CLUSTERED  @@ -515,7 +519,7 @@ ALTER TABLE [phpbb_forums_access] WITH NOCHECK ADD  		[forum_id],  		[user_id],  		[session_id] -	)  ON [PRIMARY]  +	)  GO @@ -526,15 +530,14 @@ CREATE TABLE [phpbb_forums_track] (  	[user_id] [int] DEFAULT (0) NOT NULL ,  	[forum_id] [int] DEFAULT (0) NOT NULL ,  	[mark_time] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_forums_track] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_forums_track] PRIMARY KEY  CLUSTERED   	(  		[user_id],  		[forum_id] -	)  ON [PRIMARY]  +	)  GO @@ -544,17 +547,24 @@ GO  CREATE TABLE [phpbb_forums_watch] (  	[forum_id] [int] DEFAULT (0) NOT NULL ,  	[user_id] [int] DEFAULT (0) NOT NULL , -	[notify_status] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] +	[notify_status] [int] DEFAULT (0) NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_forums_watch] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_forums_watch] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  INDEX [forum_id] ON [phpbb_forums_watch]([forum_id]) ON [PRIMARY] +CREATE  INDEX [forum_id] ON [phpbb_forums_watch]([forum_id])  GO -CREATE  INDEX [user_id] ON [phpbb_forums_watch]([user_id]) ON [PRIMARY] +CREATE  INDEX [user_id] ON [phpbb_forums_watch]([user_id])  GO -CREATE  INDEX [notify_stat] ON [phpbb_forums_watch]([notify_status]) ON [PRIMARY] +CREATE  INDEX [notify_stat] ON [phpbb_forums_watch]([notify_status])  GO @@ -583,17 +593,16 @@ CREATE TABLE [phpbb_groups] (  	[group_message_limit] [int] DEFAULT (0) NOT NULL ,  	[group_max_recipients] [int] DEFAULT (0) NOT NULL ,  	[group_legend] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_groups] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_groups] PRIMARY KEY  CLUSTERED   	(  		[group_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [group_legend_name] ON [phpbb_groups]([group_legend], [group_name]) ON [PRIMARY] +CREATE  INDEX [group_legend_name] ON [phpbb_groups]([group_legend], [group_name])  GO @@ -607,17 +616,16 @@ CREATE TABLE [phpbb_icons] (  	[icons_height] [int] DEFAULT (0) NOT NULL ,  	[icons_order] [int] DEFAULT (0) NOT NULL ,  	[display_on_posting] [int] DEFAULT (1) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_icons] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_icons] PRIMARY KEY  CLUSTERED   	(  		[icons_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [display_on_posting] ON [phpbb_icons]([display_on_posting]) ON [PRIMARY] +CREATE  INDEX [display_on_posting] ON [phpbb_icons]([display_on_posting])  GO @@ -631,17 +639,16 @@ CREATE TABLE [phpbb_lang] (  	[lang_english_name] [varchar] (100) DEFAULT ('') NOT NULL ,  	[lang_local_name] [varchar] (255) DEFAULT ('') NOT NULL ,  	[lang_author] [varchar] (255) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_lang] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_lang] PRIMARY KEY  CLUSTERED   	(  		[lang_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [lang_iso] ON [phpbb_lang]([lang_iso]) ON [PRIMARY] +CREATE  INDEX [lang_iso] ON [phpbb_lang]([lang_iso])  GO @@ -659,32 +666,31 @@ CREATE TABLE [phpbb_log] (  	[log_time] [int] DEFAULT (0) NOT NULL ,  	[log_operation] [varchar] (4000) DEFAULT ('') NOT NULL ,  	[log_data] [text] DEFAULT ('') NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_log] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_log] PRIMARY KEY  CLUSTERED   	(  		[log_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [log_type] ON [phpbb_log]([log_type]) ON [PRIMARY] +CREATE  INDEX [log_type] ON [phpbb_log]([log_type])  GO -CREATE  INDEX [log_time] ON [phpbb_log]([log_time]) ON [PRIMARY] +CREATE  INDEX [log_time] ON [phpbb_log]([log_time])  GO -CREATE  INDEX [forum_id] ON [phpbb_log]([forum_id]) ON [PRIMARY] +CREATE  INDEX [forum_id] ON [phpbb_log]([forum_id])  GO -CREATE  INDEX [topic_id] ON [phpbb_log]([topic_id]) ON [PRIMARY] +CREATE  INDEX [topic_id] ON [phpbb_log]([topic_id])  GO -CREATE  INDEX [reportee_id] ON [phpbb_log]([reportee_id]) ON [PRIMARY] +CREATE  INDEX [reportee_id] ON [phpbb_log]([reportee_id])  GO -CREATE  INDEX [user_id] ON [phpbb_log]([user_id]) ON [PRIMARY] +CREATE  INDEX [user_id] ON [phpbb_log]([user_id])  GO @@ -698,20 +704,27 @@ CREATE TABLE [phpbb_login_attempts] (  	[attempt_time] [int] DEFAULT (0) NOT NULL ,  	[user_id] [int] DEFAULT (0) NOT NULL ,  	[username] [varchar] (255) DEFAULT (0) NOT NULL , -	[username_clean] [varchar] (255) DEFAULT (0) NOT NULL  -) ON [PRIMARY] +	[username_clean] [varchar] (255) DEFAULT (0) NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_login_attempts] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_login_attempts] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  INDEX [att_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY] +CREATE  INDEX [att_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time])  GO -CREATE  INDEX [att_for] ON [phpbb_login_attempts]([attempt_forwarded_for], [attempt_time]) ON [PRIMARY] +CREATE  INDEX [att_for] ON [phpbb_login_attempts]([attempt_forwarded_for], [attempt_time])  GO -CREATE  INDEX [att_time] ON [phpbb_login_attempts]([attempt_time]) ON [PRIMARY] +CREATE  INDEX [att_time] ON [phpbb_login_attempts]([attempt_time])  GO -CREATE  INDEX [user_id] ON [phpbb_login_attempts]([user_id]) ON [PRIMARY] +CREATE  INDEX [user_id] ON [phpbb_login_attempts]([user_id])  GO @@ -724,14 +737,21 @@ CREATE TABLE [phpbb_moderator_cache] (  	[username] [varchar] (255) DEFAULT ('') NOT NULL ,  	[group_id] [int] DEFAULT (0) NOT NULL ,  	[group_name] [varchar] (255) DEFAULT ('') NOT NULL , -	[display_on_index] [int] DEFAULT (1) NOT NULL  -) ON [PRIMARY] +	[display_on_index] [int] DEFAULT (1) NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_moderator_cache] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_moderator_cache] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  INDEX [disp_idx] ON [phpbb_moderator_cache]([display_on_index]) ON [PRIMARY] +CREATE  INDEX [disp_idx] ON [phpbb_moderator_cache]([display_on_index])  GO -CREATE  INDEX [forum_id] ON [phpbb_moderator_cache]([forum_id]) ON [PRIMARY] +CREATE  INDEX [forum_id] ON [phpbb_moderator_cache]([forum_id])  GO @@ -746,14 +766,13 @@ CREATE TABLE [phpbb_migrations] (  	[migration_data_state] [varchar] (8000) DEFAULT ('') NOT NULL ,  	[migration_start_time] [int] DEFAULT (0) NOT NULL ,  	[migration_end_time] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_migrations] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_migrations] PRIMARY KEY  CLUSTERED   	(  		[migration_name] -	)  ON [PRIMARY]  +	)  GO @@ -772,23 +791,22 @@ CREATE TABLE [phpbb_modules] (  	[module_langname] [varchar] (255) DEFAULT ('') NOT NULL ,  	[module_mode] [varchar] (255) DEFAULT ('') NOT NULL ,  	[module_auth] [varchar] (255) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_modules] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_modules] PRIMARY KEY  CLUSTERED   	(  		[module_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [left_right_id] ON [phpbb_modules]([left_id], [right_id]) ON [PRIMARY] +CREATE  INDEX [left_right_id] ON [phpbb_modules]([left_id], [right_id])  GO -CREATE  INDEX [module_enabled] ON [phpbb_modules]([module_enabled]) ON [PRIMARY] +CREATE  INDEX [module_enabled] ON [phpbb_modules]([module_enabled])  GO -CREATE  INDEX [class_left_id] ON [phpbb_modules]([module_class], [left_id]) ON [PRIMARY] +CREATE  INDEX [class_left_id] ON [phpbb_modules]([module_class], [left_id])  GO @@ -799,17 +817,16 @@ CREATE TABLE [phpbb_notification_types] (  	[notification_type_id] [int] IDENTITY (1, 1) NOT NULL ,  	[notification_type_name] [varchar] (255) DEFAULT ('') NOT NULL ,  	[notification_type_enabled] [int] DEFAULT (1) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_notification_types] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_notification_types] PRIMARY KEY  CLUSTERED   	(  		[notification_type_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  UNIQUE  INDEX [type] ON [phpbb_notification_types]([notification_type_name]) ON [PRIMARY] +CREATE  UNIQUE  INDEX [type] ON [phpbb_notification_types]([notification_type_name])  GO @@ -825,20 +842,19 @@ CREATE TABLE [phpbb_notifications] (  	[notification_read] [int] DEFAULT (0) NOT NULL ,  	[notification_time] [int] DEFAULT (1) NOT NULL ,  	[notification_data] [varchar] (4000) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_notifications] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_notifications] PRIMARY KEY  CLUSTERED   	(  		[notification_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [item_ident] ON [phpbb_notifications]([notification_type_id], [item_id]) ON [PRIMARY] +CREATE  INDEX [item_ident] ON [phpbb_notifications]([notification_type_id], [item_id])  GO -CREATE  INDEX [user] ON [phpbb_notifications]([user_id], [notification_read]) ON [PRIMARY] +CREATE  INDEX [user] ON [phpbb_notifications]([user_id], [notification_read])  GO @@ -849,15 +865,14 @@ CREATE TABLE [phpbb_oauth_accounts] (  	[user_id] [int] DEFAULT (0) NOT NULL ,  	[provider] [varchar] (255) DEFAULT ('') NOT NULL ,  	[oauth_provider_id] [varchar] (4000) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_oauth_accounts] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_oauth_accounts] PRIMARY KEY  CLUSTERED   	(  		[user_id],  		[provider] -	)  ON [PRIMARY]  +	)  GO @@ -868,14 +883,21 @@ CREATE TABLE [phpbb_oauth_tokens] (  	[user_id] [int] DEFAULT (0) NOT NULL ,  	[session_id] [char] (32) DEFAULT ('') NOT NULL ,  	[provider] [varchar] (255) DEFAULT ('') NOT NULL , -	[oauth_token] [text] DEFAULT ('') NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +	[oauth_token] [text] DEFAULT ('') NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_oauth_tokens] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_oauth_tokens] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  INDEX [user_id] ON [phpbb_oauth_tokens]([user_id]) ON [PRIMARY] +CREATE  INDEX [user_id] ON [phpbb_oauth_tokens]([user_id])  GO -CREATE  INDEX [provider] ON [phpbb_oauth_tokens]([provider]) ON [PRIMARY] +CREATE  INDEX [provider] ON [phpbb_oauth_tokens]([provider])  GO @@ -886,14 +908,21 @@ CREATE TABLE [phpbb_poll_options] (  	[poll_option_id] [int] DEFAULT (0) NOT NULL ,  	[topic_id] [int] DEFAULT (0) NOT NULL ,  	[poll_option_text] [varchar] (4000) DEFAULT ('') NOT NULL , -	[poll_option_total] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] +	[poll_option_total] [int] DEFAULT (0) NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_poll_options] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_poll_options] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  INDEX [poll_opt_id] ON [phpbb_poll_options]([poll_option_id]) ON [PRIMARY] +CREATE  INDEX [poll_opt_id] ON [phpbb_poll_options]([poll_option_id])  GO -CREATE  INDEX [topic_id] ON [phpbb_poll_options]([topic_id]) ON [PRIMARY] +CREATE  INDEX [topic_id] ON [phpbb_poll_options]([topic_id])  GO @@ -904,17 +933,24 @@ CREATE TABLE [phpbb_poll_votes] (  	[topic_id] [int] DEFAULT (0) NOT NULL ,  	[poll_option_id] [int] DEFAULT (0) NOT NULL ,  	[vote_user_id] [int] DEFAULT (0) NOT NULL , -	[vote_user_ip] [varchar] (40) DEFAULT ('') NOT NULL  -) ON [PRIMARY] +	[vote_user_ip] [varchar] (40) DEFAULT ('') NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_poll_votes] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_poll_votes] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  INDEX [topic_id] ON [phpbb_poll_votes]([topic_id]) ON [PRIMARY] +CREATE  INDEX [topic_id] ON [phpbb_poll_votes]([topic_id])  GO -CREATE  INDEX [vote_user_id] ON [phpbb_poll_votes]([vote_user_id]) ON [PRIMARY] +CREATE  INDEX [vote_user_id] ON [phpbb_poll_votes]([vote_user_id])  GO -CREATE  INDEX [vote_user_ip] ON [phpbb_poll_votes]([vote_user_ip]) ON [PRIMARY] +CREATE  INDEX [vote_user_ip] ON [phpbb_poll_votes]([vote_user_ip])  GO @@ -951,35 +987,34 @@ CREATE TABLE [phpbb_posts] (  	[post_delete_time] [int] DEFAULT (0) NOT NULL ,  	[post_delete_reason] [varchar] (255) DEFAULT ('') NOT NULL ,  	[post_delete_user] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_posts] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_posts] PRIMARY KEY  CLUSTERED   	(  		[post_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [forum_id] ON [phpbb_posts]([forum_id]) ON [PRIMARY] +CREATE  INDEX [forum_id] ON [phpbb_posts]([forum_id])  GO -CREATE  INDEX [topic_id] ON [phpbb_posts]([topic_id]) ON [PRIMARY] +CREATE  INDEX [topic_id] ON [phpbb_posts]([topic_id])  GO -CREATE  INDEX [poster_ip] ON [phpbb_posts]([poster_ip]) ON [PRIMARY] +CREATE  INDEX [poster_ip] ON [phpbb_posts]([poster_ip])  GO -CREATE  INDEX [poster_id] ON [phpbb_posts]([poster_id]) ON [PRIMARY] +CREATE  INDEX [poster_id] ON [phpbb_posts]([poster_id])  GO -CREATE  INDEX [post_visibility] ON [phpbb_posts]([post_visibility]) ON [PRIMARY] +CREATE  INDEX [post_visibility] ON [phpbb_posts]([post_visibility])  GO -CREATE  INDEX [post_username] ON [phpbb_posts]([post_username]) ON [PRIMARY] +CREATE  INDEX [post_username] ON [phpbb_posts]([post_username])  GO -CREATE  INDEX [tid_post_time] ON [phpbb_posts]([topic_id], [post_time]) ON [PRIMARY] +CREATE  INDEX [tid_post_time] ON [phpbb_posts]([topic_id], [post_time])  GO @@ -1009,26 +1044,25 @@ CREATE TABLE [phpbb_privmsgs] (  	[to_address] [varchar] (4000) DEFAULT ('') NOT NULL ,  	[bcc_address] [varchar] (4000) DEFAULT ('') NOT NULL ,  	[message_reported] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_privmsgs] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_privmsgs] PRIMARY KEY  CLUSTERED   	(  		[msg_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [author_ip] ON [phpbb_privmsgs]([author_ip]) ON [PRIMARY] +CREATE  INDEX [author_ip] ON [phpbb_privmsgs]([author_ip])  GO -CREATE  INDEX [message_time] ON [phpbb_privmsgs]([message_time]) ON [PRIMARY] +CREATE  INDEX [message_time] ON [phpbb_privmsgs]([message_time])  GO -CREATE  INDEX [author_id] ON [phpbb_privmsgs]([author_id]) ON [PRIMARY] +CREATE  INDEX [author_id] ON [phpbb_privmsgs]([author_id])  GO -CREATE  INDEX [root_level] ON [phpbb_privmsgs]([root_level]) ON [PRIMARY] +CREATE  INDEX [root_level] ON [phpbb_privmsgs]([root_level])  GO @@ -1040,17 +1074,16 @@ CREATE TABLE [phpbb_privmsgs_folder] (  	[user_id] [int] DEFAULT (0) NOT NULL ,  	[folder_name] [varchar] (255) DEFAULT ('') NOT NULL ,  	[pm_count] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_privmsgs_folder] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_privmsgs_folder] PRIMARY KEY  CLUSTERED   	(  		[folder_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [user_id] ON [phpbb_privmsgs_folder]([user_id]) ON [PRIMARY] +CREATE  INDEX [user_id] ON [phpbb_privmsgs_folder]([user_id])  GO @@ -1067,17 +1100,16 @@ CREATE TABLE [phpbb_privmsgs_rules] (  	[rule_group_id] [int] DEFAULT (0) NOT NULL ,  	[rule_action] [int] DEFAULT (0) NOT NULL ,  	[rule_folder_id] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_privmsgs_rules] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_privmsgs_rules] PRIMARY KEY  CLUSTERED   	(  		[rule_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [user_id] ON [phpbb_privmsgs_rules]([user_id]) ON [PRIMARY] +CREATE  INDEX [user_id] ON [phpbb_privmsgs_rules]([user_id])  GO @@ -1094,17 +1126,24 @@ CREATE TABLE [phpbb_privmsgs_to] (  	[pm_replied] [int] DEFAULT (0) NOT NULL ,  	[pm_marked] [int] DEFAULT (0) NOT NULL ,  	[pm_forwarded] [int] DEFAULT (0) NOT NULL , -	[folder_id] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] +	[folder_id] [int] DEFAULT (0) NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_privmsgs_to] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_privmsgs_to] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  INDEX [msg_id] ON [phpbb_privmsgs_to]([msg_id]) ON [PRIMARY] +CREATE  INDEX [msg_id] ON [phpbb_privmsgs_to]([msg_id])  GO -CREATE  INDEX [author_id] ON [phpbb_privmsgs_to]([author_id]) ON [PRIMARY] +CREATE  INDEX [author_id] ON [phpbb_privmsgs_to]([author_id])  GO -CREATE  INDEX [usr_flder_id] ON [phpbb_privmsgs_to]([user_id], [folder_id]) ON [PRIMARY] +CREATE  INDEX [usr_flder_id] ON [phpbb_privmsgs_to]([user_id], [folder_id])  GO @@ -1136,20 +1175,19 @@ CREATE TABLE [phpbb_profile_fields] (  	[field_is_contact] [int] DEFAULT (0) NOT NULL ,  	[field_contact_desc] [varchar] (255) DEFAULT ('') NOT NULL ,  	[field_contact_url] [varchar] (255) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_profile_fields] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_profile_fields] PRIMARY KEY  CLUSTERED   	(  		[field_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [fld_type] ON [phpbb_profile_fields]([field_type]) ON [PRIMARY] +CREATE  INDEX [fld_type] ON [phpbb_profile_fields]([field_type])  GO -CREATE  INDEX [fld_ordr] ON [phpbb_profile_fields]([field_order]) ON [PRIMARY] +CREATE  INDEX [fld_ordr] ON [phpbb_profile_fields]([field_order])  GO @@ -1166,14 +1204,13 @@ CREATE TABLE [phpbb_profile_fields_data] (  	[pf_phpbb_wlm] [varchar] (255) DEFAULT ('') NOT NULL ,  	[pf_phpbb_yahoo] [varchar] (255) DEFAULT ('') NOT NULL ,  	[pf_phpbb_website] [varchar] (255) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_profile_fields_data] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_profile_fields_data] PRIMARY KEY  CLUSTERED   	(  		[user_id] -	)  ON [PRIMARY]  +	)  GO @@ -1186,8 +1223,7 @@ CREATE TABLE [phpbb_profile_fields_lang] (  	[option_id] [int] DEFAULT (0) NOT NULL ,  	[field_type] [varchar] (100) DEFAULT ('') NOT NULL ,  	[lang_value] [varchar] (255) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_profile_fields_lang] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_profile_fields_lang] PRIMARY KEY  CLUSTERED  @@ -1195,7 +1231,7 @@ ALTER TABLE [phpbb_profile_fields_lang] WITH NOCHECK ADD  		[field_id],  		[lang_id],  		[option_id] -	)  ON [PRIMARY]  +	)  GO @@ -1208,15 +1244,14 @@ CREATE TABLE [phpbb_profile_lang] (  	[lang_name] [varchar] (255) DEFAULT ('') NOT NULL ,  	[lang_explain] [varchar] (4000) DEFAULT ('') NOT NULL ,  	[lang_default_value] [varchar] (255) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_profile_lang] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_profile_lang] PRIMARY KEY  CLUSTERED   	(  		[field_id],  		[lang_id] -	)  ON [PRIMARY]  +	)  GO @@ -1229,14 +1264,13 @@ CREATE TABLE [phpbb_ranks] (  	[rank_min] [int] DEFAULT (0) NOT NULL ,  	[rank_special] [int] DEFAULT (0) NOT NULL ,  	[rank_image] [varchar] (255) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_ranks] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_ranks] PRIMARY KEY  CLUSTERED   	(  		[rank_id] -	)  ON [PRIMARY]  +	)  GO @@ -1259,20 +1293,19 @@ CREATE TABLE [phpbb_reports] (  	[reported_post_enable_magic_url] [int] DEFAULT (1) NOT NULL ,  	[reported_post_enable_smilies] [int] DEFAULT (1) NOT NULL ,  	[reported_post_enable_bbcode] [int] DEFAULT (1) NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_reports] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_reports] PRIMARY KEY  CLUSTERED   	(  		[report_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [post_id] ON [phpbb_reports]([post_id]) ON [PRIMARY] +CREATE  INDEX [post_id] ON [phpbb_reports]([post_id])  GO -CREATE  INDEX [pm_id] ON [phpbb_reports]([pm_id]) ON [PRIMARY] +CREATE  INDEX [pm_id] ON [phpbb_reports]([pm_id])  GO @@ -1284,14 +1317,13 @@ CREATE TABLE [phpbb_reports_reasons] (  	[reason_title] [varchar] (255) DEFAULT ('') NOT NULL ,  	[reason_description] [text] DEFAULT ('') NOT NULL ,  	[reason_order] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_reports_reasons] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_reports_reasons] PRIMARY KEY  CLUSTERED   	(  		[reason_id] -	)  ON [PRIMARY]  +	)  GO @@ -1303,14 +1335,13 @@ CREATE TABLE [phpbb_search_results] (  	[search_time] [int] DEFAULT (0) NOT NULL ,  	[search_keywords] [text] DEFAULT ('') NOT NULL ,  	[search_authors] [text] DEFAULT ('') NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_search_results] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_search_results] PRIMARY KEY  CLUSTERED   	(  		[search_key] -	)  ON [PRIMARY]  +	)  GO @@ -1322,20 +1353,19 @@ CREATE TABLE [phpbb_search_wordlist] (  	[word_text] [varchar] (255) DEFAULT ('') NOT NULL ,  	[word_common] [int] DEFAULT (0) NOT NULL ,  	[word_count] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_search_wordlist] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_search_wordlist] PRIMARY KEY  CLUSTERED   	(  		[word_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  UNIQUE  INDEX [wrd_txt] ON [phpbb_search_wordlist]([word_text]) ON [PRIMARY] +CREATE  UNIQUE  INDEX [wrd_txt] ON [phpbb_search_wordlist]([word_text])  GO -CREATE  INDEX [wrd_cnt] ON [phpbb_search_wordlist]([word_count]) ON [PRIMARY] +CREATE  INDEX [wrd_cnt] ON [phpbb_search_wordlist]([word_count])  GO @@ -1345,17 +1375,24 @@ GO  CREATE TABLE [phpbb_search_wordmatch] (  	[post_id] [int] DEFAULT (0) NOT NULL ,  	[word_id] [int] DEFAULT (0) NOT NULL , -	[title_match] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] +	[title_match] [int] DEFAULT (0) NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_search_wordmatch] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_search_wordmatch] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  UNIQUE  INDEX [unq_mtch] ON [phpbb_search_wordmatch]([word_id], [post_id], [title_match]) ON [PRIMARY] +CREATE  UNIQUE  INDEX [unq_mtch] ON [phpbb_search_wordmatch]([word_id], [post_id], [title_match])  GO -CREATE  INDEX [word_id] ON [phpbb_search_wordmatch]([word_id]) ON [PRIMARY] +CREATE  INDEX [word_id] ON [phpbb_search_wordmatch]([word_id])  GO -CREATE  INDEX [post_id] ON [phpbb_search_wordmatch]([post_id]) ON [PRIMARY] +CREATE  INDEX [post_id] ON [phpbb_search_wordmatch]([post_id])  GO @@ -1376,23 +1413,22 @@ CREATE TABLE [phpbb_sessions] (  	[session_viewonline] [int] DEFAULT (1) NOT NULL ,  	[session_autologin] [int] DEFAULT (0) NOT NULL ,  	[session_admin] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_sessions] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_sessions] PRIMARY KEY  CLUSTERED   	(  		[session_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [session_time] ON [phpbb_sessions]([session_time]) ON [PRIMARY] +CREATE  INDEX [session_time] ON [phpbb_sessions]([session_time])  GO -CREATE  INDEX [session_user_id] ON [phpbb_sessions]([session_user_id]) ON [PRIMARY] +CREATE  INDEX [session_user_id] ON [phpbb_sessions]([session_user_id])  GO -CREATE  INDEX [session_fid] ON [phpbb_sessions]([session_forum_id]) ON [PRIMARY] +CREATE  INDEX [session_fid] ON [phpbb_sessions]([session_forum_id])  GO @@ -1404,18 +1440,17 @@ CREATE TABLE [phpbb_sessions_keys] (  	[user_id] [int] DEFAULT (0) NOT NULL ,  	[last_ip] [varchar] (40) DEFAULT ('') NOT NULL ,  	[last_login] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_sessions_keys] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_sessions_keys] PRIMARY KEY  CLUSTERED   	(  		[key_id],  		[user_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [last_login] ON [phpbb_sessions_keys]([last_login]) ON [PRIMARY] +CREATE  INDEX [last_login] ON [phpbb_sessions_keys]([last_login])  GO @@ -1427,14 +1462,13 @@ CREATE TABLE [phpbb_sitelist] (  	[site_ip] [varchar] (40) DEFAULT ('') NOT NULL ,  	[site_hostname] [varchar] (255) DEFAULT ('') NOT NULL ,  	[ip_exclude] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_sitelist] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_sitelist] PRIMARY KEY  CLUSTERED   	(  		[site_id] -	)  ON [PRIMARY]  +	)  GO @@ -1450,17 +1484,16 @@ CREATE TABLE [phpbb_smilies] (  	[smiley_height] [int] DEFAULT (0) NOT NULL ,  	[smiley_order] [int] DEFAULT (0) NOT NULL ,  	[display_on_posting] [int] DEFAULT (1) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_smilies] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_smilies] PRIMARY KEY  CLUSTERED   	(  		[smiley_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [display_on_post] ON [phpbb_smilies]([display_on_posting]) ON [PRIMARY] +CREATE  INDEX [display_on_post] ON [phpbb_smilies]([display_on_posting])  GO @@ -1476,17 +1509,16 @@ CREATE TABLE [phpbb_styles] (  	[bbcode_bitfield] [varchar] (255) DEFAULT ('kNg=') NOT NULL ,  	[style_parent_id] [int] DEFAULT (0) NOT NULL ,  	[style_parent_tree] [varchar] (8000) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_styles] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_styles] PRIMARY KEY  CLUSTERED   	(  		[style_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  UNIQUE  INDEX [style_name] ON [phpbb_styles]([style_name]) ON [PRIMARY] +CREATE  UNIQUE  INDEX [style_name] ON [phpbb_styles]([style_name])  GO @@ -1499,14 +1531,13 @@ CREATE TABLE [phpbb_teampage] (  	[teampage_name] [varchar] (255) DEFAULT ('') NOT NULL ,  	[teampage_position] [int] DEFAULT (0) NOT NULL ,  	[teampage_parent] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_teampage] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_teampage] PRIMARY KEY  CLUSTERED   	(  		[teampage_id] -	)  ON [PRIMARY]  +	)  GO @@ -1552,32 +1583,31 @@ CREATE TABLE [phpbb_topics] (  	[topic_delete_time] [int] DEFAULT (0) NOT NULL ,  	[topic_delete_reason] [varchar] (255) DEFAULT ('') NOT NULL ,  	[topic_delete_user] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_topics] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_topics] PRIMARY KEY  CLUSTERED   	(  		[topic_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [forum_id] ON [phpbb_topics]([forum_id]) ON [PRIMARY] +CREATE  INDEX [forum_id] ON [phpbb_topics]([forum_id])  GO -CREATE  INDEX [forum_id_type] ON [phpbb_topics]([forum_id], [topic_type]) ON [PRIMARY] +CREATE  INDEX [forum_id_type] ON [phpbb_topics]([forum_id], [topic_type])  GO -CREATE  INDEX [last_post_time] ON [phpbb_topics]([topic_last_post_time]) ON [PRIMARY] +CREATE  INDEX [last_post_time] ON [phpbb_topics]([topic_last_post_time])  GO -CREATE  INDEX [topic_visibility] ON [phpbb_topics]([topic_visibility]) ON [PRIMARY] +CREATE  INDEX [topic_visibility] ON [phpbb_topics]([topic_visibility])  GO -CREATE  INDEX [forum_appr_last] ON [phpbb_topics]([forum_id], [topic_visibility], [topic_last_post_id]) ON [PRIMARY] +CREATE  INDEX [forum_appr_last] ON [phpbb_topics]([forum_id], [topic_visibility], [topic_last_post_id])  GO -CREATE  INDEX [fid_time_moved] ON [phpbb_topics]([forum_id], [topic_last_post_time], [topic_moved_id]) ON [PRIMARY] +CREATE  INDEX [fid_time_moved] ON [phpbb_topics]([forum_id], [topic_last_post_time], [topic_moved_id])  GO @@ -1589,21 +1619,20 @@ CREATE TABLE [phpbb_topics_track] (  	[topic_id] [int] DEFAULT (0) NOT NULL ,  	[forum_id] [int] DEFAULT (0) NOT NULL ,  	[mark_time] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_topics_track] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_topics_track] PRIMARY KEY  CLUSTERED   	(  		[user_id],  		[topic_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [topic_id] ON [phpbb_topics_track]([topic_id]) ON [PRIMARY] +CREATE  INDEX [topic_id] ON [phpbb_topics_track]([topic_id])  GO -CREATE  INDEX [forum_id] ON [phpbb_topics_track]([forum_id]) ON [PRIMARY] +CREATE  INDEX [forum_id] ON [phpbb_topics_track]([forum_id])  GO @@ -1614,15 +1643,14 @@ CREATE TABLE [phpbb_topics_posted] (  	[user_id] [int] DEFAULT (0) NOT NULL ,  	[topic_id] [int] DEFAULT (0) NOT NULL ,  	[topic_posted] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_topics_posted] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_topics_posted] PRIMARY KEY  CLUSTERED   	(  		[user_id],  		[topic_id] -	)  ON [PRIMARY]  +	)  GO @@ -1632,17 +1660,24 @@ GO  CREATE TABLE [phpbb_topics_watch] (  	[topic_id] [int] DEFAULT (0) NOT NULL ,  	[user_id] [int] DEFAULT (0) NOT NULL , -	[notify_status] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] +	[notify_status] [int] DEFAULT (0) NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_topics_watch] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_topics_watch] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  INDEX [topic_id] ON [phpbb_topics_watch]([topic_id]) ON [PRIMARY] +CREATE  INDEX [topic_id] ON [phpbb_topics_watch]([topic_id])  GO -CREATE  INDEX [user_id] ON [phpbb_topics_watch]([user_id]) ON [PRIMARY] +CREATE  INDEX [user_id] ON [phpbb_topics_watch]([user_id])  GO -CREATE  INDEX [notify_stat] ON [phpbb_topics_watch]([notify_status]) ON [PRIMARY] +CREATE  INDEX [notify_stat] ON [phpbb_topics_watch]([notify_status])  GO @@ -1654,8 +1689,15 @@ CREATE TABLE [phpbb_user_notifications] (  	[item_id] [int] DEFAULT (0) NOT NULL ,  	[user_id] [int] DEFAULT (0) NOT NULL ,  	[method] [varchar] (255) DEFAULT ('') NOT NULL , -	[notify] [int] DEFAULT (1) NOT NULL  -) ON [PRIMARY] +	[notify] [int] DEFAULT (1) NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_user_notifications] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_user_notifications] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO @@ -1666,17 +1708,24 @@ CREATE TABLE [phpbb_user_group] (  	[group_id] [int] DEFAULT (0) NOT NULL ,  	[user_id] [int] DEFAULT (0) NOT NULL ,  	[group_leader] [int] DEFAULT (0) NOT NULL , -	[user_pending] [int] DEFAULT (1) NOT NULL  -) ON [PRIMARY] +	[user_pending] [int] DEFAULT (1) NOT NULL , +	[mssqlindex] [int] IDENTITY (1, 1) NOT NULL  +)GO + +ALTER TABLE [phpbb_user_group] WITH NOCHECK ADD  +	CONSTRAINT [PK_phpbb_user_group] PRIMARY KEY  CLUSTERED  +	( +		[mssqlindex] +	)  GO -CREATE  INDEX [group_id] ON [phpbb_user_group]([group_id]) ON [PRIMARY] +CREATE  INDEX [group_id] ON [phpbb_user_group]([group_id])  GO -CREATE  INDEX [user_id] ON [phpbb_user_group]([user_id]) ON [PRIMARY] +CREATE  INDEX [user_id] ON [phpbb_user_group]([user_id])  GO -CREATE  INDEX [group_leader] ON [phpbb_user_group]([group_leader]) ON [PRIMARY] +CREATE  INDEX [group_leader] ON [phpbb_user_group]([group_leader])  GO @@ -1751,26 +1800,25 @@ CREATE TABLE [phpbb_users] (  	[user_new] [int] DEFAULT (1) NOT NULL ,  	[user_reminded] [int] DEFAULT (0) NOT NULL ,  	[user_reminded_time] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_users] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_users] PRIMARY KEY  CLUSTERED   	(  		[user_id] -	)  ON [PRIMARY]  +	)  GO -CREATE  INDEX [user_birthday] ON [phpbb_users]([user_birthday]) ON [PRIMARY] +CREATE  INDEX [user_birthday] ON [phpbb_users]([user_birthday])  GO -CREATE  INDEX [user_email_hash] ON [phpbb_users]([user_email_hash]) ON [PRIMARY] +CREATE  INDEX [user_email_hash] ON [phpbb_users]([user_email_hash])  GO -CREATE  INDEX [user_type] ON [phpbb_users]([user_type]) ON [PRIMARY] +CREATE  INDEX [user_type] ON [phpbb_users]([user_type])  GO -CREATE  UNIQUE  INDEX [username_clean] ON [phpbb_users]([username_clean]) ON [PRIMARY] +CREATE  UNIQUE  INDEX [username_clean] ON [phpbb_users]([username_clean])  GO @@ -1783,14 +1831,13 @@ CREATE TABLE [phpbb_warnings] (  	[post_id] [int] DEFAULT (0) NOT NULL ,  	[log_id] [int] DEFAULT (0) NOT NULL ,  	[warning_time] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_warnings] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_warnings] PRIMARY KEY  CLUSTERED   	(  		[warning_id] -	)  ON [PRIMARY]  +	)  GO @@ -1801,14 +1848,13 @@ CREATE TABLE [phpbb_words] (  	[word_id] [int] IDENTITY (1, 1) NOT NULL ,  	[word] [varchar] (255) DEFAULT ('') NOT NULL ,  	[replacement] [varchar] (255) DEFAULT ('') NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_words] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_words] PRIMARY KEY  CLUSTERED   	(  		[word_id] -	)  ON [PRIMARY]  +	)  GO @@ -1820,15 +1866,14 @@ CREATE TABLE [phpbb_zebra] (  	[zebra_id] [int] DEFAULT (0) NOT NULL ,  	[friend] [int] DEFAULT (0) NOT NULL ,  	[foe] [int] DEFAULT (0) NOT NULL  -) ON [PRIMARY] -GO +)GO  ALTER TABLE [phpbb_zebra] WITH NOCHECK ADD   	CONSTRAINT [PK_phpbb_zebra] PRIMARY KEY  CLUSTERED   	(  		[user_id],  		[zebra_id] -	)  ON [PRIMARY]  +	)  GO diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php index 2dc0489030..68a68ebe54 100644 --- a/phpBB/language/en/acp/ban.php +++ b/phpBB/language/en/acp/ban.php @@ -73,10 +73,10 @@ $lang = array_merge($lang, array(  	'PERMANENT'		=> 'Permanent',  	'UNTIL'						=> 'Until', -	'USER_BAN'					=> 'Ban one or more usernames', +	'USER_BAN'					=> 'Ban one or more users by username',  	'USER_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered users from all current bans.',  	'USER_BAN_EXPLAIN'			=> 'You can ban multiple users in one go by entering each name on a new line. Use the <span style="text-decoration: underline;">Find a member</span> facility to look up and add one or more users automatically.',  	'USER_NO_BANNED'			=> 'No banned usernames', -	'USER_UNBAN'				=> 'Un-ban or un-exclude usernames', +	'USER_UNBAN'				=> 'Un-ban or un-exclude users by username',  	'USER_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are emphasised.',  )); diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 428b9ffd3b..cf32c7c225 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -49,7 +49,7 @@ $lang = array_merge($lang, array(  	'ACP_BAN'					=> 'Banning',  	'ACP_BAN_EMAILS'			=> 'Ban emails',  	'ACP_BAN_IPS'				=> 'Ban IPs', -	'ACP_BAN_USERNAMES'			=> 'Ban usernames', +	'ACP_BAN_USERNAMES'			=> 'Ban users',  	'ACP_BBCODES'				=> 'BBCodes',  	'ACP_BOARD_CONFIGURATION'	=> 'Board configuration',  	'ACP_BOARD_FEATURES'		=> 'Board features', @@ -360,7 +360,7 @@ $lang = array_merge($lang, array(  	'GZIP_COMPRESSION'	=> 'GZip compression', -	'NO_SEARCH_INDEX'	=> 'The selected search backend does not have a search index.<br >Please create the index for “%1$s” in the %2$ssearch index%3$s section.', +	'NO_SEARCH_INDEX'	=> 'The selected search backend does not have a search index.<br />Please create the index for “%1$s” in the %2$ssearch index%3$s section.',  	'NOT_AVAILABLE'		=> 'Not available',  	'NUMBER_FILES'		=> 'Number of attachments',  	'NUMBER_POSTS'		=> 'Number of posts', diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 409b800ba6..baa7d01763 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -96,7 +96,7 @@ $lang = array_merge($lang, array(  	'HOMEPAGE'				=> 'Homepage',  	'PATH'					=> 'File Path',  	'TIME'					=> 'Release Time', -	'LICENCE'				=> 'Licence', +	'LICENSE'				=> 'Licence',  	'REQUIREMENTS'			=> 'Requirements',  	'PHPBB_VERSION'			=> 'phpBB Version', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index c7f301fb8c..95efe35b7d 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -90,7 +90,7 @@ $lang = array_merge($lang, array(  		1	=> '%d user',  		2	=> '%d users',  	), -	'LOGIN_EXPLAIN_LEADERS'		=> 'The board requires you to be registered and logged in to view the team listing.', +	'LOGIN_EXPLAIN_TEAM'		=> 'The board requires you to be registered and logged in to view the team listing.',  	'LOGIN_EXPLAIN_MEMBERLIST'	=> 'The board requires you to be registered and logged in to access the memberlist.',  	'LOGIN_EXPLAIN_SEARCHUSER'	=> 'The board requires you to be registered and logged in to search users.',  	'LOGIN_EXPLAIN_VIEWPROFILE'	=> 'The board requires you to be registered and logged in to view profiles.', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index ab851638ae..c1d8cef7de 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -194,9 +194,9 @@ $lang = array_merge($lang, array(  	'POST_APPROVAL_NOTIFY'		=> 'You will be notified when your post has been approved.',  	'POST_CONFIRMATION'			=> 'Confirmation of post',  	'POST_CONFIRM_EXPLAIN'		=> 'To prevent automated posts the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', -	'POST_DELETED'				=> 'This message has been deleted successfully.', -	'POST_EDITED'				=> 'This message has been edited successfully.', -	'POST_EDITED_MOD'			=> 'This message has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.', +	'POST_DELETED'				=> 'This post has been deleted successfully.', +	'POST_EDITED'				=> 'This post has been edited successfully.', +	'POST_EDITED_MOD'			=> 'This post has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.',  	'POST_GLOBAL'				=> 'Global',  	'POST_ICON'					=> 'Post icon',  	'POST_NORMAL'				=> 'Normal', diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 3fc89ba01b..1449346deb 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -284,7 +284,7 @@ $template->assign_vars(array(  ));  // Generate the page, do not display/query online list -$module->display($module->get_page_title(), false); +$module->display($module->get_page_title());  /**  * Functions used to generate additional URL paramters diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 738b0be01c..df47fd2f4b 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -29,8 +29,15 @@ $username	= request_var('un', '', true);  $group_id	= request_var('g', 0);  $topic_id	= request_var('t', 0); +// Redirect when old mode is used +if ($mode == 'leaders') +{ +	send_status_line(301, 'Moved Permanently'); +	redirect(append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team')); +} +  // Check our mode... -if (!in_array($mode, array('', 'group', 'viewprofile', 'email', 'contact', 'searchuser', 'leaders'))) +if (!in_array($mode, array('', 'group', 'viewprofile', 'email', 'contact', 'searchuser', 'team')))  {  	trigger_error('NO_MODE');  } @@ -64,12 +71,12 @@ $sort_dir = request_var('sd', 'a');  // What do you want to do today? ... oops, I think that line is taken ...  switch ($mode)  { -	case 'leaders': +	case 'team':  		// Display a listing of board admins, moderators  		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);  		$page_title = $user->lang['THE_TEAM']; -		$template_html = 'memberlist_leaders.html'; +		$template_html = 'memberlist_team.html';  		$sql = 'SELECT *  			FROM ' . TEAMPAGE_TABLE . ' @@ -1623,7 +1630,7 @@ switch ($mode)  }  // Output the page -page_header($page_title, false); +page_header($page_title);  $template->set_filenames(array(  	'body' => $template_html) diff --git a/phpBB/phpbb/cache/driver/apc.php b/phpBB/phpbb/cache/driver/apc.php index a28d91c00a..77b7b11181 100644 --- a/phpBB/phpbb/cache/driver/apc.php +++ b/phpBB/phpbb/cache/driver/apc.php @@ -18,9 +18,7 @@ class apc extends \phpbb\cache\driver\memory  	var $extension = 'apc';  	/** -	* Purge cache data -	* -	* @return null +	* {@inheritDoc}  	*/  	function purge()  	{ diff --git a/phpBB/phpbb/cache/driver/driver_interface.php b/phpBB/phpbb/cache/driver/driver_interface.php index 0715a4b934..8444028115 100644 --- a/phpBB/phpbb/cache/driver/driver_interface.php +++ b/phpBB/phpbb/cache/driver/driver_interface.php @@ -18,46 +18,73 @@ interface driver_interface  {  	/**  	* Load global cache +	* +	* @return mixed False if an error was encountered, otherwise the data type of the cached data  	*/  	public function load();  	/**  	* Unload cache object +	* +	* @return null  	*/  	public function unload();  	/**  	* Save modified objects +	* +	* @return null  	*/  	public function save();  	/**  	* Tidy cache +	* +	* @return null  	*/  	public function tidy();  	/**  	* Get saved cache object +	* +	* @param string $var_name 		Cache key +	* @return mixed 				False if an error was encountered, otherwise the saved cached object  	*/  	public function get($var_name);  	/**  	* Put data into cache +	* +	* @param string $var_name 		Cache key +	* @param mixed $var 			Cached data to store +	* @param int $ttl 				Time-to-live of cached data +	* @return null  	*/  	public function put($var_name, $var, $ttl = 0);  	/**  	* Purge cache data +	* +	* @return null  	*/  	public function purge();  	/**  	* Destroy cache data +	* +	* @param string $var_name 		Cache key +	* @param string $table 			Table name +	* @return null  	*/  	public function destroy($var_name, $table = '');  	/**  	* Check if a given cache entry exists +	* +	* @param string $var_name 		Cache key +	* +	* @return bool 					True if cache file exists and has not expired. +	*								False otherwise.  	*/  	public function _exists($var_name); diff --git a/phpBB/phpbb/cache/driver/eaccelerator.php b/phpBB/phpbb/cache/driver/eaccelerator.php index 2629cb53e5..d1ad69ef6d 100644 --- a/phpBB/phpbb/cache/driver/eaccelerator.php +++ b/phpBB/phpbb/cache/driver/eaccelerator.php @@ -22,9 +22,7 @@ class eaccelerator extends \phpbb\cache\driver\memory  	var $serialize_header = '#phpbb-serialized#';  	/** -	* Purge cache data -	* -	* @return null +	* {@inheritDoc}  	*/  	function purge()  	{ @@ -39,10 +37,8 @@ class eaccelerator extends \phpbb\cache\driver\memory  	}  	/** -	 * Perform cache garbage collection -	 * -	 * @return null -	 */ +	* {@inheritDoc} +	*/  	function tidy()  	{  		eaccelerator_gc(); diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php index 6686da6953..a57a805193 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -33,7 +33,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Load global cache +	* {@inheritDoc}  	*/  	function load()  	{ @@ -41,7 +41,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Unload cache object +	* {@inheritDoc}  	*/  	function unload()  	{ @@ -58,7 +58,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Save modified objects +	* {@inheritDoc}  	*/  	function save()  	{ @@ -93,7 +93,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Tidy cache +	* {@inheritDoc}  	*/  	function tidy()  	{ @@ -155,7 +155,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Get saved cache object +	* {@inheritDoc}  	*/  	function get($var_name)  	{ @@ -177,7 +177,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Put data into cache +	* {@inheritDoc}  	*/  	function put($var_name, $var, $ttl = 31536000)  	{ @@ -194,7 +194,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Purge cache data +	* {@inheritDoc}  	*/  	function purge()  	{ @@ -280,7 +280,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Destroy cache data +	* {@inheritDoc}  	*/  	function destroy($var_name, $table = '')  	{ @@ -359,7 +359,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Check if a given cache entry exist +	* {@inheritDoc}  	*/  	function _exists($var_name)  	{ @@ -385,7 +385,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Load cached sql query +	* {@inheritDoc}  	*/  	function sql_load($query)  	{ @@ -431,7 +431,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Ceck if a given sql query exist in cache +	* {@inheritDoc}  	*/  	function sql_exists($query_id)  	{ @@ -439,7 +439,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Fetch row from cache (database) +	* {@inheritDoc}  	*/  	function sql_fetchrow($query_id)  	{ @@ -452,7 +452,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Fetch a field from the current row of a cached database result (database) +	* {@inheritDoc}  	*/  	function sql_fetchfield($query_id, $field)  	{ @@ -465,7 +465,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Seek a specific row in an a cached database result (database) +	* {@inheritDoc}  	*/  	function sql_rowseek($rownum, $query_id)  	{ @@ -479,7 +479,7 @@ class file extends \phpbb\cache\driver\base  	}  	/** -	* Free memory used for a cached database result (database) +	* {@inheritDoc}  	*/  	function sql_freeresult($query_id)  	{ @@ -758,6 +758,10 @@ class file extends \phpbb\cache\driver\base  	/**  	* Removes/unlinks file +	* +	* @param string $filename Filename to remove +	* @param bool $check Check file permissions +	* @return bool True if the file was successfully removed, otherwise false  	*/  	function remove_file($filename, $check = false)  	{ diff --git a/phpBB/phpbb/cache/driver/memcache.php b/phpBB/phpbb/cache/driver/memcache.php index c725ec0fb0..eb3fced973 100644 --- a/phpBB/phpbb/cache/driver/memcache.php +++ b/phpBB/phpbb/cache/driver/memcache.php @@ -56,9 +56,7 @@ class memcache extends \phpbb\cache\driver\memory  	}  	/** -	* Unload the cache resources -	* -	* @return null +	* {@inheritDoc}  	*/  	function unload()  	{ @@ -68,9 +66,7 @@ class memcache extends \phpbb\cache\driver\memory  	}  	/** -	* Purge cache data -	* -	* @return null +	* {@inheritDoc}  	*/  	function purge()  	{ diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php index 292024212b..b618b0f3e6 100644 --- a/phpBB/phpbb/cache/driver/memory.php +++ b/phpBB/phpbb/cache/driver/memory.php @@ -50,7 +50,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Load global cache +	* {@inheritDoc}  	*/  	function load()  	{ @@ -66,7 +66,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Unload cache object +	* {@inheritDoc}  	*/  	function unload()  	{ @@ -81,7 +81,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Save modified objects +	* {@inheritDoc}  	*/  	function save()  	{ @@ -96,7 +96,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Tidy cache +	* {@inheritDoc}  	*/  	function tidy()  	{ @@ -106,7 +106,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Get saved cache object +	* {@inheritDoc}  	*/  	function get($var_name)  	{ @@ -126,7 +126,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Put data into cache +	* {@inheritDoc}  	*/  	function put($var_name, $var, $ttl = 2592000)  	{ @@ -142,7 +142,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Purge cache data +	* {@inheritDoc}  	*/  	function purge()  	{ @@ -183,7 +183,7 @@ abstract class memory extends \phpbb\cache\driver\base  	/** -	* Destroy cache data +	* {@inheritDoc}  	*/  	function destroy($var_name, $table = '')  	{ @@ -237,7 +237,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Check if a given cache entry exist +	* {@inheritDoc}  	*/  	function _exists($var_name)  	{ @@ -257,7 +257,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Load cached sql query +	* {@inheritDoc}  	*/  	function sql_load($query)  	{ @@ -335,7 +335,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Ceck if a given sql query exist in cache +	* {@inheritDoc}  	*/  	function sql_exists($query_id)  	{ @@ -343,7 +343,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Fetch row from cache (database) +	* {@inheritDoc}  	*/  	function sql_fetchrow($query_id)  	{ @@ -356,7 +356,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Fetch a field from the current row of a cached database result (database) +	* {@inheritDoc}  	*/  	function sql_fetchfield($query_id, $field)  	{ @@ -369,7 +369,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Seek a specific row in an a cached database result (database) +	* {@inheritDoc}  	*/  	function sql_rowseek($rownum, $query_id)  	{ @@ -383,7 +383,7 @@ abstract class memory extends \phpbb\cache\driver\base  	}  	/** -	* Free memory used for a cached database result (database) +	* {@inheritDoc}  	*/  	function sql_freeresult($query_id)  	{ @@ -400,6 +400,10 @@ abstract class memory extends \phpbb\cache\driver\base  	/**  	* Removes/unlinks file +	* +	* @param string $filename Filename to remove +	* @param bool $check Check file permissions +	* @return bool True if the file was successfully removed, otherwise false  	*/  	function remove_file($filename, $check = false)  	{ diff --git a/phpBB/phpbb/cache/driver/null.php b/phpBB/phpbb/cache/driver/null.php index ea535ca1e1..8af63eb725 100644 --- a/phpBB/phpbb/cache/driver/null.php +++ b/phpBB/phpbb/cache/driver/null.php @@ -23,7 +23,7 @@ class null extends \phpbb\cache\driver\base  	}  	/** -	* Load global cache +	* {@inheritDoc}  	*/  	function load()  	{ @@ -31,21 +31,21 @@ class null extends \phpbb\cache\driver\base  	}  	/** -	* Unload cache object +	* {@inheritDoc}  	*/  	function unload()  	{  	}  	/** -	* Save modified objects +	* {@inheritDoc}  	*/  	function save()  	{  	}  	/** -	* Tidy cache +	* {@inheritDoc}  	*/  	function tidy()  	{ @@ -54,7 +54,7 @@ class null extends \phpbb\cache\driver\base  	}  	/** -	* Get saved cache object +	* {@inheritDoc}  	*/  	function get($var_name)  	{ @@ -62,28 +62,28 @@ class null extends \phpbb\cache\driver\base  	}  	/** -	* Put data into cache +	* {@inheritDoc}  	*/  	function put($var_name, $var, $ttl = 0)  	{  	}  	/** -	* Purge cache data +	* {@inheritDoc}  	*/  	function purge()  	{  	}  	/** -	* Destroy cache data +	* {@inheritDoc}  	*/  	function destroy($var_name, $table = '')  	{  	}  	/** -	* Check if a given cache entry exist +	* {@inheritDoc}  	*/  	function _exists($var_name)  	{ @@ -91,7 +91,7 @@ class null extends \phpbb\cache\driver\base  	}  	/** -	* Load cached sql query +	* {@inheritDoc}  	*/  	function sql_load($query)  	{ @@ -107,7 +107,7 @@ class null extends \phpbb\cache\driver\base  	}  	/** -	* Ceck if a given sql query exist in cache +	* {@inheritDoc}  	*/  	function sql_exists($query_id)  	{ @@ -115,7 +115,7 @@ class null extends \phpbb\cache\driver\base  	}  	/** -	* Fetch row from cache (database) +	* {@inheritDoc}  	*/  	function sql_fetchrow($query_id)  	{ @@ -123,7 +123,7 @@ class null extends \phpbb\cache\driver\base  	}  	/** -	* Fetch a field from the current row of a cached database result (database) +	* {@inheritDoc}  	*/  	function sql_fetchfield($query_id, $field)  	{ @@ -131,7 +131,7 @@ class null extends \phpbb\cache\driver\base  	}  	/** -	* Seek a specific row in an a cached database result (database) +	* {@inheritDoc}  	*/  	function sql_rowseek($rownum, $query_id)  	{ @@ -139,7 +139,7 @@ class null extends \phpbb\cache\driver\base  	}  	/** -	* Free memory used for a cached database result (database) +	* {@inheritDoc}  	*/  	function sql_freeresult($query_id)  	{ diff --git a/phpBB/phpbb/cache/driver/redis.php b/phpBB/phpbb/cache/driver/redis.php index 2b6f9bf36d..2f2a32a12d 100644 --- a/phpBB/phpbb/cache/driver/redis.php +++ b/phpBB/phpbb/cache/driver/redis.php @@ -92,9 +92,7 @@ class redis extends \phpbb\cache\driver\memory  	}  	/** -	* Unload the cache resources -	* -	* @return null +	* {@inheritDoc}  	*/  	function unload()  	{ @@ -104,9 +102,7 @@ class redis extends \phpbb\cache\driver\memory  	}  	/** -	* Purge cache data -	* -	* @return null +	* {@inheritDoc}  	*/  	function purge()  	{ diff --git a/phpBB/phpbb/cache/driver/wincache.php b/phpBB/phpbb/cache/driver/wincache.php index 1f040e9ab2..d0f636d9cb 100644 --- a/phpBB/phpbb/cache/driver/wincache.php +++ b/phpBB/phpbb/cache/driver/wincache.php @@ -18,9 +18,7 @@ class wincache extends \phpbb\cache\driver\memory  	var $extension = 'wincache';  	/** -	* Purge cache data -	* -	* @return null +	* {@inheritDoc}  	*/  	function purge()  	{ diff --git a/phpBB/phpbb/cache/driver/xcache.php b/phpBB/phpbb/cache/driver/xcache.php index 4d0d683b3d..6c9323ec83 100644 --- a/phpBB/phpbb/cache/driver/xcache.php +++ b/phpBB/phpbb/cache/driver/xcache.php @@ -33,9 +33,7 @@ class xcache extends \phpbb\cache\driver\memory  	}  	/** -	* Purge cache data -	* -	* @return null +	* {@inheritDoc}  	*/  	function purge()  	{ diff --git a/phpBB/phpbb/class_loader.php b/phpBB/phpbb/class_loader.php index 37b62fff24..ee9767148b 100644 --- a/phpBB/phpbb/class_loader.php +++ b/phpBB/phpbb/class_loader.php @@ -142,7 +142,13 @@ class class_loader  	*/  	public function load_class($class)  	{ -		$class = '\\' . $class; +		// In general $class is not supposed to contain a leading backslash, +		// but sometimes it does. See tickets PHP-50731 and HHVM-1840. +		if ($class[0] !== '\\') +		{ +			$class = '\\' . $class; +		} +  		if (substr($class, 0, strlen($this->namespace)) === $this->namespace)  		{  			$path = $this->resolve_path($class); diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 10fdbb1375..54c30c93fc 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -77,9 +77,9 @@ class helper  	* @param int $status_code The status code to be sent to the page header  	* @return Response object containing rendered page  	*/ -	public function render($template_file, $page_title = '', $status_code = 200) +	public function render($template_file, $page_title = '', $status_code = 200, $display_online_list = false)  	{ -		page_header($page_title); +		page_header($page_title, $display_online_list);  		$this->template->set_filenames(array(  			'body'	=> $template_file, diff --git a/phpBB/phpbb/db/migration/data/v310/profilefield_location_cleanup.php b/phpBB/phpbb/db/migration/data/v310/profilefield_location_cleanup.php new file mode 100644 index 0000000000..54ff2a31eb --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/profilefield_location_cleanup.php @@ -0,0 +1,47 @@ +<?php +/** +* +* @package migration +* @copyright (c) 2014 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\db\migration\data\v310; + +class profilefield_location_cleanup extends \phpbb\db\migration\migration +{ +	public function effectively_installed() +	{ +		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_from'); +	} + +	static public function depends_on() +	{ +		return array( +			'\phpbb\db\migration\data\v310\profilefield_location', +		); +	} + +	public function update_schema() +	{ +		return array( +			'drop_columns'	=> array( +				$this->table_prefix . 'users'			=> array( +					'user_from', +				), +			), +		); +	} + +	public function revert_schema() +	{ +		return array( +			'add_columns'	=> array( +				$this->table_prefix . 'users'			=> array( +					'user_from'	=> array('VCHAR_UNI:100', ''), +				), +			), +		); +	} +} diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 3a7207e743..8631c11d0e 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -467,9 +467,6 @@ class tools  		// Determine if we have created a PRIMARY KEY in the earliest  		$primary_key_gen = false; -		// Determine if the table must be created with TEXTIMAGE -		$create_textimage = false; -  		// Determine if the table requires a sequence  		$create_sequence = false; @@ -486,6 +483,15 @@ class tools  			break;  		} +		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative') +		{ +			if (!isset($table_data['PRIMARY_KEY'])) +			{ +				$table_data['COLUMNS']['mssqlindex'] = array('UINT', null, 'auto_increment'); +				$table_data['PRIMARY_KEY'] = 'mssqlindex'; +			} +		} +  		// Iterate through the columns to create a table  		foreach ($table_data['COLUMNS'] as $column_name => $column_data)  		{ @@ -516,12 +522,6 @@ class tools  				$primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set'];  			} -			// create textimage DDL based off of the existance of certain column types -			if (!$create_textimage) -			{ -				$create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage']; -			} -  			// create sequence DDL based off of the existance of auto incrementing columns  			if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment'])  			{ @@ -536,13 +536,9 @@ class tools  		switch ($this->sql_layer)  		{  			case 'firebird': -				$table_sql .= "\n);"; -				$statements[] = $table_sql; -			break; -  			case 'mssql':  			case 'mssqlnative': -				$table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : ''); +				$table_sql .= "\n);";  				$statements[] = $table_sql;  			break;  		} @@ -1850,22 +1846,49 @@ class tools  			case 'mssql':  			case 'mssqlnative': -				// remove default cosntraints first -				// http://msdn.microsoft.com/en-us/library/aa175912%28v=sql.80%29.aspx -				$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000) -					SET @drop_default_name = -						(SELECT so.name FROM sysobjects so -						JOIN sysconstraints sc ON so.id = sc.constid -						WHERE object_name(so.parent_obj) = '{$table_name}' -							AND so.xtype = 'D' -							AND sc.colid = (SELECT colid FROM syscolumns -								WHERE id = object_id('{$table_name}') -									AND name = '{$column_name}')) -					IF @drop_default_name <> '' -					BEGIN -						SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']' -						EXEC(@cmd) -					END"; +				$sql = "SELECT CAST(SERVERPROPERTY('productversion') AS VARCHAR(25)) AS mssql_version"; +				$result = $this->db->sql_query($sql); +				$row = $this->db->sql_fetchrow($result); +				$this->db->sql_freeresult($result); + +				// Remove default constraints +				if ($row['mssql_version'][0] == '8')	// SQL Server 2000 +				{ +					// http://msdn.microsoft.com/en-us/library/aa175912%28v=sql.80%29.aspx +					// Deprecated in SQL Server 2005 +					$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000) +						SET @drop_default_name = +							(SELECT so.name FROM sysobjects so +							JOIN sysconstraints sc ON so.id = sc.constid +							WHERE object_name(so.parent_obj) = '{$table_name}' +								AND so.xtype = 'D' +								AND sc.colid = (SELECT colid FROM syscolumns +									WHERE id = object_id('{$table_name}') +										AND name = '{$column_name}')) +						IF @drop_default_name <> '' +						BEGIN +							SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']' +							EXEC(@cmd) +						END"; +				} +				else +				{ +					$sql = "SELECT dobj.name AS def_name +					FROM sys.columns col  +						LEFT OUTER JOIN sys.objects dobj ON (dobj.object_id = col.default_object_id AND dobj.type = 'D') +					WHERE col.object_id = object_id('{$table_name}')  +					AND col.name = '{$column_name}' +					AND dobj.name IS NOT NULL"; +					$result = $this->db->sql_query($sql); +					$row = $this->db->sql_fetchrow($result); +					$this->db->sql_freeresult($result); + +					if ($row) +					{ +						$statements[] = 'ALTER TABLE [' . $table_name . '] DROP CONSTRAINT [' . $row['def_name'] . ']'; +					} +				} +  				$statements[] = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']';  			break; @@ -2069,7 +2092,7 @@ class tools  				$sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD ";  				$sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED (";  				$sql .= '[' . implode("],\n\t\t[", $column) . ']'; -				$sql .= ') ON [PRIMARY]'; +				$sql .= ')';  				$statements[] = $sql;  			break; @@ -2167,7 +2190,7 @@ class tools  			case 'mssql':  			case 'mssqlnative': -				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]'; +				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';  			break;  		} @@ -2220,7 +2243,7 @@ class tools  			case 'mssql':  			case 'mssqlnative': -				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]'; +				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';  			break;  		} @@ -2352,23 +2375,48 @@ class tools  				if (!empty($column_data['default']))  				{ +					$sql = "SELECT CAST(SERVERPROPERTY('productversion') AS VARCHAR(25)) AS mssql_version"; +					$result = $this->db->sql_query($sql); +					$row = $this->db->sql_fetchrow($result); +					$this->db->sql_freeresult($result); +  					// Using TRANSACT-SQL for this statement because we do not want to have colliding data if statements are executed at a later stage -					$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000) -						SET @drop_default_name = -							(SELECT so.name FROM sysobjects so -							JOIN sysconstraints sc ON so.id = sc.constid -							WHERE object_name(so.parent_obj) = '{$table_name}' -								AND so.xtype = 'D' -								AND sc.colid = (SELECT colid FROM syscolumns -									WHERE id = object_id('{$table_name}') -										AND name = '{$column_name}')) -						IF @drop_default_name <> '' -						BEGIN -							SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']' -							EXEC(@cmd) -						END -						SET @cmd = 'ALTER TABLE [{$table_name}] ADD CONSTRAINT [DF_{$table_name}_{$column_name}_1] {$column_data['default']} FOR [{$column_name}]' -						EXEC(@cmd)"; +					if ($row['mssql_version'][0] == '8')	// SQL Server 2000 +					{ +						$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000) +							SET @drop_default_name = +								(SELECT so.name FROM sysobjects so +								JOIN sysconstraints sc ON so.id = sc.constid +								WHERE object_name(so.parent_obj) = '{$table_name}' +									AND so.xtype = 'D' +									AND sc.colid = (SELECT colid FROM syscolumns +										WHERE id = object_id('{$table_name}') +											AND name = '{$column_name}')) +							IF @drop_default_name <> '' +							BEGIN +								SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']' +								EXEC(@cmd) +							END +							SET @cmd = 'ALTER TABLE [{$table_name}] ADD CONSTRAINT [DF_{$table_name}_{$column_name}_1] {$column_data['default']} FOR [{$column_name}]' +							EXEC(@cmd)"; +					} +					else +					{ +						$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000) +							SET @drop_default_name = +								(SELECT dobj.name FROM sys.columns col  +									LEFT OUTER JOIN sys.objects dobj ON (dobj.object_id = col.default_object_id AND dobj.type = 'D') +								WHERE col.object_id = object_id('{$table_name}')  +								AND col.name = '{$column_name}' +								AND dobj.name IS NOT NULL) +							IF @drop_default_name <> '' +							BEGIN +								SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']' +								EXEC(@cmd) +							END +							SET @cmd = 'ALTER TABLE [{$table_name}] ADD CONSTRAINT [DF_{$table_name}_{$column_name}_1] {$column_data['default']} FOR [{$column_name}]' +							EXEC(@cmd)"; +					}  				}  			break; diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 66cdb86513..c90445ee09 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -196,7 +196,7 @@ class metadata_manager  		$fields = array(  			'name'		=> '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#',  			'type'		=> '#^phpbb-extension$#', -			'licence'	=> '#.+#', +			'license'	=> '#.+#',  			'version'	=> '#.+#',  		); @@ -351,7 +351,7 @@ class metadata_manager  			'META_HOMEPAGE'		=> (isset($this->metadata['homepage'])) ? $this->metadata['homepage'] : '',  			'META_VERSION'		=> (isset($this->metadata['version'])) ? htmlspecialchars($this->metadata['version']) : '',  			'META_TIME'			=> (isset($this->metadata['time'])) ? htmlspecialchars($this->metadata['time']) : '', -			'META_LICENCE'		=> htmlspecialchars($this->metadata['licence']), +			'META_LICENSE'		=> htmlspecialchars($this->metadata['license']),  			'META_REQUIRE_PHP'		=> (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '',  			'META_REQUIRE_PHP_FAIL'	=> !$this->validate_require_php(), diff --git a/phpBB/phpbb/notification/type/bookmark.php b/phpBB/phpbb/notification/type/bookmark.php index 5e6fdd2523..003998677d 100644 --- a/phpBB/phpbb/notification/type/bookmark.php +++ b/phpBB/phpbb/notification/type/bookmark.php @@ -75,7 +75,7 @@ class bookmark extends \phpbb\notification\type\post  		$result = $this->db->sql_query($sql);  		while ($row = $this->db->sql_fetchrow($result))  		{ -			$users[] = $row['user_id']; +			$users[] = (int) $row['user_id'];  		}  		$this->db->sql_freeresult($result); diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php index bc42c4422b..b2ad8ff33d 100644 --- a/phpBB/phpbb/notification/type/post.php +++ b/phpBB/phpbb/notification/type/post.php @@ -103,7 +103,7 @@ class post extends \phpbb\notification\type\base  		$result = $this->db->sql_query($sql);  		while ($row = $this->db->sql_fetchrow($result))  		{ -			$users[] = $row['user_id']; +			$users[] = (int) $row['user_id'];  		}  		$this->db->sql_freeresult($result); @@ -115,7 +115,7 @@ class post extends \phpbb\notification\type\base  		$result = $this->db->sql_query($sql);  		while ($row = $this->db->sql_fetchrow($result))  		{ -			$users[] = $row['user_id']; +			$users[] = (int) $row['user_id'];  		}  		$this->db->sql_freeresult($result); diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php index e8527261d8..745430e114 100644 --- a/phpBB/phpbb/notification/type/quote.php +++ b/phpBB/phpbb/notification/type/quote.php @@ -94,7 +94,7 @@ class quote extends \phpbb\notification\type\post  		$result = $this->db->sql_query($sql);  		while ($row = $this->db->sql_fetchrow($result))  		{ -			$users[] = $row['user_id']; +			$users[] = (int) $row['user_id'];  		}  		$this->db->sql_freeresult($result); diff --git a/phpBB/phpbb/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php index 98f086a50b..635d05bccd 100644 --- a/phpBB/phpbb/notification/type/topic.php +++ b/phpBB/phpbb/notification/type/topic.php @@ -103,7 +103,7 @@ class topic extends \phpbb\notification\type\base  		$result = $this->db->sql_query($sql);  		while ($row = $this->db->sql_fetchrow($result))  		{ -			$users[] = $row['user_id']; +			$users[] = (int) $row['user_id'];  		}  		$this->db->sql_freeresult($result); diff --git a/phpBB/posting.php b/phpBB/posting.php index aee9ba50af..ef90c229da 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1589,7 +1589,7 @@ if ($allowed)  posting_gen_attachment_entry($attachment_data, $filename_data, $allowed);  // Output page ... -page_header($page_title, false); +page_header($page_title);  $template->set_filenames(array(  	'body' => 'posting_body.html') @@ -1617,7 +1617,7 @@ function upload_popup($forum_style = 0)  	($forum_style) ? $user->setup('posting', $forum_style) : $user->setup('posting'); -	page_header($user->lang['PROGRESS_BAR'], false); +	page_header($user->lang['PROGRESS_BAR']);  	$template->set_filenames(array(  		'popup'	=> 'posting_progress_bar.html') diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_team.html index fd2ba564d3..fd2ba564d3 100644 --- a/phpBB/styles/prosilver/template/memberlist_leaders.html +++ b/phpBB/styles/prosilver/template/memberlist_team.html diff --git a/phpBB/styles/subsilver2/template/memberlist_leaders.html b/phpBB/styles/subsilver2/template/memberlist_team.html index a4f38aafc4..a4f38aafc4 100644 --- a/phpBB/styles/subsilver2/template/memberlist_leaders.html +++ b/phpBB/styles/subsilver2/template/memberlist_team.html diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 0c587cbf28..8c773886a6 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -128,7 +128,7 @@ switch ($mode)  		);  		// Disable online list -		page_header($user->lang[$title], false); +		page_header($user->lang[$title]);  		$template->assign_vars(array(  			'S_AGREEMENT'			=> true, @@ -353,7 +353,7 @@ $module->load_active();  $module->assign_tpl_vars(append_sid("{$phpbb_root_path}ucp.$phpEx"));  // Generate the page, do not display/query online list -$module->display($module->get_page_title(), false); +$module->display($module->get_page_title());  /**  * Function for assigning a template var if the zebra module got included diff --git a/tests/extension/ext/barfoo/composer.json b/tests/extension/ext/barfoo/composer.json index 35d5d2a956..d88fd413c9 100644 --- a/tests/extension/ext/barfoo/composer.json +++ b/tests/extension/ext/barfoo/composer.json @@ -4,7 +4,7 @@  	"description": "An example/sample extension to be used for testing purposes in phpBB Development.",  	"version": "1.0.0",  	"time": "2012-02-15 01:01:01", -	"licence": "GNU GPL v2", +	"license": "GNU GPL v2",  	"authors": [{  			"name": "John Smith",  			"username": "JohnSmith27", diff --git a/tests/extension/ext/vendor/moo/composer.json b/tests/extension/ext/vendor/moo/composer.json index 901cb7f17a..b8fc544c01 100644 --- a/tests/extension/ext/vendor/moo/composer.json +++ b/tests/extension/ext/vendor/moo/composer.json @@ -4,7 +4,7 @@  	"description": "An example/sample extension to be used for testing purposes in phpBB Development.",  	"version": "1.0.0",  	"time": "2012-02-15 01:01:01", -	"licence": "GNU GPL v2", +	"license": "GNU GPL v2",  	"authors": [{  			"name": "John Smith",  			"username": "JohnSmith27", diff --git a/tests/extension/ext/vendor2/bar/composer.json b/tests/extension/ext/vendor2/bar/composer.json index 5d60ec031e..215e7d59db 100644 --- a/tests/extension/ext/vendor2/bar/composer.json +++ b/tests/extension/ext/vendor2/bar/composer.json @@ -4,7 +4,7 @@  	"description": "An example/sample extension to be used for testing purposes in phpBB Development.",  	"version": "1.0.0",  	"time": "2012-02-15 01:01:01", -	"licence": "GPL-2.0", +	"license": "GPL-2.0",  	"authors": [{  			"name": "John Smith",  			"email": "email@phpbb.com", diff --git a/tests/extension/ext/vendor2/foo/composer.json b/tests/extension/ext/vendor2/foo/composer.json index 8821d9d50e..7b2a80f5d3 100644 --- a/tests/extension/ext/vendor2/foo/composer.json +++ b/tests/extension/ext/vendor2/foo/composer.json @@ -4,7 +4,7 @@  	"description": "An example/sample extension to be used for testing purposes in phpBB Development.",  	"version": "1.0.0",  	"time": "2012-02-15 01:01:01", -	"licence": "GPL-2.0", +	"license": "GPL-2.0",  	"authors": [{  			"name": "John Smith",  			"email": "email@phpbb.com", diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php index a3c4cc89e9..a3584be67b 100644 --- a/tests/extension/metadata_manager_test.php +++ b/tests/extension/metadata_manager_test.php @@ -148,13 +148,13 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case  		try  		{ -			$manager->validate('licence'); +			$manager->validate('license');  			$this->fail('Exception not triggered');  		}  		catch(\phpbb\extension\exception $e)  		{ -			$this->assertEquals((string) $e, 'Required meta field \'licence\' has not been set.'); +			$this->assertEquals((string) $e, 'Required meta field \'license\' has not been set.');  		}  		try @@ -208,7 +208,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case  		$manager->set_metadata(array(  			'name'		=> 'asdf',  			'type'		=> 'asdf', -			'licence'	=> '', +			'license'	=> '',  			'version'	=> '',  		)); @@ -236,13 +236,13 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case  		try  		{ -			$manager->validate('licence'); +			$manager->validate('license');  			$this->fail('Exception not triggered');  		}  		catch(\phpbb\extension\exception $e)  		{ -			$this->assertEquals((string) $e, 'Meta field \'licence\' is invalid.'); +			$this->assertEquals((string) $e, 'Meta field \'license\' is invalid.');  		}  		try @@ -267,7 +267,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case  		$manager->set_metadata(array(  			'name'		=> 'test/foo',  			'type'		=> 'phpbb-extension', -			'licence'	=> 'GPL v2', +			'license'	=> 'GPL v2',  			'version'	=> '1.0.0',  		)); diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 53f62c4f19..1d79043eae 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -116,7 +116,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case  			'DESCRIPTION'		=> 'An example/sample extension to be used for testing purposes in phpBB Development.',  			'VERSION'	  		=> '1.0.0',  			'TIME'				=> '2012-02-15 01:01:01', -			'LICENCE'			=> 'GPL-2.0', +			'LICENSE'			=> 'GPL-2.0',  			'PHPBB_VERSION'		=> '3.1.*@dev',  			'PHP_VERSION'		=> '>=5.3',  			'AUTHOR_NAME'		=> 'John Smith', diff --git a/tests/functional/fixtures/ext/foo/bar/composer.json b/tests/functional/fixtures/ext/foo/bar/composer.json index e3e5fc21cd..2f91426d2a 100644 --- a/tests/functional/fixtures/ext/foo/bar/composer.json +++ b/tests/functional/fixtures/ext/foo/bar/composer.json @@ -5,7 +5,7 @@  	"homepage": "",  	"version": "1.0.0",  	"time": "2013-03-21 01:01:01", -	"licence": "GPL-2.0", +	"license": "GPL-2.0",  	"authors": [{  		"name": "Joas Schilling",  		"email": "nickvergessen@phpbb.com", diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php index 738ec4f9dd..b7f7a1823d 100644 --- a/tests/functional/memberlist_test.php +++ b/tests/functional/memberlist_test.php @@ -39,7 +39,7 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case  	protected function get_memberlist_leaders_table_crawler()  	{ -		$crawler = self::request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid); +		$crawler = self::request('GET', 'memberlist.php?mode=team&sid=' . $this->sid);  		return $crawler->filter('.forumbg-table');  	} diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index fb8e2ac807..10d676c687 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -133,7 +133,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c  			FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt  			WHERE nt.notification_type_name = '" . $this->item_type . "'  				AND n.notification_type_id = nt.notification_type_id -			ORDER BY user_id, item_id ASC"; +			ORDER BY user_id ASC, item_id ASC";  		$result = $this->db->sql_query($sql);  		$this->assertEquals($expected_before, $this->db->sql_fetchrowset($result));  		$this->db->sql_freeresult($result); @@ -142,11 +142,6 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c  		$post_data = array_merge($this->post_data, $additional_post_data);  		submit_post('reply', '', 'poster-name', POST_NORMAL, $poll_data, $post_data, false, false); -		$sql = 'SELECT user_id, item_id, item_parent_id -			FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt -			WHERE nt.notification_type_name = '" . $this->item_type . "' -				AND n.notification_type_id = nt.notification_type_id -			ORDER BY user_id ASC, item_id ASC";  		$result = $this->db->sql_query($sql);  		$this->assertEquals($expected_after, $this->db->sql_fetchrowset($result));  		$this->db->sql_freeresult($result); diff --git a/tests/notification/submit_post_type_bookmark_test.php b/tests/notification/submit_post_type_bookmark_test.php index 861017ff5f..4e4a3f6c9a 100644 --- a/tests/notification/submit_post_type_bookmark_test.php +++ b/tests/notification/submit_post_type_bookmark_test.php @@ -27,7 +27,7 @@ class phpbb_notification_submit_post_type_bookmark_test extends phpbb_notificati  				$this->greaterThan(0))  			->will($this->returnValueMap(array(  				array( -					array('3', '4', '5', '6', '7'), +					array(3, 4, 5, 6, 7),  					'f_read',  					1,  					array( diff --git a/tests/notification/submit_post_type_post_test.php b/tests/notification/submit_post_type_post_test.php index 473247a764..c2eb419522 100644 --- a/tests/notification/submit_post_type_post_test.php +++ b/tests/notification/submit_post_type_post_test.php @@ -27,7 +27,7 @@ class phpbb_notification_submit_post_type_post_test extends phpbb_notification_s  				$this->greaterThan(0))  			->will($this->returnValueMap(array(  				array( -					array('3', '4', '5', '6', '7', '8'), +					array(3, 4, 5, 6, 7, 8),  					'f_read',  					1,  					array( diff --git a/tests/notification/submit_post_type_quote_test.php b/tests/notification/submit_post_type_quote_test.php index 2b66d9c6a1..a849cb7b1b 100644 --- a/tests/notification/submit_post_type_quote_test.php +++ b/tests/notification/submit_post_type_quote_test.php @@ -27,7 +27,7 @@ class phpbb_notification_submit_post_type_quote_test extends phpbb_notification_  				$this->greaterThan(0))  			->will($this->returnValueMap(array(  				array( -					array('3', '4', '5', '6', '7'), +					array(3, 4, 5, 6, 7),  					'f_read',  					1,  					array( | 
