move server info to the admin page

appinfo/app.php

@@ -23,36 +23,4 @@
 
 use OCP\AppFramework\App;
 
-$app = new App('serverinfo');
-$container = $app->getContainer();
-
-$groupManager = \OC::$server->getGroupManager();
-$user = \OC::$server->getUserSession()->getUser();
-$isAdmin = $user !== null && $groupManager->isAdmin($user->getUID());
-
-
-if ($isAdmin) {
-	$container->query('OCP\INavigationManager')->add(function () use ($container) {
-		$urlGenerator = $container->query('OCP\IURLGenerator');
-		$l10n = $container->query('OCP\IL10N');
-		return [
-			// the string under which your app will be referenced in owncloud
-			'id' => 'serverinfo',
-
-			// sorting weight for the navigation. The higher the number, the higher
-			// will it be listed in the navigation
-			'order' => 10,
-
-			// the route that will be shown on startup
-			'href' => $urlGenerator->linkToRoute('serverinfo.page.index'),
-
-			// the icon that will be shown in the navigation
-			// this file needs to exist in img/
-			'icon' => $urlGenerator->imagePath('serverinfo', 'app.svg'),
-
-			// the title of your application. This will be used in the
-			// navigation or on the settings page of your app
-			'name' => $l10n->t('Server Info'),
-		];
-	});
-}
+new App('serverinfo');

appinfo/info.xml

@@ -5,11 +5,15 @@
     <description>Provider useful server information</description>
     <licence>AGPL</licence>
     <author>Bjoern Schiessle, Ivan Sein Santiago</author>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <namespace>ServerInfo</namespace>
     <category>other</category>
     <dependencies>
         <owncloud min-version="9.1" max-version="9.2" />
     </dependencies>
     <default_enable/>
+    <settings>
+        <admin>\OCA\ServerInfo\Settings\AdminSettings</admin>
+        <admin-section>\OCA\ServerInfo\Settings\AdminSection</admin-section>
+    </settings>
 </info>

appinfo/routes.php

@@ -30,7 +30,6 @@
 
 return [
     'routes' => [
-	   ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
 	   ['name' => 'page#update', 'url' => '/update', 'verb' => 'GET'],
     ],
 	'ocs' => [

lib/Controller/PageController.php

@@ -54,9 +54,6 @@ class PageController extends Controller {
 	/** @var SessionStatistics */
 	private $sessionStatistics;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
 	/**
 	 * ApiController constructor.
 	 *
@@ -68,7 +65,6 @@ class PageController extends Controller {
 	 * @param DatabaseStatistics $databaseStatistics
 	 * @param ShareStatistics $shareStatistics
 	 * @param SessionStatistics $sessionStatistics
-	 * @param IURLGenerator $urlGenerator
 	 */
 	public function __construct($appName,
 								IRequest $request,
@@ -77,8 +73,7 @@ public function __construct($appName,
 								PhpStatistics $phpStatistics,
 								DatabaseStatistics $databaseStatistics,
 								ShareStatistics $shareStatistics,
-								SessionStatistics $sessionStatistics,
-								IURLGenerator $urlGenerator
+								SessionStatistics $sessionStatistics
 	) {
 		parent::__construct($appName, $request);
 
@@ -88,18 +83,6 @@ public function __construct($appName,
 		$this->databaseStatistics = $databaseStatistics;
 		$this->shareStatistics = $shareStatistics;
 		$this->sessionStatistics = $sessionStatistics;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * Show app page with the server statistics
-	 * @NoCSRFRequired
-	 *
-	 * @return TemplateResponse
-	 */
-	public function index() {
-		$params = ['ocs' => $this->urlGenerator->getAbsoluteURL('ocs/v2.php/apps/serverinfo/api/v1/info')];
-		return new TemplateResponse('serverinfo', 'main', $params);
 	}
 
 	/**

lib/Settings/AdminSection.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\ServerInfo\Settings;
+
+
+use OCP\IL10N;
+use OCP\Settings\ISection;
+
+class AdminSection implements ISection {
+
+	/** @var IL10N */
+	private $l;
+
+	public function __construct(IL10N $l) {
+		$this->l = $l;
+	}
+
+	/**
+	 * returns the ID of the section. It is supposed to be a lower case string
+	 *
+	 * @returns string
+	 */
+	public function getID() {
+		return 'serverinfo';
+	}
+
+	/**
+	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+	 * integration'. Use the L10N service to translate it.
+	 *
+	 * @return string
+	 */
+	public function getName() {
+		return $this->l->t('Server Info');
+	}
+
+	/**
+	 * @return int whether the form should be rather on the top or bottom of
+	 * the settings navigation. The sections are arranged in ascending order of
+	 * the priority values. It is required to return a value between 0 and 99.
+	 *
+	 * keep the server setting at the top, right after "server settings"
+	 */
+	public function getPriority() {
+		return 0;
+	}
+
+}

lib/Settings/AdminSettings.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\ServerInfo\Settings;
+
+
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Settings\ISettings;
+
+class AdminSettings implements ISettings {
+
+
+	/** @var IL10N */
+	private $l;
+
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
+	/**
+	 * Admin constructor.
+	 *
+	 * @param IL10N $l
+	 * @param IURLGenerator $urlGenerator
+	 */
+	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
+		$this->l = $l;
+		$this->urlGenerator = $urlGenerator;
+	}
+
+	/**
+	 * @return TemplateResponse
+	 */
+	public function getForm() {
+		$monitoringEndPoint = $this->urlGenerator->getAbsoluteURL('ocs/v2.php/apps/serverinfo/api/v1/info');
+		$params = ['ocs' => $monitoringEndPoint];
+
+		return new TemplateResponse('serverinfo', 'settings-admin', $params);
+	}
+
+	/**
+	 * @return string the section ID, e.g. 'sharing'
+	 */
+	public function getSection() {
+		return 'serverinfo';
+	}
+
+	/**
+	 * @return int whether the form should be rather on the top or bottom of
+	 * the admin section. The forms are arranged in ascending order of the
+	 * priority values. It is required to return a value between 0 and 100.
+	 *
+	 * keep the server setting at the top, right after "server settings"
+	 */
+	public function getPriority() {
+		return 0;
+	}
+
+}

templates/part.content.php → templates/settings-admin.php

@@ -1,3 +1,32 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+script('serverinfo', 'script');
+script('serverinfo', 'smoothie');
+script('serverinfo', 'Chart.min');
+
+style('serverinfo', 'style');
+?>
+
 <div class="section" id="cpuSection">
 	<h2><?php p($l->t('CPU load'));?></h2>
 	<canvas id="cpuloadcanvas" width="600" height="150"></canvas>
@@ -41,6 +70,4 @@
 	<h2><?php p($l->t('External monitoring tool'));?></h2>
 	<p>
 		<?php p($l->t('You can connect a external monitoring tool by using this end point: ') . $_['ocs']);?>
-
-
 </div>