@@ -31,41 +31,41 @@ |
||
| 31 | 31 | */ |
| 32 | 32 | interface IShareable extends INode { |
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * Updates the list of shares. |
|
| 36 | - * |
|
| 37 | - * The first array is a list of people that are to be added to the |
|
| 38 | - * resource. |
|
| 39 | - * |
|
| 40 | - * Every element in the add array has the following properties: |
|
| 41 | - * * href - A url. Usually a mailto: address |
|
| 42 | - * * commonName - Usually a first and last name, or false |
|
| 43 | - * * readOnly - A boolean value |
|
| 44 | - * |
|
| 45 | - * Every element in the remove array is just the address string. |
|
| 46 | - * |
|
| 47 | - * @param list<array{href: string, commonName: string, readOnly: bool}> $add |
|
| 48 | - * @param list<string> $remove |
|
| 49 | - */ |
|
| 50 | - public function updateShares(array $add, array $remove): void; |
|
| 34 | + /** |
|
| 35 | + * Updates the list of shares. |
|
| 36 | + * |
|
| 37 | + * The first array is a list of people that are to be added to the |
|
| 38 | + * resource. |
|
| 39 | + * |
|
| 40 | + * Every element in the add array has the following properties: |
|
| 41 | + * * href - A url. Usually a mailto: address |
|
| 42 | + * * commonName - Usually a first and last name, or false |
|
| 43 | + * * readOnly - A boolean value |
|
| 44 | + * |
|
| 45 | + * Every element in the remove array is just the address string. |
|
| 46 | + * |
|
| 47 | + * @param list<array{href: string, commonName: string, readOnly: bool}> $add |
|
| 48 | + * @param list<string> $remove |
|
| 49 | + */ |
|
| 50 | + public function updateShares(array $add, array $remove): void; |
|
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * Returns the list of people whom this resource is shared with. |
|
| 54 | - * |
|
| 55 | - * Every element in this array should have the following properties: |
|
| 56 | - * * href - Often a mailto: address |
|
| 57 | - * * commonName - Optional, for example a first + last name |
|
| 58 | - * * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants. |
|
| 59 | - * * readOnly - boolean |
|
| 60 | - * |
|
| 61 | - * @return list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}> |
|
| 62 | - */ |
|
| 63 | - public function getShares(): array; |
|
| 52 | + /** |
|
| 53 | + * Returns the list of people whom this resource is shared with. |
|
| 54 | + * |
|
| 55 | + * Every element in this array should have the following properties: |
|
| 56 | + * * href - Often a mailto: address |
|
| 57 | + * * commonName - Optional, for example a first + last name |
|
| 58 | + * * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants. |
|
| 59 | + * * readOnly - boolean |
|
| 60 | + * |
|
| 61 | + * @return list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}> |
|
| 62 | + */ |
|
| 63 | + public function getShares(): array; |
|
| 64 | 64 | |
| 65 | - public function getResourceId(): int; |
|
| 65 | + public function getResourceId(): int; |
|
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * @return ?string |
|
| 69 | - */ |
|
| 70 | - public function getOwner(); |
|
| 67 | + /** |
|
| 68 | + * @return ?string |
|
| 69 | + */ |
|
| 70 | + public function getOwner(); |
|
| 71 | 71 | } |
@@ -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 | } |
@@ -32,31 +32,31 @@ |
||
| 32 | 32 | * @since 11.0.0 |
| 33 | 33 | */ |
| 34 | 34 | interface ISimpleRoot { |
| 35 | - /** |
|
| 36 | - * Get the folder with name $name |
|
| 37 | - * |
|
| 38 | - * @throws NotFoundException |
|
| 39 | - * @throws \RuntimeException |
|
| 40 | - * @since 11.0.0 |
|
| 41 | - */ |
|
| 42 | - public function getFolder(string $name): ISimpleFolder; |
|
| 35 | + /** |
|
| 36 | + * Get the folder with name $name |
|
| 37 | + * |
|
| 38 | + * @throws NotFoundException |
|
| 39 | + * @throws \RuntimeException |
|
| 40 | + * @since 11.0.0 |
|
| 41 | + */ |
|
| 42 | + public function getFolder(string $name): ISimpleFolder; |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * Get all the Folders |
|
| 46 | - * |
|
| 47 | - * @return ISimpleFolder[] |
|
| 48 | - * @throws NotFoundException |
|
| 49 | - * @throws \RuntimeException |
|
| 50 | - * @since 11.0.0 |
|
| 51 | - */ |
|
| 52 | - public function getDirectoryListing(): array; |
|
| 44 | + /** |
|
| 45 | + * Get all the Folders |
|
| 46 | + * |
|
| 47 | + * @return ISimpleFolder[] |
|
| 48 | + * @throws NotFoundException |
|
| 49 | + * @throws \RuntimeException |
|
| 50 | + * @since 11.0.0 |
|
| 51 | + */ |
|
| 52 | + public function getDirectoryListing(): array; |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * Create a new folder named $name |
|
| 56 | - * |
|
| 57 | - * @throws NotPermittedException |
|
| 58 | - * @throws \RuntimeException |
|
| 59 | - * @since 11.0.0 |
|
| 60 | - */ |
|
| 61 | - public function newFolder(string $name): ISimpleFolder; |
|
| 54 | + /** |
|
| 55 | + * Create a new folder named $name |
|
| 56 | + * |
|
| 57 | + * @throws NotPermittedException |
|
| 58 | + * @throws \RuntimeException |
|
| 59 | + * @since 11.0.0 |
|
| 60 | + */ |
|
| 61 | + public function newFolder(string $name): ISimpleFolder; |
|
| 62 | 62 | } |