Changeset:
635a6c61b6b9
https://sourceforge.net/p/mrbs/hg-code/ci/635a6c61b6b98c831fa3d36969c5c1d12d8a9ab9
Author:
Campbell Morrison <[email protected]>
Date:
Fri Mar 03 15:29:38 2017 +0000
Log message:
Added Server Software information to the Help information, to help with
determining the Apache version for choosing a .htaccess file - as well as being
generally useful for support.
diffstat:
web/functions.inc | 15 +++++++++++++++
web/help.php | 1 +
web/lang/lang.en | 1 +
3 files changed, 17 insertions(+), 0 deletions(-)
diffs (44 lines):
diff -r f26a70a2b158 -r 635a6c61b6b9 web/functions.inc
--- a/web/functions.inc Fri Mar 03 14:32:25 2017 +0000
+++ b/web/functions.inc Fri Mar 03 15:29:38 2017 +0000
@@ -2922,3 +2922,18 @@
}
+// Gets the web server software type and version, if it can.
+function get_server_software()
+{
+ if (function_exists('apache_get_version'))
+ {
+ return apache_get_version();
+ }
+
+ if (isset($_SERVER['SERVER_SOFTWARE']))
+ {
+ return $_SERVER['SERVER_SOFTWARE'];
+ }
+
+ return '';
+}
diff -r f26a70a2b158 -r 635a6c61b6b9 web/help.php
--- a/web/help.php Fri Mar 03 14:32:25 2017 +0000
+++ b/web/help.php Fri Mar 03 15:29:38 2017 +0000
@@ -14,6 +14,7 @@
echo "<tr><td><a href=\"http://mrbs.sourceforge.net\";>" . get_vocab("mrbs") .
"</a>:</td><td>" . get_mrbs_version() . "</td></tr>\n";
echo "<tr><td>" . get_vocab("database") . ":</td><td>" . db()->version() .
"</td></tr>\n";
echo "<tr><td>" . get_vocab("system") . ":</td><td>" . php_uname() .
"</td></tr>\n";
+echo "<tr><td>" . get_vocab("server_software") . ":</td><td>" .
htmlspecialchars(get_server_software()) . "</td></tr>\n";
echo "<tr><td>" . get_vocab("servertime") . ":</td><td>" .
utf8_strftime($strftime_format['datetime'], time()) .
"</td></tr>\n";
diff -r f26a70a2b158 -r 635a6c61b6b9 web/lang/lang.en
--- a/web/lang/lang.en Fri Mar 03 14:32:25 2017 +0000
+++ b/web/lang/lang.en Fri Mar 03 15:29:38 2017 +0000
@@ -450,6 +450,7 @@
$vocab["database"] = "Database";
$vocab["system"] = "System";
$vocab["servertime"] = "Server time";
+$vocab["server_software"] = "Server software";
$vocab["please_contact"] = "Please contact ";
$vocab["for_any_questions"] = "for any questions that aren't answered here.";
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
