@@ -9,10 +9,13 @@ discard block |
||
| 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 | - value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); ?> /> |
|
| 16 | + value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); |
|
| 17 | +} |
|
| 18 | +?> /> |
|
| 16 | 19 | <label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br> |
| 17 | 20 | <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> |
| 18 | 21 | </p> |
@@ -42,7 +45,10 @@ discard block |
||
| 42 | 45 | </p> |
| 43 | 46 | <br/><br/> |
| 44 | 47 | |
| 45 | - <p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>> |
|
| 48 | + <p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') { |
|
| 49 | + print_unescaped('class="hidden"'); |
|
| 50 | +} |
|
| 51 | +?>> |
|
| 46 | 52 | <?php p($l->t("Change recovery key password:")); ?> |
| 47 | 53 | <span class="msg"></span> |
| 48 | 54 | <br/> |
@@ -59,6 +59,9 @@ discard block |
||
| 59 | 59 | return $query->execute()->fetchAll(); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | + /** |
|
| 63 | + * @param string $path |
|
| 64 | + */ |
|
| 62 | 65 | private function getId($storage, $path) { |
| 63 | 66 | $builder = $this->connection->getQueryBuilder(); |
| 64 | 67 | |
@@ -70,6 +73,9 @@ discard block |
||
| 70 | 73 | return $query->execute()->fetchColumn(); |
| 71 | 74 | } |
| 72 | 75 | |
| 76 | + /** |
|
| 77 | + * @param string $newPath |
|
| 78 | + */ |
|
| 73 | 79 | private function update($fileid, $newPath) { |
| 74 | 80 | $builder = $this->connection->getQueryBuilder(); |
| 75 | 81 | |
@@ -180,6 +180,10 @@ discard block |
||
| 180 | 180 | return 'en'; |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | + /** |
|
| 184 | + * @param string $app |
|
| 185 | + * @param string $lang |
|
| 186 | + */ |
|
| 183 | 187 | public function findLocale($app = null, $lang = null) |
| 184 | 188 | { |
| 185 | 189 | if ($this->config->getSystemValue('installed', false)) { |
@@ -367,6 +371,11 @@ discard block |
||
| 367 | 371 | */ |
| 368 | 372 | // FIXME This method is only public, until OC_L10N does not need it anymore, |
| 369 | 373 | // FIXME This is also the reason, why it is not in the public interface |
| 374 | + |
|
| 375 | + /** |
|
| 376 | + * @param string $app |
|
| 377 | + * @param string $lang |
|
| 378 | + */ |
|
| 370 | 379 | public function getL10nFilesForApp($app, $lang) { |
| 371 | 380 | $languageFiles = []; |
| 372 | 381 | |