Category and module lang name changes + show ban information when selecting entries to unban

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

phpBB/admin/admin_ban.php

@@ -29,9 +29,9 @@ if (!empty($setmodules))
 	}
 
 	$filename = basename(__FILE__);
-	$module['Users']['Ban_users'] = $filename . "$SID&mode=user";
+	$module['USER']['BAN_USERS'] = $filename . "$SID&mode=user";
-	$module['Users']['Ban_emails'] = $filename . "$SID&mode=email";
+	$module['USER']['BAN_EMAILS'] = $filename . "$SID&mode=email";
-	$module['Users']['Ban_ips'] = $filename . "$SID&mode=ip";
+	$module['USER']['BAN_IPS'] = $filename . "$SID&mode=ip";
 
 	return;
 }
@@ -302,7 +302,7 @@ if (isset($_POST['bansubmit']) || isset($_GET['bansubmit']))
 		add_admin_log($log_entry . $mode, $ban_reason, $ban_list_log);
 	}
 
-	trigger_error($user->lang['Ban_update_sucessful']);
+	trigger_error($user->lang['BAN_UPDATE_SUCESSFUL']);
 
 }
 else if (isset($_POST['unbansubmit']))
@@ -322,7 +322,7 @@ else if (isset($_POST['unbansubmit']))
 		add_admin_log('log_unban_' . $mode, sizeof($_POST['unban']));
 	}
 
-	trigger_error($user->lang['Ban_update_sucessful']);
+	trigger_error($user->lang['BAN_UPDATE_SUCESSFUL']);
 }
 
 //
@@ -340,7 +340,7 @@ $db->sql_query($sql);
 //
 // Ban length options
 //
-$ban_end_text = array(0 => $user->lang['Permanent'], 30 => $user->lang['30_Mins'], 60 => $user->lang['1_Hour'], 360 => $user->lang['6_Hours'], 1440 => $user->lang['1_Day'], 10080 => $user->lang['7_Days'], 20160 => $user->lang['2_Weeks'], 40320 => $user->lang['1_Month'], -1 => $user->lang['Other']);
+$ban_end_text = array(0 => $user->lang['PERMANENT'], 30 => $user->lang['30_MINS'], 60 => $user->lang['1_HOUR'], 360 => $user->lang['6_HOURS'], 1440 => $user->lang['1_DAY'], 10080 => $user->lang['7_DAYS'], 20160 => $user->lang['2_WEEKS'], 40320 => $user->lang['1_MONTH'], -1 => $user->lang['OTHER'] . ' -> ');
 
 $ban_end_options = '';
 foreach ($ban_end_text as $length => $text)
@@ -354,13 +354,13 @@ foreach ($ban_end_text as $length => $text)
 switch ($mode)
 {
 	case 'user':
-		$l_title = $user->lang['Ban_users'];
+		$l_title = $user->lang['BAN_USERS'];
 		break;
 	case 'email':
-		$l_title = $user->lang['Ban_emails'];
+		$l_title = $user->lang['BAN_EMAILS'];
 		break;
 	case 'ip':
-		$l_title = $user->lang['Ban_ips'];
+		$l_title = $user->lang['BAN_IPS'];
 		break;
 }
 
@@ -371,13 +371,24 @@ page_header($l_title);
 
 ?>
 
-<p><?php echo $user->lang['Ban_explain']; ?></p>
+<p><?php echo $user->lang['BAN_EXPLAIN']; ?></p>
 
 <?php
 
 switch ($mode)
 {
 	case 'user':
+
+		$field = 'username';
+		$l_ban_title = $user->lang['BAN_USERS'];
+		$l_ban_explain = $user->lang['BAN_USERNAME_EXPLAIN'];
+		$l_ban_exclude_explain = $user->lang['BAN_USER_EXCLUDE_EXPLAIN'];
+		$l_unban_title = $user->lang['UNBAN_USERNAME'];
+		$l_unban_explain = $user->lang['UNBAN_USERNAME_EXPLAIN'];
+		$l_ban_cell = $user->lang['USERNAME'];
+		$l_no_ban_cell = $user->lang['NO_BANNED_USERS'];
+		$s_submit_extra = '<input type="submit" name="usersubmit" value="' . $user->lang['Find_username'] . '" class="liteoption" onClick="window.open(\'../memberlist.' . $phpEx . $SID . '&amp;mode=searchuser&amp;field=ban\', \'_phpbbsearch\', \'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740\');return false;" />';
+
 		$sql = "SELECT b.*, u.user_id, u.username
 			FROM " . BANLIST_TABLE . " b, " . USERS_TABLE . " u
 			WHERE (b.ban_end >= " . time() . "
@@ -386,105 +397,65 @@ switch ($mode)
 				AND b.ban_userid <> 0
 				AND u.user_id <> " . ANONYMOUS . "
 			ORDER BY u.user_id ASC";
-		$result = $db->sql_query($sql);
-
-		$banned_options = '';
-		$banned_length = '';
-		$banned_options = '';
-		if ($row = $db->sql_fetchrow($result))
-		{
-			do
-			{
-
-				$banned_options .=  '<option' . (($row['ban_exclude']) ? ' style="color:red"' : '') . ' value="' . $row['ban_id'] . '">' . $row['username'] . '</option>';
-				$banned_length .= (($banned_length != '') ? ', ' : '') . '\'' . ($ban_end_text[(($row['ban_end'] - $row['ban_start']) / 60)]) . '\'';
-				$banned_reasons .= (($banned_reasons != '') ? ', ' : '') . '\'' . addslashes($row['ban_reason']) . '\'';
-			}
-			while ($row = $db->sql_fetchrow($result));
-		}
-		$db->sql_freeresult($result);
-
-		$l_ban_title = $user->lang['Ban_users'];
-		$l_ban_explain = $user->lang['Ban_username_explain'];
-		$l_ban_exclude_explain = $user->lang['BAN_USER_EXCLUDE_EXPLAIN'];
-		$l_unban_title = $user->lang['Unban_username'];
-		$l_unban_explain = $user->lang['Unban_username_explain'];
-		$l_ban_cell = $user->lang['USERNAME'];
-		$l_no_ban_cell = $user->lang['No_banned_users'];
-		$s_submit_extra = '<input type="submit" name="usersubmit" value="' . $user->lang['Find_username'] . '" class="liteoption" onClick="window.open(\'../memberlist.' . $phpEx . $SID . '&amp;mode=searchuser&amp;field=ban\', \'_phpbbsearch\', \'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740\');return false;" />';
-
 		break;
 
 	case 'ip':
 
+		$field = 'ban_ip';
+		$l_ban_title = $user->lang['BAN_IPS'];
+		$l_ban_explain = $user->lang['BAN_IP_EXPLAIN'];
+		$l_ban_exclude_explain = $user->lang['BAN_IP_EXCLUDE_EXPLAIN'];
+		$l_unban_title = $user->lang['UNBAN_IP'];
+		$l_unban_explain = $user->lang['UNBAN_IP_EXPLAIN'];
+		$l_ban_cell = $user->lang['IP_HOSTNAME'];
+		$l_no_ban_cell = $user->lang['NO_BANNED_IP'];
+		$s_submit_extra = '';
+
 		$sql = "SELECT *
 			FROM " . BANLIST_TABLE . "
 			WHERE (ban_end >= " . time() . "
 					OR ban_end = 0)
 				AND ban_ip <> ''";
-		$result = $db->sql_query($sql);
-
-		$banned_reasons = '';
-		$banned_length = '';
-		$banned_options = '';
-		if ($row = $db->sql_fetchrow($result))
-		{
-			do
-			{
-				$banned_options .= '<option value="' . $row['ban_id'] . '">' . $row['ban_ip'] . '</option>';
-				$banned_length .= (($banned_length != '') ? ', ' : '') . '\'' . ($ban_end_text[(($row['ban_end'] - $row['ban_start']) / 60)]) . '\'';
-				$banned_reasons .= (($banned_reasons != '') ? ', ' : '') . '\'' . addslashes($row['ban_reason']) . '\'';
-			}
-			while ($row = $db->sql_fetchrow($result));
-		}
-		$db->sql_freeresult($result);
-
-		$l_ban_title = $user->lang['Ban_ips'];
-		$l_ban_explain = $user->lang['Ban_IP_explain'];
-		$l_ban_exclude_explain = $user->lang['BAN_IP_EXCLUDE_EXPLAIN'];
-		$l_unban_title = $user->lang['Unban_IP'];
-		$l_unban_explain = $user->lang['Unban_IP_explain'];
-		$l_ban_cell = $user->lang['IP_hostname'];
-		$l_no_ban_cell = $user->lang['No_banned_ip'];
-		$s_submit_extra = '';
-
 		break;
 
 	case 'email':
 
+		$field = 'ban_email';
+		$l_ban_title = $user->lang['BAN_EMAILS'];
+		$l_ban_explain = $user->lang['BAN_EMAIL_EXPLAIN'];
+		$l_ban_exclude_explain = $user->lang['BAN_EMAIL_EXCLUDE_EXPLAIN'];
+		$l_unban_title = $user->lang['UNBAN_EMAIL'];
+		$l_unban_explain = $user->lang['UNBAN_EMAIL_EXPLAIN'];
+		$l_ban_cell = $user->lang['EMAIL_ADDRESS'];
+		$l_no_ban_cell = $user->lang['NO_BANNED_EMAIL'];
+		$s_submit_extra = '';
+
 		$sql = "SELECT *
 			FROM " . BANLIST_TABLE . "
 			WHERE (ban_end >= " . time() . "
 					OR ban_end = 0)
 				AND ban_email <> ''";
-		$result = $db->sql_query($sql);
-
-		$banned_options = '';
-		$banned_length = '';
-		$banned_options = '';
-		if ($row = $db->sql_fetchrow($result))
-		{
-			do
-			{
-				$banned_options .= '<option value="' . $row['ban_id'] . '">' . $row['ban_email'] . '</option>';
-				$banned_length .= (($banned_length != '') ? ', ' : '') . '\'' . ($ban_end_text[(($row['ban_end'] - $row['ban_start']) / 60)]) . '\'';
-				$banned_reasons .= (($banned_reasons != '') ? ', ' : '') . '\'' . addslashes($row['ban_reason']) . '\'';
-			}
-			while ($row = $db->sql_fetchrow($result));
-		}
-		$db->sql_freeresult($result);
-
-		$l_ban_title = $user->lang['Ban_emails'];
-		$l_ban_explain = $user->lang['Ban_email_explain'];
-		$l_ban_exclude_explain = $user->lang['BAN_EMAIL_EXCLUDE_EXPLAIN'];
-		$l_unban_title = $user->lang['Unban_email'];
-		$l_unban_explain = $user->lang['Unban_email_explain'];
-		$l_ban_cell = $user->lang['EMAIL_ADDRESS'];
-		$l_no_ban_cell = $user->lang['No_banned_email'];
-		$s_submit_extra = '';
-
 		break;
 }
+$result = $db->sql_query($sql);
+
+$banned_options = '';
+$ban_length = $ban_reasons = array();
+if ($row = $db->sql_fetchrow($result))
+{
+	do
+	{
+
+		$banned_options .=  '<option' . (($row['ban_exclude']) ? ' class="sep"' : '') . ' value="' . $row['ban_id'] . '">' . $row[$field] . '</option>';
+
+		$time_length = (!empty($row['ban_end'])) ? ($row['ban_end'] - $row['ban_start']) / 60 : 0;
+		$ban_length[$row['ban_id']] = (!empty($ban_end_text[$time_length])) ? $ban_end_text[$time_length] : $user->lang['OTHER'] . ' -> ' . gmdate('Y-m-d', $row['ban_end']);
+
+		$ban_reasons[$row['ban_id']] = addslashes($row['ban_reason']);
+	}
+	while ($row = $db->sql_fetchrow($result));
+}
+$db->sql_freeresult($result);
 
 ?>
 
@@ -494,8 +465,38 @@ switch ($mode)
 
 <script language="Javascript" type="text/javascript">
 <!--
-	var ban_length = new Array(<?php echo $banned_length; ?>);
+
-	var ban_reasons = new Array(<?php echo $banned_reasons; ?>);
+var ban_length = new Array();
+<?php
+
+	if (sizeof($ban_length))
+	{
+		foreach ($ban_length as $ban_id => $length)
+		{
+			echo "ban_length['$ban_id'] = \"$length\";\n";
+		}
+	}
+
+?>
+
+var ban_reason = new Array();
+<?php
+
+	if (sizeof($ban_reasons))
+	{
+		foreach ($ban_reasons as $ban_id => $reason)
+		{
+			echo "ban_reason['$ban_id'] = \"$reason\";\n";
+		}
+	}
+?>
+
+function display_details(option)
+{
+	document.forms[0].unbanreason.value = ban_reason[option];
+	document.forms[0].unbanlength.value = ban_length[option];
+}
+
 //-->
 </script>
 
@@ -508,7 +509,7 @@ switch ($mode)
 		<td class="row1"><textarea cols="40" rows="3" name="ban"></textarea></td>
 	</tr>
 	<tr>
-		<td class="row2" width="45%"><?php echo $user->lang['Ban_length']; ?>:</td>
+		<td class="row2" width="45%"><?php echo $user->lang['BAN_LENGTH']; ?>:</td>
 		<td class="row1"><select name="banlength"><?php echo $ban_end_options; ?></select>&nbsp; <input type="text" name="banlengthother" maxlength="10" size="10" /></td>
 	</tr>
 	<tr>
@@ -516,11 +517,11 @@ switch ($mode)
 		<td class="row1"><input type="radio" name="banexclude" value="1" /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="banexclude" value="0" checked="checked" /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row2" width="45%"><?php echo $user->lang['Ban_reason']; ?>:</td>
+		<td class="row2" width="45%"><?php echo $user->lang['BAN_REASON']; ?>:</td>
 		<td class="row1"><input type="text" name="banreason" maxlength="255" size="40" /></td>
 	</tr>
 	<tr>
-		<td class="cat" colspan="2" align="center"> <input type="submit" name="bansubmit" value="<?php echo $user->lang['SUBMIT']; ?>" class="mainoption" />&nbsp; <input type="reset" value="<?php echo $user->lang['Reset']; ?>" class="liteoption" />&nbsp; <?php echo $s_submit_extra; ?></td>
+		<td class="cat" colspan="2" align="center"> <input type="submit" name="bansubmit" value="<?php echo $user->lang['SUBMIT']; ?>" class="mainoption" />&nbsp; <input type="RESET" value="<?php echo $user->lang['RESET']; ?>" class="liteoption" />&nbsp; <?php echo $s_submit_extra; ?></td>
 	</tr>
 </table>
 
@@ -532,15 +533,24 @@ switch ($mode)
 	<tr>
 		<th colspan="2"><?php echo $l_unban_title; ?></th>
 	</tr>
-	<tr>
 <?php
 
 	if ($banned_options != '')
 	{
 
 ?>
-		<td class="row1" width="45%"><?php echo $l_ban_cell; ?>: <br /></td>
+	<tr>
-		<td class="row1"> <select name="unban[]" multiple="multiple" size="5"><?php echo $banned_options; ?></select></td>
+		<td class="row2" width="45%"><?php echo $l_ban_cell; ?>: <br /></td>
+		<td class="row1"> <select name="unban[]" multiple="multiple" size="5" onchange="display_details(this.options[this.selectedIndex].value)"><?php echo $banned_options; ?></select></td>
+	</tr>
+	<tr>
+		<td class="row2" width="45%"><?php echo $user->lang['BAN_REASON']; ?>:</td>
+		<td class="row1"><input type="text" name="unbanreason" size="40" /></td>
+	</tr>
+	<tr>
+		<td class="row2" width="45%"><?php echo $user->lang['BAN_LENGTH']; ?>:</td>
+		<td class="row1"><input type="text" name="unbanlength" size="40" /></td>
+	</tr>
 <?php
 
 	}
@@ -548,13 +558,14 @@ switch ($mode)
 	{
 
 ?>
+	<tr>
 		<td class="row1" colspan="2" align="center"><?php echo $l_no_ban_cell;  ?></td>
+	</tr>
 <?php
 
 	}
 
 ?>
-	</tr>
 	<tr>
 		<td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="<?php echo $user->lang['SUBMIT']; ?>" class="mainoption" /></td>
 	</tr>

phpBB/admin/admin_board.php

@@ -22,13 +22,13 @@
 if (!empty($setmodules))
 {
 	$file = basename(__FILE__);
-	$module['General']['Cookie_settings'] = ($auth->acl_get('a_cookies')) ? "$file$SID&mode=cookie" : '';
+	$module['GENERAL']['Cookie_settings'] = ($auth->acl_get('a_cookies')) ? "$file$SID&mode=cookie" : '';
-	$module['General']['Board_defaults'] = ($auth->acl_get('a_defaults')) ? "$file$SID&mode=default" : '';
+	$module['GENERAL']['Board_defaults'] = ($auth->acl_get('a_defaults')) ? "$file$SID&mode=default" : '';
-	$module['General']['Board_settings'] = ($auth->acl_get('a_board')) ? "$file$SID&mode=setting" : '';
+	$module['GENERAL']['Board_settings'] = ($auth->acl_get('a_board')) ? "$file$SID&mode=setting" : '';
-	$module['General']['Avatar_settings'] = ($auth->acl_get('a_board')) ? "$file$SID&mode=avatar" : '';
+	$module['GENERAL']['Avatar_settings'] = ($auth->acl_get('a_board')) ? "$file$SID&mode=avatar" : '';
-	$module['General']['Email_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&mode=email" : '';
+	$module['GENERAL']['Email_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&mode=email" : '';
-	$module['General']['Server_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&mode=server" : '';
+	$module['GENERAL']['Server_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&mode=server" : '';
-	$module['General']['Auth_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&mode=auth" : '';
+	$module['GENERAL']['Auth_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&mode=auth" : '';
 	return;
 }
 

phpBB/admin/admin_database.php

@@ -22,12 +22,12 @@
 if (!empty($setmodules))
 {
 	$filename = basename(__FILE__);
-	$module['DB']['DB_Backup'] = ($auth->acl_get('a_backup')) ? $filename . "$SID&mode=backup" : '';
+	$module['DB']['DB_BACKUP'] = ($auth->acl_get('a_backup')) ? $filename . "$SID&mode=backup" : '';
 
 	$file_uploads = @ini_get('file_uploads');
 	if (!empty($file_uploads) && $file_uploads !== 0 && strtolower($file_uploads) != 'off' && @phpversion() != '4.0.4pl1' && $auth->acl_get('a_restore'))
 	{
-		$module['DB']['DB_Restore'] = $filename . "$SID&mode=restore";
+		$module['DB']['DB_RESTORE'] = $filename . "$SID&mode=restore";
 	}
 
 	return;

phpBB/admin/admin_disallow.php

@@ -21,14 +21,14 @@
 
 define('IN_PHPBB', 1);
 
-if(!empty($setmodules))
+if (!empty($setmodules))
 {
 	if (!$auth->acl_get('a_names'))
 	{
 		return;
 	}
 
-	$module['Users']['Disallow'] = basename(__FILE__) . $SID;
+	$module['USER']['DISALLOW'] = basename(__FILE__) . $SID;
 
 	return;
 }

phpBB/admin/admin_email.php

@@ -26,7 +26,7 @@ if (!empty($setmodules))
 		return;
 	}
 
-	$module['General']['Mass_Email'] = basename(__FILE__) . $SID;
+	$module['GENERAL']['MASS_EMAIL'] = basename(__FILE__) . $SID;
 
 	return;
 }

phpBB/admin/admin_forums.php

@@ -26,7 +26,7 @@ if (!empty($setmodules))
 		return;
 	}
 
-	$module['Forums']['Manage'] = basename(__FILE__) . $SID;
+	$module['FORUM']['MANAGE'] = basename(__FILE__) . $SID;
 	return;
 }
 

phpBB/admin/admin_groups.php

@@ -27,9 +27,8 @@ if( !empty($setmodules) )
 	}
 
 	$filename = basename(__FILE__);
-	$module['Groups']['Create'] = $filename . "$SID&mode=create";
+	$module['GROUP']['CREATE'] = $filename . "$SID&mode=create";
-	$module['Groups']['Delete'] = $filename . "$SID&mode=delete";
+	$module['GROUP']['MANAGE'] = $filename . "$SID&mode=manage";
-	$module['Groups']['Manage'] = $filename . "$SID&mode=manage";
 
 	return;
 }

phpBB/admin/admin_permissions.php

@@ -22,12 +22,12 @@
 if (!empty($setmodules))
 {
 	$filename = basename(__FILE__);
-	$module['Forums']['PERMISSIONS'] = ($auth->acl_get('a_auth')) ? $filename . $SID . '&mode=forums' : '';
+	$module['FORUM']['PERMISSIONS'] = ($auth->acl_get('a_auth')) ? $filename . $SID . '&mode=forums' : '';
-	$module['Forums']['MODERATORS'] = ($auth->acl_get('a_authmods')) ? $filename . $SID . '&mode=moderators' : '';
+	$module['FORUM']['MODERATORS'] = ($auth->acl_get('a_authmods')) ? $filename . $SID . '&mode=moderators' : '';
-	$module['Forums']['SUPER_MODERATORS'] = ($auth->acl_get('a_authmods')) ? $filename . $SID . '&mode=supermoderators' : '';
+	$module['FORUM']['SUPER_MODERATORS'] = ($auth->acl_get('a_authmods')) ? $filename . $SID . '&mode=supermoderators' : '';
-	$module['General']['ADMINISTRATORS'] = ($auth->acl_get('a_authadmins')) ? $filename . $SID . '&mode=administrators' : '';
+	$module['GENERAL']['ADMINISTRATORS'] = ($auth->acl_get('a_authadmins')) ? $filename . $SID . '&mode=administrators' : '';
-	$module['Users']['PERMISSIONS'] = ($auth->acl_get('a_authusers')) ? $filename . $SID . '&mode=users' : '';
+	$module['USER']['PERMISSIONS'] = ($auth->acl_get('a_authusers')) ? $filename . $SID . '&mode=users' : '';
-	$module['Groups']['PERMISSIONS'] = ($auth->acl_get('a_authgroups')) ? $filename . $SID . '&mode=groups' : '';
+	$module['GROUP']['PERMISSIONS'] = ($auth->acl_get('a_authgroups')) ? $filename . $SID . '&mode=groups' : '';
 
 	return;
 }
@@ -333,6 +333,9 @@ if (!empty($forum_id) || !empty($group_id) || !empty($username) ||
 
 	if (!empty($entries))
 	{
+
+
+
 		// Founder only operations ... these operations can
 		// only be altered by someone with founder status
 		$founder_sql = (!$userdata['user_founder']) ? ' AND founder_only <> 1' : '';
@@ -362,6 +365,9 @@ if (!empty($forum_id) || !empty($group_id) || !empty($username) ||
 			$where_sql .= (($where_sql != '') ? ', ' : '') . (($_POST['type'] == 'user' && !empty($_POST['new'])) ? '\'' . $value . '\'' : intval($value));
 		}
 
+
+
+
 		$ug = '';;
 		$ug_hidden = '';
 		$auth_values = array();
@@ -659,6 +665,10 @@ if (!empty($forum_id) || !empty($group_id) || !empty($username) ||
 			}
 		}
 
+
+
+
+
 		if ($auth->acl_gets('a_events', 'a_cron'))
 		{
 			$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
@@ -692,6 +702,10 @@ if (!empty($forum_id) || !empty($group_id) || !empty($username) ||
 
 		}
 
+
+
+
+
 ?>
 	<tr>
 		<td class="cat" colspan="4" align="center"><input class="mainoption" type="submit" name="update" value="<?php echo $user->lang['Update']; ?>" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="cancel" value="<?php echo $user->lang['CANCEL']; ?>" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /><input type="hidden" name="type" value="<?php echo $_POST['type']; ?>" /><?php echo $ug_hidden; ?></td>
@@ -738,6 +752,8 @@ if (!empty($forum_id) || !empty($group_id) || !empty($username) ||
 
 
 
+
+
 ?>
 
 <p><?php echo $l_title_explain; ?></p>
@@ -904,6 +920,7 @@ switch ($mode)
 		break;
 
 	case 'groups':
+		// Generate list of groups
 		$sql = "SELECT group_id, group_name    
 			FROM " . GROUPS_TABLE . " 
 			ORDER BY group_type DESC";

phpBB/admin/admin_prune.php

@@ -26,7 +26,7 @@ if (!empty($setmodules))
 		return;
 	}
 
-	$module['Forums']['Prune']   = basename(__FILE__) . $SID . '&mode=forums';
+	$module['FORUM']['PRUNE']   = basename(__FILE__) . $SID . '&mode=forums';
 
 	return;
 }

phpBB/admin/admin_prune_users.php

@@ -26,7 +26,7 @@ if (!empty($setmodules))
 		return;
 	}
 
-	$module['Users']['Prune_users'] = basename(__FILE__) . $SID;
+	$module['USER']['PRUNE_USERS'] = basename(__FILE__) . $SID;
 
 	return;
 }
@@ -66,13 +66,13 @@ if (isset($_POST['prune']))
 
 ?>
 
-<h1><?php echo $user->lang['Prune_users']; ?></h1>
+<h1><?php echo $user->lang['PRUNE_USERS']; ?></h1>
 
-<p><?php echo $user->lang['Prune_users_explain']; ?></p>
+<p><?php echo $user->lang['PRUNE_USERS_EXPLAIN']; ?></p>
 
 <?php
 
-		page_message($user->lang['Confirm'], $l_message, false);
+		page_message($user->lang['CONFIRM'], $l_message, false);
 		page_footer();
 
 	}

phpBB/admin/admin_ranks.php

@@ -26,7 +26,7 @@ if (!empty($setmodules))
 		return;
 	}
 
-	$module['Users']['Ranks'] = basename(__FILE__) . $SID;
+	$module['USER']['RANKS'] = basename(__FILE__) . $SID;
 	return;
 }
 

phpBB/admin/admin_search.php

@@ -26,7 +26,7 @@ if (!empty($setmodules))
 		return;
 	}
 
-	$module['DB']['Search_indexing'] = basename(__FILE__) . $SID;
+	$module['DB']['SEARCH_INDEX'] = basename(__FILE__) . $SID;
 
 	return;
 }
@@ -64,8 +64,7 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
 
 			if ($load > 3)
 			{
-				header("Location: admin_search.$phpEx$SID&batchstart=$batchstart&batchcount=$batch_count");
+				redirect("admin_search.$phpEx$SID&batchstart=$batchstart&batchcount=$batch_count");
-				exit;
 			}
 		}
 	}
@@ -99,22 +98,16 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
 
 	if (!isset($_GET['batchstart']))
 	{
-		//
 		// Take board offline
-		//
 		set_config('board_disable', 1);
 
-		//
 		// Empty existing tables
-		//
 		$db->sql_query("TRUNCATE " . SEARCH_TABLE);
 		$db->sql_query("TRUNCATE " . SEARCH_WORD_TABLE);
 		$db->sql_query("TRUNCATE " . SEARCH_MATCH_TABLE);
 	}
 
-	//
 	// Fetch a batch of posts_text entries
-	//
 	$sql = "SELECT COUNT(*) AS total, MAX(post_id) AS max_post_id, MIN(post_id) AS min_post_id
 		FROM " . POSTS_TEXT_TABLE;
 	$result = $db->sql_query($sql);
@@ -271,19 +264,18 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
 
 	if (($batchstart + $batchsize) < $max_post_id)
 	{
-		header("Location: admin_search.$phpEx$SID&batchstart=" . ($batchstart + $batchsize) . "&batchcount=$batch_count");
+		redirect("Location: admin_search.$phpEx$SID&batchstart=" . ($batchstart + $batchsize) . "&batchcount=$batch_count");
-		exit;
 	}
 	else
 	{
 		set_config('board_disable', 0);
-		page_header($user->lang['Search_indexing']);
+		page_header($user->lang['SEARCH_INDEX']);
 
 ?>
 
-<h1><?php echo $user->lang['Search_indexing']; ?></h1>
+<h1><?php echo $user->lang['SEARCH_INDEX']; ?></h1>
 
-<p><?php echo $user->lang['Search_indexing_complete']; ?></p>
+<p><?php echo $user->lang['SEARCH_INDEX_COMPLETE']; ?></p>
 
 <?php
 
@@ -297,13 +289,13 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
 else if (isset($_POST['cancel']))
 {
 	set_config('board_disable', 0);
-	page_header($user->lang['Search_indexing']);
+	page_header($user->lang['SEARCH_INDEX']);
 
 ?>
 
-<h1><?php echo $user->lang['Search_indexing']; ?></h1>
+<h1><?php echo $user->lang['SEARCH_INDEX']; ?></h1>
 
-<p><?php echo $user->lang['Search_indexing_cancel']; ?></p>
+<p><?php echo $user->lang['SEARCH_INDEX_CANCEL']; ?></p>
 
 <?php
 
@@ -312,17 +304,17 @@ else if (isset($_POST['cancel']))
 }
 else
 {
-	page_header($user->lang['Search_indexing']);
+	page_header($user->lang['Search_index']);
 
 ?>
 
-<h1><?php echo $user->lang['Search_indexing']; ?></h1>
+<h1><?php echo $user->lang['SEARCH_INDEX']; ?></h1>
 
-<p><?php echo $user->lang['Search_indexing_explain']; ?></p>
+<p><?php echo $user->lang['SEARCH_INDEX_EXPLAIN']; ?></p>
 
 <form method="post" action="<?php echo "admin_search.$phpEx$SID"; ?>"><table cellspacing="1" cellpadding="4" border="0" align="center" bgcolor="#98AAB1">
 	<tr>
-		<td class="cat" height="28" align="center">&nbsp;<input type="submit" name="start" value="<?php echo $user->lang['Start']; ?>" class="mainoption" /> &nbsp; <input type="submit" name="cancel" value="<?php echo $user->lang['Cancel']; ?>" class="mainoption" />&nbsp;</td>
+		<td class="cat" height="28" align="center">&nbsp;<input type="submit" name="start" value="<?php echo $user->lang['START']; ?>" class="mainoption" /> &nbsp; <input type="submit" name="cancel" value="<?php echo $user->lang['CANCEL']; ?>" class="mainoption" />&nbsp;</td>
 	</tr>
 </table></form>
 

phpBB/admin/admin_smilies.php

@@ -27,8 +27,8 @@ if (!empty($setmodules))
 	}
 
 	$filename = basename(__FILE__);
-	$module['Posts']['Emoticons'] = $filename . $SID . '&type=emoticons';
+	$module['POST']['EMOTICONS'] = $filename . $SID . '&type=emoticons';
-	$module['Posts']['Topic_icons'] = $filename . $SID . '&type=icons';
+	$module['POST']['TOPIC_ICONS'] = $filename . $SID . '&type=icons';
 
 	return;
 }

phpBB/admin/admin_styles.php

@@ -8,10 +8,10 @@ if ( !empty($setmodules) )
 	}
 
 	$filename = basename(__FILE__);
-	$module['Styles']['Edit_Style'] = $filename . "$SID&mode=newstyle";
+	$module['STYLE']['EDIT_STYLE'] = $filename . "$SID&mode=newstyle";
-	$module['Styles']['Edit_Template'] = $filename . "$SID&mode=edittemplate";
+	$module['STYLE']['EDIT_TEMPLATE'] = $filename . "$SID&mode=edittemplate";
-	$module['Styles']['Edit_Theme'] = $filename . "$SID&mode=edittheme";
+	$module['STYLE']['EDIT_THEME'] = $filename . "$SID&mode=edittheme";
-	$module['Styles']['Edit_Imageset'] = $filename . "$SID&mode=editimageset";
+	$module['STYLE']['EDIT_IMAGESET'] = $filename . "$SID&mode=editimageset";
 
 	return;
 }

phpBB/admin/admin_users.php

@@ -26,7 +26,7 @@ if (!empty($setmodules))
 		return;
 	}
 
-	$module['Users']['Manage'] = basename(__FILE__) . $SID;
+	$module['USER']['MANAGE'] = basename(__FILE__) . $SID;
 
 	return;
 }

phpBB/admin/admin_viewlogs.php

@@ -27,8 +27,8 @@ if (!empty($setmodules))
 	}
 
 	$filename = basename(__FILE__);
-	$module['Log']['Admin_logs'] = $filename . "$SID&mode=admin";
+	$module['LOG']['ADMIN_LOGS'] = $filename . "$SID&mode=admin";
-	$module['Log']['Mod_logs'] = $filename . "$SID&mode=mod";
+	$module['LOG']['MOD_LOGS'] = $filename . "$SID&mode=mod";
 
 	return;
 }

phpBB/admin/admin_words.php

@@ -26,7 +26,7 @@ if (!empty($setmodules))
 		return;
 	}
 
-	$module['Posts']['Word_Censor'] = basename(__FILE__) . $SID;
+	$module['POST']['WORD_CENSOR'] = basename(__FILE__) . $SID;
 	return;
 }
 

phpBB/admin/index.php

@@ -82,13 +82,13 @@ else if (isset($_GET['pane']) && $_GET['pane'] == 'left')
 	<tr>
 		<td width="100%"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
-				<th class="menu" height="25">&#0187; <?php echo $user->lang['Return_to']; ?></th>
+				<th class="menu" height="25">&#0187; <?php echo $user->lang['RETURN_TO']; ?></th>
 			</tr>
 			<tr>
-				<td class="row1"><a class="genmed" href="index.<?php echo $phpEx . $SID; ?>&amp;pane=right" target="main"><?php echo $user->lang['Admin_Index']; ?></a></td>
+				<td class="row1"><a class="genmed" href="index.<?php echo $phpEx . $SID; ?>&amp;pane=right" target="main"><?php echo $user->lang['ADMIN_INDEX']; ?></a></td>
 			</tr>
 			<tr>
-				<td class="row2"><a class="genmed" href="../index.<?php echo $phpEx . $SID; ?>" target="_top"><?php echo $user->lang['Forum_index']; ?></a></td>
+				<td class="row2"><a class="genmed" href="../index.<?php echo $phpEx . $SID; ?>" target="_top"><?php echo $user->lang['FORUM_INDEX']; ?></a></td>
 			</tr>
 <?php
 
@@ -97,7 +97,7 @@ else if (isset($_GET['pane']) && $_GET['pane'] == 'left')
 		@ksort($module);
 		foreach ($module as $cat => $action_ary)
 		{
-			$cat = (empty($user->lang[$cat . '_cat'])) ? $user->lang[$cat . '_cat'] : preg_replace('/_/', ' ', $cat);
+			$cat = (!empty($user->lang[$cat . '_CAT'])) ? $user->lang[$cat . '_CAT'] : preg_replace('#_#', ' ', $cat);
 
 ?>
 			<tr>

phpBB/language/en/lang_admin.php

@@ -21,48 +21,67 @@
 
 $lang = array_merge($lang, array(
 	'Admin_title'	=> 'Administration Panel',
+	'Admin'			=> 'Administration',
 	'NO_ADMIN'		=> 'You are not authorised to administer this board',
-	'No_frames' => 'Sorry, your browser does not support frames',
+	'NO_FRAMES'		=> 'Sorry, your browser does not support frames',
-	'Return_to' => 'Return to ...',
+	'RETURN_TO'		=> 'Return to ...',
-	'DB_cat' => 'Database Admin',
+	'FORUM_INDEX'	=> 'Forum Index',
-	'Forums_cat' => 'Forum Admin',
+	'ADMIN_INDEX'	=> 'Admin Index',
-	'General_cat' => 'General Admin',
+
-	'Groups_cat' => 'Group Admin',
-	'Log_cat' => 'Log Admin',
-	'Posts_cat' => 'Posting Admin',
-	'Styles_cat' => 'Styles Admin',
-	'Users_cat' => 'User Admin',
-	'Avatar_settings' => 'Avatar Settings',
-	'Cookie_settings' => 'Cookie Settings',
-	'Board_defaults' => 'Board Defaults',
-	'Board_settings' => 'Board Settings',
-	'Email_settings' => 'Email Settings',
-	'Server_settings' => 'Server Settings',
-	'Auth_settings' => 'Authentication',
 	'PERMISSIONS'	=> 'Permissions',
-	'Manage' => 'Manage',
+	'MANAGE'		=> 'Manage',
-	'Disallow' => 'Disallow names',
+
-	'Prune' => 'Pruning',
+	'DB_CAT'		=> 'Database Admin', 
-	'Mass_Email' => 'Mass Email',
+	'DB_BACKUP'		=> 'DB Backup',
-	'Ranks' => 'Ranks',
+	'DB_RESTORE'	=> 'DB Restore',
-	'Smilies' => 'Smilies',
+	'SEARCH_INDEX'	=> 'Search indexing', 
-	'Topic_icons' => 'Topic Icons',
+
-	'Ban_users' => 'Ban Usernames',
+	'FORUM_CAT'	=> 'Forum Admin',
-	'Ban_emails' => 'Ban Emails',
+	'PRUNE'		=> 'Pruning',
-	'Ban_ips' => 'Ban IPs',
+
-	'Word_Censor' => 'Word Censors',
+	'GENERAL_CAT'		=> 'General Admin',
-	'Export' => 'Export',
+	'AUTH_SETTINGS'		=> 'Authentication',
-	'Create_new' => 'Create',
+	'AVATAR_SETTINGS'	=> 'Avatar Settings',
-	'Add_new' => 'Add',
+	'BASIC_CONFIG'		=> 'Basic Configuration',
-	'DB_Backup' => 'DB Backup',
+	'BOARD_DEFAULTS'	=> 'Board Defaults',
-	'DB_Restore' => 'DB Restore',
+	'BOARD_SETTINGS'	=> 'Board Settings',
-	'Basic_Config' => 'Basic Configuration',
+	'COOKIE_SETTINGS'	=> 'Cookie Settings',
+	'EMAIL_SETTINGS'	=> 'Email Settings',
+	'MASS_EMAIL'		=> 'Mass Email',
+	'SERVER_SETTINGS'	=> 'Server Settings',
+	'EVENTS'			=> 'Events', 
+	'CRON'				=> 'Cronjobs', 
+
+	'GROUP_CAT'	=> 'Group Admin',
+	'CREATE'	=> 'Create',
+
+	'LOG_CAT'	=> 'Log Admin',
+	'ADMIN_LOGS'=> 'Admin Log',
+	'MOD_LOGS'	=> 'Moderator Log',
+
+	'POST_CAT'		=> 'Posting Admin',
+	'SMILIES'		=> 'Smilies',
+	'TOPIC_ICONS'	=> 'Topic Icons',
+	'WORD_CENSOR'	=> 'Word Censors',
+
+	'STYLE_CAT'		=> 'Styles Admin',
+	'EDIT_STYLE'	=> 'Edit style', 
+	'EDIT_TEMPLATE'	=> 'Edit template', 
+	'EDIT_THEME'	=> 'Edit theme', 
+	'EDIT_IMAGESET'	=> 'Edit imageset', 
+
+	'USER_CAT'		=> 'User Admin', 
+	'BAN_EMAILS'	=> 'Ban Emails',
+	'BAN_IPS'		=> 'Ban IPs',
+	'BAN_USERS'		=> 'Ban Usernames',
+	'DISALLOW'		=> 'Disallow names',
+	'RANKS'			=> 'Ranks',
+	'PRUNE_USERS'	=> 'Prune users', 
+
 	'ADMINISTRATORS' => 'Administrators',
-	'Admin_logs' => 'Admin Log',
+
-	'Mod_logs' => 'Moderator Log',
-	'Users' => 'Users',
-	'Groups' => 'Groups',
 	'Look_up_Forum' => 'Select a Forum',
+
 	'log_index_activate'	=> '<b>Activated inactive users</b> => %s users',
 	'log_index_delete'		=> '<b>Deleted inactive users</b> => %s',
 	'log_index_remind'		=> '<b>Sent reminder emails to inactive users</b> => %s users',
@@ -98,12 +117,14 @@ $lang = array_merge($lang, array(
 	'log_avatar_config'		=> '<b>Altered avatar settings</b>',
 	'log_auth_config'		=> '<b>Altered authentication settings</b>',
 	'log_prune_user_deac'	=> '<b>Users Deactivated</b> => %s',
-	'log_prune_user_del_del' => '<b>Users Pruned and Posts Deleted</b> => %s',
+	'log_prune_user_del_del'=> '<b>Users Pruned and Posts Deleted</b> => %s',
-	'log_prune_user_del_anon' => '<b>Users Pruned and Posts Retained</b> => %s',
+	'log_prune_user_del_anon'=> '<b>Users Pruned and Posts Retained</b> => %s',
+
 	'RUN_HOW'	=> 'When to run', 
-	'RUN_AS_NOW' => 'Run now',
+	'RUN_AS_NOW'=> 'Run now',
-	'RUN_AS_EVT' => 'Run as Event', 
+	'RUN_AS_EVT'=> 'Run as Event', 
-	'RUN_AS_CRN' => 'Run as Cron', 
+	'RUN_AS_CRN'=> 'Run as Cron', 
+
 
 	'EVT_DEFINE' => 'Define an Event', 
 	'EVT_DEFINE_EXPLAIN' => 'Here you can decide what conditions are necessary for the information you previously provided to be executed. For example, if you defined a change in permissions you can decide to enable it only when a user has registered for a minimum number of days. You can define up to three trigger points. The forum selection only matters if the trigger is post count, it has no effect if days registered or karma are selected. Please note that events are user based. If you selected a usergroup the event will be executed for each user of that group.',
@@ -124,14 +145,10 @@ $lang = array_merge($lang, array(
 	'Sort_date' => 'Date',
 	'Sort_action' => 'Log action',
 	'No_entries' => 'No log entries for this period',
-	'Admin' => 'Administration',
+
-	'Not_admin' => 'You are not authorised to administer this board',
 	'Welcome_phpBB' => 'Welcome to phpBB',
 	'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. The links on the left hand side of this screen allow you to control every aspect of your forum experience. Each page will have instructions on how to use the tools.',
-	'Main_index' => 'Forum Index',
 	'Forum_stats' => 'Forum Statistics',
-	'Admin_Index' => 'Admin Index',
-	'Preview_forum' => 'Preview Forum',
 	'Click_return_admin_index' => 'Click %sHere%s to return to the Admin Index',
 	'Statistic' => 'Statistic',
 	'Value' => 'Value',
@@ -155,6 +172,7 @@ $lang = array_merge($lang, array(
 	'Admin_log_index_explain' => 'This gives an overview of the last few actions carried out by board administrators. The username, IP, time and action are all listed. A full copy of the log can be viewed from the appropriate menu item to the left',
 	'IP' => 'User IP',
 	'Action' => 'Action',
+
 	'Database_Utilities' => 'Database Utilities',
 	'Restore' => 'Restore',
 	'Backup' => 'Backup',
@@ -187,6 +205,7 @@ $lang = array_merge($lang, array(
 	'Restore_Error_filename' => 'The file you uploaded had an unsupported extension.',
 	'Compress_unsupported' => 'The version of PHP installed on this server does not support the type of compression used for your backup. Please use a compression method listed on the previous page.',
 	'Restore_Error_no_file' => 'No file was uploaded',
+
 	'ACL_EXPLAIN' => 'Permissions are based on an ALLOW / INHERIT / DENY system with all options being denied by default. The precedent is DENY &gt; ALLOW &gt; INHERIT for any combination of user or group settings. The INHERIT setting causes permissions granted elsewhere for the option being used in place of a specific ALLOW / DENY setting here.',
 	'PERMISSIONS_EXPLAIN' => 'Here you can alter which users and groups can access which forums. To assign moderators or define administrators please use the appropriate page (see left hand side menu).',
 	'MODERATORS' => 'Moderators',
@@ -199,7 +218,6 @@ $lang = array_merge($lang, array(
 	'GROUP_PERMISSIONS' => 'Group Permissions', 
 	'GROUP_PERMISSIONS_EXPLAIN' => 'Here you can set usergroup based permissions. These include capabilities such as the use of avatars, sending private messages, etc. To alter these settings for single users the User permissions system is the prefered method.', 
 	'LOOK_UP_GROUP' => 'Look up Usergroup', 
-
 	'Manage_users' => 'Manage Users',
 	'Add_users' => 'Add Users',
 	'Manage_groups' => 'Manage Groups',
@@ -233,6 +251,7 @@ $lang = array_merge($lang, array(
 	'SELECT_PRESET' => 'Select preset', 
 	'PRESET_NAME' => 'Preset name', 
 	'EMPTY' => 'Empty',
+	'Auth_updated' => 'Permissions have been updated',
 
 	'acl_a_server' 		=> 'Alter Server/Email Settings',
 	'acl_a_defaults' 	=> 'Alter Board Defaults',
@@ -307,7 +326,7 @@ $lang = array_merge($lang, array(
 	'acl_u_avatar' => 'Display avatar',
 	'acl_u_email' => 'Send emails',
 
-	'Auth_updated' => 'Permissions have been updated',
+
 	'Prune_users' => 'Prune Users',
 	'Prune_users_explain' => 'Here you can delete (or deactivate) users from you board. This can be done in a variety of ways; by post count, last activity, etc. Each of these criteria can be combined, i.e. you can prune users last active before 2002-01-01 with fewer than 10 posts. Alternatively you can enter a list of users directly into the text box, any criteria entered will be ignored. Take care with this facility! Once a user is deleted there is no way back.',
 	'Select_users_explain' => 'If you want to prune specifc users rather than use the criteria above you can enter their usernames here, one per line. Use the find username facility if you wish.',
@@ -318,33 +337,35 @@ $lang = array_merge($lang, array(
 	'Delete_user_posts_explain' => 'Setting this to yes will remove all posts made by the pruned users.',
 	'Confirm_prune_users' => 'Are you sure you wish to prune the selected users?',
 	'Success_user_prune' => 'The selected users have been pruned successfully',
-	'Ban_explain' => 'Here you can control the banning of users by name, IP or email address. These methods prevent a user reaching any part of the board. You can give a short (255 character) reason for the ban if you wish. This will be displayed in the admin log. The length of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select <u>Until</u> for the ban length and enter a date in yyyy-mm-dd format.',
+
-	'Ban_length' => 'Length of ban',
+	'BAN_EXPLAIN' => 'Here you can control the banning of users by name, IP or email address. These methods prevent a user reaching any part of the board. You can give a short (255 character) reason for the ban if you wish. This will be displayed in the admin log. The length of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select <u>Until</u> for the ban length and enter a date in yyyy-mm-dd format.',
-	'Permanent' => 'Permanent',
+	'BAN_LENGTH' => 'Length of ban',
-	'30_Mins' => '30 Minutes',
+	'PERMANENT' => 'Permanent',
-	'1_Hour' => '1 Hour',
+	'30_MINS' => '30 Minutes',
-	'6_Hours' => '6 Hours',
+	'1_HOUR' => '1 Hour',
-	'Other' => 'Until -&gt;', 
+	'6_HOURS' => '6 Hours',
+	'OTHER' => 'Until', 
 	'BAN_EXCLUDE' => 'Exclude from banning', 
 	'BAN_USER_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered users from all current bans.', 
 	'BAN_EMAIL_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered email address from all current bans.', 
 	'BAN_IP_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered IP from all current bans.', 
-	'Ban_reason' => 'Reason for ban',
+	'BAN_REASON' => 'Reason for ban',
-	'Ban_username_explain' => 'You can ban multiple users in one go by entering each name on a new line. Use the <u>Find a Username</u> facility to look up and add one or more users automatically.',
+	'BAN_USERNAME_EXPLAIN' => 'You can ban multiple users in one go by entering each name on a new line. Use the <u>Find a Username</u> facility to look up and add one or more users automatically.',
-	'Unban_username' => 'Un-ban or Un-exclude usernames',
+	'UNBAN_USERNAME' => 'Un-ban or Un-exclude usernames',
-	'Unban_username_explain' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are listed in Red.',
+	'UNBAN_USERNAME_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users have a grey background.',
-	'IP_hostname' => 'IP addresses or hostnames',
+	'IP_HOSTNAME' => 'IP addresses or hostnames',
-	'Ban_IP_explain' => 'To specify several different IP\'s or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use *',
+	'BAN_IP_EXPLAIN' => 'To specify several different IP\'s or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use *',
-	'Unban_IP' => 'Un-ban or Un-exclude IPs',
+	'UNBAN_IP' => 'Un-ban or Un-exclude IPs',
-	'Unban_IP_explain' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Un-excluded IP\'s are listed in Red.',
+	'UNBAN_IP_EXPLAIN' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IP\'s have a grey background.',
-	'Ban_email' => 'Ban one or more email addresses',
+	'BAN_EMAIL' => 'Ban one or more email addresses',
-	'Ban_email_explain' => 'To specify more than one email address enter each on a new line. To match partial addresses use * as the wildcard, e.g. *@hotmail.com, *@*.domain.tld, etc.',
+	'BAN_EMAIL_EXPLAIN' => 'To specify more than one email address enter each on a new line. To match partial addresses use * as the wildcard, e.g. *@hotmail.com, *@*.domain.tld, etc.',
-	'Unban_email' => 'Un-ban or Un-exclude Emails',
+	'UNBAN_EMAIL' => 'Un-ban or Un-exclude Emails',
-	'Unban_email_explain' => 'You can unban (or un-exclude) multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Un-excluded email addresses are listed in Red.',
+	'UNBAN_EMAIL_EXPLAIN' => 'You can unban (or un-exclude) multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded email addresses have a grey background.',
-	'No_banned_users' => 'No banned usernames',
+	'NO_BANNED_USERS' => 'No banned usernames',
-	'No_banned_ip' => 'No banned IP addresses',
+	'NO_BANNED_IP' => 'No banned IP addresses',
-	'No_banned_email' => 'No banned email addresses',
+	'NO_BANNED_EMAIL' => 'No banned email addresses',
-	'Ban_update_sucessful' => 'The banlist has been updated successfully',
+	'BAN_UPDATE_SUCESSFUL' => 'The banlist has been updated successfully', 
+
 	'Cookie_settings_explain' => 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in.',
 	'Cookie_domain' => 'Cookie domain',
 	'Cookie_name' => 'Cookie name',
@@ -554,6 +575,7 @@ $lang = array_merge($lang, array(
 	'Smile_added' => 'This emoticon has been successfully added',
 	'Smilies_imported' => 'The emoticons pack has been successfully imported',
 	'Click_return_smileadmin' => 'Click %sHere%s to return to Emoticons Administration',
+
 	'User_admin' => 'User Administration',
 	'User_admin_explain' => 'Here you can change your user\'s information and certain specific options. To modify the users permissions please use the user and group permissions system.',
 	'Look_up_user' => 'Look up user',
@@ -568,6 +590,7 @@ $lang = array_merge($lang, array(
 	'Admin_avatar_explain' => 'Here you can see and delete the users current avatar.',
 	'User_special' => 'Special admin-only fields',
 	'User_special_explain' => 'These fields are not able to be modified by the users.  Here you can set their status and other options that are not given to users.',
+
 	'Group_administration' => 'Group Administration',
 	'Group_admin_explain' => 'From this panel you can administer all your usergroups, you can; delete, create and edit existing groups. You may choose moderators, toggle open/closed group status and set the group name and description',
 	'Error_updating_groups' => 'There was an error while updating the groups',
@@ -595,6 +618,7 @@ $lang = array_merge($lang, array(
 	'Click_return_groupsadmin' => 'Click %sHere%s to return to Group Administration.',
 	'Select_group' => 'Select a group',
 	'Look_up_group' => 'Look up group',
+
 	'Forum_Prune' => 'Forum Prune',
 	'Forum_Prune_explain' => 'This will delete any topic which has not been posted to within the number of days you select. If you do not enter a number then all topics will be deleted. It will not remove topics in which polls are still running nor will it remove announcements. You will need to remove these topics manually.',
 	'Do_Prune' => 'Do Prune',
@@ -603,6 +627,7 @@ $lang = array_merge($lang, array(
 	'Topics_pruned' => 'Topics pruned',
 	'Posts_pruned' => 'Posts pruned',
 	'Prune_success' => 'Pruning of forums was successful',
+
 	'Words_title' => 'Word Censoring',
 	'Words_explain' => 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. In addition people will not be allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, eg. *test* will match detestable, test* would match testing, *test would match detest.',
 	'Word' => 'Word',
@@ -615,11 +640,13 @@ $lang = array_merge($lang, array(
 	'Word_updated' => 'The selected word censor has been successfully updated',
 	'Word_added' => 'The word censor has been successfully added',
 	'Word_removed' => 'The selected word censor has been successfully removed', 
+
 	'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 recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed',
 	'Compose' => 'Compose',
 	'Recipients' => 'Recipients',
 	'All_users' => 'All Users',
 	'Email_successfull' => 'Your message has been sent',
+
 	'Ranks_explain' => 'Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility',
 	'Add_new_rank' => 'Add new rank',
 	'Rank_title' => 'Rank Title',
@@ -633,6 +660,7 @@ $lang = array_merge($lang, array(
 	'Rank_added' => 'The rank was successfully added',
 	'Rank_removed' => 'The rank was successfully deleted',
 	'No_update_ranks' => 'The rank was successfully deleted, however, user accounts using this rank were not updated.  You will need to manually reset the rank on these accounts',
+
 	'Disallow_control' => 'Username Disallow Control',
 	'Disallow_explain' => 'Here you can control usernames which will not be allowed to be used.  Disallowed usernames are allowed to contain a wildcard character of *.  Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it',
 	'Delete_disallow' => 'Delete',
@@ -645,6 +673,7 @@ $lang = array_merge($lang, array(
 	'Disallowed_deleted' => 'The disallowed username has been successfully removed',
 	'Disallow_successful' => 'The disallowed username has been successfully added',
 	'Disallowed_already' => 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present',
+
 	'Edit_style' => 'Edit Styles',
 	'Style' => 'Style',
 	'Styles_admin' => 'Styles Administration',
@@ -680,6 +709,13 @@ $lang = array_merge($lang, array(
 	'Style_exists' => 'The style name to selected already exists, please go back and choose a different name.',
 	'Click_return_styleadmin' => 'Click %sHere%s to return to Style Administration',
 	'Save_Settings' => 'Save Settings',
+
+	'SEARCH_INDEX_EXPLAIN' => 'phpBB2 uses a fulltext search system. This breaks down each post into seperate words and then, if the word does not already exist it stores those words in a table. In turn the post is linked to each word it contains in this table. This allows quick searching of large databases and helps reduce load on the server compared to most other methods.</p><p>However, if the tables get out of sync for some reason or you change the minimum, maximum or disallowed list of words the tables need updating. This facility allows you to do just that.</p><p>Please be aware this procedure can take a long time, particularly on large databases. During this period your forum will be automatically shut down to prevent people posting. You can cancel the procedure at any time. Please remember this is an intensive operation and should only be carried out when absolutely necessarily. Do not run this script too often!</p>',
+	'SEARCH_INDEX_CANCEL' => 'Re-indexing of search system has been cancelled. Please note this will result in searches returning incomplete results. You can re-index the posts again at any stage.',
+	'SEARCH_INDEXING_COMPLETE' => 'Re-indexing of search system has been completed. You can re-index the posts again at any stage.',
+	'START' => 'Start',
+	'STOP' => 'Stop', 
+
 	'Welcome_install' => 'Welcome to phpBB 2 Installation',
 	'Initial_config' => 'Basic Configuration',
 	'DB_config' => 'Database Configuration',
@@ -725,11 +761,5 @@ $lang = array_merge($lang, array(
 	'Install_No_PHP4' => 'phpBB2 requires you have at least PHP 4.0.4 installed<br /><br />Contact your hosting provider or see <a href=\"http://www.php.net/\">www.php.net</a> for more information',
 	'Install_No_Ext' => 'The PHP configuration on your server does not support the database type that you choose<br /><br />Contact your hosting provider or see <a href=\"http://www.php.net/\">www.php.net</a> for more information',
 	'Install_No_PCRE' => 'phpBB2 requires the Perl-Compatible Regular Expressions module for PHP to be available<br /><br />Contact your hosting provider or see <a href=\"http://www.php.net/\">www.php.net</a> for more information',
-	'Search_indexing' => 'Search Indexing',
-	'Search_indexing_explain' => 'phpBB2 uses a fulltext search system. This breaks down each post into seperate words and then, if the word does not already exist it stores those words in a table. In turn the post is linked to each word it contains in this table. This allows quick searching of large databases and helps reduce load on the server compared to most other methods.</p><p>However, if the tables get out of sync for some reason or you change the minimum, maximum or disallowed list of words the tables need updating. This facility allows you to do just that.</p><p>Please be aware this procedure can take a long time, particularly on large databases. During this period your forum will be automatically shut down to prevent people posting. You can cancel the procedure at any time. Please remember this is an intensive operation and should only be carried out when absolutely necessarily. Do not run this script too often!</p>',
-	'Search_indexing_cancel' => 'Re-indexing of search system has been cancelled. Please note this will result in searches returning incomplete results. You can re-index the posts again at any stage.',
-	'Search_indexing_complete' => 'Re-indexing of search system has been completed. You can re-index the posts again at any stage.',
-	'Start' => 'Start',
-	'Stop' => 'Stop'
 ));
 ?>