Passed
Push — master ( 0c0397...46bfe3 )
by Roeland
21:08 queued 10:02
created
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/mail.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,10 +15,10 @@
 block discarded – undo
15 15
 					<td width="20px">&nbsp;</td>
16 16
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
17 17
 						<?php
18
-						print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', [$_['password']]));
19
-						// TRANSLATORS term at the end of a mail
20
-						p($l->t('Cheers!'));
21
-						?>
18
+                        print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', [$_['password']]));
19
+                        // TRANSLATORS term at the end of a mail
20
+                        p($l->t('Cheers!'));
21
+                        ?>
22 22
 					</td>
23 23
 				</tr>
24 24
 				<tr><td colspan="2">&nbsp;</td></tr>
Please login to merge, or discard this patch.
apps/encryption/templates/altmail.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -4,8 +4,8 @@
 block discarded – undo
4 4
 
5 5
 print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", [$_['password']]));
6 6
 if (isset($_['expiration'])) {
7
-	print_unescaped($l->t("The share will expire on %s.", [$_['expiration']]));
8
-	print_unescaped("\n\n");
7
+    print_unescaped($l->t("The share will expire on %s.", [$_['expiration']]));
8
+    print_unescaped("\n\n");
9 9
 }
10 10
 // TRANSLATORS term at the end of a mail
11 11
 p($l->t("Cheers!"));
Please login to merge, or discard this patch.
apps/encryption/templates/settings-admin.php 1 patch
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.
apps/workflowengine/lib/Check/RequestURL.php 1 patch
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -26,66 +26,66 @@
 block discarded – undo
26 26
 
27 27
 class RequestURL extends AbstractStringCheck {
28 28
 
29
-	/** @var string */
30
-	protected $url;
29
+    /** @var string */
30
+    protected $url;
31 31
 
32
-	/** @var IRequest */
33
-	protected $request;
32
+    /** @var IRequest */
33
+    protected $request;
34 34
 
35
-	/**
36
-	 * @param IL10N $l
37
-	 * @param IRequest $request
38
-	 */
39
-	public function __construct(IL10N $l, IRequest $request) {
40
-		parent::__construct($l);
41
-		$this->request = $request;
42
-	}
35
+    /**
36
+     * @param IL10N $l
37
+     * @param IRequest $request
38
+     */
39
+    public function __construct(IL10N $l, IRequest $request) {
40
+        parent::__construct($l);
41
+        $this->request = $request;
42
+    }
43 43
 
44
-	/**
45
-	 * @param string $operator
46
-	 * @param string $value
47
-	 * @return bool
48
-	 */
49
-	public function executeCheck($operator, $value) {
50
-		$actualValue = $this->getActualValue();
51
-		if (in_array($operator, ['is', '!is'])) {
52
-			switch ($value) {
53
-				case 'webdav':
54
-					if ($operator === 'is') {
55
-						return $this->isWebDAVRequest();
56
-					} else {
57
-						return !$this->isWebDAVRequest();
58
-					}
59
-			}
60
-		}
61
-		return $this->executeStringCheck($operator, $value, $actualValue);
62
-	}
44
+    /**
45
+     * @param string $operator
46
+     * @param string $value
47
+     * @return bool
48
+     */
49
+    public function executeCheck($operator, $value) {
50
+        $actualValue = $this->getActualValue();
51
+        if (in_array($operator, ['is', '!is'])) {
52
+            switch ($value) {
53
+                case 'webdav':
54
+                    if ($operator === 'is') {
55
+                        return $this->isWebDAVRequest();
56
+                    } else {
57
+                        return !$this->isWebDAVRequest();
58
+                    }
59
+            }
60
+        }
61
+        return $this->executeStringCheck($operator, $value, $actualValue);
62
+    }
63 63
 
64
-	/**
65
-	 * @return string
66
-	 */
67
-	protected function getActualValue() {
68
-		if ($this->url !== null) {
69
-			return $this->url;
70
-		}
64
+    /**
65
+     * @return string
66
+     */
67
+    protected function getActualValue() {
68
+        if ($this->url !== null) {
69
+            return $this->url;
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
-		return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
78
-	}
77
+        return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
78
+    }
79 79
 
80
-	/**
81
-	 * @return bool
82
-	 */
83
-	protected function isWebDAVRequest() {
84
-		return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
85
-			$this->request->getPathInfo() === '/webdav' ||
86
-			strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
87
-			$this->request->getPathInfo() === '/dav/files' ||
88
-			strpos($this->request->getPathInfo(), '/dav/files/') === 0
89
-		);
90
-	}
80
+    /**
81
+     * @return bool
82
+     */
83
+    protected function isWebDAVRequest() {
84
+        return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
85
+            $this->request->getPathInfo() === '/webdav' ||
86
+            strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
87
+            $this->request->getPathInfo() === '/dav/files' ||
88
+            strpos($this->request->getPathInfo(), '/dav/files/') === 0
89
+        );
90
+    }
91 91
 }
Please login to merge, or discard this patch.
apps/sharebymail/lib/Settings/Admin.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -27,40 +27,40 @@
 block discarded – undo
27 27
 
28 28
 class Admin implements ISettings {
29 29
 
30
-	/** @var SettingsManager */
31
-	private $settingsManager;
30
+    /** @var SettingsManager */
31
+    private $settingsManager;
32 32
 
33
-	public function __construct(SettingsManager $settingsManager) {
34
-		$this->settingsManager = $settingsManager;
35
-	}
33
+    public function __construct(SettingsManager $settingsManager) {
34
+        $this->settingsManager = $settingsManager;
35
+    }
36 36
 
37
-	/**
38
-	 * @return TemplateResponse
39
-	 */
40
-	public function getForm() {
41
-		$parameters = [
42
-			'sendPasswordMail' => $this->settingsManager->sendPasswordByMail(),
43
-			'enforcePasswordProtection' => $this->settingsManager->enforcePasswordProtection()
44
-		];
37
+    /**
38
+     * @return TemplateResponse
39
+     */
40
+    public function getForm() {
41
+        $parameters = [
42
+            'sendPasswordMail' => $this->settingsManager->sendPasswordByMail(),
43
+            'enforcePasswordProtection' => $this->settingsManager->enforcePasswordProtection()
44
+        ];
45 45
 
46
-		return new TemplateResponse('sharebymail', 'settings-admin', $parameters, '');
47
-	}
46
+        return new TemplateResponse('sharebymail', 'settings-admin', $parameters, '');
47
+    }
48 48
 
49
-	/**
50
-	 * @return string the section ID, e.g. 'sharing'
51
-	 */
52
-	public function getSection() {
53
-		return 'sharing';
54
-	}
49
+    /**
50
+     * @return string the section ID, e.g. 'sharing'
51
+     */
52
+    public function getSection() {
53
+        return 'sharing';
54
+    }
55 55
 
56
-	/**
57
-	 * @return int whether the form should be rather on the top or bottom of
58
-	 * the admin section. The forms are arranged in ascending order of the
59
-	 * priority values. It is required to return a value between 0 and 100.
60
-	 *
61
-	 * E.g.: 70
62
-	 */
63
-	public function getPriority() {
64
-		return 40;
65
-	}
56
+    /**
57
+     * @return int whether the form should be rather on the top or bottom of
58
+     * the admin section. The forms are arranged in ascending order of the
59
+     * priority values. It is required to return a value between 0 and 100.
60
+     *
61
+     * E.g.: 70
62
+     */
63
+    public function getPriority() {
64
+        return 40;
65
+    }
66 66
 }
Please login to merge, or discard this patch.
apps/sharebymail/templates/settings-admin.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@
 block discarded – undo
12 12
 
13 13
 	<p>
14 14
 		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if ($_['sendPasswordMail']) {
15
-	p('checked');
15
+    p('checked');
16 16
 } ?> />
17 17
 		<label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label><br/>
18 18
 		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if ($_['enforcePasswordProtection']) {
19
-	p('checked');
19
+    p('checked');
20 20
 } ?> />
21 21
 		<label for="enforcePasswordProtection"><?php p($l->t('Enforce password protection')); ?></label>
22 22
 	</p>
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/CleanUp.php 1 patch
Indentation   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -32,81 +32,81 @@
 block discarded – undo
32 32
 
33 33
 class CleanUp extends Command {
34 34
 
35
-	/** @var IUserManager */
36
-	protected $userManager;
35
+    /** @var IUserManager */
36
+    protected $userManager;
37 37
 
38
-	/** @var IRootFolder */
39
-	protected $rootFolder;
38
+    /** @var IRootFolder */
39
+    protected $rootFolder;
40 40
 
41
-	/**
42
-	 * @param IRootFolder $rootFolder
43
-	 * @param IUserManager $userManager
44
-	 */
45
-	public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
46
-		parent::__construct();
47
-		$this->userManager = $userManager;
48
-		$this->rootFolder = $rootFolder;
49
-	}
41
+    /**
42
+     * @param IRootFolder $rootFolder
43
+     * @param IUserManager $userManager
44
+     */
45
+    public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
46
+        parent::__construct();
47
+        $this->userManager = $userManager;
48
+        $this->rootFolder = $rootFolder;
49
+    }
50 50
 
51
-	protected function configure() {
52
-		$this
53
-			->setName('versions:cleanup')
54
-			->setDescription('Delete versions')
55
-			->addArgument(
56
-				'user_id',
57
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
58
-				'delete versions of the given user(s), if no user is given all versions will be deleted'
59
-			);
60
-	}
51
+    protected function configure() {
52
+        $this
53
+            ->setName('versions:cleanup')
54
+            ->setDescription('Delete versions')
55
+            ->addArgument(
56
+                'user_id',
57
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
58
+                'delete versions of the given user(s), if no user is given all versions will be deleted'
59
+            );
60
+    }
61 61
 
62 62
 
63
-	protected function execute(InputInterface $input, OutputInterface $output) {
64
-		$users = $input->getArgument('user_id');
65
-		if (!empty($users)) {
66
-			foreach ($users as $user) {
67
-				if ($this->userManager->userExists($user)) {
68
-					$output->writeln("Delete versions of   <info>$user</info>");
69
-					$this->deleteVersions($user);
70
-				} else {
71
-					$output->writeln("<error>Unknown user $user</error>");
72
-				}
73
-			}
74
-		} else {
75
-			$output->writeln('Delete all versions');
76
-			foreach ($this->userManager->getBackends() as $backend) {
77
-				$name = get_class($backend);
63
+    protected function execute(InputInterface $input, OutputInterface $output) {
64
+        $users = $input->getArgument('user_id');
65
+        if (!empty($users)) {
66
+            foreach ($users as $user) {
67
+                if ($this->userManager->userExists($user)) {
68
+                    $output->writeln("Delete versions of   <info>$user</info>");
69
+                    $this->deleteVersions($user);
70
+                } else {
71
+                    $output->writeln("<error>Unknown user $user</error>");
72
+                }
73
+            }
74
+        } else {
75
+            $output->writeln('Delete all versions');
76
+            foreach ($this->userManager->getBackends() as $backend) {
77
+                $name = get_class($backend);
78 78
 
79
-				if ($backend instanceof IUserBackend) {
80
-					$name = $backend->getBackendName();
81
-				}
79
+                if ($backend instanceof IUserBackend) {
80
+                    $name = $backend->getBackendName();
81
+                }
82 82
 
83
-				$output->writeln("Delete versions for users on backend <info>$name</info>");
83
+                $output->writeln("Delete versions for users on backend <info>$name</info>");
84 84
 
85
-				$limit = 500;
86
-				$offset = 0;
87
-				do {
88
-					$users = $backend->getUsers('', $limit, $offset);
89
-					foreach ($users as $user) {
90
-						$output->writeln("   <info>$user</info>");
91
-						$this->deleteVersions($user);
92
-					}
93
-					$offset += $limit;
94
-				} while (count($users) >= $limit);
95
-			}
96
-		}
97
-	}
85
+                $limit = 500;
86
+                $offset = 0;
87
+                do {
88
+                    $users = $backend->getUsers('', $limit, $offset);
89
+                    foreach ($users as $user) {
90
+                        $output->writeln("   <info>$user</info>");
91
+                        $this->deleteVersions($user);
92
+                    }
93
+                    $offset += $limit;
94
+                } while (count($users) >= $limit);
95
+            }
96
+        }
97
+    }
98 98
 
99 99
 
100
-	/**
101
-	 * delete versions for the given user
102
-	 *
103
-	 * @param string $user
104
-	 */
105
-	protected function deleteVersions($user) {
106
-		\OC_Util::tearDownFS();
107
-		\OC_Util::setupFS($user);
108
-		if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
109
-			$this->rootFolder->get('/' . $user . '/files_versions')->delete();
110
-		}
111
-	}
100
+    /**
101
+     * delete versions for the given user
102
+     *
103
+     * @param string $user
104
+     */
105
+    protected function deleteVersions($user) {
106
+        \OC_Util::tearDownFS();
107
+        \OC_Util::setupFS($user);
108
+        if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
109
+            $this->rootFolder->get('/' . $user . '/files_versions')->delete();
110
+        }
111
+    }
112 112
 }
Please login to merge, or discard this patch.