Merge pull request #27238 from owncloud/show_status_in_general

Vincent Petry · web-flow · commit dbad94a54ea0 · 2017-02-27T09:35:36.000+01:00
Show system status in Settings/General
diff --git a/lib/private/Settings/SettingsManager.php b/lib/private/Settings/SettingsManager.php
@@ -56,6 +56,7 @@
 use OC\Settings\Panels\Admin\SecurityWarning;
 use OC\Settings\Panels\Admin\Updater;
 use OC\Settings\Panels\Admin\Tips;
+use OC\Settings\Panels\Admin\Status;
 
 /*
  * @since 10.0
@@ -239,7 +240,8 @@ private function getBuiltInPanels() {
 				FileSharing::class,
 				Encryption::class,
 				Certificates::class,
-				Apps::class
+				Apps::class,
+				Status::class
 			]
 		];
 	}
diff --git a/lib/public/Util.php b/lib/public/Util.php
@@ -703,4 +703,29 @@ public static function needUpgrade() {
 		}		
 		return self::$needUpgradeCache;
 	}
+
+	/**
+	 * Collects all status infos.
+	 *
+	 * @return array 
+	 * @since 10.0
+	 */
+	public static function getStatusInfo() {
+		$systemConfig = \OC::$server->getSystemConfig();
+
+		$installed = (bool) $systemConfig->getValue('installed', false);
+		$maintenance = (bool) $systemConfig->getValue('maintenance', false);
+		# see core/lib/private/legacy/defaults.php and core/themes/example/defaults.php
+		# for description and defaults
+		$defaults = new \OCP\Defaults();
+		$values = [
+			'installed'=> $installed ? 'true' : 'false',
+			'maintenance' => $maintenance ? 'true' : 'false',
+			'needsDbUpgrade' => self::needUpgrade() ? 'true' : 'false',
+			'version' => implode('.', self::getVersion()),
+			'versionstring' => \OC_Util::getVersionString(),
+			'edition' => \OC_Util::getEditionString(),
+			'productname' => $defaults->getName()];
+		return $values;
+	}
 }
diff --git a/settings/Panels/Admin/Status.php b/settings/Panels/Admin/Status.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @author Martin Mattel <martin.mattel@diemattels.at>
+ *
+ * @copyright Copyright (c) 2017, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Settings\Panels\Admin;
+
+use OCP\Settings\ISettings;
+use OCP\Template;
+
+class Status implements ISettings {
+
+	public function getPriority() {
+		return 0;
+	}
+
+	public function getPanel() {
+		$tmpl = new Template('settings', 'panels/admin/status');
+		$values = \OCP\Util::getStatusInfo();
+		$tmpl->assign('showStatus', $values);
+		return $tmpl;
+	}
+
+	public function getSectionID() {
+		return 'general';
+	}
+
+}
diff --git a/settings/templates/panels/admin/status.php b/settings/templates/panels/admin/status.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @var array $_
+ * @var \OCP\IL10N $l
+ * @var OC_Defaults $theme
+ */
+?>
+<div class="section">
+	<h2 class="app-name"><?php p($l->t('System Status'));?></h2>
+	<table>
+		<tr>
+			<?php
+			// show system status
+			// do not translate, keep original keywords = same output as via status.php
+			foreach ($_['showStatus'] as $statusKey => $statusValue) {
+			?>
+				<td style="padding: 0 15px;"><?php p($statusKey); ?></td>
+				<td style="padding: 0 15px;"><?php p($statusValue); ?></td>
+		</tr>
+			<?php
+			}
+			?>
+	</table>
+</div>
diff --git a/status.php b/status.php
@@ -34,21 +34,8 @@
 
 	require_once __DIR__ . '/lib/base.php';
 
-	$systemConfig = \OC::$server->getSystemConfig();
+	$values = \OCP\Util::getStatusInfo();
 
-	$installed = (bool) $systemConfig->getValue('installed', false);
-	$maintenance = (bool) $systemConfig->getValue('maintenance', false);
-	# see core/lib/private/legacy/defaults.php and core/themes/example/defaults.php
-	# for description and defaults
-	$defaults = new \OCP\Defaults();
-	$values= [
-		'installed'=>$installed,
-		'maintenance' => $maintenance,
-		'needsDbUpgrade' => \OCP\Util::needUpgrade(),
-		'version'=>implode('.', \OCP\Util::getVersion()),
-		'versionstring'=>OC_Util::getVersionString(),
-		'edition'=>OC_Util::getEditionString(),
-		'productname'=>$defaults->getName()];
 	if (OC::$CLI) {
 		print_r($values);
 	} else {
