From 95f61af798a304e3edce6cca3ab6489e02806b04 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 26 Apr 2017 09:34:15 -0700
Subject: [PATCH] [ticket/15198] Add PHP version to board stats in the ACP

PHPBB3-15198
---
 phpBB/adm/style/acp_main.html    | 54 ++++++++++++--------------------
 phpBB/language/en/acp/common.php |  8 ++---
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index e306ce78e9..9522baa9c2 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -94,45 +94,15 @@
 
 	<!-- EVENT acp_main_notice_after -->
 
-	<table class="table1 no-header" style="width: auto;" data-no-responsive-header="true">
-		<caption>{L_SOFTWARE_HEADING}</caption>
-		<col class="col1" /><col class="col2" />
-	<thead>
-	<tr>
-		<th>{L_SOFTWARE_PRODUCT}</th>
-		<th>{L_SOFTWARE_VERSION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td>{L_BOARD_VERSION}</td>
-	<!-- IF S_VERSIONCHECK -->
-		<td><strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
-		</td>
-	<!-- ELSE -->
-		<td><strong>{BOARD_VERSION}</strong></td>
-	<!-- ENDIF -->
-	</tr>
-	<tr>
-		<td>{L_PHP_VERSION}</td>
-		<td><strong>{PHP_VERSION_INFO}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_DATABASE_SERVER_INFO}</td>
-		<td><strong>{DATABASE_INFO}</strong></td>
-	</tr>
-	</tbody>
-	</table>
-
 	<table class="table1 two-columns no-header" data-no-responsive-header="true">
 		<caption>{L_FORUM_STATS}</caption>
 		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 	<thead>
 	<tr>
-		<th style="width: 25%">{L_STATISTIC}</th>
-		<th style="width: 25%">{L_VALUE}</th>
-		<th style="width: 25%">{L_STATISTIC}</th>
-		<th style="width: 25%">{L_VALUE}</th>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -173,8 +143,14 @@
 		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
 	</tr>
 	<tr>
+		<td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>
+		<td><strong>{DATABASE_INFO}</strong></td>
 		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
 		<td><strong>{GZIP_COMPRESSION}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_PHP_VERSION}{L_COLON} </td>
+		<td><strong>{PHP_VERSION_INFO}</strong></td>
 	<!-- IF S_TOTAL_ORPHAN -->
 		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
 		<td><strong>{TOTAL_ORPHAN}</strong></td>
@@ -183,6 +159,16 @@
 		<td>&nbsp;</td>
 	<!-- ENDIF -->
 	</tr>
+	<!-- IF S_VERSIONCHECK -->
+	<tr>
+		<td>{L_BOARD_VERSION}{L_COLON} </td>
+		<td>
+			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+		</td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	<!-- ENDIF -->
 	</tbody>
 	</table>
 
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 9be3cc9676..63235c01d8 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -367,7 +367,7 @@ $lang = array_merge($lang, array(
 	'AVATAR_DIR_SIZE'			=> 'Avatar directory size',
 
 	'BOARD_STARTED'		=> 'Board started',
-	'BOARD_VERSION'		=> 'phpBB',
+	'BOARD_VERSION'		=> 'Board version',
 
 	'DATABASE_SERVER_INFO'	=> 'Database server',
 	'DATABASE_SIZE'			=> 'Database size',
@@ -395,7 +395,7 @@ $lang = array_merge($lang, array(
 	'NUMBER_USERS'		=> 'Number of users',
 	'NUMBER_ORPHAN'		=> 'Orphan attachments',
 
-	'PHP_VERSION'		=> 'PHP',
+	'PHP_VERSION'		=> 'PHP version',
 	'PHP_VERSION_OLD'	=> 'The version of PHP on this server (%1$s) will no longer be supported by future versions of phpBB. The minimum required version will be PHP %2$s. %3$sDetails%4$s',
 
 	'POSTS_PER_DAY'		=> 'Posts per day',
@@ -430,10 +430,6 @@ $lang = array_merge($lang, array(
 	'RESYNC_STATS_SUCCESS'			=> 'Resynchronised statistics',
 	'RUN'							=> 'Run now',
 
-	'SOFTWARE_HEADING'			=> 'Installed software',
-	'SOFTWARE_PRODUCT'			=> 'Product',
-	'SOFTWARE_VERSION'			=> 'Version',
-
 	'STATISTIC'					=> 'Statistic',
 	'STATISTIC_RESYNC_OPTIONS'	=> 'Resynchronise or reset statistics',