Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/serverinfo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Kesselberg <mail@danielkesselberg.de>2020-10-03 23:08:35 +0300
committerDaniel Kesselberg <mail@danielkesselberg.de>2020-10-03 23:08:35 +0300
commit7b499276fd61dc23751b180cab459f0f32f7ae9d (patch)
treef62fd08dfc979534329b92301d1cfc365fcbff0a /lib
parent741936af1e628ffd1127ecefb3b7409522cfe334 (diff)
Remove timeservers
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/Controller/ApiController.php4
-rw-r--r--lib/OperatingSystems/DefaultOs.php9
-rw-r--r--lib/OperatingSystems/FreeBSD.php16
-rw-r--r--lib/Os.php8
4 files changed, 1 insertions, 36 deletions
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
index 5b08a80..e4d0be9 100644
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@@ -115,12 +115,10 @@ class ApiController extends OCSController {
public function BasicData(): DataResponse {
$servertime = $this->os->getTime();
$uptime = $this->formatUptime($this->os->getUptime());
- $timeservers = $this->os->getTimeServers()[0];
return new DataResponse([
'servertime' => $servertime,
- 'uptime' => $uptime,
- 'timeservers' => $timeservers
+ 'uptime' => $uptime
]);
}
diff --git a/lib/OperatingSystems/DefaultOs.php b/lib/OperatingSystems/DefaultOs.php
index 0e2aa45..0465357 100644
--- a/lib/OperatingSystems/DefaultOs.php
+++ b/lib/OperatingSystems/DefaultOs.php
@@ -129,15 +129,6 @@ class DefaultOs implements IOperatingSystem {
/**
* @return string
*/
- public function getTimeServers() {
- $servers = shell_exec('cat /etc/ntp.conf 2>/dev/null |grep \'^pool\' | cut -f 2 -d " "');
- $servers .= ' ' . shell_exec('cat /etc/systemd/timesyncd.conf 2>/dev/null |grep \'^NTP=\' | cut -f 2 -d " "');
- return $servers;
- }
-
- /**
- * @return string
- */
public function getNetworkInfo() {
$result = [];
$result['hostname'] = \gethostname();
diff --git a/lib/OperatingSystems/FreeBSD.php b/lib/OperatingSystems/FreeBSD.php
index c61d423..3a247ea 100644
--- a/lib/OperatingSystems/FreeBSD.php
+++ b/lib/OperatingSystems/FreeBSD.php
@@ -125,22 +125,6 @@ class FreeBSD implements IOperatingSystem {
/**
* @return string
*/
- public function getTimeServers() {
- $servers = " ";
-
- try {
- $servers = $this->executeCommand('cat /etc/ntp.conf 2>/dev/null');
- preg_match_all("/(?<=^pool ).\S*/m", $servers, $matches);
- $allservers = implode(' ', $matches[0]);
- } catch (\RuntimeException $e) {
- return $servers;
- }
- return $allservers;
- }
-
- /**
- * @return string
- */
public function getNetworkInfo() {
$result = [];
$result['hostname'] = \gethostname();
diff --git a/lib/Os.php b/lib/Os.php
index 01f086e..21c0217 100644
--- a/lib/Os.php
+++ b/lib/Os.php
@@ -83,14 +83,6 @@ class Os implements IOperatingSystem {
return $this->backend->getUptime();
}
- /**
- * @return string
- */
- public function getTimeServers() {
- $data = $this->backend->getTimeServers();
- return explode("\n", $data);
- }
-
public function getDiskInfo(): array {
return $this->backend->getDiskInfo();
}