merging some changes

git-svn-id: file:///svn/phpbb/trunk@8484 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2008-03-31 14:58:14 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2008-03-31 14:58:14 +0000
commit: 3e42df098cedbd4c70f893ea23de7f06df519fe2 (patch)
tree: df5d5b407cf15af4219b244c79d530bc3e1424ba
parent: 45c97a40d268ec2be7e3300a46a2068e75f5ce52 (diff)
download: forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar
forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.gz
forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.bz2
forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.xz
forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.zip
8 files changed, 459 insertions, 16 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 3bc4e9cf03..eec428a70b 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -164,7 +164,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 	$sql = "SELECT t.*$read_tracking_select
 		FROM " . TOPICS_TABLE . " t $read_tracking_join
-		WHERE " . $db->sql_in_set('t.topic_id', $topic_list);
+		WHERE " . $db->sql_in_set('t.topic_id', $topic_list, false, true);
 
 	$result = $db->sql_query($sql);
 	while ($row = $db->sql_fetchrow($result))
@@ -389,7 +389,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		return;
 	}
 
-	$redirect = request_var('redirect', build_url(array('_f_', 'quickmod')));
+	$redirect = request_var('redirect', build_url(array('quickmod')));
 
 	$s_hidden_fields = build_hidden_fields(array(
 		'i'				=> 'main',
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index d0c8c3abe6..f6b1c61b20 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -312,9 +312,24 @@ class session
 								$sql_ary['session_page'] = substr($this->page['page'], 0, 199);
 							}
 
+							$db->sql_return_on_error(true);
+
 							$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
 								WHERE session_id = '" . $db->sql_escape($this->session_id) . "'";
-							$db->sql_query($sql);
+							$result = $db->sql_query($sql);
+
+							$db->sql_return_on_error(false);
+
+							// If the database is not yet updated, there will be an error due to the session_forum_id
+							// @todo REMOVE for 3.0.2
+							if ($result === false)
+							{
+								unset($sql_ary['session_forum_id']);
+
+								$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
+									WHERE session_id = '" . $db->sql_escape($this->session_id) . "'";
+								$db->sql_query($sql);
+							}
 						}
 
 						$this->data['is_registered'] = ($this->data['user_id'] != ANONYMOUS && ($this->data['user_type'] == USER_NORMAL || $this->data['user_type'] == USER_FOUNDER)) ? true : false;
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 06eeecbc71..c0b59ecd5c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -460,16 +460,23 @@ if ($exit)
 flush();
 
 // We go through the schema changes from the lowest to the highest version
-// We skip those versions older than the current version
+// We try to also include versions 'in-between'...
 $no_updates = true;
-foreach ($database_update_info as $version => $schema_changes)
+$versions = array_keys($database_update_info);
+for ($i = 0; $i < sizeof($versions); $i++)
 {
-	if (version_compare($version, $current_version, '<'))
+	$version = $versions[$i];
+	$schema_changes = $database_update_info[$version];
+
+	$next_version = (isset($versions[$i + 1])) ? $versions[$i + 1] : $updates_to_version;
+
+	if (!sizeof($schema_changes))
 	{
 		continue;
 	}
 
-	if (!sizeof($schema_changes))
+	// If the installed version to be updated to is < than the current version, and if the current version is >= as the version to be updated to next, we will skip the process
+	if (version_compare($version, $current_version, '<') && version_compare($current_version, $next_version, '>='))
 	{
 		continue;
 	}
@@ -581,7 +588,25 @@ flush();
 
 $no_updates = true;
 
+$versions = array(
+	'3.0.RC2', '3.0.RC3', '3.0.RC4', '3.0.RC5', '3.0.0'
+);
+
 // some code magic
+for ($i = 0; $i < sizeof($versions); $i++)
+{
+	$version = $versions[$i];
+	$next_version = (isset($versions[$i + 1])) ? $versions[$i + 1] : $updates_to_version;
+
+	// If the installed version to be updated to is < than the current version, and if the current version is >= as the version to be updated to next, we will skip the process
+	if (version_compare($version, $current_version, '<') && version_compare($current_version, $next_version, '>='))
+	{
+		continue;
+	}
+
+	$no_updates = false;
+	change_database_data($version);
+}
 
 _write_result($no_updates, $errored, $error_ary);
 
@@ -607,7 +632,8 @@ _sql($sql, $errored, $error_ary);
 
 // Reset permissions
 $sql = 'UPDATE ' . USERS_TABLE . "
-	SET user_permissions = ''";
+	SET user_permissions = '',
+		user_perm_from = 0";
 _sql($sql, $errored, $error_ary);
 
 /* Optimize/vacuum analyze the tables where appropriate
@@ -639,6 +665,8 @@ _write_result($no_updates, $errored, $error_ary);
 
 if (!$inline_update)
 {
+	// Purge the cache...
+	$cache->purge();
 ?>
 
 	<p style="color:red"><?php echo $lang['UPDATE_FILES_NOTICE']; ?></p>
@@ -690,6 +718,406 @@ if (function_exists('exit_handler'))
 	exit_handler();
 }
 
+/**
+* Function where all data changes are executed
+*/
+function change_database_data($version)
+{
+	global $db, $map_dbms, $errored, $error_ary, $config, $phpbb_root_path;
+
+	switch ($version)
+	{
+		case '3.0.RC2':
+
+			$smileys = array();
+
+			$sql = 'SELECT smiley_id, code
+				FROM ' . SMILIES_TABLE;
+			$result = $db->sql_query($sql);
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$smileys[$row['smiley_id']] = $row['code'];
+			}
+			$db->sql_freeresult($result);
+	
+			foreach ($smileys as $id => $code)
+			{
+				// 2.0 only entitized lt and gt; We need to do something about double quotes.
+				if (strchr($code, '"') === false)
+				{
+					continue;
+				}
+
+				$new_code = str_replace('&amp;', '&', $code);
+				$new_code = str_replace('&lt;', '<', $new_code);
+				$new_code = str_replace('&gt;', '>', $new_code);
+				$new_code = utf8_htmlspecialchars($new_code);
+
+				$sql = 'UPDATE ' . SMILIES_TABLE . '
+					SET code = \'' . $db->sql_escape($new_code) . '\'
+					WHERE smiley_id = ' . (int) $id;
+				$db->sql_query($sql);
+			}
+
+			$index_list = sql_list_index($map_dbms, ACL_ROLES_DATA_TABLE);
+
+			if (in_array('ath_opt_id', $index_list))
+			{
+				sql_index_drop($map_dbms, 'ath_opt_id', ACL_ROLES_DATA_TABLE);
+				sql_create_index($map_dbms, 'ath_op_id', ACL_ROLES_DATA_TABLE, array('auth_option_id'));
+			}
+
+		break;
+
+		case '3.0.RC3':
+
+			if ($map_dbms === 'postgres')
+			{
+				$sql = "SELECT SETVAL('" . FORUMS_TABLE . "_seq',(select case when max(forum_id)>0 then max(forum_id)+1 else 1 end from " . FORUMS_TABLE . '));';
+				_sql($sql, $errored, $error_ary);
+			}
+
+			// we check for:
+			// ath_opt_id
+			// ath_op_id
+			// ACL_ROLES_DATA_TABLE_ath_opt_id
+			// we want ACL_ROLES_DATA_TABLE_ath_op_id
+
+			$table_index_fix = array(
+				ACL_ROLES_DATA_TABLE => array(
+					'ath_opt_id'							=> 'ath_op_id',
+					'ath_op_id'								=> 'ath_op_id',
+					ACL_ROLES_DATA_TABLE . '_ath_opt_id'	=> 'ath_op_id'
+				),
+				STYLES_IMAGESET_DATA_TABLE => array(
+					'i_id'									=> 'i_d',
+					'i_d'									=> 'i_d',
+					STYLES_IMAGESET_DATA_TABLE . '_i_id'	=> 'i_d'
+				)
+			);
+
+			// we need to create some indicies...
+			$needed_creation = array();
+
+			foreach ($table_index_fix as $table_name => $index_info)
+			{
+				$index_list = sql_list_fake($map_dbms, $table_name);
+				foreach ($index_info as $bad_index => $good_index)
+				{
+					if (in_array($bad_index, $index_list))
+					{
+						// mysql is actually OK, it won't get a hand in this crud
+						switch ($map_dbms)
+						{
+							// last version, mssql had issues with index removal
+							case 'mssql':
+								$sql = 'DROP INDEX ' . $table_name . '.' . $bad_index;
+								_sql($sql, $errored, $error_ary);
+							break;
+
+							// last version, firebird, oracle, postgresql and sqlite all got bad index names
+							// we got kinda lucky, tho: they all support the same syntax
+							case 'firebird':
+							case 'oracle':
+							case 'postgres':
+							case 'sqlite':
+								$sql = 'DROP INDEX ' . $bad_index;
+								_sql($sql, $errored, $error_ary);
+							break;
+						}
+
+						// If the good index already exist we do not need to create it again...
+						if (($map_dbms == 'mysql_40' || $map_dbms == 'mysql_41') && $bad_index == $good_index)
+						{
+						}
+						else
+						{
+							$needed_creation[$table_name][$good_index] = 1;
+						}
+					}
+				}
+			}
+
+			$new_index_defs = array('ath_op_id' => array('auth_option_id'), 'i_d' => array('imageset_id'));
+
+			foreach ($needed_creation as $bad_table => $index_repair_list)
+			{
+				foreach ($index_repair_list as $new_index => $garbage)
+				{
+					sql_create_index($map_dbms, $new_index, $bad_table, $new_index_defs[$new_index]);
+				}
+			}
+
+			// Make sure empty smiley codes do not exist
+			$sql = 'DELETE FROM ' . SMILIES_TABLE . "
+				WHERE code = ''";
+			_sql($sql, $errored, $error_ary);
+
+			set_config('allow_birthdays', '1');
+			set_config('cron_lock', '0', true);
+
+		break;
+
+		case '3.0.RC4':
+
+			$update_auto_increment = array(
+				STYLES_TABLE				=> 'style_id',
+				STYLES_TEMPLATE_TABLE		=> 'template_id',
+				STYLES_THEME_TABLE			=> 'theme_id',
+				STYLES_IMAGESET_TABLE		=> 'imageset_id'
+			);
+
+			$sql = 'SELECT *
+				FROM ' . STYLES_TABLE . '
+				WHERE style_id = 0';
+			$result = _sql($sql, $errored, $error_ary);
+			$bad_style_row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if ($bad_style_row)
+			{
+				$sql = 'SELECT MAX(style_id) as max_id
+					FROM ' . STYLES_TABLE;
+				$result = _sql($sql, $errored, $error_ary);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				$proper_id = $row['max_id'] + 1;
+
+				_sql('UPDATE ' . STYLES_TABLE . " SET style_id = $proper_id WHERE style_id = 0", $errored, $error_ary);
+				_sql('UPDATE ' . FORUMS_TABLE . " SET forum_style = $proper_id WHERE forum_style = 0", $errored, $error_ary);
+				_sql('UPDATE ' . USERS_TABLE . " SET user_style = $proper_id WHERE user_style = 0", $errored, $error_ary);
+
+				$sql = 'SELECT config_value
+					FROM ' . CONFIG_TABLE . "
+					WHERE config_name = 'default_style'";
+				$result = _sql($sql, $errored, $error_ary);
+				$style_config = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if ($style_config['config_value'] === '0')
+				{
+					set_config('default_style', (string) $proper_id);
+				}
+			}
+
+			$sql = 'SELECT *
+				FROM ' . STYLES_TEMPLATE_TABLE . '
+				WHERE template_id = 0';
+			$result = _sql($sql, $errored, $error_ary);
+			$bad_style_row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if ($bad_style_row)
+			{
+				$sql = 'SELECT MAX(template_id) as max_id
+					FROM ' . STYLES_TEMPLATE_TABLE;
+				$result = _sql($sql, $errored, $error_ary);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				$proper_id = $row['max_id'] + 1;
+
+				_sql('UPDATE ' . STYLES_TABLE . " SET template_id = $proper_id WHERE template_id = 0", $errored, $error_ary);
+			}
+
+			$sql = 'SELECT *
+				FROM ' . STYLES_THEME_TABLE . '
+				WHERE theme_id = 0';
+			$result = _sql($sql, $errored, $error_ary);
+			$bad_style_row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if ($bad_style_row)
+			{
+				$sql = 'SELECT MAX(theme_id) as max_id
+					FROM ' . STYLES_THEME_TABLE;
+				$result = _sql($sql, $errored, $error_ary);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				$proper_id = $row['max_id'] + 1;
+
+				_sql('UPDATE ' . STYLES_TABLE . " SET theme_id = $proper_id WHERE theme_id = 0", $errored, $error_ary);
+			}
+
+			$sql = 'SELECT *
+				FROM ' . STYLES_IMAGESET_TABLE . '
+				WHERE imageset_id = 0';
+			$result = _sql($sql, $errored, $error_ary);
+			$bad_style_row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if ($bad_style_row)
+			{
+				$sql = 'SELECT MAX(imageset_id) as max_id
+					FROM ' . STYLES_IMAGESET_TABLE;
+				$result = _sql($sql, $errored, $error_ary);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				$proper_id = $row['max_id'] + 1;
+
+				_sql('UPDATE ' . STYLES_TABLE . " SET imageset_id = $proper_id WHERE imageset_id = 0", $errored, $error_ary);
+				_sql('UPDATE ' . STYLES_IMAGESET_DATA_TABLE . " SET imageset_id = $proper_id WHERE imageset_id = 0", $errored, $error_ary);
+			}
+
+			if ($map_dbms == 'mysql_40' || $map_dbms == 'mysql_41')
+			{
+				foreach ($update_auto_increment as $auto_table_name => $auto_column_name)
+				{
+					$sql = "SELECT MAX({$auto_column_name}) as max_id
+						FROM {$auto_table_name}";
+					$result = _sql($sql, $errored, $error_ary);
+					$row = $db->sql_fetchrow($result);
+					$db->sql_freeresult($result);
+
+					$max_id = ((int) $row['max_id']) + 1;
+					_sql("ALTER TABLE {$auto_table_name} AUTO_INCREMENT = {$max_id}", $errored, $error_ary);
+				}
+			}
+			else if ($map_dbms == 'postgres')
+			{
+				foreach ($update_auto_increment as $auto_table_name => $auto_column_name)
+				{
+					$sql = "SELECT SETVAL('" . $auto_table_name . "_seq',(select case when max({$auto_column_name})>0 then max({$auto_column_name})+1 else 1 end from " . $auto_table_name . '));';
+					_sql($sql, $errored, $error_ary);
+				}
+
+				$sql = 'DROP SEQUENCE ' . STYLES_TEMPLATE_DATA_TABLE . '_seq';
+				_sql($sql, $errored, $error_ary);
+			}
+			else if ($map_dbms == 'firebird')
+			{
+				$sql = 'DROP TRIGGER t_' . STYLES_TEMPLATE_DATA_TABLE;
+				_sql($sql, $errored, $error_ary);
+
+				$sql = 'DROP GENERATOR ' . STYLES_TEMPLATE_DATA_TABLE . '_gen';
+				_sql($sql, $errored, $error_ary);
+			}
+			else if ($map_dbms == 'oracle')
+			{
+				$sql = 'DROP TRIGGER t_' . STYLES_TEMPLATE_DATA_TABLE;
+				_sql($sql, $errored, $error_ary);
+
+				$sql = 'DROP SEQUENCE ' . STYLES_TEMPLATE_DATA_TABLE . '_seq';
+				_sql($sql, $errored, $error_ary);
+			}
+			else if ($map_dbms == 'mssql')
+			{
+				// we use transactions because we need to have a working DB at the end of all of this
+				$db->sql_transaction('begin');
+
+				$sql = 'SELECT *
+					FROM ' . STYLES_TEMPLATE_DATA_TABLE;
+				$result = _sql($sql, $errored, $error_ary);
+				$old_style_rows = array();
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$old_style_rows[] = $row;
+				}
+				$db->sql_freeresult($result);
+
+				// death to the table, it is evil!
+				$sql = 'DROP TABLE ' . STYLES_TEMPLATE_DATA_TABLE;
+				_sql($sql, $errored, $error_ary);
+
+				// the table of awesomeness, praise be to it (or something)
+				$sql = 'CREATE TABLE [' . STYLES_TEMPLATE_DATA_TABLE . "] (
+					[template_id] [int] DEFAULT (0) NOT NULL ,
+					[template_filename] [varchar] (100) DEFAULT ('') NOT NULL ,
+					[template_included] [varchar] (8000) DEFAULT ('') NOT NULL ,
+					[template_mtime] [int] DEFAULT (0) NOT NULL ,
+					[template_data] [text] DEFAULT ('') NOT NULL
+				) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]";
+				_sql($sql, $errored, $error_ary);
+
+				// index? index
+				$sql = 'CREATE  INDEX [tid] ON [' . STYLES_TEMPLATE_DATA_TABLE . ']([template_id]) ON [PRIMARY]';
+				_sql($sql, $errored, $error_ary);
+
+				// yet another index
+				$sql = 'CREATE  INDEX [tfn] ON [' . STYLES_TEMPLATE_DATA_TABLE . ']([template_filename]) ON [PRIMARY]';
+				_sql($sql, $errored, $error_ary);
+
+				foreach ($old_style_rows as $return_row)
+				{
+					_sql('INSERT INTO ' . STYLES_TEMPLATE_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $return_row), $errored, $error_ary);
+				}
+
+				$db->sql_transaction('commit');
+			}
+
+			// Setting this here again because new installations may not have it...
+			set_config('cron_lock', '0', true);
+			set_config('ldap_port', '');
+			set_config('ldap_user_filter', '');
+
+		break;
+
+		case '3.0.RC5':
+
+			// In case the user is having the bot mediapartner google "as is", adjust it.
+			$sql = 'UPDATE ' . BOTS_TABLE . "
+				SET bot_agent = '" . $db->sql_escape('Mediapartners-Google') . "'
+				WHERE bot_agent = '" . $db->sql_escape('Mediapartners-Google/') . "'";
+			_sql($sql, $errored, $error_ary);
+
+			set_config('form_token_lifetime', '7200');
+			set_config('form_token_mintime', '0');
+			set_config('min_time_reg', '5');
+			set_config('min_time_terms', '2');
+			set_config('form_token_sid_guests', '1');
+
+			$db->sql_transaction('begin');
+
+			$sql = 'SELECT forum_id, forum_password
+					FROM ' . FORUMS_TABLE;
+			$result = _sql($sql, $errored, $error_ary);
+			
+			while ($row = $db->sql_fetchrow($result))
+			{
+				if (!empty($row['forum_password']))
+				{
+					_sql('UPDATE ' . FORUMS_TABLE . " SET forum_password = '" . md5($row['forum_password']) . "' WHERE forum_id = {$row['forum_id']}", $errored, $error_ary);
+				}
+			}
+			$db->sql_freeresult($result);
+			
+			$db->sql_transaction('commit');
+
+		break;
+
+		case '3.0.0':
+
+			$sql = 'UPDATE ' . TOPICS_TABLE . "
+				SET topic_last_view_time = topic_last_post_time
+				WHERE topic_last_view_time = 0";
+			_sql($sql, $errored, $error_ary);
+	
+			// Update smiley sizes
+			$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
+
+			foreach ($smileys as $smiley)
+			{
+				if (file_exists($phpbb_root_path . 'images/smilies/' . $smiley))
+				{
+					list($width, $height) = getimagesize($phpbb_root_path . 'images/smilies/' . $smiley);
+			
+					$sql = 'UPDATE ' . SMILIES_TABLE . '
+						SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
+						WHERE smiley_url = '" . $db->sql_escape($smiley) . "'";
+			
+					_sql($sql, $errored, $error_ary);
+				}
+			}
+	
+			// TODO: remove all form token min times
+
+		break;
+	}
+}
 
 /**
 * Function for triggering an sql statement
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 47cb5de680..f380b1f570 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -264,10 +264,10 @@ $lang = array_merge($lang, array(
 	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
 	'SELECT_OPTION'			=> 'Select option',
 
-	'SETTING_TOO_LOW'		=> 'The entered value for the setting %s is too low. The minimal allowed value is %d.',
-	'SETTING_TOO_BIG'		=> 'The entered value for the setting %s is too big. The maximal allowed value is %d.',	
-	'SETTING_TOO_LONG'		=> 'The entered value for the setting %s is too long. The maximal allowed length is %d.',
-	'SETTING_TOO_SHORT'		=> 'The entered value for the setting %s is not long enough. The minimal allowed length is %d.',
+	'SETTING_TOO_LOW'		=> 'The entered value for the setting “%1$s” is too low. The minimal allowed value is %2$d.',
+	'SETTING_TOO_BIG'		=> 'The entered value for the setting “%1$s” is too big. The maximal allowed value is %2$d.',	
+	'SETTING_TOO_LONG'		=> 'The entered value for the setting “%1$s” is too long. The maximal allowed length is %2$d.',
+	'SETTING_TOO_SHORT'		=> 'The entered value for the setting “%1$s” is not long enough. The minimal allowed length is %2$d.',
 
 	'UCP'					=> 'User Control Panel',
 	'USERNAMES_EXPLAIN'		=> 'Place each username on a separate line.',
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 0217238a0d..dc28032483 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -47,7 +47,7 @@ $lang = array_merge($lang, array(
 	'CANNOT_DEACTIVATE_BOT'			=> 'You are not allowed to deactivate bot accounts. Please deactivate the bot within the bots page instead.',
 	'CANNOT_DEACTIVATE_FOUNDER'		=> 'You are not allowed to deactivate founder accounts.',
 	'CANNOT_DEACTIVATE_YOURSELF'	=> 'You are not allowed to deactivate your own account.',
-	'CANNOT_FORCE_REACT_BOT'		=> 'You are not allowed to force reactivation on bot accounts. Please deactivate the bot within the bots page instead.',
+	'CANNOT_FORCE_REACT_BOT'		=> 'You are not allowed to force reactivation on bot accounts. Please reactivate the bot within the bots page instead.',
 	'CANNOT_FORCE_REACT_FOUNDER'	=> 'You are not allowed to force reactivation on founder accounts.',
 	'CANNOT_FORCE_REACT_YOURSELF'	=> 'You are not allowed to force reactivation of your own account.',
 	'CANNOT_REMOVE_ANONYMOUS'		=> 'You are not able to remove the guest user account.',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 3f3eb7165b..a6703f4337 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -85,7 +85,7 @@ $lang = array_merge($lang, array(
 	'CONVERT_NEW_CONVERSION'	=> 'New conversion',
 	'CONVERT_NOT_EXIST'			=> 'The specified convertor does not exist.',
 	'CONVERT_OPTIONS'			=> 'Options',
-	'CONVERT_SETTINGS_VERIFIED'	=> 'The information you entered has been verified. To start the conversion process, push the button below to begin.',
+	'CONVERT_SETTINGS_VERIFIED'	=> 'The information you entered has been verified. To start the conversion process, please push the button below.',
 	'CONV_ERR_FATAL'			=> 'Fatal conversion error',
 
 	'CONV_ERROR_ATTACH_FTP_DIR'			=> 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index dfeb1f20dd..4f9920c931 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -88,7 +88,7 @@ $lang = array_merge($lang, array(
 	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
 	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
-	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$.2lf KiB.',
+	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$.2f KiB.',
 	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
 	'AVATAR_GALLERY'				=> 'Local gallery',
 	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 459efc72b3..f255862430 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -4,7 +4,7 @@
 	<!-- IF S_PRIVMSGS and not S_SHOW_DRAFTS -->
 
 		<div class="column1">
-		<!-- IF not S_ALLOW_MASS_PM -->
+		<!-- IF S_ALLOW_MASS_PM -->
 			<!-- IF .to_recipient -->
 				<dl>
 					<dt><label>{L_TO}:</label></dt>
author	Meik Sievertsen <acydburn@phpbb.com>	2008-03-31 14:58:14 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2008-03-31 14:58:14 +0000
commit	3e42df098cedbd4c70f893ea23de7f06df519fe2 (patch)
tree	df5d5b407cf15af4219b244c79d530bc3e1424ba
parent	45c97a40d268ec2be7e3300a46a2068e75f5ce52 (diff)
download	forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.gz forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.bz2 forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.xz forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.zip