merge

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

phpBB/includes/mcp/mcp_ban.php

@@ -150,7 +150,7 @@ class mcp_ban
 			'U_FIND_USERNAME'	=> append_sid('memberlist', 'mode=searchuser&form=mcp_ban&field=ban'),
 		));
 
-		if ($mode != 'user')
+		if ($mode === 'email' && !$auth->acl_get('a_user'))
 		{
 			return;
 		}
@@ -162,11 +162,24 @@ class mcp_ban
 
 		if ($user_id && $user_id <> ANONYMOUS)
 		{
-			$sql = 'SELECT username
+			$sql = 'SELECT username, user_email, user_ip
 				FROM ' . USERS_TABLE . '
 				WHERE user_id = ' . $user_id;
 			$result = $db->sql_query($sql);
-			$username = (string) $db->sql_fetchfield('username');
+			switch ($mode)
+			{
+				case 'user':
+					$pre_fill = (string) $db->sql_fetchfield('username');
+				break;
+				
+				case 'ip':
+					$pre_fill = (string) $db->sql_fetchfield('user_ip');
+				break;
+
+				case 'email':
+					$pre_fill = (string) $db->sql_fetchfield('user_email');
+				break;
+			}
 			$db->sql_freeresult($result);
 		}
 		else if ($post_id)
@@ -175,13 +188,27 @@ class mcp_ban
 
 			if (sizeof($post_info) && !empty($post_info[$post_id]))
 			{
-				$username = $post_info[$post_id]['username'];
+				switch ($mode)
+				{
+					case 'user':
+						$pre_fill = $post_info[$post_id]['username'];
+					break;
+
+					case 'ip':
+						$pre_fill = $post_info[$post_id]['poster_ip'];
+					break;
+
+					case 'email':
+						$pre_fill = $post_info[$post_id]['user_email'];
+					break;
+				}
+
 			}
 		}
 
-		if ($username)
+		if ($pre_fill)
 		{
-			$template->assign_var('USERNAMES', $username);
+			$template->assign_var('BAN_QUANTIFIER', $pre_fill);
 		}
 	}
 }

phpBB/language/en/memberlist.php

@@ -132,6 +132,7 @@ $lang = array_merge($lang, array(
 
 	'USERNAME_BEGINS_WITH'	=> 'Username begins with',
 	'USER_ADMIN'			=> 'Administrate user',
+	'USER_BAN'				=> 'Banning',
 	'USER_FORUM'			=> 'User statistics',
 	'USER_ONLINE'			=> 'Online',
 	'USER_PRESENCE'			=> 'Board presence',

phpBB/memberlist.php

@@ -551,6 +551,7 @@ switch ($mode)
 			'S_CUSTOM_FIELDS'	=> (isset($profile_fields['row']) && sizeof($profile_fields['row'])) ? true : false,
 
 			'U_USER_ADMIN'			=> ($auth->acl_get('a_user')) ? append_sid(CONFIG_ADM_FOLDER . '/index', 'i=users&mode=overview&u=' . $user_id, true, $user->session_id) : '',
+			'U_USER_BAN'			=> ($auth->acl_get('m_ban')) ? append_sid(CONFIG_ADM_FOLDER . 'mcp.$phpEx', 'i=ban&mode=user&u=' . $user_id) : '',
 			'U_SWITCH_PERMISSIONS'	=> ($auth->acl_get('a_switchperm') && $user->data['user_id'] != $user_id) ? append_sid('ucp', "mode=switch_perm&u={$user_id}") : '',
 
 			'S_ZEBRA'			=> ($user->data['user_id'] != $user_id && $user->data['is_registered'] && $zebra_enabled) ? true : false,

phpBB/styles/prosilver/template/mcp_ban.html

@@ -44,7 +44,7 @@
 	<fieldset>
 	<dl>
 		<dt><label for="ban">{L_BAN_CELL}:</label></dt>
-		<dd><label for="ban"><textarea name="ban" id="ban" class="inputbox" cols="40" rows="3">{USERNAMES}</textarea></label></dd>
+		<dd><label for="ban"><textarea name="ban" id="ban" class="inputbox" cols="40" rows="3">{BAN_QUANTIFIER}</textarea></label></dd>
 		<!-- IF S_USERNAME_BAN --><dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd><!-- ENDIF -->
 	</dl>
 	<dl>

phpBB/styles/prosilver/template/memberlist_view.html

@@ -19,6 +19,7 @@
 		<dd>
 			<!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span>
 			<!-- IF U_USER_ADMIN --> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF -->
+			<!-- IF U_USER_BAN --> [ <a href="{U_USER_BAN}">{L_USER_BAN}</a> ]<!-- ENDIF -->
 			<!-- IF U_SWITCH_PERMISSIONS --> [ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]<!-- ENDIF -->
 		</dd>
 		<!-- IF not AVATAR_IMG -->

phpBB/styles/subsilver2/template/mcp_ban.html

@@ -43,7 +43,7 @@
 <tr>
 	<td class="row1" width="45%" valign="top"><b>{L_BAN_CELL}:</b></td>
 	<td class="row2">
-		<textarea name="ban" id="ban" cols="40" rows="3" class="post">{USERNAMES}</textarea>
+		<textarea name="ban" id="ban" cols="40" rows="3" class="post">{BAN_QUANTIFIER}</textarea>
 		<!-- IF S_USERNAME_BAN --><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- ENDIF -->
 	</td>
 </tr>