Merge pull request #29471 from owncloud/stable10-conditional-sever-na…

…me-output

[stable10] Optionally show server hostname in status.php

config/config.sample.php

@@ -85,6 +85,11 @@
  */
 'version.hide' => false,
 
+/**
+ * Optionally, show the hostname of the server in status.php. Defaults to hidden
+ */
+'show_server_hostname' => false,
+
 /**
  * Identifies the database used with this installation. See also config option
  * ``supportedDatabases``

lib/public/Util.php

@@ -748,7 +748,6 @@ public static function getStatusInfo($includeVersion = false, $serverHide = fals
 			}
 		}
 
-
 		return $values;
 	}
 }

status.php

@@ -36,7 +36,9 @@
 
 	# show the version details based on config.php parameter, 
 	# but do not expose the servername in the public via url
-	$values = \OCP\Util::getStatusInfo(null,true);
+	$values = \OCP\Util::getStatusInfo(
+		null,
+		\OC::$server->getConfig()->getSystemValue('show_server_hostname', false) !== true);
 
 	if (OC::$CLI) {
 		print_r($values);