Merge branch 'develop-olympus' into develop

* develop-olympus: (57 commits)
  Revert "[ticket/7716] Data too long for column 'message_subject'"
  [ticket/7716] Data too long for column 'message_subject'
  [ticket/9780] Adding unit tests for gen_rand_string().
  [ticket/9780] Add length check back to gen_rand_string().
  [ticket/7972] Copying topics in the MCP now indexes the new topic.
  [ticket/9782] Board disable radio set on when server load high
  [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
  [ticket/9104] Safari does not display box headers correctly in the ACP.
  [ticket/9777] Print error message in pre-commit hook when php is not installed.
  [ticket/7716] Data too long for column 'message_subject'
  [task/git-tools] Ignore git commit message comments
  [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
  [task/git-tools] Vastly expanded commit-msg hook.
  [task/git-tools] Beginnings of a syntax checking hook.
  [task/git-tools] Append ticket identifier to commit message prior to editing.
  [ticket/7332] Redirect users back to post details when performing actions.
  [ticket/7332] Collapse post details content down to a maximum of 300px heigh
  [ticket/9771] Remove query string parameters that have no name.
  [ticket/9760] Remove unrestricted wildcards from search terms.
  [ticket/9599] Reimplement phpbb_checkdnsrr() function.
  ...

Conflicts:
	tests/template/template.php

phpBB/styles/prosilver/template/forum_fn.js

@@ -98,16 +98,21 @@ function viewableArea(e, itself)
 /**
 * Set display of page element
 * s[-1,0,1] = hide,toggle display,show
+* type = string: inline, block, inline-block or other CSS "display" type
 */
-function dE(n, s)
+function dE(n, s, type)
 {
-	var e = document.getElementById(n);
+	if (!type)
+	{
+		type = 'block';
+	}
 
+	var e = document.getElementById(n);
 	if (!s)
 	{
-		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
+		s = (e.style.display == '' || e.style.display == type) ? -1 : 1;
 	}
-	e.style.display = (s == 1) ? 'block' : 'none';
+	e.style.display = (s == 1) ? type : 'none';
 }
 
 /**

phpBB/styles/prosilver/template/mcp_post.html

@@ -54,6 +54,8 @@
 		</ul>
 		<!-- ENDIF -->
 
+		<span class="right-box clear" id="expand"><a href="#post_details" onclick="viewableArea(getElementById('post_details'), true); var rev_text = getElementById('expand').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'}; return false;">{L_EXPAND_VIEW}</a></span>
+
 		<h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3>
 		<!-- IF S_PM -->
 		<p class="author">
@@ -84,7 +86,7 @@
 			</p>
 		<!-- ENDIF -->
 
-		<div class="content">
+		<div class="content" id="post_details">
 			{POST_PREVIEW}
 		</div>
 

phpBB/styles/prosilver/template/ucp_pm_history.html

@@ -1,7 +1,7 @@
 
 <h3 id="review">
 	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
-	{L_MESSAGE_HISTORY}: {HISTORY_TITLE}
+	{L_MESSAGE_HISTORY}:
 </h3>
 
 <div id="topicreview">

phpBB/styles/prosilver/template/viewforum_body.html

@@ -39,7 +39,7 @@
 
 	<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
 		<div class="buttons">
-			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF --></a></div>
+			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}"><span></span><!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF --></a></div>
 		</div>
 	<!-- ENDIF -->
 

phpBB/styles/prosilver/theme/bidi.css

@@ -236,6 +236,7 @@
 }
 
 .rtl a.top2 {
+	background-position: 100% 50%;
 	padding-left: 0;
 	padding-right: 15px;
 }

phpBB/styles/prosilver/theme/content.css

@@ -298,6 +298,15 @@ div[class].topic-actions {
 	display: none;
 }
 
+/* MCP Post details
+----------------------------------------*/
+#post_details
+{
+	/* This will only work in IE7+, plus the others */
+	overflow: auto;
+	max-height: 300px;
+}
+
 /* Content container styles
 ----------------------------------------*/
 .content {

phpBB/styles/subsilver2/template/editor.js

@@ -240,6 +240,7 @@ function addquote(post_id, username, l_wrote)
 			theSelection = theSelection.replace(/&lt\;/ig, '<');
 			theSelection = theSelection.replace(/&gt\;/ig, '>');
 			theSelection = theSelection.replace(/&amp\;/ig, '&');
+			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
 		}
 		else if (document.all)
 		{
@@ -387,8 +388,8 @@ function colorPalette(dir, width, height)
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '">');
-				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" onmouseover="helpline(\'s\');"  onmouseout="helpline(\'tip\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
+				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>');
 			}
 

phpBB/styles/subsilver2/template/index_body.html

@@ -89,11 +89,11 @@
 
 <table class="legend">
 <tr>
-	<td width="20" align="center">{FORUM_NEW_IMG}</td>
-	<td><span class="gensmall">{L_NEW_POSTS}</span></td>
+	<td width="20" align="center">{FORUM_UNREAD_IMG}</td>
+	<td><span class="gensmall">{L_UNREAD_POSTS}</span></td>
 	<td>&nbsp;&nbsp;</td>
 	<td width="20" align="center">{FORUM_IMG}</td>
-	<td><span class="gensmall">{L_NO_NEW_POSTS}</span></td>
+	<td><span class="gensmall">{L_NO_UNREAD_POSTS}</span></td>
 	<td>&nbsp;&nbsp;</td>
 	<td width="20" align="center">{FORUM_LOCKED_IMG}</td>
 	<td><span class="gensmall">{L_FORUM_LOCKED}</span></td>

phpBB/styles/subsilver2/template/ucp_pm_history.html

@@ -6,7 +6,7 @@
 
 <table class="tablebg" width="100%" cellspacing="1">
 <tr>
-	<th align="center">{L_MESSAGE_HISTORY} - {HISTORY_TITLE}</th>
+	<th align="center">{L_MESSAGE_HISTORY}</th>
 </tr>
 <tr>
 	<td class="row1"><div style="overflow: auto; width: 100%; height: 300px;">

phpBB/styles/subsilver2/template/viewforum_body.html

@@ -281,31 +281,31 @@
 		<td align="{S_CONTENT_FLOW_BEGIN}" valign="top">
 			<table cellspacing="3" cellpadding="0" border="0">
 			<tr>
-				<td width="20" style="text-align: center;">{FOLDER_NEW_IMG}</td>
-				<td class="gensmall">{L_NEW_POSTS}</td>
+				<td width="20" style="text-align: center;">{FOLDER_UNREAD_IMG}</td>
+				<td class="gensmall">{L_UNREAD_POSTS}</td>
 				<td>&nbsp;&nbsp;</td>
 				<td width="20" style="text-align: center;">{FOLDER_IMG}</td>
-				<td class="gensmall">{L_NO_NEW_POSTS}</td>
+				<td class="gensmall">{L_NO_UNREAD_POSTS}</td>
 				<td>&nbsp;&nbsp;</td>
 				<td width="20" style="text-align: center;">{FOLDER_ANNOUNCE_IMG}</td>
 				<td class="gensmall">{L_ICON_ANNOUNCEMENT}</td>
 			</tr>
 			<tr>
-				<td style="text-align: center;">{FOLDER_HOT_NEW_IMG}</td>
-				<td class="gensmall">{L_NEW_POSTS_HOT}</td>
+				<td style="text-align: center;">{FOLDER_HOT_UNREAD_IMG}</td>
+				<td class="gensmall">{L_UNREAD_POSTS_HOT}</td>
 				<td>&nbsp;&nbsp;</td>
 				<td style="text-align: center;">{FOLDER_HOT_IMG}</td>
-				<td class="gensmall">{L_NO_NEW_POSTS_HOT}</td>
+				<td class="gensmall">{L_NO_UNREAD_POSTS_HOT}</td>
 				<td>&nbsp;&nbsp;</td>
 				<td style="text-align: center;">{FOLDER_STICKY_IMG}</td>
 				<td class="gensmall">{L_ICON_STICKY}</td>
 			</tr>
 			<tr>
-				<td style="text-align: center;">{FOLDER_LOCKED_NEW_IMG}</td>
-				<td class="gensmall">{L_NEW_POSTS_LOCKED}</td>
+				<td style="text-align: center;">{FOLDER_LOCKED_UNREAD_IMG}</td>
+				<td class="gensmall">{L_UNREAD_POSTS_LOCKED}</td>
 				<td>&nbsp;&nbsp;</td>
 				<td style="text-align: center;">{FOLDER_LOCKED_IMG}</td>
-				<td class="gensmall">{L_NO_NEW_POSTS_LOCKED}</td>
+				<td class="gensmall">{L_NO_UNREAD_POSTS_LOCKED}</td>
 				<td>&nbsp;&nbsp;</td>
 				<td style="text-align: center;">{FOLDER_MOVED_IMG}</td>
 				<td class="gensmall">{L_TOPIC_MOVED}</td>