@@ -25,7 +25,7 @@ |
||
25 | 25 | /** @var array $_ */ |
26 | 26 | |
27 | 27 | script('settings', [ |
28 | - 'vue-settings-admin-basic-settings', |
|
28 | + 'vue-settings-admin-basic-settings', |
|
29 | 29 | ]); |
30 | 30 | ?> |
31 | 31 |
@@ -28,25 +28,25 @@ |
||
28 | 28 | use OCP\Migration\SimpleMigrationStep; |
29 | 29 | |
30 | 30 | class Version25000Date20220515204012 extends SimpleMigrationStep { |
31 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
32 | - /** @var ISchemaWrapper $schema */ |
|
33 | - $schema = $schemaClosure(); |
|
31 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
32 | + /** @var ISchemaWrapper $schema */ |
|
33 | + $schema = $schemaClosure(); |
|
34 | 34 | |
35 | - if ($schema->hasTable('share')) { |
|
36 | - $shareTable = $schema->getTable('share'); |
|
35 | + if ($schema->hasTable('share')) { |
|
36 | + $shareTable = $schema->getTable('share'); |
|
37 | 37 | |
38 | - if (!$shareTable->hasColumn('attributes')) { |
|
39 | - $shareTable->addColumn( |
|
40 | - 'attributes', |
|
41 | - Types::JSON, |
|
42 | - [ |
|
43 | - 'default' => null, |
|
44 | - 'notnull' => false |
|
45 | - ] |
|
46 | - ); |
|
47 | - } |
|
48 | - } |
|
38 | + if (!$shareTable->hasColumn('attributes')) { |
|
39 | + $shareTable->addColumn( |
|
40 | + 'attributes', |
|
41 | + Types::JSON, |
|
42 | + [ |
|
43 | + 'default' => null, |
|
44 | + 'notnull' => false |
|
45 | + ] |
|
46 | + ); |
|
47 | + } |
|
48 | + } |
|
49 | 49 | |
50 | - return $schema; |
|
51 | - } |
|
50 | + return $schema; |
|
51 | + } |
|
52 | 52 | } |
@@ -14,25 +14,25 @@ |
||
14 | 14 | * Auto-generated migration step: Please modify to your needs! |
15 | 15 | */ |
16 | 16 | class Version24000Date20220202150027 extends SimpleMigrationStep { |
17 | - /** |
|
18 | - * @param IOutput $output |
|
19 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
20 | - * @param array $options |
|
21 | - * @return null|ISchemaWrapper |
|
22 | - */ |
|
23 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
24 | - /** @var ISchemaWrapper $schema */ |
|
25 | - $schema = $schemaClosure(); |
|
17 | + /** |
|
18 | + * @param IOutput $output |
|
19 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
20 | + * @param array $options |
|
21 | + * @return null|ISchemaWrapper |
|
22 | + */ |
|
23 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
24 | + /** @var ISchemaWrapper $schema */ |
|
25 | + $schema = $schemaClosure(); |
|
26 | 26 | |
27 | - $table = $schema->getTable('mounts'); |
|
28 | - if (!$table->hasColumn('mount_provider_class')) { |
|
29 | - $table->addColumn('mount_provider_class', Types::STRING, [ |
|
30 | - 'notnull' => false, |
|
31 | - 'length' => 128, |
|
32 | - ]); |
|
33 | - $table->addIndex(['mount_provider_class'], 'mounts_class_index'); |
|
34 | - return $schema; |
|
35 | - } |
|
36 | - return null; |
|
37 | - } |
|
27 | + $table = $schema->getTable('mounts'); |
|
28 | + if (!$table->hasColumn('mount_provider_class')) { |
|
29 | + $table->addColumn('mount_provider_class', Types::STRING, [ |
|
30 | + 'notnull' => false, |
|
31 | + 'length' => 128, |
|
32 | + ]); |
|
33 | + $table->addIndex(['mount_provider_class'], 'mounts_class_index'); |
|
34 | + return $schema; |
|
35 | + } |
|
36 | + return null; |
|
37 | + } |
|
38 | 38 | } |
@@ -10,9 +10,12 @@ discard block |
||
10 | 10 | <!-- password prompt form. It should be hidden when we show the email prompt form --> |
11 | 11 | <?php if (!isset($_['identityOk'])): ?> |
12 | 12 | <form method="post" id="password-input-form"> |
13 | - <?php else: ?> |
|
13 | + <?php else { |
|
14 | + : ?> |
|
14 | 15 | <form method="post" id="password-input-form" style="display:none;"> |
15 | - <?php endif; ?> |
|
16 | + <?php endif; |
|
17 | +} |
|
18 | +?> |
|
16 | 19 | <fieldset class="warning"> |
17 | 20 | <?php if (!isset($_['wrongpw'])): ?> |
18 | 21 | <div class="warning-info"><?php p($l->t('This share is password-protected')); ?></div> |
@@ -38,9 +41,12 @@ discard block |
||
38 | 41 | <!-- email prompt form. It should initially be hidden --> |
39 | 42 | <?php if (isset($_['identityOk'])): ?> |
40 | 43 | <form method="post" id="email-input-form"> |
41 | - <?php else: ?> |
|
44 | + <?php else { |
|
45 | + : ?> |
|
42 | 46 | <form method="post" id="email-input-form" style="display:none;"> |
43 | - <?php endif; ?> |
|
47 | + <?php endif; |
|
48 | +} |
|
49 | +?> |
|
44 | 50 | <fieldset class="warning"> |
45 | 51 | <div class="warning-info" id="email-prompt"><?php p($l->t('Please type in your email address to request a temporary password')); ?></div> |
46 | 52 | <p> |
@@ -53,8 +59,11 @@ discard block |
||
53 | 59 | <?php if (isset($_['identityOk'])): ?> |
54 | 60 | <?php if ($_['identityOk']): ?> |
55 | 61 | <div class="warning-info" id="identification-success"><?php p($l->t('Password sent!')); ?></div> |
56 | - <?php else: ?> |
|
57 | - <div class="warning" id="identification-failure"><?php p($l->t('You are not authorized to request a password for this share')); ?></div> |
|
62 | + <?php else { |
|
63 | + : ?> |
|
64 | + <div class="warning" id="identification-failure"><?php p($l->t('You are not authorized to request a password for this share')); |
|
65 | +} |
|
66 | +?></div> |
|
58 | 67 | <?php endif; ?> |
59 | 68 | <?php endif; ?> |
60 | 69 | </fieldset> |
@@ -73,9 +82,12 @@ discard block |
||
73 | 82 | id="request-password-back-button" |
74 | 83 | <?php if (isset($_['identityOk'])): ?> |
75 | 84 | style="display:block;"> |
76 | - <?php else: ?> |
|
85 | + <?php else { |
|
86 | + : ?> |
|
77 | 87 | style="display:none;"> |
78 | - <?php endif; ?> |
|
88 | + <?php endif; |
|
89 | +} |
|
90 | +?> |
|
79 | 91 | <?php p($l->t('Back')); ?></a> |
80 | 92 | </fieldset> |
81 | 93 | </form> |
@@ -31,15 +31,15 @@ |
||
31 | 31 | <h2><?php p($l->t('Account access')) ?></h2> |
32 | 32 | <p class="info"> |
33 | 33 | <?php p($l->t('Currently logged in as %1$s (%2$s).', [ |
34 | - $_['userDisplayName'], |
|
35 | - $_['userId'], |
|
36 | - ])) ?> |
|
34 | + $_['userDisplayName'], |
|
35 | + $_['userId'], |
|
36 | + ])) ?> |
|
37 | 37 | </p> |
38 | 38 | <p class="info"> |
39 | 39 | <?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [ |
40 | - '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>', |
|
41 | - \OCP\Util::sanitizeHTML($_['instanceName']) |
|
42 | - ])) ?> |
|
40 | + '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>', |
|
41 | + \OCP\Util::sanitizeHTML($_['instanceName']) |
|
42 | + ])) ?> |
|
43 | 43 | </p> |
44 | 44 | |
45 | 45 | <br/> |
@@ -37,7 +37,7 @@ |
||
37 | 37 | </p> |
38 | 38 | <p class="info"> |
39 | 39 | <?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [ |
40 | - '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>', |
|
40 | + '<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>', |
|
41 | 41 | \OCP\Util::sanitizeHTML($_['instanceName']) |
42 | 42 | ])) ?> |
43 | 43 | </p> |
@@ -4,7 +4,7 @@ |
||
4 | 4 | <h2 class="title"><?php p($l->t('App update required')); ?></h2> |
5 | 5 | <?php } else { ?> |
6 | 6 | <h2 class="title"><?php p($l->t('%1$s will be updated to version %2$s', |
7 | - [$_['productName'], $_['version']])); ?></h2> |
|
7 | + [$_['productName'], $_['version']])); ?></h2> |
|
8 | 8 | <?php } ?> |
9 | 9 | <?php if (!empty($_['appsToUpgrade'])) { ?> |
10 | 10 | <div class="text-left"> |
@@ -30,12 +30,12 @@ |
||
30 | 30 | * @since 14.0.0 |
31 | 31 | */ |
32 | 32 | interface ICheckPasswordBackend { |
33 | - /** |
|
34 | - * @since 14.0.0 |
|
35 | - * |
|
36 | - * @param string $loginName The loginname |
|
37 | - * @param string $password The password |
|
38 | - * @return string|false The uid on success false on failure |
|
39 | - */ |
|
40 | - public function checkPassword(string $loginName, string $password); |
|
33 | + /** |
|
34 | + * @since 14.0.0 |
|
35 | + * |
|
36 | + * @param string $loginName The loginname |
|
37 | + * @param string $password The password |
|
38 | + * @return string|false The uid on success false on failure |
|
39 | + */ |
|
40 | + public function checkPassword(string $loginName, string $password); |
|
41 | 41 | } |
@@ -31,62 +31,62 @@ |
||
31 | 31 | * @since 25.0.0 |
32 | 32 | */ |
33 | 33 | class BeforePreferenceSetEvent extends Event { |
34 | - protected string $userId; |
|
35 | - protected string $appId; |
|
36 | - protected string $configKey; |
|
37 | - protected string $configValue; |
|
38 | - protected bool $valid = false; |
|
34 | + protected string $userId; |
|
35 | + protected string $appId; |
|
36 | + protected string $configKey; |
|
37 | + protected string $configValue; |
|
38 | + protected bool $valid = false; |
|
39 | 39 | |
40 | - /** |
|
41 | - * @since 25.0.0 |
|
42 | - */ |
|
43 | - public function __construct(string $userId, string $appId, string $configKey, string $configValue) { |
|
44 | - parent::__construct(); |
|
45 | - $this->userId = $userId; |
|
46 | - $this->appId = $appId; |
|
47 | - $this->configKey = $configKey; |
|
48 | - $this->configValue = $configValue; |
|
49 | - } |
|
40 | + /** |
|
41 | + * @since 25.0.0 |
|
42 | + */ |
|
43 | + public function __construct(string $userId, string $appId, string $configKey, string $configValue) { |
|
44 | + parent::__construct(); |
|
45 | + $this->userId = $userId; |
|
46 | + $this->appId = $appId; |
|
47 | + $this->configKey = $configKey; |
|
48 | + $this->configValue = $configValue; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @since 25.0.0 |
|
53 | - */ |
|
54 | - public function getUserId(): string { |
|
55 | - return $this->userId; |
|
56 | - } |
|
51 | + /** |
|
52 | + * @since 25.0.0 |
|
53 | + */ |
|
54 | + public function getUserId(): string { |
|
55 | + return $this->userId; |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * @since 25.0.0 |
|
60 | - */ |
|
61 | - public function getAppId(): string { |
|
62 | - return $this->appId; |
|
63 | - } |
|
58 | + /** |
|
59 | + * @since 25.0.0 |
|
60 | + */ |
|
61 | + public function getAppId(): string { |
|
62 | + return $this->appId; |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * @since 25.0.0 |
|
67 | - */ |
|
68 | - public function getConfigKey(): string { |
|
69 | - return $this->configKey; |
|
70 | - } |
|
65 | + /** |
|
66 | + * @since 25.0.0 |
|
67 | + */ |
|
68 | + public function getConfigKey(): string { |
|
69 | + return $this->configKey; |
|
70 | + } |
|
71 | 71 | |
72 | - /** |
|
73 | - * @since 25.0.0 |
|
74 | - */ |
|
75 | - public function getConfigValue(): string { |
|
76 | - return $this->configValue; |
|
77 | - } |
|
72 | + /** |
|
73 | + * @since 25.0.0 |
|
74 | + */ |
|
75 | + public function getConfigValue(): string { |
|
76 | + return $this->configValue; |
|
77 | + } |
|
78 | 78 | |
79 | - /** |
|
80 | - * @since 25.0.0 |
|
81 | - */ |
|
82 | - public function isValid(): bool { |
|
83 | - return $this->valid; |
|
84 | - } |
|
79 | + /** |
|
80 | + * @since 25.0.0 |
|
81 | + */ |
|
82 | + public function isValid(): bool { |
|
83 | + return $this->valid; |
|
84 | + } |
|
85 | 85 | |
86 | - /** |
|
87 | - * @since 25.0.0 |
|
88 | - */ |
|
89 | - public function setValid(bool $valid): void { |
|
90 | - $this->valid = $valid; |
|
91 | - } |
|
86 | + /** |
|
87 | + * @since 25.0.0 |
|
88 | + */ |
|
89 | + public function setValid(bool $valid): void { |
|
90 | + $this->valid = $valid; |
|
91 | + } |
|
92 | 92 | } |
@@ -31,53 +31,53 @@ |
||
31 | 31 | * @since 25.0.0 |
32 | 32 | */ |
33 | 33 | class BeforePreferenceDeletedEvent extends Event { |
34 | - protected string $userId; |
|
35 | - protected string $appId; |
|
36 | - protected string $configKey; |
|
37 | - protected bool $valid = false; |
|
34 | + protected string $userId; |
|
35 | + protected string $appId; |
|
36 | + protected string $configKey; |
|
37 | + protected bool $valid = false; |
|
38 | 38 | |
39 | - /** |
|
40 | - * @since 25.0.0 |
|
41 | - */ |
|
42 | - public function __construct(string $userId, string $appId, string $configKey) { |
|
43 | - parent::__construct(); |
|
44 | - $this->userId = $userId; |
|
45 | - $this->appId = $appId; |
|
46 | - $this->configKey = $configKey; |
|
47 | - } |
|
39 | + /** |
|
40 | + * @since 25.0.0 |
|
41 | + */ |
|
42 | + public function __construct(string $userId, string $appId, string $configKey) { |
|
43 | + parent::__construct(); |
|
44 | + $this->userId = $userId; |
|
45 | + $this->appId = $appId; |
|
46 | + $this->configKey = $configKey; |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * @since 25.0.0 |
|
51 | - */ |
|
52 | - public function getUserId(): string { |
|
53 | - return $this->userId; |
|
54 | - } |
|
49 | + /** |
|
50 | + * @since 25.0.0 |
|
51 | + */ |
|
52 | + public function getUserId(): string { |
|
53 | + return $this->userId; |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * @since 25.0.0 |
|
58 | - */ |
|
59 | - public function getAppId(): string { |
|
60 | - return $this->appId; |
|
61 | - } |
|
56 | + /** |
|
57 | + * @since 25.0.0 |
|
58 | + */ |
|
59 | + public function getAppId(): string { |
|
60 | + return $this->appId; |
|
61 | + } |
|
62 | 62 | |
63 | - /** |
|
64 | - * @since 25.0.0 |
|
65 | - */ |
|
66 | - public function getConfigKey(): string { |
|
67 | - return $this->configKey; |
|
68 | - } |
|
63 | + /** |
|
64 | + * @since 25.0.0 |
|
65 | + */ |
|
66 | + public function getConfigKey(): string { |
|
67 | + return $this->configKey; |
|
68 | + } |
|
69 | 69 | |
70 | - /** |
|
71 | - * @since 25.0.0 |
|
72 | - */ |
|
73 | - public function isValid(): bool { |
|
74 | - return $this->valid; |
|
75 | - } |
|
70 | + /** |
|
71 | + * @since 25.0.0 |
|
72 | + */ |
|
73 | + public function isValid(): bool { |
|
74 | + return $this->valid; |
|
75 | + } |
|
76 | 76 | |
77 | - /** |
|
78 | - * @since 25.0.0 |
|
79 | - */ |
|
80 | - public function setValid(bool $valid): void { |
|
81 | - $this->valid = $valid; |
|
82 | - } |
|
77 | + /** |
|
78 | + * @since 25.0.0 |
|
79 | + */ |
|
80 | + public function setValid(bool $valid): void { |
|
81 | + $this->valid = $valid; |
|
82 | + } |
|
83 | 83 | } |