[gentoo-commits] gentoo-projects commit in forums/htdocs/admin: admin_user_ban.php

[Dean Stephens (desultory)]

desultory    10/11/06 03:41:52

  Modified:             admin_user_ban.php
  Log:
  Allow use of a simplified template for prespecified targets.

Revision  Changes    Path
1.11                 forums/htdocs/admin/admin_user_ban.php

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_user_ban.php?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_user_ban.php?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_user_ban.php?r1=1.10&r2=1.11

Index: admin_user_ban.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_user_ban.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- admin_user_ban.php	6 Feb 2007 18:42:11 -0000	1.10
+++ admin_user_ban.php	6 Nov 2010 03:41:52 -0000	1.11
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: admin_user_ban.php,v 1.10 2007/02/06 18:42:11 tomk Exp $
+ *   $Id: admin_user_ban.php,v 1.11 2010/11/06 03:41:52 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -305,9 +305,22 @@
 }
 else
 {
-	$template->set_filenames(array(
-		'body' => 'admin/user_ban_body.tpl')
-	);
+	$just_ban = ( isset($HTTP_GET_VARS['username']) || isset($HTTP_GET_VARS['ban_ip']) || isset($HTTP_GET_VARS['ban_email']) );
+
+	if ( $just_ban )
+	{
+		$template->set_filenames(array(
+			'body' => 'admin/user_just_ban_body.tpl')
+		);
+		 1;
+	}
+	else
+	{
+		$template->set_filenames(array(
+			'body' => 'admin/user_ban_body.tpl')
+		);
+	}
+
 
 	$hidden = $pane == '' ? '<input type="hidden" name="nopane" value="1">' : '';
 
@@ -333,109 +346,112 @@
 		'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain'])
 	);
 
-	$userban_count = 0;
-	$ipban_count = 0;
-	$emailban_count = 0;
-
-	$sql = "SELECT b.ban_id, u.user_id, u.username
-		FROM " . BANLIST_TABLE . " b, " . USERS_TABLE . " u
-		WHERE u.user_id = b.ban_userid
-			AND b.ban_userid <> 0
-			AND u.user_id <> " . ANONYMOUS . "
-		ORDER BY u.username ASC";
-		// 2005-05-10 tomk - Order banned list by username
-	if ( !($result = $db->sql_query($sql)) )
+	if ( !$just_ban )
 	{
-		message_die(GENERAL_ERROR, 'Could not select current user_id ban list', '', __LINE__, __FILE__, $sql);
-	}
+		$userban_count = 0;
+		$ipban_count = 0;
+		$emailban_count = 0;
 
-	$user_list = $db->sql_fetchrowset($result);
-	$db->sql_freeresult($result);
+		$sql = "SELECT b.ban_id, u.user_id, u.username
+			FROM " . BANLIST_TABLE . " b, " . USERS_TABLE . " u
+			WHERE u.user_id = b.ban_userid
+				AND b.ban_userid <> 0
+				AND u.user_id <> " . ANONYMOUS . "
+			ORDER BY u.username ASC";
+			// 2005-05-10 tomk - Order banned list by username
+		if ( !($result = $db->sql_query($sql)) )
+		{
+			message_die(GENERAL_ERROR, 'Could not select current user_id ban list', '', __LINE__, __FILE__, $sql);
+		}
 
-	$select_userlist = '';
-	for($i = 0; $i < count($user_list); $i++)
-	{
-		$select_userlist .= '<option value="' . $user_list[$i]['ban_id'] . '">' . $user_list[$i]['username'] . '</option>';
-		$userban_count++;
-	}
+		$user_list = $db->sql_fetchrowset($result);
+		$db->sql_freeresult($result);
 
-	if( $select_userlist == '' )
-	{
-		$select_userlist = '<option value="-1">' . $lang['No_banned_users'] . '</option>';
-	}
+		$select_userlist = '';
+		for($i = 0; $i < count($user_list); $i++)
+		{
+			$select_userlist .= '<option value="' . $user_list[$i]['ban_id'] . '">' . $user_list[$i]['username'] . '</option>';
+			$userban_count++;
+		}
 
-	$select_userlist = '<select name="unban_user[]" multiple="multiple" size="5">' . $select_userlist . '</select>';
+		if( $select_userlist == '' )
+		{
+			$select_userlist = '<option value="-1">' . $lang['No_banned_users'] . '</option>';
+		}
 
-	// 2005-10-13 tomk - sort IPs and email addresses
-	$sql = "SELECT ban_id, ban_ip
-		FROM " . BANLIST_TABLE . "
-		WHERE ban_ip != ''
-		ORDER BY ban_ip";
-	if ( !($result = $db->sql_query($sql)) )
-	{
-		message_die(GENERAL_ERROR, 'Could not select current ip ban list', '', __LINE__, __FILE__, $sql);
-	}
+		$select_userlist = '<select name="unban_user[]" multiple="multiple" size="5">' . $select_userlist . '</select>';
 
-	$banlist = $db->sql_fetchrowset($result);
-	$db->sql_freeresult($result);
+		// 2005-10-13 tomk - sort IPs and email addresses
+		$sql = "SELECT ban_id, ban_ip
+			FROM " . BANLIST_TABLE . "
+			WHERE ban_ip != ''
+			ORDER BY ban_ip";
+		if ( !($result = $db->sql_query($sql)) )
+		{
+			message_die(GENERAL_ERROR, 'Could not select current ip ban list', '', __LINE__, __FILE__, $sql);
+		}
 
-	$select_iplist = '';
+		$banlist = $db->sql_fetchrowset($result);
+		$db->sql_freeresult($result);
 
-	for($i = 0; $i < count($banlist); $i++)
-	{
-		$ban_id = $banlist[$i]['ban_id'];
+		$select_iplist = '';
 
-		if ( !empty($banlist[$i]['ban_ip']) )
+		for($i = 0; $i < count($banlist); $i++)
 		{
-			// 2006-01-25 tomk - use CIDR format for IP ranges
-			$ban_ip = decode_ip($banlist[$i]['ban_ip']);
+			$ban_id = $banlist[$i]['ban_id'];
+
+			if ( !empty($banlist[$i]['ban_ip']) )
+			{
+				// 2006-01-25 tomk - use CIDR format for IP ranges
+				$ban_ip = decode_ip($banlist[$i]['ban_ip']);
 
-			$select_iplist .= '<option value="' . $ban_id . '">' . $ban_ip . '</option>';
-			$ipban_count++;
+				$select_iplist .= '<option value="' . $ban_id . '">' . $ban_ip . '</option>';
+				$ipban_count++;
+			}
 		}
-	}
 
-	if ( $select_iplist == '' )
-	{
-		$select_iplist = '<option value="-1">' . $lang['No_banned_ip'] . '</option>';
-	}
+		if ( $select_iplist == '' )
+		{
+			$select_iplist = '<option value="-1">' . $lang['No_banned_ip'] . '</option>';
+		}
 
-	$select_emaillist = '';
+		$select_emaillist = '';
 
-	$sql = "SELECT ban_id, ban_email
-		FROM " . BANLIST_TABLE . "
-		WHERE ban_email IS NOT NULL
-		ORDER BY ban_email";
-	if ( !($result = $db->sql_query($sql)) )
-	{
-		message_die(GENERAL_ERROR, 'Could not select current email ban list', '', __LINE__, __FILE__, $sql);
-	}
+		$sql = "SELECT ban_id, ban_email
+			FROM " . BANLIST_TABLE . "
+			WHERE ban_email IS NOT NULL
+			ORDER BY ban_email";
+		if ( !($result = $db->sql_query($sql)) )
+		{
+			message_die(GENERAL_ERROR, 'Could not select current email ban list', '', __LINE__, __FILE__, $sql);
+		}
 
-	$banlist = $db->sql_fetchrowset($result);
-	$db->sql_freeresult($result);
+		$banlist = $db->sql_fetchrowset($result);
+		$db->sql_freeresult($result);
 
-	$select_emaillist = '';
+		$select_emaillist = '';
 
-	for($i = 0; $i < count($banlist); $i++)
-	{
-		$ban_id = $banlist[$i]['ban_id'];
+		for($i = 0; $i < count($banlist); $i++)
+		{
+			$ban_id = $banlist[$i]['ban_id'];
+
+			if ( !empty($banlist[$i]['ban_email']) )
+			{
+				$ban_email = $banlist[$i]['ban_email'];
+				$select_emaillist .= '<option value="' . $ban_id . '">' . $ban_email . '</option>';
+				$emailban_count++;
+			}
+		}
 
-		if ( !empty($banlist[$i]['ban_email']) )
+		if ( $select_emaillist == '' )  
 		{
-			$ban_email = $banlist[$i]['ban_email'];
-			$select_emaillist .= '<option value="' . $ban_id . '">' . $ban_email . '</option>';
-			$emailban_count++;
+			$select_emaillist = '<option value="-1">' . $lang['No_banned_email'] . '</option>';
 		}
-	}
 
-	if ( $select_emaillist == '' )  
-	{
-		$select_emaillist = '<option value="-1">' . $lang['No_banned_email'] . '</option>';
+		$select_iplist = '<select name="unban_ip[]" multiple="multiple" size="5">' . $select_iplist . '</select>';
+		$select_emaillist = '<select name="unban_email[]" multiple="multiple" size="5">' . $select_emaillist . '</select>';
 	}
 
-	$select_iplist = '<select name="unban_ip[]" multiple="multiple" size="5">' . $select_iplist . '</select>';
-	$select_emaillist = '<select name="unban_email[]" multiple="multiple" size="5">' . $select_emaillist . '</select>';
-
 	$template->assign_vars(array(
 		'L_UNBAN_USER' => $lang['Unban_username'],
 		'L_UNBAN_USER_EXPLAIN' => $lang['Unban_username_explain'],
@@ -448,11 +464,17 @@
 		'L_FIND_USERNAME' => $lang['Find_username'],
 
 		'U_SEARCH_USER' => append_sid("./../search.$phpEx?mode=searchuser"), 
-		'S_UNBAN_USERLIST_SELECT' => $select_userlist,
-		'S_UNBAN_IPLIST_SELECT' => $select_iplist,
-		'S_UNBAN_EMAILLIST_SELECT' => $select_emaillist,
 		'S_BAN_ACTION' => append_sid("admin_user_ban.$phpEx"))
 	);
+
+	if ( !$just_ban )
+	{
+		$template->assign_vars(array(
+			'S_UNBAN_USERLIST_SELECT' => $select_userlist,
+			'S_UNBAN_IPLIST_SELECT' => $select_iplist,
+			'S_UNBAN_EMAILLIST_SELECT' => $select_emaillist)
+		);
+	}
 }
 
 $template->pparse('body');