- streamlined reports to consist of the feature set we decided upon (Nils, your turn now)

- use getenv instead of $_ENV (with $_ENV the case could be wrong) - permission fixes (there was a bug arising with getting permission flags - re-added them and handled roles deletion differently) - implemented max login attempts - changed the expected return parameters for logins/sessions - added acp page for editing report/denial reasons - other fixes here and there git-svn-id: file:///svn/phpbb/trunk@5622 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-07-31 14:00:31 +02:00 · 2006-03-12 23:19:55 +00:00
parent f4cfd3665f
commit 9988679d56
58 changed files with 1117 additions and 1119 deletions
--- a/phpBB/styles/subSilver/template/index_body.html
+++ b/phpBB/styles/subSilver/template/index_body.html
@@ -2,6 +2,14 @@

 	<!-- $Id$ -->

+	<!-- IF U_MCP -->
+	<div id="pageheader">
+		<p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p>
+	</div>
+
+	<br clear="all" /><br />
+	<!-- ENDIF -->
+
 	<table class="tablebg" cellspacing="1" width="100%">
 		<tr>
 			<td class="cat" colspan="5" align="right"><a class="nav" href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a>&nbsp;</td>
--- a/phpBB/styles/subSilver/template/login_body.html
+++ b/phpBB/styles/subSilver/template/login_body.html
@@ -20,7 +20,6 @@
 			<p class="genmed" align="center"><a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a></p>
 		</td>
 		<td class="row2"><table cellspacing="1" cellpadding="4">
-
 			<!-- IF LOGIN_ERROR -->
 			<tr>
 				<td class="gensmall" colspan="2" align="center"><span class="error">{LOGIN_ERROR}</span></td>
@@ -51,6 +50,24 @@
 			<!-- ENDIF -->
 		</table></td>
 	</tr>
+	<!-- IF S_CONFIRM_CODE -->
+	<tr> 
+		<th colspan="2" height="28" valign="middle">{L_LOGIN_CONFIRMATION}</th>
+	</tr>
+	<tr> 
+		<td class="row3" colspan="2"><span class="gensmall">{L_LOGIN_CONFIRM_EXPLAIN}</span></td>
+	</tr>
+	<tr>
+		<td class="row1" colspan="2" align="center">
+			<input type="hidden" name="confirm_id" value="{CONFIRM_ID}" />
+			{CONFIRM_IMAGE}
+		</td>
+	</tr>
+	<tr> 
+		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}:  </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td>
+		<td class="row2"><input class="post" type="text"  name="confirm_code" size="8" maxlength="8" /></td>
+	</tr>
+	<!-- ENDIF -->
 	<tr>
 		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="3" /></td>
 	</tr>
--- a/phpBB/styles/subSilver/template/report_body.html
+++ b/phpBB/styles/subSilver/template/report_body.html
@@ -2,27 +2,30 @@

 	<!-- $Id$ -->

-<form method="post" action="{S_REPORT_ACTION}" name="report">
+<form method="post" id="report" action="{S_REPORT_ACTION}">
+
 <table class="tablebg" width="100%" cellspacing="1">
 <tr>
-	<th colspan="2"><!-- IF S_REPORT_POST -->{L_REPORT_POST}<!-- ELSE -->{L_REPORT_MESSAGE}<!-- ENDIF --></th>
+	<th colspan="2">{L_REPORT_POST}</th>
 </tr>
 <tr>
-	<td class="row3" colspan="2"><span class="gensmall"><!-- IF S_REPORT_POST -->{L_REPORT_POST_EXPLAIN}<!-- ELSE -->{L_REPORT_MESSAGE_EXPLAIN}<!-- ENDIF --></span></td>
+	<td class="row3" colspan="2"><span class="gensmall">{L_REPORT_POST_EXPLAIN}</span></td>
 </tr>
 <tr>
 	<td class="row1" width="22%"><b class="gen">{L_REASON}:</b></td>
-	<td class="row2" width="78%"><select name="reason_id"><!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --></select></td>
+	<td class="row2" width="78%"><select name="reason_id">
+		<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.TITLE} &raquo; {reason.DESCRIPTION}</option><!-- END reason -->
+	</select></td>
 </tr>
 <!-- IF S_CAN_NOTIFY -->
 <tr>
 	<td class="row1"><span class="gen"><b>{L_REPORT_NOTIFY}:</b></span><br /><span class="gensmall">{L_REPORT_NOTIFY_EXPLAIN}</span></td>
-	<td class="row2"><span class="gen"><input type="radio" name="notify" value="1" <!-- IF S_NOTIFY -->checked="checked" <!-- ENDIF -->/>{L_YES} &nbsp;<input type="radio" name="notify" value="0" <!-- IF not S_NOTIFY -->checked="checked" <!-- ENDIF -->/>{L_NO}</span></td>
+	<td class="row2"><span class="gen"><input type="radio" name="notify" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="notify" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</span></td>
 </tr>
 <!-- ENDIF -->
 <tr>
 	<td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}:</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td>
-	<td class="row2"><textarea class="post" style="width:500px" name="report_text" rows="25" cols="40"  class="post">{REPORT_TEXT}</textarea></td>
+	<td class="row2"><textarea class="post" style="width: 95%" name="report_text" rows="25" cols="40" class="post">{REPORT_TEXT}</textarea></td>
 </tr>
 <tr>
 	<td class="cat" colspan="2" align="center"><input type="submit" name="submit" class="btnmain" value="{L_SUBMIT}" />&nbsp;<input type="submit" name="cancel" class="btnlite" value="{L_CANCEL}"></td>
--- a/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html
@@ -60,9 +60,6 @@
 			<td class="row1" width="25" align="center">{messagerow.PM_ICON_IMG}</td>
 		<!-- ENDIF -->
 		<!-- IF messagerow.S_PM_DELETED --><td class="row3"><!-- ELSE --><td class="row1"><!-- ENDIF -->
-			<!-- IF messagerow.S_PM_REPORTED -->
-				<a href="{messagerow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
-			<!-- ENDIF -->
 			<!-- IF not messagerow.PM_IMG and messagerow.PM_CLASS -->
 				<span class="{messagerow.PM_CLASS}"><img src="images/spacer.gif" width="10" height="10" alt="" border="0" /></span>&nbsp;
 			<!-- ELSEIF messagerow.PM_IMG -->
--- a/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html
@@ -64,16 +64,6 @@
 			<tr>
 				<td>

-					<!-- IF S_MESSAGE_REPORTED -->
-					<table width="100%" cellspacing="0">
-						<tr>
-							<td class="gensmall"><b class="postreported">&#187 <a class="postreported" href="{U_MCP_REPORT}">{L_MESSAGE_REPORTED}</a></b></td>
-						</tr>
-					</table>
-
-					<br clear="all" />
-					<!-- ENDIF -->
-
 					<div class="postbody">{MESSAGE}</div>

 					<!-- IF S_HAS_ATTACHMENTS -->
@@ -105,7 +95,7 @@

 					<table width="100%" cellspacing="0">
 						<tr valign="middle">
-							<td class="gensmall" align="right"><!-- IF U_REPORT --><a href="{U_REPORT}">{REPORT_IMG}</a> <!-- ENDIF --> <!-- IF U_INFO --><a href="{U_INFO}">{INFO_IMG}</a> <!-- ENDIF --> <!-- IF U_DELETE --><a href="{U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td>
+							<td class="gensmall" align="right"> <!-- IF U_INFO --><a href="{U_INFO}">{INFO_IMG}</a> <!-- ENDIF --> <!-- IF U_DELETE --><a href="{U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td>
 						</tr>
 					</table>

--- a/phpBB/styles/subSilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/subSilver/template/ucp_prefs_personal.html
@@ -55,10 +55,6 @@ function dE(n,s){
 		<td class="row1" width="50%"><b class="genmed">{L_POPUP_ON_PM}:</b></td>
 		<td class="row2"><input type="radio" name="popuppm" value="1"{POPUP_PM_YES} /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="popuppm" value="0"{POPUP_PM_NO} /><span class="genmed">{L_NO}</span></td>
 	</tr>
-	<tr> 
-		<td class="row1" width="50%"><b class="genmed">{L_REPORT_PM_NOTIFY}:</b><br /><span class="gensmall">{L_REPORT_PM_NOTIFY_EXPLAIN}</span></td>
-		<td class="row2"><input type="radio" name="report_pm_notify" value="1"{REPORT_PM_YES} /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="report_pm_notify" value="0"{REPORT_PM_NO} /><span class="genmed">{L_NO}</span></td>
-	</tr>
 	<tr> 
 		<td class="row1" width="50%"><b class="genmed">{L_BOARD_LANGUAGE}:</b></td>
 		<td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td>
--- a/phpBB/styles/subSilver/template/ucp_reports_list.html
+++ b/phpBB/styles/subSilver/template/ucp_reports_list.html
@@ -1,32 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-	<!-- $Id$ -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="row3" colspan="6" align="center"><b class="gen">{L_YOUR_REPORTS}</b></td>
-	</tr>
-	<tr>
-		<th>&nbsp;{L_USER}&nbsp;</th>
-		<th>&nbsp;{L_TOPIC}&nbsp;</th>
-		<th>&nbsp;{L_FORUM}&nbsp;</th>
-		<th>&nbsp;{L_DATE}&nbsp;</th>
-		<th>&nbsp;{L_STATUS}&nbsp;</th>
-	</tr>
-	<!-- BEGIN report -->
-		<tr>
-			<td class="row1" width="15%" valign="top"><a class="gen" href="{report.U_VIEWPROFILE}">{report.POSTER}</a></span></td>
-			<td class="row2" width="15%" valign="top"><a class="gen" href="{report.U_TOPIC}">{report.TOPIC_TITLE}</a></td>
-			<td class="row1" width="15%" valign="top"><span class="gen"><a href="{report.U_USER}"><a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span></td>
-			<td class="row2" width="15%" valign="top"><span class="gen">{report.REPORT_TIME}</span></td>
-			<td class="row1" width="15%" valign="top"><span class="gen">{report.REPORT_STATUS}</span></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="5" align="center"><span class="gen">{L_REPORTS_ZERO_TOTAL}</span></td>
-		</tr>
-	<!-- END report -->
-	</table>
-
-	<br clear="all" /><br />
-
-<!-- INCLUDE ucp_footer.html -->
--- a/phpBB/styles/subSilver/template/ucp_reports_report.html
+++ b/phpBB/styles/subSilver/template/ucp_reports_report.html
@@ -1,34 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<!-- $Id$ -->
-
-<form method="post" action="{S_REPORT_ACTION}" name="report">
-	<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<th colspan="2"><!-- IF S_REPORT_POST -->{L_REPORT_POST}<!-- ELSE -->{L_REPORT_GENERAL}<!-- ENDIF --></th>
-		</tr>
-		<tr>
-			<td class="row3" colspan="2"><span class="gensmall"><!-- IF S_REPORT_POST -->{L_REPORT_POST_EXPLAIN}<!-- ELSE -->{L_REPORT_GENERAL_EXPLAIN}<!-- ENDIF --></span></td>
-		</tr>
-		<tr>
-			<td class="row1" width="22%"><b class="gen">{L_REASON}:</b></td>
-			<td class="row2" width="78%"><select name="reason_id"><!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --></select></td>
-		</tr>
-		<!-- IF S_CAN_NOTIFY -->
-		<tr>
-			<td class="row1"><span class="gen"><b>{L_REPORT_NOTIFY}:</b></span><br /><span class="gensmall">{L_REPORT_NOTIFY_EXPLAIN}</span></td>
-			<td class="row2"><span class="gen"><input type="radio" name="notify" value="1" <!-- IF S_NOTIFY -->checked="checked" <!-- ENDIF -->/> {L_YES} &nbsp;<input type="radio" name="notify" value="0" <!-- IF not S_NOTIFY -->checked="checked" <!-- ENDIF -->/> {L_NO}</span></td>
-		</tr>
-		<!-- ENDIF -->
-		<tr>
-			<td class="row1" valign="top"><span class="gen"><b>{L_REPORT_MORE_INFO}:</b></span><br /><span class="gensmall">{L_REPORT_CAN_LEAVE_BLANK}</span></td>
-			<td class="row2"><textarea class="post" style="width:500px" name="report_text" rows="25" cols="40"  class="post">{REPORT_TEXT}</textarea></td>
-		</tr>
-		<tr>
-			<td class="cat" colspan="2" align="center"><input type="submit" name="submit" class="btnmain" value="{L_SUBMIT}" />&nbsp;<input type="submit" name="cancel" class="btnlite" value="{L_CANCEL}"></td>
-		</tr>
-	</table>
-</form>
-
-
-<!-- INCLUDE ucp_footer.html -->
--- a/phpBB/styles/subSilver/theme/stylesheet.css
+++ b/phpBB/styles/subSilver/theme/stylesheet.css
@@ -498,9 +498,6 @@ input.radio {

 /* Private messages
 ------------------ */
-.pm_message_reported_colour {
-	background-color: #FFFFFF;
-	}
 .pm_marked_colour {
 	background-color: #000000;
 	}