Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission

* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html

phpBB/styles/subsilver2/template/confirm_body.html

@@ -9,7 +9,7 @@
 		<th>{MESSAGE_TITLE}</th>
 	</tr>
 	<tr>
-		<td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></td>
+		<td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="btnlite" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></td>
 	</tr>
 	</table>
 	

phpBB/styles/subsilver2/template/custom_profile_fields.html

@@ -21,7 +21,7 @@
 <!-- END bool -->
 
 <!-- BEGIN int -->
-	<input type="text" class="post" name="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
+	<input type="number" min="{int.FIELD_MINLEN}" max="{int.FIELD_MAXLEN}" class="post" name="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
 <!-- END int -->
 
 <!-- BEGIN date -->

phpBB/styles/subsilver2/template/editor.js

@@ -11,18 +11,16 @@ var bbcodeEnabled = true;
 // Check for Browser & Platform for PC & IE specific bits
 // More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
 var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-var clientVer = parseInt(navigator.appVersion); // Get browser version
-
-var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
-var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
+var clientVer = parseInt(navigator.appVersion, 10); // Get browser version
 
+var is_ie = ((clientPC.indexOf('msie') !== -1) && (clientPC.indexOf('opera') === -1));
+var is_win = ((clientPC.indexOf('win') !== -1) || (clientPC.indexOf('16bit') !== -1));
 var baseHeight;
 
 /**
 * Shows the help messages in the helpline window
 */
-function helpline(help)
-{
+function helpline(help) {
 	document.forms[form_name].helpbox.value = help_line[help];
 }
 
@@ -30,27 +28,23 @@ function helpline(help)
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
 */ 
-function initInsertions() 
-{
+function initInsertions() {
 	var doc;
 
-	if (document.forms[form_name])
-	{
+	if (document.forms[form_name]) {
 		doc = document;
-	}
-	else 
-	{
+	} else {
 		doc = opener.document;
 	}
 
 	var textarea = doc.forms[form_name].elements[text_name];
-	if (is_ie && typeof(baseHeight) != 'number')
-	{	
+	phpbb.applyCodeEditor(textarea);
+
+	if (is_ie && typeof(baseHeight) !== 'number') {
 		textarea.focus();
 		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
 
-		if (!document.forms[form_name])
-		{
+		if (!document.forms[form_name]) {
 			document.body.focus();
 		}
 	}
@@ -59,14 +53,10 @@ function initInsertions()
 /**
 * bbstyle
 */
-function bbstyle(bbnumber)
-{	
-	if (bbnumber != -1)
-	{
+function bbstyle(bbnumber) {
+	if (bbnumber !== -1) {
 		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	} 
-	else 
-	{
+	} else {
 		insert_text('[*]');
 		document.forms[form_name].elements[text_name].focus();
 	}
@@ -75,36 +65,32 @@ function bbstyle(bbnumber)
 /**
 * Apply bbcodes
 */
-function bbfontstyle(bbopen, bbclose)
-{
+function bbfontstyle(bbopen, bbclose) {
 	theSelection = false;
-		
+
 	var textarea = document.forms[form_name].elements[text_name];
 
 	textarea.focus();
 
-	if ((clientVer >= 4) && is_ie && is_win)
-	{
+	if ((clientVer >= 4) && is_ie && is_win) {
 		// Get text selection
 		theSelection = document.selection.createRange().text;
 
-		if (theSelection)
-		{
+		if (theSelection) {
 			// Add tags around selection
 			document.selection.createRange().text = bbopen + theSelection + bbclose;
 			document.forms[form_name].elements[text_name].focus();
 			theSelection = '';
 			return;
 		}
-	}
-	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
-	{
+	} else if (document.forms[form_name].elements[text_name].selectionEnd
+			&& (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) {
 		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
 		document.forms[form_name].elements[text_name].focus();
 		theSelection = '';
 		return;
 	}
-	
+
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
 	var new_pos = caret_pos + bbopen.length;
@@ -114,14 +100,12 @@ function bbfontstyle(bbopen, bbclose)
 
 	// Center the cursor when we don't have a selection
 	// Gecko and proper browsers
-	if (!isNaN(textarea.selectionStart))
-	{
+	if (!isNaN(textarea.selectionStart)) {
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}	
+	}
 	// IE
-	else if (document.selection)
-	{
+	else if (document.selection) {
 		var range = textarea.createTextRange(); 
 		range.move("character", new_pos); 
 		range.select();
@@ -135,62 +119,49 @@ function bbfontstyle(bbopen, bbclose)
 /**
 * Insert text at position
 */
-function insert_text(text, spaces, popup)
-{
+function insert_text(text, spaces, popup) {
 	var textarea;
-	
-	if (!popup) 
-	{
+
+	if (!popup) {
 		textarea = document.forms[form_name].elements[text_name];
-	} 
-	else 
-	{
+	} else {
 		textarea = opener.document.forms[form_name].elements[text_name];
 	}
-	if (spaces) 
-	{
+
+	if (spaces) {
 		text = ' ' + text + ' ';
 	}
 
 	// Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way.
 	// Therefore we simply add a !is_ie here until IE fixes the text-selection completely.
-	if (!isNaN(textarea.selectionStart) && !is_ie)
-	{
+	if (!isNaN(textarea.selectionStart) && !is_ie) {
 		var sel_start = textarea.selectionStart;
 		var sel_end = textarea.selectionEnd;
 
 		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
-	}	
-	
-	else if (textarea.createTextRange && textarea.caretPos)
-	{
-		if (baseHeight != textarea.caretPos.boundingHeight) 
-		{
+	} else if (textarea.createTextRange && textarea.caretPos) {
+		if (baseHeight !== textarea.caretPos.boundingHeight) {
 			textarea.focus();
 			storeCaret(textarea);
-		}		
+		}
+
 		var caret_pos = textarea.caretPos;
-		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-		
-	}
-	else
-	{
+		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) === ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
+	} else {
 		textarea.value = textarea.value + text;
 	}
-	if (!popup) 
-	{
-		textarea.focus();
-	} 	
 
+	if (!popup) {
+		textarea.focus();
+	}
 }
 
 /**
 * Add inline attachment at position
 */
-function attach_inline(index, filename)
-{
+function attach_inline(index, filename) {
 	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
 	document.forms[form_name].elements[text_name].focus();
 }
@@ -198,79 +169,57 @@ function attach_inline(index, filename)
 /**
 * Add quote text to message
 */
-function addquote(post_id, username, l_wrote)
-{
+function addquote(post_id, username, l_wrote) {
 	var message_name = 'message_' + post_id;
 	var theSelection = '';
 	var divarea = false;
+	var i;
 
-	if (l_wrote === undefined)
-	{
+	if (l_wrote === undefined) {
 		// Backwards compatibility
 		l_wrote = 'wrote';
 	}
 
-	if (document.all)
-	{
+	if (document.all) {
 		divarea = document.all[message_name];
-	}
-	else
-	{
+	} else {
 		divarea = document.getElementById(message_name);
 	}
 
 	// Get text selection - not only the post content :(
 	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
-	if (window.getSelection && !is_ie && !window.opera)
-	{
+	if (window.getSelection && !is_ie && !window.opera) {
 		theSelection = window.getSelection().toString();
-	}
-	else if (document.getSelection && !is_ie)
-	{
+	} else if (document.getSelection && !is_ie) {
 		theSelection = document.getSelection();
-	}
-	else if (document.selection)
-	{
+	} else if (document.selection) {
 		theSelection = document.selection.createRange().text;
 	}
 
-	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
-	{
-		if (divarea.innerHTML)
-		{
+	if (theSelection === '' || typeof theSelection === 'undefined' || theSelection === null) {
+		if (divarea.innerHTML) {
 			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
 			theSelection = theSelection.replace(/<br\/>/ig, '\n');
 			theSelection = theSelection.replace(/&lt\;/ig, '<');
 			theSelection = theSelection.replace(/&gt\;/ig, '>');
 			theSelection = theSelection.replace(/&amp\;/ig, '&');
 			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
-		}
-		else if (document.all)
-		{
+		} else if (document.all) {
 			theSelection = divarea.innerText;
-		}
-		else if (divarea.textContent)
-		{
+		} else if (divarea.textContent) {
 			theSelection = divarea.textContent;
-		}
-		else if (divarea.firstChild.nodeValue)
-		{
+		} else if (divarea.firstChild.nodeValue) {
 			theSelection = divarea.firstChild.nodeValue;
 		}
 	}
 
-	if (theSelection)
-	{
-		if (bbcodeEnabled)
-		{
+	if (theSelection) {
+		if (bbcodeEnabled) {
 			insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
-		}
-		else
-		{
+		} else {
 			insert_text(username + ' ' + l_wrote + ':' + '\n');
 			var lines = split_lines(theSelection);
-			for (i = 0; i < lines.length; i++)
-			{
+			for (i = 0; i < lines.length; i++) {
 				insert_text('> ' + lines[i] + '\n');
 			}
 		}
@@ -279,39 +228,32 @@ function addquote(post_id, username, l_wrote)
 	return;
 }
 
-
-function split_lines(text)
-{
+function split_lines(text) {
 	var lines = text.split('\n');
 	var splitLines = new Array();
 	var j = 0;
-	for(i = 0; i < lines.length; i++)
-	{
-		if (lines[i].length <= 80)
-		{
+	var i;
+
+	for(i = 0; i < lines.length; i++) {
+		if (lines[i].length <= 80) {
 			splitLines[j] = lines[i];
 			j++;
-		}
-		else
-		{
+		} else {
 			var line = lines[i];
-			do
-			{
-				var splitAt = line.indexOf(' ', 80);
-				
-				if (splitAt == -1)
-				{
+			var splitAt;
+			do {
+				splitAt = line.indexOf(' ', 80);
+
+				if (splitAt === -1) {
 					splitLines[j] = line;
 					j++;
-				}
-				else
-				{
+				} else {
 					splitLines[j] = line.substring(0, splitAt);
 					line = line.substring(splitAt);
 					j++;
 				}
 			}
-			while(splitAt != -1);
+			while(splitAt !== -1);
 		}
 	}
 	return splitLines;
@@ -320,15 +262,13 @@ function split_lines(text)
 /**
 * From http://www.massless.org/mozedit/
 */
-function mozWrap(txtarea, open, close)
-{
-	var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength;
+function mozWrap(txtarea, open, close) {
+	var selLength = (typeof(txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength;
 	var selStart = txtarea.selectionStart;
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2) 
-	{
+	if (selEnd === 1 || selEnd === 2) {
 		selEnd = selLength;
 	}
 
@@ -349,10 +289,8 @@ function mozWrap(txtarea, open, close)
 * Insert at Caret position. Code from
 * http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
 */
-function storeCaret(textEl)
-{
-	if (textEl.createTextRange)
-	{
+function storeCaret(textEl) {
+	if (textEl.createTextRange) {
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
 }
@@ -360,8 +298,7 @@ function storeCaret(textEl)
 /**
 * Color pallette
 */
-function colorPalette(dir, width, height)
-{
+function colorPalette(dir, width, height) {
 	var r = 0, g = 0, b = 0;
 	var numberList = new Array(6);
 	var color = '';
@@ -374,85 +311,71 @@ function colorPalette(dir, width, height)
 
 	document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
 
-	for (r = 0; r < 5; r++)
-	{
-		if (dir == 'h')
-		{
+	for (r = 0; r < 5; r++) {
+		if (dir === 'h') {
 			document.writeln('<tr>');
 		}
 
-		for (g = 0; g < 5; g++)
-		{
-			if (dir == 'v')
-			{
+		for (g = 0; g < 5; g++) {
+			if (dir === 'v') {
 				document.writeln('<tr>');
 			}
-			
-			for (b = 0; b < 5; b++)
-			{
+
+			for (b = 0; b < 5; b++) {
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
 				document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">');
 				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
 				document.writeln('</td>');
 			}
 
-			if (dir == 'v')
-			{
+			if (dir === 'v') {
 				document.writeln('</tr>');
 			}
 		}
 
-		if (dir == 'h')
-		{
+		if (dir === 'h') {
 			document.writeln('</tr>');
 		}
 	}
 	document.writeln('</table>');
 }
 
-
 /**
 * Caret Position object
 */
-function caretPosition()
-{
+function caretPosition() {
 	var start = null;
 	var end = null;
 }
 
-
 /**
 * Get the caret position in an textarea
 */
-function getCaretPosition(txtarea)
-{
+function getCaretPosition(txtarea) {
 	var caretPos = new caretPosition();
-	
+
 	// simple Gecko/Opera way
-	if(txtarea.selectionStart || txtarea.selectionStart == 0)
-	{
+	if (txtarea.selectionStart || txtarea.selectionStart === 0) {
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
 	}
 	// dirty and slow IE way
-	else if(document.selection)
-	{
+	else if (document.selection) {
 		// get current selection
 		var range = document.selection.createRange();
 
 		// a new selection of the whole textarea
 		var range_all = document.body.createTextRange();
 		range_all.moveToElementText(txtarea);
-		
+
 		// calculate selection start point by moving beginning of range_all to beginning of range
 		var sel_start;
-		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{		
+		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++) {
 			range_all.moveStart('character', 1);
 		}
-	
+
 		txtarea.sel_start = sel_start;
-	
+
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
 		caretPos.end = txtarea.sel_start;

phpBB/styles/subsilver2/template/login_forum.html

@@ -1,5 +1,13 @@
 <!-- INCLUDE overall_header.html -->
 
+<!-- IF FORUM_NAME -->
+	<div id="pageheader">
+		<h2><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
+	</div>
+
+	<br clear="all" /><br />
+<!-- ENDIF -->
+
 <div id="pagecontent">
 
 	<form name="login_forum" method="post" action="{S_LOGIN_ACTION}">

phpBB/styles/subsilver2/template/mcp_jumpbox.html

@@ -1,19 +0,0 @@
-<!-- Note: no longer in use... -->
-
-<form name="jumpbox" method="get" action="{S_JUMPBOX_ACTION}">
-
-	{HIDDEN_FIELDS_FOR_JUMPBOX}
-	<span class="gensmall">{L_JUMP_TO}{L_COLON}</span>&nbsp;<select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.jumpbox.current_f.value){ document.forms['jumpbox'].submit() }">
-
-<!-- IF S_ENABLE_SELECT_ALL -->
-	<option value="0">{L_ALL_FORUMS}</option>
-<!-- ELSE -->
-	<option value="-1">{L_SELECT_FORUM}</option>
-<!-- ENDIF -->
-
-<!-- BEGIN options -->
-	<option value="{options.VALUE}"<!-- IF options.VALUE eq -1 --> class="disabled-option"<!-- ENDIF -->{options.SELECTED}/>{options.TEXT}</option>
-<!-- BEGINELSE -->
-<!-- END options -->
-</select>&nbsp;<input type="hidden" name="current_f" value="{S_CURRENT_FORUM}" /><input name="jumpbox" class="btnlite" type="submit" value="{L_GO}" onclick="if(document.jumpbox.f.value == -1){return false;}" />
-</form>

phpBB/styles/subsilver2/template/mcp_topic.html

@@ -42,7 +42,7 @@
 	</tr>
 	<tr>
 		<td class="row1" nowrap="nowrap"><span class="gen">{L_MERGE_TOPIC_ID}</span></td>
-		<td class="row2" colspan="2"><input class="post" type="text" size="6" name="to_topic_id" value="{TO_TOPIC_ID}" /> <a href="{U_SELECT_TOPIC}">{L_SELECT_TOPIC}</a></td>
+		<td class="row2" colspan="2"><input class="post" type="number" min="0" size="6" name="to_topic_id" value="{TO_TOPIC_ID}" /> <a href="{U_SELECT_TOPIC}">{L_SELECT_TOPIC}</a></td>
 	</tr>
 	<!-- IF TO_TOPIC_INFO -->
 		<tr>
@@ -55,7 +55,7 @@
 </tr>
 <tr>
 	<td class="row1" nowrap="nowrap"><span class="gen">{L_POSTS_PER_PAGE}</span><br /><span class="gensmall">{L_POSTS_PER_PAGE_EXPLAIN}</span></td>
-	<td class="row2" colspan="2"><input class="post" type="text" name="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></td>
+	<td class="row2" colspan="2"><input class="post" type="number" min="1" name="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></td>
 </tr>
 <tr>
 	<td class="cat" colspan="3" align="center"><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>

phpBB/styles/subsilver2/template/memberlist_email.html

@@ -25,7 +25,7 @@
 	<!-- ELSE -->
 		<tr>
 			<td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}</b></td>
-			<td class="row2"><input class="post" type="text" name="email" size="50" maxlength="100" value="{EMAIL}" /></td>
+			<td class="row2"><input class="post" type="email" name="email" size="50" maxlength="100" value="{EMAIL}" /></td>
 		</tr>
 		<tr> 
 			<td class="row1" width="35%"><b class="genmed">{L_REAL_NAME}</b></td>

phpBB/styles/subsilver2/template/memberlist_search.html

@@ -35,7 +35,7 @@
 		{
 			opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = user;
 			self.close();
-		}		
+		}
 
 		/**
 		* Mark/unmark checklist
@@ -51,7 +51,7 @@
 			}
 
 			var rb = parent.getElementsByTagName('input');
-			
+
 			for (var r = 0; r < rb.length; r++)
 			{
 				if (rb[r].name.substr(0, name.length) == name)
@@ -82,7 +82,7 @@
 <tr>
 <!-- IF S_EMAIL_SEARCH_ALLOWED -->
 	<td class="row1"><b class="genmed">{L_EMAIL}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="email" value="{EMAIL}" /></td>
+	<td class="row2"><input class="post" type="email" name="email" value="{EMAIL}" /></td>
 <!-- ELSE -->
 	<td colspan="2" class="row1">&nbsp;</td>
 <!-- ENDIF -->
@@ -107,7 +107,7 @@
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_POSTS}{L_COLON}</b></td>
-	<td class="row2"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="text" name="count" value="{COUNT}" /></td>
+	<td class="row2"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="number" min="0" name="count" value="{COUNT}" /></td>
 	<td class="row1"><b class="genmed">{L_JABBER}{L_COLON}</b></td>
 	<td class="row2"><input class="post" type="text" name="jabber" value="{JABBER}" /></td>
 </tr>

phpBB/styles/subsilver2/template/posting_body.html

@@ -335,7 +335,7 @@
 <!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->
 	<tr>
 		<td class="row1"><b class="genmed">{L_STICK_TOPIC_FOR}{L_COLON}</b><br /><span class="gensmall">{L_STICKY_ANNOUNCE_TIME_LIMIT}</span></td>
-		<td class="row2"><input class="post" type="text" name="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" />&nbsp;<b class="gen">{L_DAYS}</b> <span class="gensmall">{L_STICK_TOPIC_FOR_EXPLAIN}</span></td>
+		<td class="row2"><input class="post" type="number" min="0" max="999" name="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" />&nbsp;<b class="gen">{L_DAYS}</b> <span class="gensmall">{L_STICK_TOPIC_FOR_EXPLAIN}</span></td>
 	</tr>
 <!-- ENDIF -->
 

phpBB/styles/subsilver2/template/posting_poll_body.html

@@ -15,11 +15,11 @@
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_POLL_MAX_OPTIONS}{L_COLON}</b><br /><span class="gensmall">{L_POLL_MAX_OPTIONS_EXPLAIN}</span></td>
-	<td class="row2"><input class="post" type="text" name="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" /></td>
+	<td class="row2"><input class="post" type="number" min="1" max="999" name="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" /></td>
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_POLL_FOR}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" />&nbsp;<b class="gen">{L_DAYS}</b> <span class="gensmall">{L_POLL_FOR_EXPLAIN}</span></td>
+	<td class="row2"><input class="post" type="number" min="0" max="999" name="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" />&nbsp;<b class="gen">{L_DAYS}</b> <span class="gensmall">{L_POLL_FOR_EXPLAIN}</span></td>
 </tr>
 <!-- IF S_POLL_VOTE_CHANGE -->
 	<tr>

phpBB/styles/subsilver2/template/report_body.html

@@ -6,6 +6,11 @@
 <tr>
 	<th colspan="2"><!-- IF S_REPORT_POST -->{L_REPORT_POST}<!-- ELSE -->{L_REPORT_MESSAGE}<!-- ENDIF --></th>
 </tr>
+<!-- IF ERROR -->
+	<tr>
+		<td class="row3" colspan="2" align="center"><span class="genmed error">{ERROR}</span></td>
+	</tr>
+<!-- ENDIF -->
 <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>
 </tr>
@@ -25,6 +30,9 @@
 	<td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}{L_COLON}</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td>
 	<td class="row2"><textarea class="post" name="report_text" rows="10" cols="50">{REPORT_TEXT}</textarea></td>
 </tr>
+<!-- IF CAPTCHA_TEMPLATE -->
+			<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
+<!-- ENDIF -->	
 <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>

phpBB/styles/subsilver2/template/timezone.js

@@ -1,5 +1,7 @@
 (function($) { // Avoid conflicts with other libraries
 
+"use strict";
+
 $('#tz_date').change(function() {
 	phpbb.timezoneSwitchDate(false);
 });
@@ -13,7 +15,7 @@ $(document).ready(
 );
 
 $(document).ready(
-	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') == 'true')
+	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') == 'true')
 );
 
 })(jQuery); // Avoid conflicts with other libraries

phpBB/styles/subsilver2/template/timezone_option.html

@@ -7,7 +7,7 @@
 				<option value="">{L_SELECT_CURRENT_TIME}</option>
 				{S_TZ_DATE_OPTIONS}
 			</select><br />
-			<input type="button" id="tz_select_date_suggest" class="btnlite" style="display: none;" data-is-registration="<!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
+			<input type="button" id="tz_select_date_suggest" class="btnlite" style="display: none;" timezone-preselect="<!-- IF S_TZ_PRESELECT -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
 		</div>
 		<!-- ENDIF -->
 		<select name="tz" id="timezone" class="autowidth tz_select">

phpBB/styles/subsilver2/template/ucp_notifications.html

@@ -2,145 +2,137 @@
 
 <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
-<table width="100%" cellspacing="1">
+<!-- IF MODE == 'notification_options' -->
+	<table width="100%" cellspacing="1">
 	<tr>
-		<th colspan="4">{TITLE}</th>
+		<th colspan="{NOTIFICATION_TYPES_COLS}">{TITLE}</th>
 	</tr>
 	<tr>
-		<td class="row1" colspan="4" align="center"><span class="genmed">{TITLE_EXPLAIN}</span></td>
+		<td class="row1" colspan="{NOTIFICATION_TYPES_COLS}" align="center"><span class="genmed">{TITLE_EXPLAIN}</span></td>
+	</tr>
+	<tr>
+		<th>{L_NOTIFICATION_TYPE}</th>
+		<th width="10%">{L_NOTIFICATIONS}</th>
+		<!-- BEGIN notification_methods -->
+			<th width="10%">{notification_methods.NAME}</th>
+		<!-- END notification_methods -->
 	</tr>
-	<!-- IF MODE == 'notification_options' -->
-		<tr>
-			<th>{L_NOTIFICATION_TYPE}</th>
-			<th width="10%">{L_NOTIFICATIONS}</th>
-			<!-- BEGIN notification_methods -->
-				<th width="10%">{notification_methods.NAME}</th>
-			<!-- END notification_methods -->
-		</tr>
 
-		<!-- BEGIN notification_types -->
-			<!-- IF notification_types.GROUP_NAME -->
-				<tr>
-					<td class="row3" colspan="3">{notification_types.GROUP_NAME}</td>
-				</tr>
-			<!-- ELSE -->
-				<!-- IF notification_types.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-					<td>
-						{notification_types.NAME}
-						<!-- IF notification_types.EXPLAIN --><br />&nbsp; &nbsp;{notification_types.EXPLAIN}<!-- ENDIF -->
-					</td>
-					<td align="center"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
-					<!-- BEGIN notification_methods -->
-						<td align="center"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
-					<!-- END notification_methods -->
-				</tr>
-			<!-- ENDIF -->
-		<!-- END notification_types -->
+	<!-- BEGIN notification_types -->
+		<!-- IF notification_types.GROUP_NAME -->
+			<tr>
+				<td class="row3" colspan="{NOTIFICATION_TYPES_COLS}">{notification_types.GROUP_NAME}</td>
+			</tr>
+		<!-- ELSE -->
+			<!-- IF notification_types.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+				<td>
+					{notification_types.NAME}
+					<!-- IF notification_types.EXPLAIN --><br />&nbsp; &nbsp;{notification_types.EXPLAIN}<!-- ENDIF -->
+				</td>
+				<td align="center"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
+				<!-- BEGIN notification_methods -->
+					<td align="center"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
+				<!-- END notification_methods -->
+			</tr>
+		<!-- ENDIF -->
+	<!-- END notification_types -->
+	<tr>
+		<td class="cat" colspan="{NOTIFICATION_TYPES_COLS}" align="center">
+			<input type="hidden" name="form_time" value="{FORM_TIME}" />
+			{S_HIDDEN_FIELDS}
+			<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;
+			<input class="btnlite" type="reset" value="{L_RESET}" name="reset" />
+			{S_FORM_TOKEN}
+		</td>
+	</tr>
+	</table>
+<!-- ELSE -->
+	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
 		<tr>
-			<td class="cat" colspan="3" align="center">
-				<input type="hidden" name="form_time" value="{FORM_TIME}" />
-				{S_HIDDEN_FIELDS}
-				<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;
-				<input class="btnlite" type="reset" value="{L_RESET}" name="reset" />
-				{S_FORM_TOKEN}
-			</td>
-		</tr>
-	<!-- ELSE -->
-		<tr>
-			<td>
-				<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
+			<td class="row1">
+				<table border="0" cellspacing="0" cellpadding="0" width="100%">
 					<tr>
-						<td class="row1">
-							<table border="0" cellspacing="0" cellpadding="0" width="100%">
-								<tr>
-									<td align="{S_CONTENT_FLOW_BEGIN}">
-										<!-- IF TOTAL_COUNT -->
-											<table width="100%" cellspacing="1">
-												<tr>
-													<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}</td>
-													<td class="gensmall" nowrap="nowrap" width="100%">&nbsp;[ <b>{TOTAL_COUNT}</b> ]&nbsp;</td>
-												</tr>
-											</table>
-										<!-- ENDIF -->
-									</td>
-									<td align="{S_CONTENT_FLOW_END}"><!-- INCLUDE pagination.html --></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-
-				<div style="padding: 2px;"></div>
-
-				<div class="notification_list">
-					<table class="tablebg" width="100%" cellspacing="1">
-						<tr>
-							<td class="cat" colspan="3">
-								<table width="100%" cellspacing="0">
-									<tr class="nav">
-										<td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a><!-- ENDIF --></td>
+						<td align="{S_CONTENT_FLOW_BEGIN}">
+							<!-- IF TOTAL_COUNT -->
+								<table width="100%" cellspacing="1">
+									<tr>
+										<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}</td>
+										<td class="gensmall" nowrap="nowrap" width="100%">&nbsp;[ <b>{TOTAL_COUNT}</b> ]&nbsp;</td>
 									</tr>
 								</table>
-							</td>
-						</tr>
-						<tr>
-							<th colspan="2">{L_NOTIFICATIONS}</th>
-							<th width="15%">{L_MARK_READ}</th>
-						</tr>
-						<!-- BEGIN notification_list -->
-							<tr class="row<!-- IF notification_list.UNREAD -->3<!-- ELSEIF notification_list.S_ROW_COUNT is even -->1<!-- ELSE -->2<!-- ENDIF -->">
-								<!-- IF notification_list.AVATAR -->
-									<td width="50px">
-										{notification_list.AVATAR}
-									</td>
-									<td valign="top">
-								<!-- ELSE -->
-									<td colspan="2" valign="top" height="50px">
-								<!-- ENDIF -->
-									<span class="gen">
-									<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
-										<strong>{notification_list.FORMATTED_TITLE}</strong>
-									<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
-									&raquo; {notification_list.TIME}
-									</span>
-								</td>
-								<td align="center">
-									<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF -->
-								</td>
-							</tr>
-						<!-- END notification_list -->
-						<tr>
-							<td class="cat" colspan="3" align="center">
-								<input type="hidden" name="form_time" value="{FORM_TIME}" />
-								{S_HIDDEN_FIELDS}
-								<input class="btnmain" type="submit" name="submit" value="{L_MARK_READ}" />
-								{S_FORM_TOKEN}
-							</td>
-						</tr>
-					</table>
-				</div>
-
-				<div style="padding: 2px;"></div>
-
-				<!-- IF .pagination -->
-					<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
-						<tr>
-							<td class="row1">
-								<table border="0" cellspacing="0" cellpadding="0" width="100%">
-								<tr>
-									<td align="{S_CONTENT_FLOW_BEGIN}">
-										<!-- INCLUDE pagination.html -->
-									</td>
-								</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				<!-- ENDIF -->
+							<!-- ENDIF -->
+						</td>
+						<td align="{S_CONTENT_FLOW_END}"><!-- INCLUDE pagination.html --></td>
+					</tr>
+				</table>
 			</td>
 		</tr>
+	</table>
+
+	<div class="notification_list">
+		<table class="tablebg" width="100%" cellspacing="1">
+			<tr>
+				<td class="cat" colspan="3">
+					<table width="100%" cellspacing="0">
+						<tr class="nav">
+							<td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a><!-- ENDIF --></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<th colspan="2">{L_NOTIFICATIONS}</th>
+				<th width="15%">{L_MARK_READ}</th>
+			</tr>
+			<!-- BEGIN notification_list -->
+				<tr class="row<!-- IF notification_list.UNREAD -->3<!-- ELSEIF notification_list.S_ROW_COUNT is even -->1<!-- ELSE -->2<!-- ENDIF -->">
+					<!-- IF notification_list.AVATAR -->
+						<td width="50px">
+							{notification_list.AVATAR}
+						</td>
+						<td valign="top">
+					<!-- ELSE -->
+						<td colspan="2" valign="top" height="50px">
+					<!-- ENDIF -->
+						<span class="gen">
+						<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+							<strong>{notification_list.FORMATTED_TITLE}</strong>
+						<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
+						&raquo; {notification_list.TIME}
+						</span>
+					</td>
+					<td align="center">
+						<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF -->
+					</td>
+				</tr>
+			<!-- END notification_list -->
+			<tr>
+				<td class="cat" colspan="3" align="center">
+					<input type="hidden" name="form_time" value="{FORM_TIME}" />
+					{S_HIDDEN_FIELDS}
+					<input class="btnmain" type="submit" name="submit" value="{L_MARK_READ}" />
+					{S_FORM_TOKEN}
+				</td>
+			</tr>
+		</table>
+	</div>
+
+	<!-- IF .pagination -->
+		<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
+			<tr>
+				<td class="row1">
+					<table border="0" cellspacing="0" cellpadding="0" width="100%">
+					<tr>
+						<td align="{S_CONTENT_FLOW_BEGIN}">
+							<!-- INCLUDE pagination.html -->
+						</td>
+					</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
 	<!-- ENDIF -->
-</table>
+<!-- ENDIF -->
 
 <!-- IF .notifications -->
 <div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="$('#ucp input:checkbox').attr('checked', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="$('#ucp input:checkbox').attr('checked', false); return false;">{L_UNMARK_ALL}</a></b></div>

phpBB/styles/subsilver2/template/ucp_profile_avatar.html

@@ -9,7 +9,7 @@
 		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
-<tr> 
+<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_IMAGE}{L_COLON} </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
 	<td class="row2" align="center"><br />
 		<!-- IF AVATAR -->{AVATAR}<br /><br /><input type="checkbox" class="radio" name="avatar_delete" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span>

phpBB/styles/subsilver2/template/ucp_profile_profile_info.html

@@ -9,53 +9,53 @@
 		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
-<tr> 
+<tr>
 	<td class="row1" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_ICQ}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="text" name="icq" size="30" maxlength="15" value="{ICQ}" /></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_AIM}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="text" name="aim" size="30" maxlength="255" value="{AIM}" /></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_MSNM}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="text" name="msn" size="30" maxlength="255" value="{MSN}" /></td>
+	<td class="row2"><input class="post" type="email" name="msn" size="30" maxlength="255" value="{MSN}" /></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_YIM}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="text" name="yim" size="30" maxlength="255" value="{YIM}" /></td>
+	<td class="row2"><input class="post" type="email" name="yim" size="30" maxlength="255" value="{YIM}" /></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_JABBER}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="text" name="jabber" size="30" maxlength="255" value="{JABBER}" /></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_WEBSITE}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="text" name="website" size="30" maxlength="255" value="{WEBSITE}" /></td>
+	<td class="row2"><input class="post" type="url" name="website" size="30" maxlength="255" value="{WEBSITE}" /></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_LOCATION}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="text" name="location" size="30" maxlength="100" value="{LOCATION}" /></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_OCCUPATION}{L_COLON} </b></td>
 	<td class="row2"><textarea class="post" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_INTERESTS}{L_COLON} </b></td>
 	<td class="row2"><textarea class="post" name="interests" rows="3" cols="30">{INTERESTS}</textarea></td>
 </tr>
 <!-- IF S_BIRTHDAYS_ENABLED -->
-	<tr> 
+	<tr>
 		<td class="row1" width="35%"><b class="genmed">{L_BIRTHDAY}{L_COLON} </b><br /><span class="gensmall">{L_BIRTHDAY_EXPLAIN}</span></td>
 		<td class="row2"><span class="genmed">{L_DAY}{L_COLON}</span> <select name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> <span class="genmed">{L_MONTH}{L_COLON}</span> <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> <span class="genmed">{L_YEAR}{L_COLON}</span> <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></td>
 	</tr>
 <!-- ENDIF -->
 <!-- BEGIN profile_fields -->
-	<tr> 
+	<tr>
 		<td class="row1" width="35%">
 			<b class="genmed">{profile_fields.LANG_NAME}{L_COLON} </b>
 			<!-- IF profile_fields.S_REQUIRED --><b>*</b><!-- ENDIF -->

phpBB/styles/subsilver2/template/ucp_profile_reg_details.html

@@ -20,7 +20,7 @@
 </tr>
 <tr>
 	<td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b></td>
-	<td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="text" class="post" name="email" size="30" maxlength="100" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td>
+	<td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="email" class="post" name="email" size="30" maxlength="100" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td>
 </tr>
 <!-- IF S_CHANGE_PASSWORD -->
 	<tr>

phpBB/styles/subsilver2/template/ucp_register.html

@@ -39,7 +39,7 @@
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="text" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
+	<td class="row2"><input class="post" type="email" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_PASSWORD}{L_COLON} </b><br /><span class="gensmall">{L_PASSWORD_EXPLAIN}</span></td>

phpBB/styles/subsilver2/template/ucp_remind.html

@@ -14,7 +14,7 @@
 </tr>
 <tr> 
 	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td>
-	<td class="row2"><input type="text" class="post" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
+	<td class="row2"><input type="email" class="post" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
 </tr>
 <tr> 
 	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="btnmain" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" name="reset" class="btnlite" /></td>

phpBB/styles/subsilver2/template/ucp_resend.html

@@ -14,7 +14,7 @@
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td>
-	<td class="row2"><input type="text" class="post" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
+	<td class="row2"><input type="email" class="post" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
 </tr>
 <tr>
 	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="btnmain" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" name="reset" class="btnlite" /></td>

phpBB/styles/subsilver2/template/viewtopic_body.html

@@ -358,6 +358,7 @@
 <!-- INCLUDE quickreply_editor.html -->
 <!-- ENDIF -->
 
+<!-- EVENT viewtopic_body_footer_before -->
 <!-- INCLUDE breadcrumbs.html -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->