more bugfixing. Important change: admins able to give ban reason for user quick tool ban - logging also syndicated, now always logged to ACP and MCP logs.

git-svn-id: file:///svn/phpbb/trunk@7426 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2007-04-29 12:30:22 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2007-04-29 12:30:22 +0000
commit: 290187c6c79d069ea669384c515ba38965ff1002 (patch)
tree: b19f7a3ee1413b8405cbf9e3ce221a19080491ea /phpBB/adm/style/acp_users_overview.html
parent: c262c4addbb8d18fdd3a84d0a4b64dd9899320c0 (diff)
download: forums-290187c6c79d069ea669384c515ba38965ff1002.tar
forums-290187c6c79d069ea669384c515ba38965ff1002.tar.gz
forums-290187c6c79d069ea669384c515ba38965ff1002.tar.bz2
forums-290187c6c79d069ea669384c515ba38965ff1002.tar.xz
forums-290187c6c79d069ea669384c515ba38965ff1002.zip
1 files changed, 129 insertions, 81 deletions
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index ccff69424c..5a794b343a 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -1,94 +1,142 @@
-	<form id="user_overview" method="post" action="{U_ACTION}">
+<form id="user_overview" method="post" action="{U_ACTION}">
 
-	<fieldset>
-		<legend>{L_ACP_USER_OVERVIEW}</legend>
-	<dl>
-		<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
-		<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
-		<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
-	</dl>
-	<!-- IF S_USER_INACTIVE -->
-	<dl>
-		<dt><label>{L_USER_IS_INACTIVE}:</label></dt>
-		<dd><strong>{USER_INACTIVE_REASON}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label>{L_REGISTERED}:</label></dt>
-		<dd><strong>{USER_REGISTERED}</strong></dd>
-	</dl>
-	<!-- IF S_USER_IP -->
-	<dl>
-		<dt><label>{L_REGISTERED_IP}:</label></dt>
-		<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
-		<dd>[ <a href="#" onclick="window.open('{U_WHOIS}', '_whois', 'height=500, resizable=yes, scrollbars=yes, width=700'); return false;">{L_WHOIS}</a> ]</dd>
-	</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label>{L_LAST_ACTIVE}:</label></dt>
-		<dd><strong>{USER_LASTACTIVE}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_POSTS}:</label></dt>
-		<dd><strong>{USER_POSTS}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_WARNINGS}:</label></dt>
-		<dd><strong>{USER_WARNINGS}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
-		<dd><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_YES}&nbsp; <input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_NO}&nbsp;</dd>
-	</dl>
-	<dl>
-		<dt><label for="user_email">{L_EMAIL}:</label></dt>
-		<dd><input class="medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
-		<dd><input class="medium" type="text" id="email_confirm" name="email_confirm" value="" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="new_password" name="new_password" value="" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="password_confirm" name="password_confirm" value="" /></dd>
-	</dl>
+<fieldset>
+	<legend>{L_ACP_USER_OVERVIEW}</legend>
+<dl>
+	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
+	<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
+	<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
+</dl>
+<!-- IF S_USER_INACTIVE -->
+<dl>
+	<dt><label>{L_USER_IS_INACTIVE}:</label></dt>
+	<dd><strong>{USER_INACTIVE_REASON}</strong></dd>
+</dl>
+<!-- ENDIF -->
+<dl>
+	<dt><label>{L_REGISTERED}:</label></dt>
+	<dd><strong>{USER_REGISTERED}</strong></dd>
+</dl>
+<!-- IF S_USER_IP -->
+<dl>
+	<dt><label>{L_REGISTERED_IP}:</label></dt>
+	<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
+	<dd>[ <a href="#" onclick="window.open('{U_WHOIS}', '_whois', 'height=500, resizable=yes, scrollbars=yes, width=700'); return false;">{L_WHOIS}</a> ]</dd>
+</dl>
+<!-- ENDIF -->
+<dl>
+	<dt><label>{L_LAST_ACTIVE}:</label></dt>
+	<dd><strong>{USER_LASTACTIVE}</strong></dd>
+</dl>
+<dl>
+	<dt><label>{L_POSTS}:</label></dt>
+	<dd><strong>{USER_POSTS}</strong></dd>
+</dl>
+<dl>
+	<dt><label>{L_WARNINGS}:</label></dt>
+	<dd><strong>{USER_WARNINGS}</strong></dd>
+</dl>
+<dl>
+	<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
+	<dd><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_YES}&nbsp; <input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_NO}&nbsp;</dd>
+</dl>
+<dl>
+	<dt><label for="user_email">{L_EMAIL}:</label></dt>
+	<dd><input class="medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" /></dd>
+</dl>
+<dl>
+	<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
+	<dd><input class="medium" type="text" id="email_confirm" name="email_confirm" value="" /></dd>
+</dl>
+<dl>
+	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
+	<dd><input type="password" id="new_password" name="new_password" value="" /></dd>
+</dl>
+<dl>
+	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
+	<dd><input type="password" id="password_confirm" name="password_confirm" value="" /></dd>
+</dl>
 
-	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		<input type="hidden" name="action" value="" />
-	</p>
+<p class="quick">
+	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	<input type="hidden" name="action" value="" />
+</p>
 
-	</fieldset>
+</fieldset>
 
-	</form>
+</form>
+
+<!-- IF not S_USER_FOUNDER or S_FOUNDER -->
+
+	<script type="text/javascript">
+	<!--
+
+		function display_reason(option)
+		{
+			if (option != 'banuser' && option != 'banemail' && option != 'banip')
+			{
+				dE('reasons', -1);
+				return;
+			}
+
+			dE('reasons', 1);
+
+			element = document.getElementById('user_quick_tools').ban_reason;
+
+			if (element.value && element.value != '{LA_USER_ADMIN_BAN_NAME_REASON}' && element.value != '{LA_USER_ADMIN_BAN_EMAIL_REASON}' && element.value != '{LA_USER_ADMIN_BAN_IP_REASON}')
+			{
+				return;
+			}
 
-	<!-- IF not S_USER_FOUNDER or S_FOUNDER -->
-		<form id="user_quick_tools" method="post" action="{U_ACTION}">
+			if (option == 'banuser')
+			{
+				element.value = '{LA_USER_ADMIN_BAN_NAME_REASON}';
+			}
+			else if (option == 'banemail')
+			{
+				element.value = '{LA_USER_ADMIN_BAN_EMAIL_REASON}';
+			}
+			else if (option == 'banip')
+			{
+				element.value = '{LA_USER_ADMIN_BAN_IP_REASON}';
+			}
+		}
 
-		<fieldset>
-			<legend>{L_USER_TOOLS}</legend>
+	//-->
+	</script>
+
+	<form id="user_quick_tools" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_USER_TOOLS}</legend>
+	<dl>
+		<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt>
+		<dd><select id="quicktools" name="action" onchange="display_reason(this.options[this.selectedIndex].value);">{S_ACTION_OPTIONS}</select></dd>
+	</dl>
+	<div style="display: none;" id="reasons">
 		<dl>
-			<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt>
-			<dd><select id="quicktools" name="action">{S_ACTION_OPTIONS}</select></dd>
+			<dt><label for="ban_reason">{L_BAN_REASON}:</label></dt>
+			<dd><input name="ban_reason" type="text" id="ban_reason" class="medium" maxlength="3000" /></dd>
 		</dl>
-			<!-- IF not S_OWN_ACCOUNT -->
-				<dl>
-					<dt><label for="delete_user">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
-					<dd><input type="checkbox" class="radio" name="delete" value="1" /></dd>
-					<dd><select id="delete_user" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
-				</dl>
-			<!-- ENDIF -->
+		<dl>
+			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}:</label></dt>
+			<dd><input name="ban_give_reason" type="text" id="ban_give_reason" class="medium" maxlength="3000" /></dd>
+		</dl>
+	</div>
+		<!-- IF not S_OWN_ACCOUNT -->
+			<dl>
+				<dt><label for="delete_user">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
+				<dd><input type="checkbox" class="radio" name="delete" value="1" /></dd>
+				<dd><select id="delete_user" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
+			</dl>
+		<!-- ENDIF -->
 
-		<p class="quick">
-			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		</p>
+	<p class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</p>
 
-		</fieldset>
+	</fieldset>
 
 	</form>
 
-	<!-- ENDIF -->
+<!-- ENDIF -->
author	Meik Sievertsen <acydburn@phpbb.com>	2007-04-29 12:30:22 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2007-04-29 12:30:22 +0000
commit	290187c6c79d069ea669384c515ba38965ff1002 (patch)
tree	b19f7a3ee1413b8405cbf9e3ce221a19080491ea /phpBB/adm/style/acp_users_overview.html
parent	c262c4addbb8d18fdd3a84d0a4b64dd9899320c0 (diff)
download	forums-290187c6c79d069ea669384c515ba38965ff1002.tar forums-290187c6c79d069ea669384c515ba38965ff1002.tar.gz forums-290187c6c79d069ea669384c515ba38965ff1002.tar.bz2 forums-290187c6c79d069ea669384c515ba38965ff1002.tar.xz forums-290187c6c79d069ea669384c515ba38965ff1002.zip