From c06f4756eca4dfbbdad8984a62976745aeb183dd Mon Sep 17 00:00:00 2001 From: nomind60s Date: Fri, 17 Feb 2017 13:44:42 -0700 Subject: [PATCH 1/5] [ticket/15097] Add PHP version to Board statistics The ACP main page shows the phpBB version and the database version, but didn't show the PHP version. With this change the PHP version is displayed as part of the Board statistics. PHPBB3-15097 --- phpBB/adm/style/acp_main.html | 4 ++++ phpBB/includes/acp/acp_main.php | 1 + phpBB/language/en/acp/common.php | 1 + 3 files changed, 6 insertions(+) diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 1bdb7b8d2a..944cf10ea5 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -167,6 +167,10 @@   + + {L_PHP_VERSION}{L_COLON} + {PHP_VERSION} + diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 6e7bd91a86..0c750abc0a 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -569,6 +569,7 @@ class acp_main 'S_TOTAL_ORPHAN' => ($total_orphan === false) ? false : true, 'GZIP_COMPRESSION' => ($config['gzip_compress'] && @extension_loaded('zlib')) ? $user->lang['ON'] : $user->lang['OFF'], 'DATABASE_INFO' => $db->sql_server_info(), + 'PHP_VERSION' => PHP_VERSION, 'BOARD_VERSION' => $config['version'], 'U_ACTION' => $this->u_action, diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 562b446f8a..3cb2828d09 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -373,6 +373,7 @@ $lang = array_merge($lang, array( 'NUMBER_USERS' => 'Number of users', 'NUMBER_ORPHAN' => 'Orphan attachments', + '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', From c30ad4ce60267a1301a406c3d0279f95b856f5a5 Mon Sep 17 00:00:00 2001 From: nomind60s Date: Fri, 17 Feb 2017 14:19:18 -0700 Subject: [PATCH 2/5] [ticket/15097] Add PHP version to Board statistics Rework commit message per DavidIQ's guidance and change variable name to avoid confusion PHPBB3-15907 --- phpBB/adm/style/acp_main.html | 2 +- phpBB/includes/acp/acp_main.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 944cf10ea5..5f8040b57e 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -169,7 +169,7 @@ {L_PHP_VERSION}{L_COLON} - {PHP_VERSION} + {PHP_VERSION_INFO} diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 0c750abc0a..c611db5759 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -569,7 +569,7 @@ class acp_main 'S_TOTAL_ORPHAN' => ($total_orphan === false) ? false : true, 'GZIP_COMPRESSION' => ($config['gzip_compress'] && @extension_loaded('zlib')) ? $user->lang['ON'] : $user->lang['OFF'], 'DATABASE_INFO' => $db->sql_server_info(), - 'PHP_VERSION' => PHP_VERSION, + 'PHP_VERSION_INFO' => PHP_VERSION, 'BOARD_VERSION' => $config['version'], 'U_ACTION' => $this->u_action, From 65513c79f57d7e10dcc973d094bf723673738ada Mon Sep 17 00:00:00 2001 From: nomind60s Date: Fri, 17 Feb 2017 16:15:00 -0700 Subject: [PATCH 3/5] [ticket/15097] Resolve travis-ci error Make sure indentation is using tabs not spaces per code guidelines PHPBB3-15097 --- phpBB/includes/acp/acp_main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index c611db5759..d40cda0358 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -569,7 +569,7 @@ class acp_main 'S_TOTAL_ORPHAN' => ($total_orphan === false) ? false : true, 'GZIP_COMPRESSION' => ($config['gzip_compress'] && @extension_loaded('zlib')) ? $user->lang['ON'] : $user->lang['OFF'], 'DATABASE_INFO' => $db->sql_server_info(), - 'PHP_VERSION_INFO' => PHP_VERSION, + 'PHP_VERSION_INFO' => PHP_VERSION, 'BOARD_VERSION' => $config['version'], 'U_ACTION' => $this->u_action, From 16dbc4195af2244405c201b49de7be8f25085eb2 Mon Sep 17 00:00:00 2001 From: nomind60s Date: Fri, 17 Feb 2017 16:25:30 -0700 Subject: [PATCH 4/5] [ticket/15097] Resolve travis-ci error Make sure indentation is using tabs not spaces per code guidelines PHPBB3-15097 --- phpBB/language/en/acp/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 3cb2828d09..5c9e31f028 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -373,7 +373,7 @@ $lang = array_merge($lang, array( 'NUMBER_USERS' => 'Number of users', 'NUMBER_ORPHAN' => 'Orphan attachments', - 'PHP_VERSION' => 'PHP version', + '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', From f677376b8ca4451e3a0c415f603ad1513ed24ef7 Mon Sep 17 00:00:00 2001 From: nomind60s Date: Sun, 19 Feb 2017 11:49:07 -0700 Subject: [PATCH 5/5] [ticket/15097] New 'Installed software' lead section Created a new lead section showing the installed software (phpBB, PHP and Database server) and their versions. Implementation is inspired by MediaWiki's Special:Version page. Removed those items from Board statistics section. PHPBB3-15097 --- phpBB/adm/style/acp_main.html | 59 +++++++++++++++++++------------- phpBB/language/en/acp/common.php | 8 +++-- 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 5f8040b57e..e306ce78e9 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -94,15 +94,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_SOFTWARE_HEADING}
{L_SOFTWARE_PRODUCT}{L_SOFTWARE_VERSION}
{L_BOARD_VERSION}style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] + {BOARD_VERSION}
{L_PHP_VERSION}{PHP_VERSION_INFO}
{L_DATABASE_SERVER_INFO}{DATABASE_INFO}
+ - - - - + + + + @@ -130,8 +160,6 @@ - - @@ -145,33 +173,16 @@ - - - - - - - - - - - + - - - - -
{L_FORUM_STATS}
{L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}
{L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY}
{L_BOARD_STARTED}{L_COLON} {START_DATE}{UPLOAD_DIR_SIZE}
{L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO} {L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION}
{L_BOARD_VERSION}{L_COLON} - style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] - {L_NUMBER_ORPHAN}{L_COLON} {TOTAL_ORPHAN}    
{L_PHP_VERSION}{L_COLON} {PHP_VERSION_INFO}
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 5c9e31f028..f67aba162c 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -345,7 +345,7 @@ $lang = array_merge($lang, array( 'AVATAR_DIR_SIZE' => 'Avatar directory size', 'BOARD_STARTED' => 'Board started', - 'BOARD_VERSION' => 'Board version', + 'BOARD_VERSION' => 'phpBB', 'DATABASE_SERVER_INFO' => 'Database server', 'DATABASE_SIZE' => 'Database size', @@ -373,7 +373,7 @@ $lang = array_merge($lang, array( 'NUMBER_USERS' => 'Number of users', 'NUMBER_ORPHAN' => 'Orphan attachments', - 'PHP_VERSION' => 'PHP version', + 'PHP_VERSION' => 'PHP', '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', @@ -408,6 +408,10 @@ $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',