Passed
Push — master ( ff6610...e81fdf )
by Robin
14:53 queued 15s
created
apps/encryption/lib/Crypto/DecryptAll.php 2 patches
Indentation   +122 added lines, -122 removed lines patch added patch discarded remove patch
@@ -34,126 +34,126 @@
 block discarded – undo
34 34
 
35 35
 class DecryptAll {
36 36
 
37
-	/** @var Util  */
38
-	protected $util;
39
-
40
-	/** @var QuestionHelper  */
41
-	protected $questionHelper;
42
-
43
-	/** @var  Crypt */
44
-	protected $crypt;
45
-
46
-	/** @var  KeyManager */
47
-	protected $keyManager;
48
-
49
-	/** @var Session  */
50
-	protected $session;
51
-
52
-	/**
53
-	 * @param Util $util
54
-	 * @param KeyManager $keyManager
55
-	 * @param Crypt $crypt
56
-	 * @param Session $session
57
-	 * @param QuestionHelper $questionHelper
58
-	 */
59
-	public function __construct(
60
-		Util $util,
61
-		KeyManager $keyManager,
62
-		Crypt $crypt,
63
-		Session $session,
64
-		QuestionHelper $questionHelper
65
-	) {
66
-		$this->util = $util;
67
-		$this->keyManager = $keyManager;
68
-		$this->crypt = $crypt;
69
-		$this->session = $session;
70
-		$this->questionHelper = $questionHelper;
71
-	}
72
-
73
-	/**
74
-	 * prepare encryption module to decrypt all files
75
-	 *
76
-	 * @param InputInterface $input
77
-	 * @param OutputInterface $output
78
-	 * @param $user
79
-	 * @return bool
80
-	 */
81
-	public function prepare(InputInterface $input, OutputInterface $output, $user) {
82
-		$question = new Question('Please enter the recovery key password: ');
83
-
84
-		if ($this->util->isMasterKeyEnabled()) {
85
-			$output->writeln('Use master key to decrypt all files');
86
-			$user = $this->keyManager->getMasterKeyId();
87
-			$password = $this->keyManager->getMasterKeyPassword();
88
-		} else {
89
-			$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
90
-			if (!empty($user)) {
91
-				$output->writeln('You can only decrypt the users files if you know');
92
-				$output->writeln('the users password or if he activated the recovery key.');
93
-				$output->writeln('');
94
-				$questionUseLoginPassword = new ConfirmationQuestion(
95
-					'Do you want to use the users login password to decrypt all files? (y/n) ',
96
-					false
97
-				);
98
-				$useLoginPassword = $this->questionHelper->ask($input, $output, $questionUseLoginPassword);
99
-				if ($useLoginPassword) {
100
-					$question = new Question('Please enter the user\'s login password: ');
101
-				} elseif ($this->util->isRecoveryEnabledForUser($user) === false) {
102
-					$output->writeln('No recovery key available for user ' . $user);
103
-					return false;
104
-				} else {
105
-					$user = $recoveryKeyId;
106
-				}
107
-			} else {
108
-				$output->writeln('You can only decrypt the files of all users if the');
109
-				$output->writeln('recovery key is enabled by the admin and activated by the users.');
110
-				$output->writeln('');
111
-				$user = $recoveryKeyId;
112
-			}
113
-
114
-			$question->setHidden(true);
115
-			$question->setHiddenFallback(false);
116
-			$password = $this->questionHelper->ask($input, $output, $question);
117
-		}
118
-
119
-		$privateKey = $this->getPrivateKey($user, $password);
120
-		if ($privateKey !== false) {
121
-			$this->updateSession($user, $privateKey);
122
-			return true;
123
-		} else {
124
-			$output->writeln('Could not decrypt private key, maybe you entered the wrong password?');
125
-		}
126
-
127
-
128
-		return false;
129
-	}
130
-
131
-	/**
132
-	 * get the private key which will be used to decrypt all files
133
-	 *
134
-	 * @param string $user
135
-	 * @param string $password
136
-	 * @return bool|string
137
-	 * @throws \OCA\Encryption\Exceptions\PrivateKeyMissingException
138
-	 */
139
-	protected function getPrivateKey($user, $password) {
140
-		$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
141
-		$masterKeyId = $this->keyManager->getMasterKeyId();
142
-		if ($user === $recoveryKeyId) {
143
-			$recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId);
144
-			$privateKey = $this->crypt->decryptPrivateKey($recoveryKey, $password);
145
-		} elseif ($user === $masterKeyId) {
146
-			$masterKey = $this->keyManager->getSystemPrivateKey($masterKeyId);
147
-			$privateKey = $this->crypt->decryptPrivateKey($masterKey, $password, $masterKeyId);
148
-		} else {
149
-			$userKey = $this->keyManager->getPrivateKey($user);
150
-			$privateKey = $this->crypt->decryptPrivateKey($userKey, $password, $user);
151
-		}
152
-
153
-		return $privateKey;
154
-	}
155
-
156
-	protected function updateSession($user, $privateKey) {
157
-		$this->session->prepareDecryptAll($user, $privateKey);
158
-	}
37
+    /** @var Util  */
38
+    protected $util;
39
+
40
+    /** @var QuestionHelper  */
41
+    protected $questionHelper;
42
+
43
+    /** @var  Crypt */
44
+    protected $crypt;
45
+
46
+    /** @var  KeyManager */
47
+    protected $keyManager;
48
+
49
+    /** @var Session  */
50
+    protected $session;
51
+
52
+    /**
53
+     * @param Util $util
54
+     * @param KeyManager $keyManager
55
+     * @param Crypt $crypt
56
+     * @param Session $session
57
+     * @param QuestionHelper $questionHelper
58
+     */
59
+    public function __construct(
60
+        Util $util,
61
+        KeyManager $keyManager,
62
+        Crypt $crypt,
63
+        Session $session,
64
+        QuestionHelper $questionHelper
65
+    ) {
66
+        $this->util = $util;
67
+        $this->keyManager = $keyManager;
68
+        $this->crypt = $crypt;
69
+        $this->session = $session;
70
+        $this->questionHelper = $questionHelper;
71
+    }
72
+
73
+    /**
74
+     * prepare encryption module to decrypt all files
75
+     *
76
+     * @param InputInterface $input
77
+     * @param OutputInterface $output
78
+     * @param $user
79
+     * @return bool
80
+     */
81
+    public function prepare(InputInterface $input, OutputInterface $output, $user) {
82
+        $question = new Question('Please enter the recovery key password: ');
83
+
84
+        if ($this->util->isMasterKeyEnabled()) {
85
+            $output->writeln('Use master key to decrypt all files');
86
+            $user = $this->keyManager->getMasterKeyId();
87
+            $password = $this->keyManager->getMasterKeyPassword();
88
+        } else {
89
+            $recoveryKeyId = $this->keyManager->getRecoveryKeyId();
90
+            if (!empty($user)) {
91
+                $output->writeln('You can only decrypt the users files if you know');
92
+                $output->writeln('the users password or if he activated the recovery key.');
93
+                $output->writeln('');
94
+                $questionUseLoginPassword = new ConfirmationQuestion(
95
+                    'Do you want to use the users login password to decrypt all files? (y/n) ',
96
+                    false
97
+                );
98
+                $useLoginPassword = $this->questionHelper->ask($input, $output, $questionUseLoginPassword);
99
+                if ($useLoginPassword) {
100
+                    $question = new Question('Please enter the user\'s login password: ');
101
+                } elseif ($this->util->isRecoveryEnabledForUser($user) === false) {
102
+                    $output->writeln('No recovery key available for user ' . $user);
103
+                    return false;
104
+                } else {
105
+                    $user = $recoveryKeyId;
106
+                }
107
+            } else {
108
+                $output->writeln('You can only decrypt the files of all users if the');
109
+                $output->writeln('recovery key is enabled by the admin and activated by the users.');
110
+                $output->writeln('');
111
+                $user = $recoveryKeyId;
112
+            }
113
+
114
+            $question->setHidden(true);
115
+            $question->setHiddenFallback(false);
116
+            $password = $this->questionHelper->ask($input, $output, $question);
117
+        }
118
+
119
+        $privateKey = $this->getPrivateKey($user, $password);
120
+        if ($privateKey !== false) {
121
+            $this->updateSession($user, $privateKey);
122
+            return true;
123
+        } else {
124
+            $output->writeln('Could not decrypt private key, maybe you entered the wrong password?');
125
+        }
126
+
127
+
128
+        return false;
129
+    }
130
+
131
+    /**
132
+     * get the private key which will be used to decrypt all files
133
+     *
134
+     * @param string $user
135
+     * @param string $password
136
+     * @return bool|string
137
+     * @throws \OCA\Encryption\Exceptions\PrivateKeyMissingException
138
+     */
139
+    protected function getPrivateKey($user, $password) {
140
+        $recoveryKeyId = $this->keyManager->getRecoveryKeyId();
141
+        $masterKeyId = $this->keyManager->getMasterKeyId();
142
+        if ($user === $recoveryKeyId) {
143
+            $recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId);
144
+            $privateKey = $this->crypt->decryptPrivateKey($recoveryKey, $password);
145
+        } elseif ($user === $masterKeyId) {
146
+            $masterKey = $this->keyManager->getSystemPrivateKey($masterKeyId);
147
+            $privateKey = $this->crypt->decryptPrivateKey($masterKey, $password, $masterKeyId);
148
+        } else {
149
+            $userKey = $this->keyManager->getPrivateKey($user);
150
+            $privateKey = $this->crypt->decryptPrivateKey($userKey, $password, $user);
151
+        }
152
+
153
+        return $privateKey;
154
+    }
155
+
156
+    protected function updateSession($user, $privateKey) {
157
+        $this->session->prepareDecryptAll($user, $privateKey);
158
+    }
159 159
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
 				if ($useLoginPassword) {
100 100
 					$question = new Question('Please enter the user\'s login password: ');
101 101
 				} elseif ($this->util->isRecoveryEnabledForUser($user) === false) {
102
-					$output->writeln('No recovery key available for user ' . $user);
102
+					$output->writeln('No recovery key available for user '.$user);
103 103
 					return false;
104 104
 				} else {
105 105
 					$user = $recoveryKeyId;
Please login to merge, or discard this patch.
apps/encryption/lib/Exceptions/PrivateKeyMissingException.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -28,13 +28,13 @@
 block discarded – undo
28 28
 
29 29
 class PrivateKeyMissingException extends GenericEncryptionException {
30 30
 
31
-	/**
32
-	 * @param string $userId
33
-	 */
34
-	public function __construct($userId) {
35
-		if (empty($userId)) {
36
-			$userId = "<no-user-id-given>";
37
-		}
38
-		parent::__construct("Private Key missing for user: $userId");
39
-	}
31
+    /**
32
+     * @param string $userId
33
+     */
34
+    public function __construct($userId) {
35
+        if (empty($userId)) {
36
+            $userId = "<no-user-id-given>";
37
+        }
38
+        parent::__construct("Private Key missing for user: $userId");
39
+    }
40 40
 }
Please login to merge, or discard this patch.
apps/encryption/lib/Exceptions/PublicKeyMissingException.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,13 +25,13 @@
 block discarded – undo
25 25
 
26 26
 class PublicKeyMissingException extends GenericEncryptionException {
27 27
 
28
-	/**
29
-	 * @param string $userId
30
-	 */
31
-	public function __construct($userId) {
32
-		if (empty($userId)) {
33
-			$userId = "<no-user-id-given>";
34
-		}
35
-		parent::__construct("Public Key missing for user: $userId");
36
-	}
28
+    /**
29
+     * @param string $userId
30
+     */
31
+    public function __construct($userId) {
32
+        if (empty($userId)) {
33
+            $userId = "<no-user-id-given>";
34
+        }
35
+        parent::__construct("Public Key missing for user: $userId");
36
+    }
37 37
 }
Please login to merge, or discard this patch.
apps/encryption/lib/Settings/Personal.php 1 patch
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -32,63 +32,63 @@
 block discarded – undo
32 32
 
33 33
 class Personal implements ISettings {
34 34
 
35
-	/** @var IConfig */
36
-	private $config;
37
-	/** @var Session */
38
-	private $session;
39
-	/** @var Util */
40
-	private $util;
41
-	/** @var IUserSession */
42
-	private $userSession;
35
+    /** @var IConfig */
36
+    private $config;
37
+    /** @var Session */
38
+    private $session;
39
+    /** @var Util */
40
+    private $util;
41
+    /** @var IUserSession */
42
+    private $userSession;
43 43
 
44
-	public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) {
45
-		$this->config = $config;
46
-		$this->session = $session;
47
-		$this->util = $util;
48
-		$this->userSession = $userSession;
49
-	}
44
+    public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) {
45
+        $this->config = $config;
46
+        $this->session = $session;
47
+        $this->util = $util;
48
+        $this->userSession = $userSession;
49
+    }
50 50
 
51
-	/**
52
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
53
-	 * @since 9.1
54
-	 */
55
-	public function getForm() {
56
-		$recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled');
57
-		$privateKeySet = $this->session->isPrivateKeySet();
51
+    /**
52
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
53
+     * @since 9.1
54
+     */
55
+    public function getForm() {
56
+        $recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled');
57
+        $privateKeySet = $this->session->isPrivateKeySet();
58 58
 
59
-		if (!$recoveryAdminEnabled && $privateKeySet) {
60
-			return new TemplateResponse('settings', 'settings/empty', [], '');
61
-		}
59
+        if (!$recoveryAdminEnabled && $privateKeySet) {
60
+            return new TemplateResponse('settings', 'settings/empty', [], '');
61
+        }
62 62
 
63
-		$userId = $this->userSession->getUser()->getUID();
64
-		$recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId);
63
+        $userId = $this->userSession->getUser()->getUID();
64
+        $recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId);
65 65
 
66
-		$parameters = [
67
-			'recoveryEnabled' => $recoveryAdminEnabled,
68
-			'recoveryEnabledForUser' => $recoveryEnabledForUser,
69
-			'privateKeySet' => $privateKeySet,
70
-			'initialized' => $this->session->getStatus(),
71
-		];
72
-		return new TemplateResponse('encryption', 'settings-personal', $parameters, '');
73
-	}
66
+        $parameters = [
67
+            'recoveryEnabled' => $recoveryAdminEnabled,
68
+            'recoveryEnabledForUser' => $recoveryEnabledForUser,
69
+            'privateKeySet' => $privateKeySet,
70
+            'initialized' => $this->session->getStatus(),
71
+        ];
72
+        return new TemplateResponse('encryption', 'settings-personal', $parameters, '');
73
+    }
74 74
 
75
-	/**
76
-	 * @return string the section ID, e.g. 'sharing'
77
-	 * @since 9.1
78
-	 */
79
-	public function getSection() {
80
-		return 'security';
81
-	}
75
+    /**
76
+     * @return string the section ID, e.g. 'sharing'
77
+     * @since 9.1
78
+     */
79
+    public function getSection() {
80
+        return 'security';
81
+    }
82 82
 
83
-	/**
84
-	 * @return int whether the form should be rather on the top or bottom of
85
-	 * the admin section. The forms are arranged in ascending order of the
86
-	 * priority values. It is required to return a value between 0 and 100.
87
-	 *
88
-	 * E.g.: 70
89
-	 * @since 9.1
90
-	 */
91
-	public function getPriority() {
92
-		return 80;
93
-	}
83
+    /**
84
+     * @return int whether the form should be rather on the top or bottom of
85
+     * the admin section. The forms are arranged in ascending order of the
86
+     * priority values. It is required to return a value between 0 and 100.
87
+     *
88
+     * E.g.: 70
89
+     * @since 9.1
90
+     */
91
+    public function getPriority() {
92
+        return 80;
93
+    }
94 94
 }
Please login to merge, or discard this patch.
apps/encryption/lib/Hooks/Contracts/IHook.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -23,10 +23,10 @@
 block discarded – undo
23 23
 namespace OCA\Encryption\Hooks\Contracts;
24 24
 
25 25
 interface IHook {
26
-	/**
27
-	 * Connects Hooks
28
-	 *
29
-	 * @return null
30
-	 */
31
-	public function addHooks();
26
+    /**
27
+     * Connects Hooks
28
+     *
29
+     * @return null
30
+     */
31
+    public function addHooks();
32 32
 }
Please login to merge, or discard this patch.
apps/encryption/templates/settings-admin.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 		<p id="encryptHomeStorageSetting">
14 14
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
15 15
 				   value="1" <?php if ($_['encryptHomeStorage']) {
16
-	print_unescaped('checked="checked"');
16
+    print_unescaped('checked="checked"');
17 17
 } ?> />
18 18
 			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
19 19
 			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 			<br/><br/>
46 46
 
47 47
 			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if ($_['recoveryEnabled'] === '0') {
48
-	print_unescaped('class="hidden"');
48
+    print_unescaped('class="hidden"');
49 49
 }?>>
50 50
 				<?php p($l->t("Change recovery key password:")); ?>
51 51
 				<span class="msg"></span>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,11 +9,13 @@
 block discarded – undo
9 9
 	<h3><?php p($l->t("Default encryption module")); ?></h3>
10 10
 	<?php if (!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?>
11 11
 		<?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?>
12
-	<?php else: ?>
12
+	<?php else {
13
+    : ?>
13 14
 		<p id="encryptHomeStorageSetting">
14 15
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
15 16
 				   value="1" <?php if ($_['encryptHomeStorage']) {
16 17
 	print_unescaped('checked="checked"');
18
+}
17 19
 } ?> />
18 20
 			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
19 21
 			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 				   value="1" <?php if ($_['encryptHomeStorage']) {
15 15
 	print_unescaped('checked="checked"');
16 16
 } ?> />
17
-			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
17
+			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage')); ?></label></br>
18 18
 			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
19 19
 		</p>
20 20
 		<br />
Please login to merge, or discard this patch.
apps/workflowengine/lib/Check/RequestURL.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -69,10 +69,10 @@
 block discarded – undo
69 69
 			return $this->url;
70 70
 		}
71 71
 
72
-		$this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
73
-		$this->url .= $this->request->getServerHost();// E.g. localhost
74
-		$this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
75
-		$this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
72
+		$this->url = $this->request->getServerProtocol().'://'; // E.g. http(s) + ://
73
+		$this->url .= $this->request->getServerHost(); // E.g. localhost
74
+		$this->url .= $this->request->getScriptName(); // E.g. /nextcloud/index.php
75
+		$this->url .= $this->request->getPathInfo(); // E.g. /apps/files_texteditor/ajax/loadfile
76 76
 
77 77
 		return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
78 78
 	}
Please login to merge, or discard this patch.
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -27,72 +27,72 @@
 block discarded – undo
27 27
 use OCP\IRequest;
28 28
 
29 29
 class RequestURL extends AbstractStringCheck {
30
-	public const CLI = 'cli';
30
+    public const CLI = 'cli';
31 31
 
32
-	/** @var ?string */
33
-	protected $url;
32
+    /** @var ?string */
33
+    protected $url;
34 34
 
35
-	/** @var IRequest */
36
-	protected $request;
35
+    /** @var IRequest */
36
+    protected $request;
37 37
 
38
-	/**
39
-	 * @param IL10N $l
40
-	 * @param IRequest $request
41
-	 */
42
-	public function __construct(IL10N $l, IRequest $request) {
43
-		parent::__construct($l);
44
-		$this->request = $request;
45
-	}
38
+    /**
39
+     * @param IL10N $l
40
+     * @param IRequest $request
41
+     */
42
+    public function __construct(IL10N $l, IRequest $request) {
43
+        parent::__construct($l);
44
+        $this->request = $request;
45
+    }
46 46
 
47
-	/**
48
-	 * @param string $operator
49
-	 * @param string $value
50
-	 * @return bool
51
-	 */
52
-	public function executeCheck($operator, $value) {
53
-		if (\OC::$CLI) {
54
-			$actualValue = $this->url = RequestURL::CLI;
55
-		} else {
56
-			$actualValue = $this->getActualValue();
57
-		}
58
-		if (in_array($operator, ['is', '!is'])) {
59
-			switch ($value) {
60
-				case 'webdav':
61
-					if ($operator === 'is') {
62
-						return $this->isWebDAVRequest();
63
-					} else {
64
-						return !$this->isWebDAVRequest();
65
-					}
66
-			}
67
-		}
68
-		return $this->executeStringCheck($operator, $value, $actualValue);
69
-	}
47
+    /**
48
+     * @param string $operator
49
+     * @param string $value
50
+     * @return bool
51
+     */
52
+    public function executeCheck($operator, $value) {
53
+        if (\OC::$CLI) {
54
+            $actualValue = $this->url = RequestURL::CLI;
55
+        } else {
56
+            $actualValue = $this->getActualValue();
57
+        }
58
+        if (in_array($operator, ['is', '!is'])) {
59
+            switch ($value) {
60
+                case 'webdav':
61
+                    if ($operator === 'is') {
62
+                        return $this->isWebDAVRequest();
63
+                    } else {
64
+                        return !$this->isWebDAVRequest();
65
+                    }
66
+            }
67
+        }
68
+        return $this->executeStringCheck($operator, $value, $actualValue);
69
+    }
70 70
 
71
-	/**
72
-	 * @return string
73
-	 */
74
-	protected function getActualValue() {
75
-		if ($this->url !== null) {
76
-			return $this->url;
77
-		}
71
+    /**
72
+     * @return string
73
+     */
74
+    protected function getActualValue() {
75
+        if ($this->url !== null) {
76
+            return $this->url;
77
+        }
78 78
 
79
-		$this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
80
-		$this->url .= $this->request->getServerHost();// E.g. localhost
81
-		$this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
82
-		$this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
79
+        $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
80
+        $this->url .= $this->request->getServerHost();// E.g. localhost
81
+        $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
82
+        $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
83 83
 
84
-		return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
85
-	}
84
+        return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
85
+    }
86 86
 
87
-	protected function isWebDAVRequest(): bool {
88
-		if ($this->url === RequestURL::CLI) {
89
-			return false;
90
-		}
91
-		return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
92
-			$this->request->getPathInfo() === '/webdav' ||
93
-			strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
94
-			$this->request->getPathInfo() === '/dav/files' ||
95
-			strpos($this->request->getPathInfo(), '/dav/files/') === 0
96
-		);
97
-	}
87
+    protected function isWebDAVRequest(): bool {
88
+        if ($this->url === RequestURL::CLI) {
89
+            return false;
90
+        }
91
+        return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
92
+            $this->request->getPathInfo() === '/webdav' ||
93
+            strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
94
+            $this->request->getPathInfo() === '/dav/files' ||
95
+            strpos($this->request->getPathInfo(), '/dav/files/') === 0
96
+        );
97
+    }
98 98
 }
Please login to merge, or discard this patch.
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
 }
Please login to merge, or discard this patch.
apps/files_versions/lib/Command/ExpireVersions.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 		} else {
90 90
 			$p = new ProgressBar($output);
91 91
 			$p->start();
92
-			$this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
92
+			$this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
93 93
 				$p->advance();
94 94
 				$this->expireVersionsForUser($user);
95 95
 			});
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 		\OC_Util::setupFS($user);
117 117
 
118 118
 		// Check if this user has a version directory
119
-		$view = new \OC\Files\View('/' . $user);
119
+		$view = new \OC\Files\View('/'.$user);
120 120
 		if (!$view->is_dir('/files_versions')) {
121 121
 			return false;
122 122
 		}
Please login to merge, or discard this patch.
Indentation   +80 added lines, -80 removed lines patch added patch discarded remove patch
@@ -37,94 +37,94 @@
 block discarded – undo
37 37
 
38 38
 class ExpireVersions extends Command {
39 39
 
40
-	/**
41
-	 * @var Expiration
42
-	 */
43
-	private $expiration;
40
+    /**
41
+     * @var Expiration
42
+     */
43
+    private $expiration;
44 44
 
45
-	/**
46
-	 * @var IUserManager
47
-	 */
48
-	private $userManager;
45
+    /**
46
+     * @var IUserManager
47
+     */
48
+    private $userManager;
49 49
 
50
-	/**
51
-	 * @param IUserManager $userManager
52
-	 * @param Expiration $expiration
53
-	 */
54
-	public function __construct(IUserManager $userManager,
55
-								Expiration $expiration) {
56
-		parent::__construct();
50
+    /**
51
+     * @param IUserManager $userManager
52
+     * @param Expiration $expiration
53
+     */
54
+    public function __construct(IUserManager $userManager,
55
+                                Expiration $expiration) {
56
+        parent::__construct();
57 57
 
58
-		$this->userManager = $userManager;
59
-		$this->expiration = $expiration;
60
-	}
58
+        $this->userManager = $userManager;
59
+        $this->expiration = $expiration;
60
+    }
61 61
 
62
-	protected function configure() {
63
-		$this
64
-			->setName('versions:expire')
65
-			->setDescription('Expires the users file versions')
66
-			->addArgument(
67
-				'user_id',
68
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
69
-				'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
70
-			);
71
-	}
62
+    protected function configure() {
63
+        $this
64
+            ->setName('versions:expire')
65
+            ->setDescription('Expires the users file versions')
66
+            ->addArgument(
67
+                'user_id',
68
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
69
+                'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
70
+            );
71
+    }
72 72
 
73
-	protected function execute(InputInterface $input, OutputInterface $output): int {
74
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
75
-		if (!$maxAge) {
76
-			$output->writeln("Auto expiration is configured - expiration will be handled automatically according to the expiration patterns detailed at the following link https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/file_versioning.html.");
77
-			return 1;
78
-		}
73
+    protected function execute(InputInterface $input, OutputInterface $output): int {
74
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
75
+        if (!$maxAge) {
76
+            $output->writeln("Auto expiration is configured - expiration will be handled automatically according to the expiration patterns detailed at the following link https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/file_versioning.html.");
77
+            return 1;
78
+        }
79 79
 
80
-		$users = $input->getArgument('user_id');
81
-		if (!empty($users)) {
82
-			foreach ($users as $user) {
83
-				if ($this->userManager->userExists($user)) {
84
-					$output->writeln("Remove deleted files of   <info>$user</info>");
85
-					$userObject = $this->userManager->get($user);
86
-					$this->expireVersionsForUser($userObject);
87
-				} else {
88
-					$output->writeln("<error>Unknown user $user</error>");
89
-					return 1;
90
-				}
91
-			}
92
-		} else {
93
-			$p = new ProgressBar($output);
94
-			$p->start();
95
-			$this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
96
-				$p->advance();
97
-				$this->expireVersionsForUser($user);
98
-			});
99
-			$p->finish();
100
-			$output->writeln('');
101
-		}
102
-		return 0;
103
-	}
80
+        $users = $input->getArgument('user_id');
81
+        if (!empty($users)) {
82
+            foreach ($users as $user) {
83
+                if ($this->userManager->userExists($user)) {
84
+                    $output->writeln("Remove deleted files of   <info>$user</info>");
85
+                    $userObject = $this->userManager->get($user);
86
+                    $this->expireVersionsForUser($userObject);
87
+                } else {
88
+                    $output->writeln("<error>Unknown user $user</error>");
89
+                    return 1;
90
+                }
91
+            }
92
+        } else {
93
+            $p = new ProgressBar($output);
94
+            $p->start();
95
+            $this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
96
+                $p->advance();
97
+                $this->expireVersionsForUser($user);
98
+            });
99
+            $p->finish();
100
+            $output->writeln('');
101
+        }
102
+        return 0;
103
+    }
104 104
 
105
-	public function expireVersionsForUser(IUser $user) {
106
-		$uid = $user->getUID();
107
-		if (!$this->setupFS($uid)) {
108
-			return;
109
-		}
110
-		Storage::expireOlderThanMaxForUser($uid);
111
-	}
105
+    public function expireVersionsForUser(IUser $user) {
106
+        $uid = $user->getUID();
107
+        if (!$this->setupFS($uid)) {
108
+            return;
109
+        }
110
+        Storage::expireOlderThanMaxForUser($uid);
111
+    }
112 112
 
113
-	/**
114
-	 * Act on behalf on versions item owner
115
-	 * @param string $user
116
-	 * @return boolean
117
-	 */
118
-	protected function setupFS($user) {
119
-		\OC_Util::tearDownFS();
120
-		\OC_Util::setupFS($user);
113
+    /**
114
+     * Act on behalf on versions item owner
115
+     * @param string $user
116
+     * @return boolean
117
+     */
118
+    protected function setupFS($user) {
119
+        \OC_Util::tearDownFS();
120
+        \OC_Util::setupFS($user);
121 121
 
122
-		// Check if this user has a version directory
123
-		$view = new \OC\Files\View('/' . $user);
124
-		if (!$view->is_dir('/files_versions')) {
125
-			return false;
126
-		}
122
+        // Check if this user has a version directory
123
+        $view = new \OC\Files\View('/' . $user);
124
+        if (!$view->is_dir('/files_versions')) {
125
+            return false;
126
+        }
127 127
 
128
-		return true;
129
-	}
128
+        return true;
129
+    }
130 130
 }
Please login to merge, or discard this patch.