Various admin lang and other fixes ... this will break other things I'm sure, only submit bug reports for recently commited files

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

phpBB/admin/admin_board.php

@@ -55,20 +55,24 @@ else
 		}
 	}
 
-	if($HTTP_POST_VARS['submit'])
+	if( isset($HTTP_POST_VARS['submit']) )
 	{
-		message_die(GENERAL_MESSAGE, $lang['Config_updated']);
+		$message = $lang['Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_config'], "<a href=\"" . append_sid("admin_board.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
+
+		message_die(GENERAL_MESSAGE, $message);
 	}
 }
 
 $style_select = style_select($new['default_style'], 'default_style', "../templates");
-
-$admin_style_select = style_select($new['default_admin_style'], 'default_admin_style', "../templates");
-
 $lang_select = language_select($new['default_lang'], 'default_lang', "../language");
-
 $timezone_select = tz_select($new['board_timezone'], 'board_timezone');
 
+$disable_board_yes = ( $new['board_disable'] ) ? "checked=\"checked\"" : "";
+$disable_board_no = ( !$new['board_disable'] ) ? "checked=\"checked\"" : "";
+
+$cookie_secure_yes = ( $new['cookie_secure'] ) ? "checked=\"checked\"" : "";
+$cookie_secure_no = ( !$new['cookie_secure'] ) ? "checked=\"checked\"" : "";
+
 $html_tags = $new['allow_html_tags'];
 
 $override_user_style_yes = ( $new['override_user_style'] ) ? "checked=\"checked\"" : "";
@@ -129,7 +133,16 @@ $template->assign_vars(array(
 	"L_GENERAL_SETTINGS" => $lang['General_settings'],
 	"L_SITE_NAME" => $lang['Site_name'],
 	"L_SITE_DESCRIPTION" => $lang['Site_desc'],
+	"L_DISABLE_BOARD" => $lang['Board_disable'], 
+	"L_DISABLE_BOARD_EXPLAIN" => $lang['Board_disable_explain'], 
 	"L_ACCT_ACTIVATION" => $lang['Acct_activation'], 
+	"L_COOKIE_SETTINGS" => $lang['Cookie_settings'], 
+	"L_COOKIE_SETTINGS_EXPLAIN" => $lang['Cookie_settings_explain'], 
+	"L_COOKIE_NAME" => $lang['Cookie_name'], 
+	"L_COOKIE_DOMAIN" => $lang['Cookie_domain'], 
+	"L_COOKIE_PATH" => $lang['Cookie_path'], 
+	"L_SESSION_LENGTH" => $lang['Session_length'], 
+	"L_COOKIE_SECURE" => $lang['Cookie_secure'], 
 	"L_PRIVATE_MESSAGING" => $lang['Private_Messaging'], 
 	"L_INBOX_LIMIT" => $lang['Inbox_limits'], 
 	"L_SENTBOX_LIMIT" => $lang['Sentbox_limits'], 
@@ -189,9 +202,12 @@ $template->assign_vars(array(
 	"L_USE_SMTP_EXPLAIN" => $lang['Use_SMTP_explain'],
 	"L_SMTP_SERVER" => $lang['SMTP_server'], 
 	"L_SUBMIT" => $lang['Submit'], 
+	"L_RESET" => $lang['Reset'], 
 	
 	"SITENAME" => $new['sitename'],
 	"SITE_DESCRIPTION" => $new['site_desc'], 
+	"S_DISABLE_BOARD_YES" => $disable_board_yes,
+	"S_DISABLE_BOARD_NO" => $disable_board_no,
 	"ACTIVATION_NONE" => USER_ACTIVATION_NONE, 
 	"ACTIVATION_NONE_CHECKED" => $activation_none,
 	"ACTIVATION_USER" => USER_ACTIVATION_SELF, 
@@ -216,6 +232,12 @@ $template->assign_vars(array(
 	"INBOX_LIMIT" => $new['max_inbox_privmsgs'], 
 	"SENTBOX_LIMIT" => $new['max_sentbox_privmsgs'],
 	"SAVEBOX_LIMIT" => $new['max_savebox_privmsgs'],
+	"COOKIE_NAME" => $new['cookie_name'], 
+	"COOKIE_DOMAIN" => $new['cookie_domain'], 
+	"COOKIE_PATH" => $new['cookie_path'], 
+	"SESSION_LENGTH" => $new['session_length'], 
+	"S_COOKIE_SECURE_ENABLED" => $cookie_secure_yes, 
+	"S_COOKIE_SECURE_DISABLED" => $cookie_secure_no, 
 	"GZIP_YES" => $gzip_yes,
 	"GZIP_NO" => $gzip_no,
 	"PRUNE_YES" => $prune_yes,

phpBB/admin/admin_forumauth.php

@@ -201,10 +201,10 @@ if( empty($forum_id) )
 	$select_list .= "</select>";
 
 	$template->assign_vars(array(
-		"L_AUTH_TITLE" => $lang['Forum'] . " " . $lang['Auth_Control'],
+		"L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
 		"L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
-		"L_AUTH_SELECT" => $lang['Select_a'] . " " . $lang['Forum'],
+		"L_AUTH_SELECT" => $lang['Select_a_Forum'],
-		"L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Forum'],
+		"L_LOOK_UP" => $lang['Look_up_Forum'],
 
 		"S_AUTH_ACTION" => append_sid("admin_forumauth.$phpEx"),
 		"S_AUTH_SELECT" => $select_list)
@@ -328,10 +328,10 @@ else
 	$template->assign_vars(array(
 		"FORUM_NAME" => $forum_name,
 
-		"L_AUTH_TITLE" => $lang['Forum'] . " " . $lang['Auth_Control'],
+		"L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
 		"L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
-		"L_SUBMIT_CHANGES" => $lang['Submit_changes'],
+		"L_SUBMIT" => $lang['Submit'],
-		"L_RESET_CHANGES" => $lang['Reset_changes'],
+		"L_RESET" => $lang['Reset'],
 
 		"U_FORUMAUTH_ACTION" => append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id"),
 		"U_SWITCH_MODE" => $u_switch_mode,

phpBB/admin/admin_groupauth.php

@@ -455,48 +455,52 @@ if( isset($HTTP_POST_VARS['submit']) && ( !empty($HTTP_POST_VARS[POST_GROUPS_URL
 	//
 	// Any warnings?
 	//
-	$warning_list = "";
+	$warning_list_mod = "";
 	while( list($forum_id, $user_ary) = each($warning_mod_userid) )
 	{
 		for($i = 0; $i < count($user_ary); $i++)
 		{
-			if(!empty($valid_auth_mod_sql[$forum_id]))
+			echo $user_ary[$i];
+			if( !empty($valid_auth_mod_sql[$forum_id]) )
 			{
-				$warning_list .= "<b><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_mod_username[$forum_id][$i] . "</a></b> " . $lang['has_moderator_status'] .  " <b>" . $warning_mod_frmname[$forum_id][$i] . "</b><br />";
+				$warning_list_mod .= "<br /><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_mod_username[$forum_id][$i] . "</a> -> " . $warning_mod_frmname[$forum_id][$i];
 			}
 		}
 	}
 
+	$warning_list_acl = "";
 	while( list($forum_id, $user_ary) = each($warning_prv_userid) )
 	{
 		for($i = 0; $i < count($user_ary); $i++)
 		{
-			if(!empty($valid_auth_prv_sql[$forum_id]))
+			if( !empty($valid_auth_prv_sql[$forum_id]) )
 			{
-				$warning_list .= "<b><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_prv_username[$forum_id][$i] . "</a></b> " . $lang['has_access_status'] .  " <b>" . $warning_prv_frmname[$forum_id][$i] . "</b><br />";
+				$warning_list_acl .= "<br /><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_prv_username[$forum_id][$i] . "</a> -> " . $warning_prv_frmname[$forum_id][$i];
 			}
 		}
 	}
 
-	if($warning_list != "")
+	$warning_list = "";
+	if( $warning_list_mod != "" )
 	{
-		$warning_list = "<br />" . $lang['Conflict_message_groupauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] ." <a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id") . "\">" . $lang['HERE'] . "</a> " . $lang['return_group_auth_admin'] . "<br />";
+		$warning_list .= $lang['Conflict_mod_groupauth'] . "<br />" . $warning_list_mod;
+	}
+	if( $warning_list_acl != "" )
+	{
+		$warning_list .= $lang['Conflict_access_groupauth'] . "<br />" . $warning_list_acl;
+	}
 
-		include('page_header_admin.'.$phpEx);
+	if( $warning_list != "" )
+	{
+		$message =  $warning_list . "<br /><br />" . sprintf($lang['Click_return_groupauth'], "<a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
 
-		$template->set_filenames(array(
+		message_die(GENERAL_MESSAGE, $message);
-			"body" => "admin/admin_message_body.tpl")
-		);
-
-		$template->assign_vars(array(
-			"MESSAGE_TITLE" => $lang['Conflict_warning'],
-			"MESSAGE_TEXT" => $warning_list)
-		);
 	}
 	else
 	{
+		$message = $lang['Auth_updated'] . "<br /><br />" . sprintf($lang['Click_return_groupauth'], "<a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
 
-		header("Location: " . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id", true));
+		message_die(GENERAL_MESSAGE, $message);
 	}
 
 }
@@ -733,10 +737,10 @@ else if( !empty($HTTP_POST_VARS[POST_GROUPS_URL]) || !empty($HTTP_GET_VARS[POST_
 		$optionlist_mod .= "</select>";
 
 		$row_class = ( !($i%2) ) ? "row2" : "row1";
-		$row_color = "#" . ( ( !($i%2) ) ? $theme['td_color1'] : $theme['td_color2'] );
+		$row_color = ( !($i%2) ) ? $theme['td_color1'] : $theme['td_color2'];
 
 		$template->assign_block_vars("forums", array(
-			"ROW_COLOR" => $row_color,
+			"ROW_COLOR" => "#" . $row_color,
 			"ROW_CLASS" => $row_class,
 			"FORUM_NAME" => $forum_access[$i]['forum_name'],
 
@@ -818,18 +822,19 @@ else if( !empty($HTTP_POST_VARS[POST_GROUPS_URL]) || !empty($HTTP_GET_VARS[POST_
 	$switch_mode_text = ( !$adv ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
 	$u_switch_mode = '<a href="' . append_sid($switch_mode) . '">' . $switch_mode_text . '</a>';
 
+	$template->assign_block_vars("switch_group_auth", array());
+
 	$template->assign_vars(array(
 		"USERNAME" => $t_groupname,
-		"USER_GROUP_MEMBERSHIPS" => $lang['Group_has_members'] . ": " . $t_usergroup_list,
+		"GROUP_MEMBERSHIP" => $lang['Usergroup_members'] . ": " . $t_usergroup_list,
-
 
 		"L_USER_OR_GROUPNAME" => $lang['Group_name'],
-		"L_AUTH_TITLE" => $lang['Group'] . " " . $lang['Auth_Control'],
+		"L_AUTH_TITLE" => $lang['Auth_Control_Group'],
-		"L_AUTH_EXPLAIN" => $lang['User_auth_explain'],
+		"L_AUTH_EXPLAIN" => $lang['Group_auth_explain'],
 		"L_MODERATOR_STATUS" => $lang['Moderator_status'],
 		"L_PERMISSIONS" => $lang['Permissions'],
-		"L_SUBMIT_CHANGES" => $lang['Submit_changes'],
+		"L_SUBMIT" => $lang['Submit'],
-		"L_RESET_CHANGES" => $lang['Reset_changes'],
+		"L_RESET" => $lang['Reset'],
 
 		"U_USER_OR_GROUP" => append_sid("admin_groupauth.$phpEx"),
 		"U_SWITCH_MODE" => $u_switch_mode,
@@ -867,10 +872,10 @@ else
 	);
 
 	$template->assign_vars(array(
-		"L_AUTH_TITLE" => $lang['Group'] . " " . $lang['Auth_Control'],
+		"L_AUTH_TITLE" => $lang['Auth_Control_Group'],
 		"L_AUTH_EXPLAIN" => $lang['Group_auth_explain'],
-		"L_AUTH_SELECT" => $lang['Select_a'] . " " . $lang['Group'],
+		"L_AUTH_SELECT" => $lang['Select_a_Group'],
-		"L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Group'],
+		"L_LOOK_UP" => $lang['Look_up_Group'],
 
 		"S_AUTH_ACTION" => append_sid("admin_groupauth.$phpEx"),
 		"S_AUTH_SELECT" => $select_list)

phpBB/admin/admin_mass_email.php

@@ -39,24 +39,11 @@ $phpbb_root_dir = "./../";
 $no_page_header = TRUE;
 require('pagestart.inc');
 
-
-//
-// Set VERBOSE to 1  for debugging info..
-//
-if(DEBUG)
-{
-	define("VERBOSE", 1);
-}
-else
-{
-	define("VERBOSE", 0);
-}
-
 //
 // Increase maximum execution time in case of a lot of users, but don't complain about it if it isn't
 // allowed.
 //
-@set_time_limit(600);
+@set_time_limit(1200);
 
 //
 // Set form names
@@ -64,68 +51,111 @@ else
 $f_title = 'e_title';
 $f_msg = 'e_msg';
 
-if(isset($HTTP_POST_VARS['submit']))
+if( isset($HTTP_POST_VARS['submit']) )
 {
-	$group_id = $HTTP_POST_VARS[POST_GROUPS_URL];
+	$group_id = intval($HTTP_POST_VARS[POST_GROUPS_URL]);
-	if($group_id != -1)
+
+	if( $group_id != -1 )
 	{
-		$sql = 'SELECT u.user_email 
+		$sql = "SELECT u.user_email 
-			FROM '.USERS_TABLE.' u, '.USER_GROUP_TABLE.' g
+			FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " g
-			WHERE u.user_id = g.user_id AND g.group_id = '.$group_id;
+			WHERE u.user_id = g.user_id 
+				AND g.group_id = $group_id";
 	}
 	else
 	{
-		$sql = 'SELECT user_email FROM '.USERS_TABLE;
+		$sql = "SELECT user_email 
+			FROM " . USERS_TABLE;
 	}
-	if(!$g_result = $db->sql_query($sql))
+
+	if( !$result = $db->sql_query($sql) )
 	{
 		message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql);
 	}
-	$g_list = $db->sql_fetchrowset($g_result);
+	$email_list = $db->sql_fetchrowset($g_result);
 	
-	$email_headers = "From: " . $board_config['board_email'] . "\r\n";
+	$subject = stripslashes($HTTP_POST_VARS["$f_title"]);
-	$msg = stripslashes($HTTP_POST_VARS["$f_msg"]);
+	$message = stripslashes($HTTP_POST_VARS["$f_msg"]);
 	
-	$email_headers .= 'bcc: ';
+	include($phpbb_root_path . 'includes/emailer.'.$phpEx);
-	for($i = 0;$i < count($g_list); $i++)
+	$emailer = new emailer($board_config['smtp_delivery']);
+
+	$email_headers = "From: " . $board_config['board_email'] . "\n";
+
+	$bcc_list = "";
+	for($i = 0; $i < count($email_list); $i++)
 	{
-		if($i != 0)
+		if( $bcc_list != "" )
 		{
-			$email_headers.= ' ,';
+			$bcc_list .= ", ";
 		}
-		$email_headers .= $g_list[$i]['user_email'];
+		$bcc_list .= $email_list[$i]['user_email'];
 	}
+	$email_headers .= "Bcc: $bcc_list\n";
+	
+	$email_headers .= "Return-Path: " . $userdata['board_email'] . "\n";
+	$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
+	$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
+	$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
+	$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
+
+	$emailer->use_template("admin_send_email");
+	$emailer->email_address($board_config['board_email']);
+	$emailer->set_subject($subject);
+	$emailer->extra_headers($email_headers);
+
+	$emailer->assign_vars(array(
+		"SITENAME" => $board_config['sitename'], 
+		"BOARD_EMAIL" => $board_config['board_email'], 
+		"MESSAGE" => $message)
+	);
+	$emailer->send();
+	$emailer->reset();
+
+	$template->assign_vars(array(
+		"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
+	);
+
+	$message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_admin_index'],  "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
+
+	message_die(GENERAL_MESSAGE, $message);
 
-	mail($board_config['board_email'],$HTTP_POST_VARS["$f_title"],$HTTP_POST_VARS["$f_msg"],$email_headers);
-	$notice = $lang['Messages'].' '.$lang['Sent'].'!';
 }	
-//Else, or if they already sent a message
 
-$sql = "SELECT group_id, group_name FROM ".GROUPS_TABLE.' WHERE group_single_user <> 1';
+//
+// Initial selection
+//
+
+$sql = "SELECT group_id, group_name 
+	FROM ".GROUPS_TABLE . "  
+	WHERE group_single_user <> 1";
 $g_result = $db->sql_query($sql);
 $group_list = $db->sql_fetchrowset($g_result);
 
-$select_list = '<SELECT name = "'.POST_GROUPS_URL.'">';
+$select_list = '<select name = "' . POST_GROUPS_URL . '">';
-$select_list .= '<OPTION value = "-1">'.$lang['All'].'</OPTION>';
+$select_list .= '<option value = "-1">' . $lang['All_users'] . '</option>';
 
 for($i = 0;$i < count($group_list); $i++)
 {
-	$select_list .= "<OPTION value = \"".$group_list[$i]['group_id'];
+	$select_list .= "<option value = \"" . $group_list[$i]['group_id'];
-	$select_list .= "\">".$group_list[$i]['group_name']."</OPTION>";
+	$select_list .= "\">" . $group_list[$i]['group_name'] . "</option>";
 }
-$select_list .= "</SELECT>";
+$select_list .= "</select>";
 
+//
+// Generate page
+//
 include('page_header_admin.'.$phpEx);
 
 $template->set_filenames(array(
-	"body" => "admin/user_email.tpl")
+	"body" => "admin/user_email_body.tpl")
 );
 
 $template->assign_vars(array(
 	"L_EMAIL_TITLE" => $lang['Email'],
 	"L_EMAIL_EXPLAIN" => $lang['Mass_email_explain'],
 	"L_COMPOSE" => $lang['Compose'],
-	"L_GROUP_SELECT" => $lang['Group'],
+	"L_RECIPIENTS" => $lang['Recipients'],
 	"L_EMAIL_SUBJECT" => $lang['Subject'],
 	"L_EMAIL_MSG" => $lang['Message'],
 	"L_EMAIL" => $lang['Email'],
@@ -140,4 +170,5 @@ $template->assign_vars(array(
 $template->pparse('body');
 
 include('page_footer_admin.'.$phpEx);
+
 ?>

phpBB/admin/admin_user_ban.php

@@ -23,8 +23,7 @@
 if($setmodules == 1)
 {
 	$filename = basename(__FILE__);
-	$module['Users']['Ban'] = $filename . "?mode=ban";
+	$module['Users']['Ban_Management'] = $filename;
-	$module['Users']['Un-ban'] = $filename . "?mode=unban";
 
 	return;
 }
@@ -35,30 +34,19 @@ if($setmodules == 1)
 $phpbb_root_dir = "./../";
 require('pagestart.inc');
 
-if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
-{
-	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
-}
-else
-{
-	$mode = "unban";
-}
-
 //
 // Start program
 //
-if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
+if( isset($HTTP_POST_VARS['submit']) )
 {
-	if($HTTP_POST_VARS['bancontrol'] == "ban")
-	{
 	$user_bansql = "";
 	$email_bansql = "";
 	$ip_bansql = "";
 
 	$user_list = array();
-		if(isset($HTTP_POST_VARS['user']))
+	if(isset($HTTP_POST_VARS['ban_user']))
 	{
-			$user_list_temp = $HTTP_POST_VARS['user'];
+		$user_list_temp = $HTTP_POST_VARS['ban_user'];
 
 		for($i = 0; $i < count($user_list_temp); $i++)
 		{
@@ -67,9 +55,9 @@ if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
 	}
 
 	$ip_list = array();
-		if(isset($HTTP_POST_VARS['ip']))
+	if(isset($HTTP_POST_VARS['ban_ip']))
 	{
-			$ip_list_temp = explode(",", $HTTP_POST_VARS['ip']);
+		$ip_list_temp = explode(",", $HTTP_POST_VARS['ban_ip']);
 
 		for($i = 0; $i < count($ip_list_temp); $i++)
 		{
@@ -152,9 +140,9 @@ if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
 	}
 
 	$email_list = array();
-		if(isset($HTTP_POST_VARS['email']))
+	if(isset($HTTP_POST_VARS['ban_mail']))
 	{
-			$email_list_temp = explode(",", $HTTP_POST_VARS['email']);
+		$email_list_temp = explode(",", $HTTP_POST_VARS['ban_mail']);
 
 		for($i = 0; $i < count($email_list_temp); $i++)
 		{
@@ -276,15 +264,12 @@ if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
 			}
 		}
 	}
-	}
-	else if($HTTP_POST_VARS['bancontrol'] == "unban")
-	{
 
 	$where_sql = "";
 
-		if(isset($HTTP_POST_VARS['user']))
+	if(isset($HTTP_POST_VARS['unban_user']))
 	{
-			$user_list = $HTTP_POST_VARS['user'];
+		$user_list = $HTTP_POST_VARS['unban_user'];
 
 		for($i = 0; $i < count($user_list); $i++)
 		{
@@ -299,9 +284,9 @@ if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
 		}
 	}
 
-		if(isset($HTTP_POST_VARS['ip']))
+	if(isset($HTTP_POST_VARS['unban_ip']))
 	{
-			$ip_list = $HTTP_POST_VARS['ip'];
+		$ip_list = $HTTP_POST_VARS['unban_ip'];
 
 		for($i = 0; $i < count($ip_list); $i++)
 		{
@@ -316,9 +301,9 @@ if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
 		}
 	}
 
-		if(isset($HTTP_POST_VARS['email']))
+	if(isset($HTTP_POST_VARS['unban_email']))
 	{
-			$email_list = $HTTP_POST_VARS['email'];
+		$email_list = $HTTP_POST_VARS['unban_email'];
 
 		for($i = 0; $i < count($email_list); $i++)
 		{
@@ -342,14 +327,29 @@ if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
 			message_die(GENERAL_ERROR, "Couldn't delete ban info from database", "", __LINE__, __FILE__, $sql);
 		}
 	}
-	}
 
 	message_die(GENERAL_MESSAGE, $lang['Ban_update_sucessful']);
+
 }
 else
 {
-	if( $mode == "ban" )
+
-	{
+	$template->set_filenames(array(
+		"body" => "admin/user_ban_body.tpl")
+	);
+
+	$template->assign_vars(array(
+		"L_BAN_TITLE" => $lang['Ban_control'],
+		"L_BAN_EXPLAIN" => $lang['Ban_explain'],
+		"L_BAN_EXPLAIN_WARN" => $lang['Ban_explain_warn'],
+		"L_IP_OR_HOSTNAME" => $lang['IP_hostname'],
+		"L_EMAIL_ADDRESS" => $lang['Email_address'],
+		"L_SUBMIT" => $lang['Submit'],
+		"L_RESET" => $lang['Reset'],
+
+		"S_BANLIST_ACTION" => append_sid("admin_user_ban.$phpEx"))
+	);
+
 	$userban_count = 0;
 
 	$sql = "SELECT user_id, username
@@ -359,42 +359,25 @@ else
 	$u_result = $db->sql_query($sql);
 	$user_list = $db->sql_fetchrowset($u_result);
 
-		$select_userlist = "<option value=\"0\">Select a Username</option>";
+	$select_userlist = "";
 	for($i = 0; $i < count($user_list); $i++)
 	{
 		$select_userlist .= "<option value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
 		$userban_count++;
 	}
-		$select_userlist = "<select name=\"user[]\"" . ( ($userban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" : ">" ) . $select_userlist . "</select>";
+	$select_userlist = "<select name=\"ban_user[]\" multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" . $select_userlist . "</select>";
-
-		$template->set_filenames(array(
-			"body" => "admin/user_ban_body.tpl")
-		);
-
-		$s_hidden_fields = "<input type=\"hidden\" name=\"bancontrol\" value=\"ban\" />";
 
 	$template->assign_vars(array(
-			"L_BAN_TITLE" => $lang['Ban_control'],
-			"L_BAN_EXPLAIN" => $lang['Ban_explain'],
-			"L_BAN_EXPLAIN_WARN" => $lang['Ban_explain_warn'],
 		"L_BAN_USER" => $lang['Ban_username'],
 		"L_BAN_USER_EXPLAIN" => $lang['Ban_username_explain'],
 		"L_BAN_IP" => $lang['Ban_IP'],
-			"L_IP_OR_HOSTNAME" => $lang['IP_hostname'],
 		"L_BAN_IP_EXPLAIN" => $lang['Ban_IP_explain'],
 		"L_BAN_EMAIL" => $lang['Ban_email'],
-			"L_EMAIL_ADDRESS" => $lang['Email_address'],
 		"L_BAN_EMAIL_EXPLAIN" => $lang['Ban_email_explain'],
-			"L_SUBMIT" => $lang['Submit'],
-			"L_RESET" => $lang['Reset'],
 
-			"S_USERLIST_SELECT" => $select_userlist,
+		"S_BAN_USERLIST_SELECT" => $select_userlist)
-			"S_HIDDEN_FIELDS" => $s_hidden_fields,
-			"S_BAN_ACTION" => append_sid("admin_user_ban.$phpEx"))
 	);
-	}
+
-	else if( $mode == "unban" )
-	{
 	$userban_count = 0;
 	$ipban_count = 0;
 	$emailban_count = 0;
@@ -424,7 +407,7 @@ else
 		$select_userlist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_userlist;
 	}
 
-		$select_userlist = "<select name=\"user[]\"" . ( ($userban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" : ">" ) . $select_userlist;
+	$select_userlist = "<select name=\"unban_user[]\" multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" . $select_userlist;
 	$select_userlist .= "</select>";
 
 	$sql = "SELECT ban_id, ban_ip, ban_email
@@ -471,39 +454,22 @@ else
 		$select_emaillist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_emaillist;
 	}
 
-		$select_iplist = "<select name=\"ip[]\"" . ( ($ipban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $ipban_count) . "\">" : ">" ) . $select_iplist . "</select>";
+	$select_iplist = "<select name=\"unban_ip[]\" multiple=\"multiple\" size=\"" . min(5, $ipban_count) . "\">" . $select_iplist . "</select>";
-		$select_emaillist = "<select name=\"email[]\"" . ( ($emailban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $emailban_count) . "\">" : ">" ) . $select_emaillist . "</select>";
+	$select_emaillist = "<select name=\"unban_email[]\" multiple=\"multiple\" size=\"" . min(5, $emailban_count) . "\">" . $select_emaillist . "</select>";
-
-		$template->set_filenames(array(
-			"body" => "admin/user_unban_body.tpl")
-		);
-
-		$s_hidden_fields = "<input type=\"hidden\" name=\"bancontrol\" value=\"unban\" />";
 
 	$template->assign_vars(array(
-			"L_BAN_TITLE" => $lang['Ban_control'],
+		"L_UNBAN_USER" => $lang['Unban_username'],
-			"L_BAN_EXPLAIN" => $lang['Ban_explain'],
+		"L_UNBAN_USER_EXPLAIN" => $lang['Unban_username_explain'],
-			"L_BAN_USER" => $lang['Unban_username'],
+		"L_UNBAN_IP" => $lang['Unban_IP'],
-			"L_BAN_USER_EXPLAIN" => $lang['Unban_username_explain'],
+		"L_UNBAN_IP_EXPLAIN" => $lang['Unban_IP_explain'],
-			"L_BAN_IP" => $lang['Unban_IP'],
+		"L_UNBAN_EMAIL" => $lang['Unban_email'],
-			"L_IP_OR_HOSTNAME" => $lang['IP_hostname'],
+		"L_UNBAN_EMAIL_EXPLAIN" => $lang['Unban_email_explain'],
-			"L_BAN_IP_EXPLAIN" => $lang['Unban_IP_explain'],
-			"L_BAN_EMAIL" => $lang['Unban_email'],
-			"L_EMAIL_ADDRESS" => $lang['Email_address'],
-			"L_BAN_EMAIL_EXPLAIN" => $lang['Unban_email_explain'],
-			"L_SUBMIT" => $lang['Submit'],
-			"L_RESET" => $lang['Reset'],
 
-			"S_USERLIST_SELECT" => $select_userlist,
+		"S_UNBAN_USERLIST_SELECT" => $select_userlist,
-			"S_IPLIST_SELECT" => $select_iplist,
+		"S_UNBAN_IPLIST_SELECT" => $select_iplist,
-			"S_EMAILLIST_SELECT" => $select_emaillist,
+		"S_UNBAN_EMAILLIST_SELECT" => $select_emaillist,
-			"S_HIDDEN_FIELDS" => $s_hidden_fields,
 		"S_BAN_ACTION" => append_sid("admin_user_ban.$phpEx"))
 	);
-
-
-	}
-
 }
 
 $template->pparse("body");

phpBB/admin/admin_userauth.php

@@ -531,47 +531,51 @@ if( isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL])
 		//
 		// Any warnings?
 		//
-		$warning_list = "";
+		$warning_list_mod = "";
 		while( list($forum_id, $group_ary) = each($warning_mod_grpid) )
 		{
 			for($i = 0; $i < count($group_ary); $i++)
 			{
 				if(!empty($valid_auth_mod_sql[$forum_id]))
 				{
-					$warning_list .= "<b><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_mod_grpname[$forum_id][$i] . "</a></b> " . $lang['grants_moderator_status'] . " <b>" . $warning_mod_frmname[$forum_id][$i] . "</b> " . $lang['for_this_user'] . "<br />";
+					$warning_list_mod .= "<br /><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_mod_grpname[$forum_id][$i] . "</a> -> " . $warning_mod_frmname[$forum_id][$i];
 				}
 			}
 		}
 
+		$warning_list_acl = "";
 		while( list($forum_id, $group_ary) = each($warning_prv_grpid) )
 		{
 			for($i = 0; $i < count($group_ary); $i++)
 			{
 				if( !empty($valid_auth_prv_sql[$forum_id]) )
 				{
-					$warning_list .= "<b><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_prv_grpname[$forum_id][$i] . "</a></b> " . $lang['grants_access_status'] . " <b>" . $warning_prv_frmname[$forum_id][$i] . "</b> " . $lang['for_this_user'] . "<br />";
+					$warning_list_acl .= "<br /><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_prv_grpname[$forum_id][$i] . "</a> -> " . $warning_prv_frmname[$forum_id][$i];
 				}
 			}
 		}
 
+		$warning_list = "";
+		if( $warning_list_mod != "" )
+		{
+			$warning_list .= $lang['Conflict_mod_groupauth'] . "<br />" . $warning_list_mod;
+		}
+		if( $warning_list_acl != "" )
+		{
+			$warning_list .= $lang['Conflict_access_groupauth'] . "<br />" . $warning_list_acl;
+		}
+
 		if( $warning_list != "" )
 		{
-			$warning_list = "<br />" . $lang['Conflict_message_userauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">" . $lang['HERE'] . "</a> ". $lang['return_user_auth_admin'] . "<br />";
+			$message =  $warning_list . "<br /><br />" . sprintf($lang['Click_return_userauth'], "<a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
 
-			include('page_header_admin.'.$phpEx);
+			message_die(GENERAL_MESSAGE, $message);
-
-			$template->set_filenames(array(
-				"body" => "admin/admin_message_body.tpl")
-			);
-
-			$template->assign_vars(array(
-				"MESSAGE_TITLE" => $lang['Conflict_warning'],
-				"MESSAGE_TEXT" => $warning_list)
-			);
 		}
 		else
 		{
-			header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
+			$message = $lang['Auth_updated'] . "<br /><br />" . sprintf($lang['Click_return_userauth'], "<a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
+
+			message_die(GENERAL_MESSAGE, $message);
 		}
 	}
 }
@@ -849,7 +853,7 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
 	@reset($auth_user);
 
 	$t_username .= $userinf[0]['username'];
-	$s_user_type = ($is_admin) ? '<select name="userlevel"><option value="admin" selected=\"selected\">' . $lang['Administrator'] . '</option><option value="user">' . $lang['User'] . '</option></select>' : '<select name="userlevel"><option value="admin">' . $lang['Administrator'] . '</option><option value="user" selected=\"selected\">' . $lang['User'] . '</option></select>';
+	$s_user_type = ($is_admin) ? '<select name="userlevel"><option value="admin" selected=\"selected\">' . $lang['Auth_Admin'] . '</option><option value="user">' . $lang['Auth_User'] . '</option></select>' : '<select name="userlevel"><option value="admin">' . $lang['Auth_Admin'] . '</option><option value="user" selected=\"selected\">' . $lang['Auth_User'] . '</option></select>';
 
 	for($i = 0; $i < count($userinf); $i++)
 	{
@@ -906,19 +910,22 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
 	$switch_mode_text = ( empty($adv) ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
 	$u_switch_mode = '<a href="' . $switch_mode . '">' . $switch_mode_text . '</a>';
 
+	$template->assign_block_vars("switch_user_auth", array());
+
 	$template->assign_vars(array(
 		"USERNAME" => $t_username,
-		"USER_GROUP_MEMBERSHIPS" => $lang['This_user_is'] . " " . $s_user_type . " " . $lang['and_belongs_groups'] . ": " . $t_usergroup_list,
+		"USER_LEVEL" => $lang['User_Level'] . " : " . $s_user_type,
+		"USER_GROUP_MEMBERSHIPS" => $lang['Group_memberships'] . " : " . $t_usergroup_list,
 
 		"L_USER_OR_GROUPNAME" => $lang['Username'],
 		"L_USER_OR_GROUP" => $lang['User'],
 
-		"L_AUTH_TITLE" => $lang['User'] . " " . $lang['Auth_Control'],
+		"L_AUTH_TITLE" => $lang['Auth_Control_User'],
 		"L_AUTH_EXPLAIN" => $lang['User_auth_explain'],
 		"L_MODERATOR_STATUS" => $lang['Moderator_status'],
 		"L_PERMISSIONS" => $lang['Permissions'],
-		"L_SUBMIT_CHANGES" => $lang['Submit_changes'],
+		"L_SUBMIT" => $lang['Submit'],
-		"L_RESET_CHANGES" => $lang['Reset_changes'],
+		"L_RESET" => $lang['Reset'],
 		"L_MODERATOR_STATUS" => $lang['Moderator_status'],
 
 		"U_USER_OR_GROUP" => append_sid("admin_userauth.$phpEx"),
@@ -958,10 +965,10 @@ else
 	);
 
 	$template->assign_vars(array(
-		"L_USER_TITLE" => $lang['User'] . " " . $lang['Auth_Control'],
+		"L_USER_TITLE" => $lang['Auth_Control_User'],
 		"L_USER_EXPLAIN" => $lang['User_auth_explain'],
-		"L_USER_SELECT" => $lang['Select_a'] . " " . $lang['User'],
+		"L_USER_SELECT" => $lang['Select_a_User'],
-		"L_LOOK_UP" => $lang['Look_up'] . " " . $lang['User'],
+		"L_LOOK_UP" => $lang['Look_up_User'],
 		"L_FIND_USERNAME" => $lang['Find_username'],
 
 		"U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"), 

phpBB/admin/index.php

@@ -57,7 +57,7 @@ if( $HTTP_GET_VARS['pane'] == 'left' )
 		"U_FORUM_INDEX" => append_sid("../index.$phpEx"),
 		"U_ADMIN_INDEX" => append_sid("index.$phpEx?pane=right"),
 
-		"L_FORUM_INDEX" => $lang['Forum_Index'],
+		"L_FORUM_INDEX" => $lang['Main_index'],
 		"L_ADMIN_INDEX" => $lang['Admin_Index'], 
 		"L_PREVIEW_FORUM" => $lang['Preview_forum'])
 	);

phpBB/language/lang_english/lang_admin.php

@@ -11,10 +11,13 @@ $lang['Admin'] = "Administration";
 $lang['Not_admin'] = "You are not authorised to administer this board";
 $lang['Welcome_phpBB'] = "Welcome to phpBB";
 $lang['Admin_intro'] = "Thank you for choosing phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your board. You can get back to this page by clicking on the <u>Admin Index</u> link in the left pane. To return to the index of your board, click the phpBB logo also in the left pane. The other links on the left hand side of this screen will allow you to control every aspect of your forum experience, each screen will have instructions on how to use the tools.";
+$lang['Main_index'] = "Forum Index";
 $lang['Forum_stats'] = "Forum Statistics";
 $lang['Admin_Index'] = "Admin Index";
 $lang['Preview_forum'] = "Preview Forum";
 
+$lang['Click_return_admin_index'] = "Click %sHere%s to return to the Admin Index";
+
 $lang['Statistic'] = "Statistic";
 $lang['Value'] = "Value";
 $lang['Number_posts'] = "Number of posts";
@@ -34,10 +37,12 @@ $lang['Not_available'] = "Not available";
 // DB Utils
 //
 $lang['Database_Utilities'] = "Database Utilities";
+
 $lang['Restore'] = "Restore";
 $lang['Backup'] = "Backup";
 $lang['Restore_explain'] = "This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may upload a gzip compressed text file and it will automatically be decompressed. <b>WARNING</b> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete.";
 $lang['Backup_explain'] = "Here you can backup all your phpBB related data. If you have any additional custom tables in the same database with phpBB that you would like to back up as well please enter their names seperated by commas in the Additional Tables textbox below. If your server supports it you may also gzip compress the file to reduce its size before download.";
+
 $lang['Backup_options'] = "Backup options";
 $lang['Start_backup'] = "Start Backup";
 $lang['Full_backup'] = "Full backup";
@@ -47,6 +52,7 @@ $lang['Additional_tables'] = "Additional tables";
 $lang['Gzip_compress'] = "Gzip compress file";
 $lang['Select_file'] = "Select a file";
 $lang['Start_Restore'] = "Start Restore";
+
 $lang['Restore_success'] = "The Database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.";
 $lang['Backup_download'] = "Your download will start shortly please wait till it begins";
 $lang['Backups_not_supported'] = "Sorry but database backups are not currently supported for your database system";
@@ -60,13 +66,15 @@ $lang['Restore_Error_no_file'] = "No file was uploaded";
 //
 // Auth pages
 //
-$lang['Administrator'] = "Administrator";
+$lang['Select_a_User'] = "Select a User";
-$lang['User'] = "User";
+$lang['Select_a_Group'] = "Select a Group";
-$lang['Group'] = "Group";
+$lang['Select_a_Forum'] = "Select a Forum";
-$lang['Forum'] = "Forum";
+$lang['Auth_Control_User'] = "User Permissions Control"; 
-$lang['Select_a'] = "Select a"; // followed by on the entries above
+$lang['Auth_Control_Group'] = "Group Permissions Control"; 
-$lang['Auth_Control'] = "Authorisation Control"; // preceeded by one of the above options
+$lang['Auth_Control_Forum'] = "Forum Permissions Control"; 
-$lang['Look_up'] = "Look up"; // preceeded by one of the above options
+$lang['Look_up_User'] = "Look up User"; 
+$lang['Look_up_Group'] = "Look up Group"; 
+$lang['Look_up_Forum'] = "Look up Forum"; 
 
 $lang['Group_auth_explain'] = "Here you can alter the permissions and moderator status assigned to each user group. Do not forget when changing group permissions that individual user permissions may still allow the user entry to forums, etc. You will be warned if this is the case.";
 $lang['User_auth_explain'] = "Here you can alter the permissions and moderator status assigned to each individual user. Do not forget when changing user permissions that group permissions may still allow the user entry to forums, etc. You will be warned if this is the case.";
@@ -82,17 +90,11 @@ $lang['Is_Moderator'] = "Is Moderator";
 $lang['Not_Moderator'] = "Not Moderator";
 
 $lang['Conflict_warning'] = "Authorisation Conflict Warning";
-$lang['Conflict_message_userauth'] = "This user still has access/moderator rights to this forum via group membership. You may want to alter the group authorisation or remove this user the group to fully prevent them having access/moderator rights. The groups granting rights are noted below.";
+$lang['Conflict_access_userauth'] = "This user still has access rights to this forum via group membership. You may want to alter the group permissions or remove this user the group to fully prevent them having access rights. The groups granting rights (and the forums involved) are noted below.";
-$lang['Conflict_message_groupauth'] = "The following user/s still have access/moderator rights to this forum via their user auth settings. You may want to alter the user authorisation/s to fully prevent them having access/moderator rights. The users granted rights are noted below.";
+$lang['Conflict_mod_userauth'] = "This user still has moderator rights to this forum via group membership. You may want to alter the group permissions or remove this user the group to fully prevent them having moderator rights. The groups granting rights (and the forums involved) are noted below.";
 
-$lang['has_moderator_status'] = "has moderator status on";
+$lang['Conflict_access_groupauth'] = "The following user (or users) still have access rights to this forum via their user permission settings. You may want to alter the user permissions to fully prevent them having access rights. The users granted rights (and the forums involved) are noted below.";
-$lang['has_access_status'] = "has access status to";
+$lang['Conflict_mod_groupauth'] = "The following user (or users) still have moderator rights to this forum via their user permissions settings. You may want to alter the user permissions to fully prevent them having moderator rights. The users granted rights (and the forums involved) are noted below.";
-$lang['grants_access_status'] = "grants access status to";
-$lang['grants_moderator_status'] = "grants moderator status to";
-$lang['for_this_user'] = "for this user";
-
-$lang['Submit_changes'] = "Submit changes";
-$lang['Reset_changes'] = "Reset changes";
 
 $lang['Public'] = "Public";
 $lang['Private'] = "Private";
@@ -114,17 +116,20 @@ $lang['Pollcreate'] = "Poll create";
 $lang['Permissions'] = "Permissions";
 $lang['Simple_Permission'] = "Simple Permission";
 
-$lang['This_user_is'] = "This user is a"; // followed by User/Administrator and then next line
+$lang['User_Level'] = "User Level"; 
-$lang['and_belongs_groups'] = "and belongs to the following groups"; // followed by list of groups
+$lang['Auth_User'] = "User";
-
+$lang['Auth_Admin'] = "Administrator";
-$lang['Group_has_members'] = "This group has the following members";
+$lang['Group_memberships'] = "Usergroup memberships";
+$lang['Usergroup_members'] = "This group has the following members";
 
 $lang['Forum_auth_updated'] = "Forum permissions updated";
 $lang['User_auth_updated'] = "User permissions updated";
 $lang['Group_auth_updated'] = "Group permissions updated";
-$lang['return_forum_auth_admin'] = "to return to the forum permissions panel";
+
-$lang['return_group_auth_admin'] = "to return to the group permissions panel";
+$lang['Auth_updated'] = "Permissions have been updated";
-$lang['return_user_auth_admin'] = "to return to the user permissions panel";
+$lang['Click_return_userauth'] = "Click %sHere%s to return to User Permissions";
+$lang['Click_return_groupauth'] = "Click %sHere%s to return to Group Permissions";
+$lang['Click_return_forumauth'] = "Click %sHere%s to return to Forum Permissions";
 
 
 //
@@ -134,25 +139,32 @@ $lang['Ban_control'] = "Ban Control";
 $lang['Ban_explain'] = "Here you can control the banning of users. You can achieve this by banning either or both of a specific user or an individual or range of IP addresses or hostnames. These methods prevent a user from even reaching the index page of your board. To prevent a user from registering under a different username you can also specify a banned email address. Please note that banning an email address alone will not prevent that user from being able to logon or post to your board, you should use one of the first two methods to achieve this.";
 $lang['Ban_explain_warn'] = "Please note that entering a range of IP addresses results in all the addresses between the start and end being added to the banlist. Attempts will be made to minimise the number of addresses added to the database by introducing wildcards automatically where appropriate. If you really must enter a range try to keep it small or better yet state specific addresses.";
 
+$lang['Select_username'] = "Select a Username";
+$lang['Select_ip'] = "Select an IP";
+$lang['Select_email'] = "Select an Email address";
+
 $lang['Ban_username'] = "Ban one or more specific users";
 $lang['Ban_username_explain'] = "You can ban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser";
+
 $lang['Ban_IP'] = "Ban one or more IP addresses or hostnames";
 $lang['IP_hostname'] = "IP addresses or hostnames";
 $lang['Ban_IP_explain'] = "To specify several different IP's or hostnames separate them with commas. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use *";
+
 $lang['Ban_email'] = "Ban one or more email addresses";
 $lang['Ban_email_explain'] = "To specify more than one email address separate them with commas. To specify a wildcard username use *, for example *@hotmail.com";
 
 $lang['Unban_username'] = "Un-ban one more specific users";
 $lang['Unban_username_explain'] = "You can unban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser";
+
 $lang['Unban_IP'] = "Un-ban one or more IP addresses";
 $lang['Unban_IP_explain'] = "You can unban multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser";
+
 $lang['Unban_email'] = "Un-ban one or more email addresses";
 $lang['Unban_email_explain'] = "You can unban multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser";
 
-$lang['No_banned_users'] = "No banned users";
+$lang['No_banned_users'] = "No banned usernames";
 $lang['No_banned_ip'] = "No banned IP addresses";
 $lang['No_banned_email'] = "No banned email addresses";
-$lang['No_unban'] = "Leave list unchanged";
 
 $lang['Ban_update_sucessful'] = "The banlist has been updated sucessfully";
 
@@ -162,19 +174,24 @@ $lang['Ban_update_sucessful'] = "The banlist has been updated sucessfully";
 //
 $lang['General_Config'] = "General Configuration";
 $lang['Config_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side.";
+
+$lang['Click_return_config'] = "Click %sHere%s to return to General Configuration";
+
 $lang['General_settings'] = "General Board Settings";
 $lang['Site_name'] = "Site name";
 $lang['Site_desc'] = "Site description";
+$lang['Board_disable'] = "Disable board";
+$lang['Board_disable_explain'] = "This will make the board unavailable to users. Do not logout when you disable the board, you will not be able to log back in!";
 $lang['Acct_activation'] = "Enable account activation";
 
-$lang['Abilities_settings'] = "User/Forum Ability Settings";
+$lang['Abilities_settings'] = "User and Forum Basic Settings";
 $lang['Flood_Interval'] = "Flood Interval";
 $lang['Flood_Interval_explain'] = "Number of seconds a user must wait between posts"; 
 $lang['Board_email_form'] = "User email via board";
 $lang['Board_email_form_explain'] = "Users send email to each other via this board";
 $lang['Topics_per_page'] = "Topics Per Page";
 $lang['Posts_per_page'] = "Posts Per Page";
-$lang['Hot_threshold'] = "Hot Threshold";
+$lang['Hot_threshold'] = "Posts for Popular Threshold";
 $lang['Default_style'] = "Default Style";
 $lang['Override_style'] = "Override user style";
 $lang['Override_style_explain'] = "Replaces users style with the default";
@@ -192,31 +209,34 @@ $lang['Smilies_path'] = "Smilies Storage Path";
 $lang['Smilies_path_explain'] = "Path under your phpBB root dir, e.g. images/smilies";
 $lang['Allow_sig'] = "Allow Signatures";
 $lang['Max_sig_length'] = "Maximum signature length";
-$lang['Max_sig_length_explain'] = "Most number of characters allowed in a users signature";
+$lang['Max_sig_length_explain'] = "Maximum number of characters in user signatures";
-$lang['Allow_name_change'] = "Allow Name Change";
+$lang['Allow_name_change'] = "Allow Username changes";
+
 $lang['Avatar_settings'] = "Avatar Settings";
-$lang['Allow_local'] = "Allow local gallery avatars";
+$lang['Allow_local'] = "Enable gallery avatars";
-$lang['Allow_remote'] = "Allow remote avatars";
+$lang['Allow_remote'] = "Enable remote avatars";
-$lang['Allow_remote_explain'] = "Avatars linked from another website";
+$lang['Allow_remote_explain'] = "Avatars linked to from another website";
-$lang['Allow_upload'] = "Allow avatar uploading";
+$lang['Allow_upload'] = "Enable avatar uploading";
-$lang['Max_filesize'] = "Max. Avatar File Size";
+$lang['Max_filesize'] = "Maximum Avatar File Size";
 $lang['Max_filesize_explain'] = "For uploaded avatar files";
-$lang['Max_avatar_size'] = "Max. Avatar Size";
+$lang['Max_avatar_size'] = "Maximum Avatar Dimensions";
-$lang['Max_avatar_size_explain'] = "(height x width)";
+$lang['Max_avatar_size_explain'] = "(Height x Width in pixels)";
 $lang['Avatar_storage_path'] = "Avatar Storage Path";
 $lang['Avatar_storage_path_explain'] = "Path under your phpBB root dir, e.g. images/avatars";
 $lang['Avatar_gallery_path'] = "Avatar Gallery Path";
 $lang['Avatar_gallery_path_explain'] = "Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery";
+
 $lang['COPPA_settings'] = "COPPA Settings";
 $lang['COPPA_fax'] = "COPPA Fax Number";
 $lang['COPPA_mail'] = "COPPA Mailing Address";
 $lang['COPPA_mail_explain'] = "This is the mailing address where parents will send COPPA registration forms";
+
 $lang['Email_settings'] = "Email Settings";
 $lang['Admin_email'] = "Admin Email Address";
 $lang['Email_sig'] = "Email Signature";
 $lang['Email_sig_explain'] = "This text will be attached to all emails the board sends";
-$lang['Use_SMTP'] = "Use SMTP for delivery";
+$lang['Use_SMTP'] = "Use SMTP Server for email";
-$lang['Use_SMTP_explain'] = "Say yes if you want or have to send email via a server instead of the local mail function";
+$lang['Use_SMTP_explain'] = "Say yes if you want or have to send email via a named server instead of the local mail function";
 $lang['SMTP_server'] = "SMTP Server Address";
 
 $lang['Disable_privmsg'] = "Private Messaging";
@@ -224,6 +244,14 @@ $lang['Inbox_limits'] = "Max posts in Inbox";
 $lang['Sentbox_limits'] = "Max posts in Sentbox";
 $lang['Savebox_limits'] = "Max posts in Savebox";
 
+$lang['Cookie_settings'] = "Cookie settings"; 
+$lang['Cookie_settings_explain'] = "These control how the cookie sent to browsers is defined. In most cases the default should be sufficient. If you need to change these do so with care, incorrect settings can prevent users logging in.";
+$lang['Cookie_name'] = "Cookie name";
+$lang['Cookie_domain'] = "Cookie domain";
+$lang['Cookie_path'] = "Cookie path";
+$lang['Session_length'] = "Session length [ seconds ]";
+$lang['Cookie_secure'] = "Cookie secure [ https ]";
+
 
 //
 // Forum Management
@@ -357,9 +385,12 @@ $lang['Word_removed'] = "The selected word censor has been successfully removed"
 //
 // Mass Email
 //
-$lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group.  To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all receptients.  If you are emailing a large group of people, please be patient after submiting and DO NOT stop the page halfway through.  It is normal for amass emailing to take a long time.";
+$lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group.  To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all receptients.  If you are emailing a large group of people, please be patient after submiting and <b>DO NOT</b> stop the page halfway through.  It is normal for amass emailing to take a long time.";
 $lang['Compose'] = "Compose"; 
 
+$lang['Recipients'] = "Recipients"; 
+$lang['All_users'] = "All Users";
+
 
 //
 // Install Process

phpBB/templates/subSilver/admin/auth_ug_body.tpl

@@ -5,7 +5,14 @@
 
 <form method="post" action="{S_AUTH_ACTION}">
 
+<!-- BEGIN switch_user_auth -->
+<p>{USER_LEVEL}</p>
 <p>{USER_GROUP_MEMBERSHIPS}</p>
+<!-- END switch_user_auth -->
+
+<!-- BEGIN switch_group_auth -->
+<p>{GROUP_MEMBERSHIP}</p>
+<!-- END switch_group_auth -->
 
 <h2>{L_PERMISSIONS}</h2>
 
@@ -33,9 +40,9 @@
 	</tr>
 	<tr>
 	  <td colspan="{S_COLUMN_SPAN}" class="catBottom" align="center">{S_HIDDEN_FIELDS} 
-		<input type="submit" name="submit" value="{L_SUBMIT_CHANGES}" class="mainoption" />
+		<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
 		&nbsp;&nbsp; 
-		<input type="reset" value="{L_RESET_CHANGES}" class="liteoption" name="reset" />
+		<input type="reset" value="{L_RESET}" class="liteoption" name="reset" />
 	  </td>
 	</tr>
   </table>

phpBB/templates/subSilver/admin/board_config_body.tpl

@@ -3,7 +3,7 @@
 
 <p>{L_CONFIGURATION_EXPLAIN}</p>
 
-<form action="{S_CONFIG_ACTION}" method="POST"><table width="99%" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline">
+<form action="{S_CONFIG_ACTION}" method="post"><table width="99%" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline">
 	<tr>
 	  <th class="thHead" colspan="2">{L_GENERAL_SETTINGS}</th>
 	</tr>
@@ -15,13 +15,17 @@
 		<td class="row1">{L_SITE_DESCRIPTION}</td>
 		<td class="row2"><input type="text" size="40" maxlength="255" name="site_desc" value="{SITE_DESCRIPTION}"></td>
 	</tr>
+	<tr>
+		<td class="row1">{L_DISABLE_BOARD}<br /><span class="gensmall">{L_DISABLE_BOARD_EXPLAIN}</span></td>
+		<td class="row2"><input type="radio" name="board_disable" value="1" {S_DISABLE_BOARD_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="board_disable" value="0" {S_DISABLE_BOARD_NO} /> {L_NO}</td>
+	</tr>
 	<tr>
 		<td class="row1">{L_ACCT_ACTIVATION}</td>
-		<td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED}>{L_NO}ne&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED}>User&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED}>Admin</td>
+		<td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED} />{L_NO}ne&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED} />User&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED} />Admin</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_BOARD_EMAIL_FORM}<br /><span class="gensmall">{L_BOARD_EMAIL_FORM_EXPLAIN}</span></td>
-		<td class="row2"><input type="radio" name="board_email_form" value="1" {BOARD_EMAIL_FORM_ENABLE}> {L_ENABLED}&nbsp;&nbsp;<input type="radio" name="board_email_form" value="0" {BOARD_EMAIL_FORM_DISABLE}> {L_DISABLED}</td>
+		<td class="row2"><input type="radio" name="board_email_form" value="1" {BOARD_EMAIL_FORM_ENABLE} /> {L_ENABLED}&nbsp;&nbsp;<input type="radio" name="board_email_form" value="0" {BOARD_EMAIL_FORM_DISABLE} /> {L_DISABLED}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_FLOOD_INTERVAL} <br /><span class="gensmall">{L_FLOOD_INTERVAL_EXPLAIN}</span></td>
@@ -45,7 +49,7 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_OVERRIDE_STYLE}<br /><span class="gensmall">{L_OVERRIDE_STYLE_EXPLAIN}</span></td>
-		<td class="row2"><input type="radio" name="override_user_style" value="1" {OVERRIDE_STYLE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="override_user_style" value="0" {OVERRIDE_STYLE_NO}> {L_NO}</td>
+		<td class="row2"><input type="radio" name="override_user_style" value="1" {OVERRIDE_STYLE_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="override_user_style" value="0" {OVERRIDE_STYLE_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_DEFAULT_LANGUAGE}</td>
@@ -61,18 +65,44 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_ENABLE_GZIP}</td>
-		<td class="row2"><input type="radio" name="gzip_compress" value="1" {GZIP_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="gzip_compress" value="0" {GZIP_NO}> {L_NO}</td>
+		<td class="row2"><input type="radio" name="gzip_compress" value="1" {GZIP_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="gzip_compress" value="0" {GZIP_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_ENABLE_PRUNE}</td>
-		<td class="row2"><input type="radio" name="prune_enable" value="1" {PRUNE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="prune_enable" value="0" {PRUNE_NO}> {L_NO}</td>
+		<td class="row2"><input type="radio" name="prune_enable" value="1" {PRUNE_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="prune_enable" value="0" {PRUNE_NO} /> {L_NO}</td>
+	</tr>
+	<tr>
+		<th class="thHead" colspan="2">{L_COOKIE_SETTINGS}</th>
+	</tr>
+	<tr>
+		<td class="row2" colspan="2"><span class="gensmall">{L_COOKIE_SETTINGS_EXPLAIN}</span></td>
+	</tr>
+	<tr>
+		<td class="row1">{L_COOKIE_NAME}</span></td>
+		<td class="row2"><input type="text" maxlength="16" name="cookie_name" value="{COOKIE_NAME}"></td>
+	</tr>
+	<tr>
+		<td class="row1">{L_COOKIE_DOMAIN}</span></td>
+		<td class="row2"><input type="text" maxlength="50" name="cookie_domain" value="{COOKIE_DOMAIN}"></td>
+	</tr>
+	<tr>
+		<td class="row1">{L_COOKIE_PATH}</span></td>
+		<td class="row2"><input type="text" maxlength="20" name="cookie_path" value="{COOKIE_PATH}"></td>
+	</tr>
+	<tr>
+		<td class="row1">{L_SESSION_LENGTH}</span></td>
+		<td class="row2"><input type="text" maxlength="5" size="5" name="session_length" value="{SESSION_LENGTH}"></td>
+	</tr>
+	<tr>
+		<td class="row1">{L_COOKIE_SECURE}</td>
+		<td class="row2"><input type="radio" name="cookie_secure" value="0" {S_COOKIE_SECURE_DISABLED} />{L_DISABLED}&nbsp; &nbsp;<input type="radio" name="cookie_secure" value="1" {S_COOKIE_SECURE_ENABLED} />{L_ENABLED}</td>
 	</tr>
 	<tr>
 		<th class="thHead" colspan="2">{L_PRIVATE_MESSAGING}</th>
 	</tr>
 	<tr>
-		<td class="row1">{L_DISABLE_PRIVATE_MESSAGING}:</td>
+		<td class="row1">{L_DISABLE_PRIVATE_MESSAGING}</td>
-		<td class="row2"><input type="radio" name="privmsg_disable" value="0" {S_PRIVMSG_ENABLED}>{L_ENABLED}&nbsp; &nbsp;<input type="radio" name="privmsg_disable" value="1" {S_PRIVMSG_DISABLED}>{L_DISABLED}</td>
+		<td class="row2"><input type="radio" name="privmsg_disable" value="0" {S_PRIVMSG_ENABLED} />{L_ENABLED}&nbsp; &nbsp;<input type="radio" name="privmsg_disable" value="1" {S_PRIVMSG_DISABLED} />{L_DISABLED}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_INBOX_LIMIT}</span></td>
@@ -91,7 +121,7 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_HTML}</td>
-		<td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_html" value="0" {HTML_NO}> {L_NO}</td>
+		<td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_html" value="0" {HTML_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOWED_TAGS}<br /><span class="gensmall">{L_ALLOWED_TAGS_EXPLAIN}</span></td>
@@ -99,11 +129,11 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_BBCODE}</td>
-		<td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> {L_NO}</td>
+		<td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_bbcode" value="0" {BBCODE_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_SMILIES}</td>
-		<td class="row2"><input type="radio" name="allow_smilies" value="1" {SMILE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_smilies" value="0" {SMILE_NO}> {L_NO}</td>
+		<td class="row2"><input type="radio" name="allow_smilies" value="1" {SMILE_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_smilies" value="0" {SMILE_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_SMILIES_PATH} <br /><span class="gensmall">{L_SMILIES_PATH_EXPLAIN}</span></td>
@@ -111,7 +141,7 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_SIG}</td>
-		<td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_sig" value="0" {SIG_NO}> {L_NO}</td>
+		<td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_sig" value="0" {SIG_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_MAX_SIG_LENGTH}<br /><span class="gensmall">{L_MAX_SIG_LENGTH_EXPLAIN}</span></td>
@@ -119,22 +149,22 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_NAME_CHANGE}</td>
-		<td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO}> {L_NO}</td>
+		<td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
 	  <th class="thHead" colspan="2">{L_AVATAR_SETTINGS}</th>
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_LOCAL}</td>
-		<td class="row2"><input type="radio" name="allow_avatar_local" value="1" {AVATARS_LOCAL_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_local" value="0" {AVATARS_LOCAL_NO}> {L_NO}</td>
+		<td class="row2"><input type="radio" name="allow_avatar_local" value="1" {AVATARS_LOCAL_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_local" value="0" {AVATARS_LOCAL_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_REMOTE} <br /><span class="gensmall">{L_ALLOW_REMOTE_EXPLAIN}</span></td>
-		<td class="row2"><input type="radio" name="allow_avatar_remote" value="1" {AVATARS_REMOTE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_remote" value="0" {AVATARS_REMOTE_NO}> {L_NO}</td>
+		<td class="row2"><input type="radio" name="allow_avatar_remote" value="1" {AVATARS_REMOTE_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_remote" value="0" {AVATARS_REMOTE_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_UPLOAD}</td>
-		<td class="row2"><input type="radio" name="allow_avatar_upload" value="1" {AVATARS_UPLOAD_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_upload" value="0" {AVATARS_UPLOAD_NO}> {L_NO}</td>
+		<td class="row2"><input type="radio" name="allow_avatar_upload" value="1" {AVATARS_UPLOAD_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_upload" value="0" {AVATARS_UPLOAD_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_MAX_FILESIZE}<br /><span class="gensmall">{L_MAX_FILESIZE_EXPLAIN}</span></td>
@@ -182,12 +212,11 @@
 		<td class="row2"><input type="radio" name="smtp_delivery" value="1" {SMTP_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="smtp_delivery" value="0" {SMTP_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1">{L_SMPT_SERVER}</td>
+		<td class="row1">{L_SMTP_SERVER}</td>
 		<td class="row2"><input type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50" /></td>
 	</tr>
-
 	<tr>
-		<td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
+		<td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" />
 		</td>
 	</tr>
 </table></form>

phpBB/templates/subSilver/admin/user_ban_body.tpl

@@ -3,41 +3,51 @@
 
 <p>{L_BAN_EXPLAIN}</p>
 
-<form method="post" action="{S_BAN_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+<form method="post" action="{S_BANLIST_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr> 
 	  <th class="thHead" colspan="2">{L_BAN_USER}</th>
 	</tr>
 	<tr> 
-	  <td class="row1">{L_USERNAME}: <br />
+	  <td class="row1">{L_USERNAME}: <br /><span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
-		<span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
+	  <td class="row2">{S_BAN_USERLIST_SELECT}</td>
-	  <td class="row2">{S_USERLIST_SELECT}</td>
+	</tr>
+	<tr> 
+	  <th class="thHead" colspan="2">{L_UNBAN_USER}</th>
+	</tr>
+	<tr> 
+	  <td class="row1">{L_USERNAME}: <br /><span class="gensmall">{L_UNBAN_USER_EXPLAIN}</span></td>
+	  <td class="row2">{S_UNBAN_USERLIST_SELECT}</td>
 	</tr>
 	<tr> 
 	  <th class="thHead" colspan="2">{L_BAN_IP}</th>
 	</tr>
 	<tr> 
-	  <td class="row1">{L_IP_OR_HOSTNAME}: <br />
+	  <td class="row1">{L_IP_OR_HOSTNAME}: <br /><span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
-		<span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
+	  <td class="row2"><input type="text" name="ban_ip" size="35" /></td>
-	  <td class="row2">
+	</tr>
-		<input type="text" name="ip" size="35" />
+	<tr> 
-	  </td>
+	  <th class="thHead" colspan="2">{L_UNBAN_IP}</th>
+	</tr>
+	<tr> 
+	  <td class="row1">{L_IP_OR_HOSTNAME}: <br /><span class="gensmall">{L_UNBAN_IP_EXPLAIN}</span></td>
+	  <td class="row2">{S_UNBAN_IPLIST_SELECT}</td>
 	</tr>
 	<tr> 
 	  <th class="thHead" colspan="2">{L_BAN_EMAIL}</th>
 	</tr>
 	<tr> 
-	  <td class="row1">{L_EMAIL_ADDRESS}: <br />
+	  <td class="row1">{L_EMAIL_ADDRESS}: <br /><span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
-		<span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
+	  <td class="row2"><input type="text" name="ban_email" size="35" /></td>
-	  <td class="row2">
-		<input type="text" name="email" size="35" />
-	  </td>
 	</tr>
 	<tr> 
-	  <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}
+	  <th class="thHead" colspan="2">{L_UNBAN_EMAIL}</th>
-		<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
+	</tr>
-		&nbsp;&nbsp;
+	<tr> 
-		<input type="reset" value="{L_RESET}" class="liteoption" />
+	  <td class="row1">{L_EMAIL_ADDRESS}: <br /><span class="gensmall">{L_UNBAN_EMAIL_EXPLAIN}</span></td>
-	  </td>
+	  <td class="row2">{S_UNBAN_EMAILLIST_SELECT}</td>
+	</tr>
+	<tr> 
+	  <td class="catBottom" colspan="2" align="center"><input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" /></td>
 	</tr>
 </table></form>
 

phpBB/templates/subSilver/admin/user_email_body.tpl

@@ -0,0 +1,25 @@
+
+<h1>{L_EMAIL_TITLE}</h1>
+
+<p>{L_EMAIL_EXPLAIN}</p>
+
+<form method="post" action="{S_USER_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr> 
+	  <th class="thHead" colspan="2">{L_COMPOSE}</th>
+	</tr>
+	<tr> 
+	  <td class="row1" align="right"><b>{L_RECIPIENTS}</b></td>
+	  <td class="row2" align="left">{S_GROUP_SELECT}</td>
+	</tr>
+	<tr> 
+	  <td class="row1" align="right"><b>{L_EMAIL_SUBJECT}</b></td>
+	  <td class="row2"><span class="gen"><input type="text" name="{S_EMAIL_SUBJECT}{S_EMAIL_SUBJECT}" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" /></span></td>
+	</tr>
+	<tr> 
+	  <td class="row1" align="right" valign="top"> <span class="gen"><b>{L_EMAIL_MSG}</b></span> 
+	  <td class="row2"><span class="gen"> <textarea name="{S_EMAIL_MSG}" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post"></textarea></span> 
+	</tr>
+	<tr> 
+	  <td class="catBottom" align="center" colspan="2"><input type="submit" value="{L_EMAIL}" name="submit" class="mainoption" /></td>
+	</tr>
+</table></form>