diff options
author | Morris Jobke <hey@morrisjobke.de> | 2020-10-06 10:16:58 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-06 10:16:58 +0300 |
commit | 4c909b1b45e51abf16ab6d850f0b9bb09728987b (patch) | |
tree | 483b2e40c91b948788bc254b462178a3a6a8c201 /lib | |
parent | d7f73846891118f33a59ac675c0b5abb5691212a (diff) | |
parent | 7b499276fd61dc23751b180cab459f0f32f7ae9d (diff) |
Merge pull request #243 from nextcloud/enh/noid/remove-time-servers
Remove timeserver
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Controller/ApiController.php | 4 | ||||
-rw-r--r-- | lib/OperatingSystems/DefaultOs.php | 9 | ||||
-rw-r--r-- | lib/OperatingSystems/FreeBSD.php | 16 | ||||
-rw-r--r-- | lib/Os.php | 8 |
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 ece7ef9..e4c7af6 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(); @@ -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(); } |