summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2016-11-21 17:17:02 +0100
committerGitHub <noreply@github.com>2016-11-21 17:17:02 +0100
commitcd24010fa4199e8ef39b831f6f27138504a9c9d6 (patch)
tree01815b38c27a4d876a015aa028feca61d479c3bc /lib
parentefdef8f801bd33b5c2e4d982947a4ff41e2514ab (diff)
parent0048b3aa2e70b2e9d2f1fbb6adb82af31b13f95a (diff)
downloadnextcloud-server-cd24010fa4199e8ef39b831f6f27138504a9c9d6.tar.gz
nextcloud-server-cd24010fa4199e8ef39b831f6f27138504a9c9d6.zip
Merge pull request #2214 from nextcloud/remove-logging
remove old logging section
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Settings/Admin/Logging.php86
-rw-r--r--lib/private/Settings/Manager.php6
2 files changed, 0 insertions, 92 deletions
diff --git a/lib/private/Settings/Admin/Logging.php b/lib/private/Settings/Admin/Logging.php
deleted file mode 100644
index 407248ac4b1..00000000000
--- a/lib/private/Settings/Admin/Logging.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
- * @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 OC\Settings\Admin;
-
-use OC\Log\File as LogFile;
-use OCP\AppFramework\Http\TemplateResponse;
-use OCP\IConfig;
-use OCP\Settings\ISettings;
-
-class Logging implements ISettings {
- /** @var IConfig */
- private $config;
-
- /**
- * @param IConfig $config
- */
- public function __construct(IConfig $config) {
- $this->config = $config;
- }
-
- /**
- * @return TemplateResponse
- */
- public function getForm() {
- $logType = $this->config->getSystemValue('log_type', 'file');
- $showLog = ($logType === 'file' || $logType === 'owncloud');
-
- $numEntriesToLoad = 5;
- $entries = LogFile::getEntries($numEntriesToLoad + 1);
- $entriesRemaining = count($entries) > $numEntriesToLoad;
- $entries = array_slice($entries, 0, $numEntriesToLoad);
-
- $logFileExists = file_exists(LogFile::getLogFilePath()) ;
- $logFileSize = $logFileExists ? filesize(LogFile::getLogFilePath()) : 0;
-
- $parameters = [
- 'loglevel' => $this->config->getSystemValue('loglevel', 2),
- 'entries' => $entries,
- 'entriesremain' => $entriesRemaining,
- 'doesLogFileExist' => $logFileExists,
- 'logFileSize' => $logFileSize,
- 'showLog' => $showLog,
- ];
-
- return new TemplateResponse('settings', 'admin/logging', $parameters, '');
- }
-
- /**
- * @return string the section ID, e.g. 'sharing'
- */
- public function getSection() {
- return 'logging';
- }
-
- /**
- * @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.
- *
- * E.g.: 70
- */
- public function getPriority() {
- return 0;
- }
-}
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index a6f9aacccb2..990750848d3 100644
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -332,7 +332,6 @@ class Manager implements IManager {
0 => [new Section('server', $this->l->t('Server settings'), 0)],
5 => [new Section('sharing', $this->l->t('Sharing'), 0)],
45 => [new Section('encryption', $this->l->t('Encryption'), 0)],
- 90 => [new Section('logging', $this->l->t('Logging'), 0)],
98 => [new Section('additional', $this->l->t('Additional settings'), 0)],
99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0)],
];
@@ -382,11 +381,6 @@ class Manager implements IManager {
$form = new Admin\Sharing($this->config);
$forms[$form->getPriority()] = [$form];
}
- if($section === 'logging') {
- /** @var ISettings $form */
- $form = new Admin\Logging($this->config);
- $forms[$form->getPriority()] = [$form];
- }
if($section === 'additional') {
/** @var ISettings $form */
$form = new Admin\Additional($this->config);