@@ -15,10 +15,10 @@ |
||
15 | 15 | <td width="20px"> </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"> </td></tr> |
@@ -4,8 +4,8 @@ |
||
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!")); |
@@ -13,7 +13,7 @@ discard block |
||
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 |
||
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> |
@@ -26,66 +26,66 @@ |
||
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 | } |
@@ -5,7 +5,7 @@ |
||
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 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | namespace OC\Core\Command\Background; |
27 | 27 | |
28 | 28 | class Ajax extends Base { |
29 | - protected function getMode() { |
|
30 | - return 'ajax'; |
|
31 | - } |
|
29 | + protected function getMode() { |
|
30 | + return 'ajax'; |
|
31 | + } |
|
32 | 32 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | namespace OC\Core\Command\Background; |
27 | 27 | |
28 | 28 | class Cron extends Base { |
29 | - protected function getMode() { |
|
30 | - return 'cron'; |
|
31 | - } |
|
29 | + protected function getMode() { |
|
30 | + return 'cron'; |
|
31 | + } |
|
32 | 32 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | namespace OC\Core\Command\Background; |
27 | 27 | |
28 | 28 | class WebCron extends Base { |
29 | - protected function getMode() { |
|
30 | - return 'webcron'; |
|
31 | - } |
|
29 | + protected function getMode() { |
|
30 | + return 'webcron'; |
|
31 | + } |
|
32 | 32 | } |
@@ -29,7 +29,7 @@ |
||
29 | 29 | <?php p($theme->getName()); ?> |
30 | 30 | </h1> |
31 | 31 | <?php if (\OC::$server->getConfig()->getSystemValue('installed', false) |
32 | - && \OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?> |
|
32 | + && \OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?> |
|
33 | 33 | <img src="<?php p($theme->getLogo()); ?>"/> |
34 | 34 | <?php endif; ?> |
35 | 35 | </div> |