Completed
Pull Request — master (#7490)
by Tobia
19:43 queued 01:32
created
apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 use OCP\AppFramework\Http;
6 6
 
7 7
 class NotSubAdminException extends \Exception {
8
-	public function __construct() {
9
-		parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
10
-	}
8
+    public function __construct() {
9
+        parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
10
+    }
11 11
 }
12 12
\ No newline at end of file
Please login to merge, or discard this patch.
apps/updatenotification/lib/Controller/AdminController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
 		$currentChannel = \OCP\Util::getChannel();
100 100
 
101 101
 		// Remove the currently used channel from the channels list
102
-		if(($key = array_search($currentChannel, $channels)) !== false) {
102
+		if (($key = array_search($currentChannel, $channels)) !== false) {
103 103
 			unset($channels[$key]);
104 104
 		}
105 105
 		$updateState = $this->updateChecker->getUpdateState();
Please login to merge, or discard this patch.
Indentation   +139 added lines, -139 removed lines patch added patch discarded remove patch
@@ -37,143 +37,143 @@
 block discarded – undo
37 37
 use OCP\Settings\ISettings;
38 38
 
39 39
 class AdminController extends Controller implements ISettings {
40
-	/** @var IJobList */
41
-	private $jobList;
42
-	/** @var ISecureRandom */
43
-	private $secureRandom;
44
-	/** @var IConfig */
45
-	private $config;
46
-	/** @var ITimeFactory */
47
-	private $timeFactory;
48
-	/** @var UpdateChecker */
49
-	private $updateChecker;
50
-	/** @var IL10N */
51
-	private $l10n;
52
-	/** @var IDateTimeFormatter */
53
-	private $dateTimeFormatter;
54
-
55
-	/**
56
-	 * @param string $appName
57
-	 * @param IRequest $request
58
-	 * @param IJobList $jobList
59
-	 * @param ISecureRandom $secureRandom
60
-	 * @param IConfig $config
61
-	 * @param ITimeFactory $timeFactory
62
-	 * @param IL10N $l10n
63
-	 * @param UpdateChecker $updateChecker
64
-	 * @param IDateTimeFormatter $dateTimeFormatter
65
-	 */
66
-	public function __construct($appName,
67
-								IRequest $request,
68
-								IJobList $jobList,
69
-								ISecureRandom $secureRandom,
70
-								IConfig $config,
71
-								ITimeFactory $timeFactory,
72
-								IL10N $l10n,
73
-								UpdateChecker $updateChecker,
74
-								IDateTimeFormatter $dateTimeFormatter) {
75
-		parent::__construct($appName, $request);
76
-		$this->jobList = $jobList;
77
-		$this->secureRandom = $secureRandom;
78
-		$this->config = $config;
79
-		$this->timeFactory = $timeFactory;
80
-		$this->l10n = $l10n;
81
-		$this->updateChecker = $updateChecker;
82
-		$this->dateTimeFormatter = $dateTimeFormatter;
83
-	}
84
-
85
-	/**
86
-	 * @return TemplateResponse
87
-	 */
88
-	public function displayPanel() {
89
-		$lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
90
-		$lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
91
-
92
-		$channels = [
93
-			'daily',
94
-			'beta',
95
-			'stable',
96
-			'production',
97
-		];
98
-		$currentChannel = \OCP\Util::getChannel();
99
-
100
-		// Remove the currently used channel from the channels list
101
-		if(($key = array_search($currentChannel, $channels)) !== false) {
102
-			unset($channels[$key]);
103
-		}
104
-		$updateState = $this->updateChecker->getUpdateState();
105
-
106
-		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
107
-
108
-		$defaultUpdateServerURL = 'https://updates.nextcloud.com/server/';
109
-		$updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
110
-
111
-		$params = [
112
-			'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
113
-			'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
114
-			'lastChecked' => $lastUpdateCheck,
115
-			'currentChannel' => $currentChannel,
116
-			'channels' => $channels,
117
-			'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'],
118
-			'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'],
119
-			'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'],
120
-			'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
121
-			'updateServerURL' => $updateServerURL,
122
-			'notify_groups' => implode('|', $notifyGroups),
123
-		];
124
-
125
-		return new TemplateResponse($this->appName, 'admin', $params, '');
126
-	}
127
-
128
-	/**
129
-	 * @UseSession
130
-	 *
131
-	 * @param string $channel
132
-	 * @return DataResponse
133
-	 */
134
-	public function setChannel($channel) {
135
-		\OCP\Util::setChannel($channel);
136
-		$this->config->setAppValue('core', 'lastupdatedat', 0);
137
-		return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
138
-	}
139
-
140
-	/**
141
-	 * @return DataResponse
142
-	 */
143
-	public function createCredentials() {
144
-		// Create a new job and store the creation date
145
-		$this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob');
146
-		$this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
147
-
148
-		// Create a new token
149
-		$newToken = $this->secureRandom->generate(64);
150
-		$this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
151
-
152
-		return new DataResponse($newToken);
153
-	}
154
-
155
-	/**
156
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
157
-	 */
158
-	public function getForm() {
159
-		return $this->displayPanel();
160
-	}
161
-
162
-	/**
163
-	 * @return string the section ID, e.g. 'sharing'
164
-	 */
165
-	public function getSection() {
166
-		return 'server';
167
-	}
168
-
169
-	/**
170
-	 * @return int whether the form should be rather on the top or bottom of
171
-	 * the admin section. The forms are arranged in ascending order of the
172
-	 * priority values. It is required to return a value between 0 and 100.
173
-	 *
174
-	 * E.g.: 70
175
-	 */
176
-	public function getPriority() {
177
-		return 1;
178
-	}
40
+    /** @var IJobList */
41
+    private $jobList;
42
+    /** @var ISecureRandom */
43
+    private $secureRandom;
44
+    /** @var IConfig */
45
+    private $config;
46
+    /** @var ITimeFactory */
47
+    private $timeFactory;
48
+    /** @var UpdateChecker */
49
+    private $updateChecker;
50
+    /** @var IL10N */
51
+    private $l10n;
52
+    /** @var IDateTimeFormatter */
53
+    private $dateTimeFormatter;
54
+
55
+    /**
56
+     * @param string $appName
57
+     * @param IRequest $request
58
+     * @param IJobList $jobList
59
+     * @param ISecureRandom $secureRandom
60
+     * @param IConfig $config
61
+     * @param ITimeFactory $timeFactory
62
+     * @param IL10N $l10n
63
+     * @param UpdateChecker $updateChecker
64
+     * @param IDateTimeFormatter $dateTimeFormatter
65
+     */
66
+    public function __construct($appName,
67
+                                IRequest $request,
68
+                                IJobList $jobList,
69
+                                ISecureRandom $secureRandom,
70
+                                IConfig $config,
71
+                                ITimeFactory $timeFactory,
72
+                                IL10N $l10n,
73
+                                UpdateChecker $updateChecker,
74
+                                IDateTimeFormatter $dateTimeFormatter) {
75
+        parent::__construct($appName, $request);
76
+        $this->jobList = $jobList;
77
+        $this->secureRandom = $secureRandom;
78
+        $this->config = $config;
79
+        $this->timeFactory = $timeFactory;
80
+        $this->l10n = $l10n;
81
+        $this->updateChecker = $updateChecker;
82
+        $this->dateTimeFormatter = $dateTimeFormatter;
83
+    }
84
+
85
+    /**
86
+     * @return TemplateResponse
87
+     */
88
+    public function displayPanel() {
89
+        $lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
90
+        $lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
91
+
92
+        $channels = [
93
+            'daily',
94
+            'beta',
95
+            'stable',
96
+            'production',
97
+        ];
98
+        $currentChannel = \OCP\Util::getChannel();
99
+
100
+        // Remove the currently used channel from the channels list
101
+        if(($key = array_search($currentChannel, $channels)) !== false) {
102
+            unset($channels[$key]);
103
+        }
104
+        $updateState = $this->updateChecker->getUpdateState();
105
+
106
+        $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
107
+
108
+        $defaultUpdateServerURL = 'https://updates.nextcloud.com/server/';
109
+        $updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
110
+
111
+        $params = [
112
+            'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
113
+            'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
114
+            'lastChecked' => $lastUpdateCheck,
115
+            'currentChannel' => $currentChannel,
116
+            'channels' => $channels,
117
+            'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'],
118
+            'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'],
119
+            'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'],
120
+            'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
121
+            'updateServerURL' => $updateServerURL,
122
+            'notify_groups' => implode('|', $notifyGroups),
123
+        ];
124
+
125
+        return new TemplateResponse($this->appName, 'admin', $params, '');
126
+    }
127
+
128
+    /**
129
+     * @UseSession
130
+     *
131
+     * @param string $channel
132
+     * @return DataResponse
133
+     */
134
+    public function setChannel($channel) {
135
+        \OCP\Util::setChannel($channel);
136
+        $this->config->setAppValue('core', 'lastupdatedat', 0);
137
+        return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
138
+    }
139
+
140
+    /**
141
+     * @return DataResponse
142
+     */
143
+    public function createCredentials() {
144
+        // Create a new job and store the creation date
145
+        $this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob');
146
+        $this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
147
+
148
+        // Create a new token
149
+        $newToken = $this->secureRandom->generate(64);
150
+        $this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
151
+
152
+        return new DataResponse($newToken);
153
+    }
154
+
155
+    /**
156
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
157
+     */
158
+    public function getForm() {
159
+        return $this->displayPanel();
160
+    }
161
+
162
+    /**
163
+     * @return string the section ID, e.g. 'sharing'
164
+     */
165
+    public function getSection() {
166
+        return 'server';
167
+    }
168
+
169
+    /**
170
+     * @return int whether the form should be rather on the top or bottom of
171
+     * the admin section. The forms are arranged in ascending order of the
172
+     * priority values. It is required to return a value between 0 and 100.
173
+     *
174
+     * E.g.: 70
175
+     */
176
+    public function getPriority() {
177
+        return 1;
178
+    }
179 179
 }
Please login to merge, or discard this patch.
apps/updatenotification/lib/UpdateChecker.php 2 patches
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -26,48 +26,48 @@
 block discarded – undo
26 26
 use OC\Updater\VersionCheck;
27 27
 
28 28
 class UpdateChecker {
29
-	/** @var VersionCheck */
30
-	private $updater;
29
+    /** @var VersionCheck */
30
+    private $updater;
31 31
 
32
-	/**
33
-	 * @param VersionCheck $updater
34
-	 */
35
-	public function __construct(VersionCheck $updater) {
36
-		$this->updater = $updater;
37
-	}
32
+    /**
33
+     * @param VersionCheck $updater
34
+     */
35
+    public function __construct(VersionCheck $updater) {
36
+        $this->updater = $updater;
37
+    }
38 38
 
39
-	/**
40
-	 * @return array
41
-	 */
42
-	public function getUpdateState() {
43
-		$data = $this->updater->check();
44
-		$result = [];
39
+    /**
40
+     * @return array
41
+     */
42
+    public function getUpdateState() {
43
+        $data = $this->updater->check();
44
+        $result = [];
45 45
 
46
-		if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
47
-			$result['updateAvailable'] = true;
48
-			$result['updateVersion'] = $data['versionstring'];
49
-			$result['updaterEnabled'] = $data['autoupdater'] === '1';
50
-			if(substr($data['web'], 0, 8) === 'https://') {
51
-				$result['updateLink'] = $data['web'];
52
-			}
53
-			if(substr($data['url'], 0, 8) === 'https://') {
54
-				$result['downloadLink'] = $data['url'];
55
-			}
46
+        if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
47
+            $result['updateAvailable'] = true;
48
+            $result['updateVersion'] = $data['versionstring'];
49
+            $result['updaterEnabled'] = $data['autoupdater'] === '1';
50
+            if(substr($data['web'], 0, 8) === 'https://') {
51
+                $result['updateLink'] = $data['web'];
52
+            }
53
+            if(substr($data['url'], 0, 8) === 'https://') {
54
+                $result['downloadLink'] = $data['url'];
55
+            }
56 56
 
57
-			return $result;
58
-		}
57
+            return $result;
58
+        }
59 59
 
60
-		return [];
61
-	}
60
+        return [];
61
+    }
62 62
 
63
-	/**
64
-	 * @param array $data
65
-	 */
66
-	public function getJavaScript(array $data) {
67
-		$data['array']['oc_updateState'] =  json_encode([
68
-			'updateAvailable' => true,
69
-			'updateVersion' => $this->getUpdateState()['updateVersion'],
70
-			'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '',
71
-		]);
72
-	}
63
+    /**
64
+     * @param array $data
65
+     */
66
+    public function getJavaScript(array $data) {
67
+        $data['array']['oc_updateState'] =  json_encode([
68
+            'updateAvailable' => true,
69
+            'updateVersion' => $this->getUpdateState()['updateVersion'],
70
+            'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '',
71
+        ]);
72
+    }
73 73
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
43 43
 		$data = $this->updater->check();
44 44
 		$result = [];
45 45
 
46
-		if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
46
+		if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
47 47
 			$result['updateAvailable'] = true;
48 48
 			$result['updateVersion'] = $data['versionstring'];
49 49
 			$result['updaterEnabled'] = $data['autoupdater'] === '1';
50
-			if(substr($data['web'], 0, 8) === 'https://') {
50
+			if (substr($data['web'], 0, 8) === 'https://') {
51 51
 				$result['updateLink'] = $data['web'];
52 52
 			}
53
-			if(substr($data['url'], 0, 8) === 'https://') {
53
+			if (substr($data['url'], 0, 8) === 'https://') {
54 54
 				$result['downloadLink'] = $data['url'];
55 55
 			}
56 56
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * @param array $data
65 65
 	 */
66 66
 	public function getJavaScript(array $data) {
67
-		$data['array']['oc_updateState'] =  json_encode([
67
+		$data['array']['oc_updateState'] = json_encode([
68 68
 			'updateAvailable' => true,
69 69
 			'updateVersion' => $this->getUpdateState()['updateVersion'],
70 70
 			'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '',
Please login to merge, or discard this patch.
apps/updatenotification/lib/AppInfo/Application.php 2 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -30,27 +30,27 @@
 block discarded – undo
30 30
 use OCP\AppFramework\IAppContainer;
31 31
 
32 32
 class Application extends App {
33
-	public function __construct (array $urlParams = array()) {
34
-		parent::__construct('updatenotification', $urlParams);
35
-		$container = $this->getContainer();
33
+    public function __construct (array $urlParams = array()) {
34
+        parent::__construct('updatenotification', $urlParams);
35
+        $container = $this->getContainer();
36 36
 
37
-		$container->registerService('AdminController', function(IAppContainer $c) {
38
-			$updater = new \OC\Updater\VersionCheck(
39
-				\OC::$server->getHTTPClientService(),
40
-				\OC::$server->getConfig()
41
-			);
42
-			return new AdminController(
43
-				$c->query('AppName'),
44
-				$c->query('Request'),
45
-				$c->getServer()->getJobList(),
46
-				$c->getServer()->getSecureRandom(),
47
-				$c->getServer()->getConfig(),
48
-				new TimeFactory(),
49
-				$c->getServer()->getL10N($c->query('AppName')),
50
-				new UpdateChecker($updater),
51
-				$c->getServer()->getDateTimeFormatter()
52
-			);
53
-		});
54
-	}
37
+        $container->registerService('AdminController', function(IAppContainer $c) {
38
+            $updater = new \OC\Updater\VersionCheck(
39
+                \OC::$server->getHTTPClientService(),
40
+                \OC::$server->getConfig()
41
+            );
42
+            return new AdminController(
43
+                $c->query('AppName'),
44
+                $c->query('Request'),
45
+                $c->getServer()->getJobList(),
46
+                $c->getServer()->getSecureRandom(),
47
+                $c->getServer()->getConfig(),
48
+                new TimeFactory(),
49
+                $c->getServer()->getL10N($c->query('AppName')),
50
+                new UpdateChecker($updater),
51
+                $c->getServer()->getDateTimeFormatter()
52
+            );
53
+        });
54
+    }
55 55
 
56 56
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 use OCP\AppFramework\IAppContainer;
31 31
 
32 32
 class Application extends App {
33
-	public function __construct (array $urlParams = array()) {
33
+	public function __construct(array $urlParams = array()) {
34 34
 		parent::__construct('updatenotification', $urlParams);
35 35
 		$container = $this->getContainer();
36 36
 
Please login to merge, or discard this patch.
apps/updatenotification/lib/ResetTokenBackgroundJob.php 2 patches
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -34,44 +34,44 @@
 block discarded – undo
34 34
  * @package OCA\UpdateNotification
35 35
  */
36 36
 class ResetTokenBackgroundJob extends TimedJob {
37
-	/** @var IConfig */
38
-	private $config;
39
-	/** @var ITimeFactory */
40
-	private $timeFactory;
37
+    /** @var IConfig */
38
+    private $config;
39
+    /** @var ITimeFactory */
40
+    private $timeFactory;
41 41
 
42
-	/**
43
-	 * @param IConfig|null $config
44
-	 * @param ITimeFactory|null $timeFactory
45
-	 */
46
-	public function __construct(IConfig $config = null,
47
-								ITimeFactory $timeFactory = null) {
48
-		// Run all 10 minutes
49
-		$this->setInterval(60 * 10);
42
+    /**
43
+     * @param IConfig|null $config
44
+     * @param ITimeFactory|null $timeFactory
45
+     */
46
+    public function __construct(IConfig $config = null,
47
+                                ITimeFactory $timeFactory = null) {
48
+        // Run all 10 minutes
49
+        $this->setInterval(60 * 10);
50 50
 
51
-		if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
52
-			$this->config = $config;
53
-			$this->timeFactory = $timeFactory;
54
-		} else {
55
-			$this->fixDIForJobs();
56
-		}
57
-	}
51
+        if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
52
+            $this->config = $config;
53
+            $this->timeFactory = $timeFactory;
54
+        } else {
55
+            $this->fixDIForJobs();
56
+        }
57
+    }
58 58
 
59
-	/**
60
-	 * DI for jobs
61
-	 */
62
-	private function fixDIForJobs() {
63
-		$this->config = \OC::$server->getConfig();
64
-		$this->timeFactory = new TimeFactory();
65
-	}
59
+    /**
60
+     * DI for jobs
61
+     */
62
+    private function fixDIForJobs() {
63
+        $this->config = \OC::$server->getConfig();
64
+        $this->timeFactory = new TimeFactory();
65
+    }
66 66
 
67
-	/**
68
-	 * @param $argument
69
-	 */
70
-	protected function run($argument) {
71
-		// Delete old tokens after 2 days
72
-		if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
73
-			$this->config->deleteSystemValue('updater.secret');
74
-		}
75
-	}
67
+    /**
68
+     * @param $argument
69
+     */
70
+    protected function run($argument) {
71
+        // Delete old tokens after 2 days
72
+        if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
73
+            $this->config->deleteSystemValue('updater.secret');
74
+        }
75
+    }
76 76
 
77 77
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 	 */
70 70
 	protected function run($argument) {
71 71
 		// Delete old tokens after 2 days
72
-		if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
72
+		if ($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
73 73
 			$this->config->deleteSystemValue('updater.secret');
74 74
 		}
75 75
 	}
Please login to merge, or discard this patch.
apps/updatenotification/appinfo/routes.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,6 +25,6 @@
 block discarded – undo
25 25
 
26 26
 $application = new Application();
27 27
 $application->registerRoutes($this, ['routes' => [
28
-	['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
29
-	['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
28
+    ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
29
+    ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
30 30
 ]]);
Please login to merge, or discard this patch.
apps/updatenotification/appinfo/app.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -23,33 +23,33 @@
 block discarded – undo
23 23
  */
24 24
 
25 25
 if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
26
-	$updater = new \OC\Updater\VersionCheck(
27
-		\OC::$server->getHTTPClientService(),
28
-		\OC::$server->getConfig()
29
-	);
30
-	$updateChecker = new \OCA\UpdateNotification\UpdateChecker(
31
-		$updater
32
-	);
26
+    $updater = new \OC\Updater\VersionCheck(
27
+        \OC::$server->getHTTPClientService(),
28
+        \OC::$server->getConfig()
29
+    );
30
+    $updateChecker = new \OCA\UpdateNotification\UpdateChecker(
31
+        $updater
32
+    );
33 33
 
34
-	$userObject = \OC::$server->getUserSession()->getUser();
35
-	if($userObject !== null) {
36
-		if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
37
-			!\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
38
-			if($updateChecker->getUpdateState() !== []) {
39
-				\OCP\Util::addScript('updatenotification', 'notification');
40
-				OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
41
-			}
42
-		}
43
-	}
34
+    $userObject = \OC::$server->getUserSession()->getUser();
35
+    if($userObject !== null) {
36
+        if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
37
+            !\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
38
+            if($updateChecker->getUpdateState() !== []) {
39
+                \OCP\Util::addScript('updatenotification', 'notification');
40
+                OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
41
+            }
42
+        }
43
+    }
44 44
 
45
-	$manager = \OC::$server->getNotificationManager();
46
-	$manager->registerNotifier(function() use ($manager) {
47
-		return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
48
-	}, function() {
49
-		$l = \OC::$server->getL10N('updatenotification');
50
-		return [
51
-			'id' => 'updatenotification',
52
-			'name' => $l->t('Update notifications'),
53
-		];
54
-	});
45
+    $manager = \OC::$server->getNotificationManager();
46
+    $manager->registerNotifier(function() use ($manager) {
47
+        return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
48
+    }, function() {
49
+        $l = \OC::$server->getL10N('updatenotification');
50
+        return [
51
+            'id' => 'updatenotification',
52
+            'name' => $l->t('Update notifications'),
53
+        ];
54
+    });
55 55
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
  *
23 23
  */
24 24
 
25
-if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
25
+if (\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
26 26
 	$updater = new \OC\Updater\VersionCheck(
27 27
 		\OC::$server->getHTTPClientService(),
28 28
 		\OC::$server->getConfig()
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
32 32
 	);
33 33
 
34 34
 	$userObject = \OC::$server->getUserSession()->getUser();
35
-	if($userObject !== null) {
36
-		if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
35
+	if ($userObject !== null) {
36
+		if (\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
37 37
 			!\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
38
-			if($updateChecker->getUpdateState() !== []) {
38
+			if ($updateChecker->getUpdateState() !== []) {
39 39
 				\OCP\Util::addScript('updatenotification', 'notification');
40 40
 				OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
41 41
 			}
Please login to merge, or discard this patch.
apps/theming/templates/settings-admin.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,5 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
-
4 3
  *
5 4
  * @author Bjoern Schiessle <[email protected]>
6 5
  * @author Jan-Christoph Borchardt <[email protected]>
Please login to merge, or discard this patch.
apps/theming/lib/Settings/Section.php 1 patch
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -28,55 +28,55 @@
 block discarded – undo
28 28
 use OCP\Settings\IIconSection;
29 29
 
30 30
 class Section implements IIconSection {
31
-	/** @var IL10N */
32
-	private $l;
33
-	/** @var IURLGenerator */
34
-	private $url;
31
+    /** @var IL10N */
32
+    private $l;
33
+    /** @var IURLGenerator */
34
+    private $url;
35 35
 
36
-	/**
37
-	 * @param IURLGenerator $url
38
-	 * @param IL10N $l
39
-	 */
40
-	public function __construct(IURLGenerator $url, IL10N $l) {
41
-		$this->url = $url;
42
-		$this->l = $l;
43
-	}
36
+    /**
37
+     * @param IURLGenerator $url
38
+     * @param IL10N $l
39
+     */
40
+    public function __construct(IURLGenerator $url, IL10N $l) {
41
+        $this->url = $url;
42
+        $this->l = $l;
43
+    }
44 44
 
45
-	/**
46
-	 * returns the ID of the section. It is supposed to be a lower case string,
47
-	 * e.g. 'ldap'
48
-	 *
49
-	 * @returns string
50
-	 */
51
-	public function getID() {
52
-		return 'theming';
53
-	}
45
+    /**
46
+     * returns the ID of the section. It is supposed to be a lower case string,
47
+     * e.g. 'ldap'
48
+     *
49
+     * @returns string
50
+     */
51
+    public function getID() {
52
+        return 'theming';
53
+    }
54 54
 
55
-	/**
56
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
57
-	 * integration'. Use the L10N service to translate it.
58
-	 *
59
-	 * @return string
60
-	 */
61
-	public function getName() {
62
-		return $this->l->t('Theming');
63
-	}
55
+    /**
56
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
57
+     * integration'. Use the L10N service to translate it.
58
+     *
59
+     * @return string
60
+     */
61
+    public function getName() {
62
+        return $this->l->t('Theming');
63
+    }
64 64
 
65
-	/**
66
-	 * @return int whether the form should be rather on the top or bottom of
67
-	 * the settings navigation. The sections are arranged in ascending order of
68
-	 * the priority values. It is required to return a value between 0 and 99.
69
-	 *
70
-	 * E.g.: 70
71
-	 */
72
-	public function getPriority() {
73
-		return 30;
74
-	}
65
+    /**
66
+     * @return int whether the form should be rather on the top or bottom of
67
+     * the settings navigation. The sections are arranged in ascending order of
68
+     * the priority values. It is required to return a value between 0 and 99.
69
+     *
70
+     * E.g.: 70
71
+     */
72
+    public function getPriority() {
73
+        return 30;
74
+    }
75 75
 
76
-	/**
77
-	 * {@inheritdoc}
78
-	 */
79
-	public function getIcon() {
80
-		return $this->url->imagePath('theming', 'app-dark.svg');
81
-	}
76
+    /**
77
+     * {@inheritdoc}
78
+     */
79
+    public function getIcon() {
80
+        return $this->url->imagePath('theming', 'app-dark.svg');
81
+    }
82 82
 }
Please login to merge, or discard this patch.