some beautifications as well as making sure manually deactivated accounts are properly handled

git-svn-id: file:///svn/phpbb/trunk@7258 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/adm/style/install_convert.html

@@ -78,7 +78,7 @@
 			<!-- ELSE -->
 
 				<dl>
-					<dt>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dt><label>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 					<dd>{checks.RESULT}</dd>
 				</dl>
 			<!-- ENDIF -->

phpBB/adm/style/install_header.html

@@ -19,10 +19,12 @@
 		<h1>{L_INSTALL_PANEL}</h1>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 		<!-- IF S_LANG_SELECT -->
-		<form method="post">
+		<form method="post" action="">
+			<fieldset class="nobg">
 				<label for="language">{L_SELECT_LANG}:</label>
 				{S_LANG_SELECT}
 				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
+			</fieldset>
 		</form>
 		<!-- ENDIF -->
 	</div>

phpBB/adm/style/install_install.html

@@ -1,6 +1,6 @@
 <!-- INCLUDE install_header.html -->
 
-<form id="install_install" method="post" action="{U_ACTION}">
+<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
 
 <!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
 <!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
@@ -68,7 +68,7 @@
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
 		{S_HIDDEN}
-		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
 	</fieldset>
 <!-- ENDIF -->
 

phpBB/includes/acp/acp_disallow.php

@@ -67,7 +67,7 @@ class acp_disallow
 
 			add_log('admin', 'LOG_DISALLOW_DELETE');
 
-			trigger_error($user->lang['DISALLOWED_DELETED'] . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($user->lang['DISALLOWED_DELETED'] . adm_back_link($this->u_action));
 		}
 
 		// Grab the current list of disallowed usernames...

phpBB/includes/ucp/ucp_remind.php

@@ -28,7 +28,7 @@ class ucp_remind
 
 		if ($submit)
 		{
-			$sql = 'SELECT user_id, username, user_email, user_jabber, user_notify_type, user_type, user_lang
+			$sql = 'SELECT user_id, username, user_email, user_jabber, user_notify_type, user_type, user_lang, user_inactive_reason
 				FROM ' . USERS_TABLE . "
 				WHERE user_email = '" . $db->sql_escape($email) . "'
 					AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
@@ -41,10 +41,22 @@ class ucp_remind
 				trigger_error('NO_EMAIL_USER');
 			}
 
+			if ($user_row['user_type'] == USER_IGNORE)
+			{
+				trigger_error('NO_USER');
+			}
+
 			if ($user_row['user_type'] == USER_INACTIVE)
+			{
+				if ($user_row['user_inactive_reason'] == INACTIVE_MANUAL)
+				{
+					trigger_error('ACCOUNT_DEACTIVATED');
+				}
+				else
 				{
 					trigger_error('ACCOUNT_NOT_ACTIVATED');
 				}
+			}
 
 			$server_url = generate_board_url();
 

phpBB/includes/ucp/ucp_resend.php

@@ -28,7 +28,7 @@ class ucp_resend
 
 		if ($submit)
 		{
-			$sql = 'SELECT user_id, group_id, username, user_email, user_type, user_lang, user_actkey
+			$sql = 'SELECT user_id, group_id, username, user_email, user_type, user_lang, user_actkey, user_inactive_reason
 				FROM ' . USERS_TABLE . "
 				WHERE user_email = '" . $db->sql_escape($email) . "'
 					AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
@@ -41,11 +41,21 @@ class ucp_resend
 				trigger_error('NO_EMAIL_USER');
 			}
 
-			if (!$user_row['user_actkey'])
+			if ($user_row['user_type'] == USER_IGNORE)
+			{
+				trigger_error('NO_USER');
+			}
+
+			if (!$user_row['user_actkey'] && $user_row['user_type'] != USER_INACTIVE)
 			{
 				trigger_error('ACCOUNT_ALREADY_ACTIVATED');
 			}
 
+			if (!$user_row['user_actkey'] || ($user_row['user_type'] == USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_MANUAL))
+			{
+				trigger_error('ACCOUNT_DEACTIVATED');
+			}
+
 			// Determine coppa status on group (REGISTERED(_COPPA))
 			$sql = 'SELECT group_name, group_type
 				FROM ' . GROUPS_TABLE . '

phpBB/install/index.php

@@ -194,6 +194,11 @@ $auth = new auth();
 $cache = new cache();
 $template = new template();
 
+// Set some standard variables we want to force
+$config = array(
+	'load_tplcompile'	=> '1'
+);
+
 $template->set_custom_template('../adm/style', 'admin');
 $template->assign_var('T_TEMPLATE_PATH', '../adm/style');
 
@@ -645,8 +650,8 @@ class module
 			break;
 
 			case 'radio':
-				$key_yes	= ($value) ? ' checked="checked"' : '';
+				$key_yes	= ($value) ? ' checked="checked" id="' . $name . '"' : '';
-				$key_no		= (!$value) ? ' checked="checked"' : '';
+				$key_no		= (!$value) ? ' checked="checked" id="' . $name . '"' : '';
 
 				$tpl_type_cond = explode('_', $tpl_type[1]);
 				$type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true;

phpBB/language/en/common.php

@@ -44,8 +44,9 @@ $lang = array_merge($lang, array(
 	'6_MONTHS'		=> '6 months',
 	'7_DAYS'		=> '7 days',
 
-	'ACCOUNT_ALREADY_ACTIVATED'		=> 'Your account is already activated',
+	'ACCOUNT_ALREADY_ACTIVATED'		=> 'Your account is already activated.',
-	'ACCOUNT_NOT_ACTIVATED'			=> 'Your account has not been activated yet',
+	'ACCOUNT_DEACTIVATED'			=> 'Your account has been manually deactivated and is only able to be reactivated by an administrator.',
+	'ACCOUNT_NOT_ACTIVATED'			=> 'Your account has not been activated yet.',
 	'ACP'							=> 'Administration Control Panel',
 	'ACTIVE'						=> 'active',
 	'ACTIVE_ERROR'					=> 'You have specified an inactive username. Please activate your account and try again. If you continue to have problems please contact a board administrator.',