@@ -99,7 +99,7 @@ |
||
99 | 99 | $currentChannel = \OCP\Util::getChannel(); |
100 | 100 | |
101 | 101 | // Remove the currently used channel from the channels list |
102 | - if(($key = array_search($currentChannel, $channels)) !== false) { |
|
102 | + if (($key = array_search($currentChannel, $channels)) !== false) { |
|
103 | 103 | unset($channels[$key]); |
104 | 104 | } |
105 | 105 | $updateState = $this->updateChecker->getUpdateState(); |
@@ -43,14 +43,14 @@ discard block |
||
43 | 43 | $data = $this->updater->check(); |
44 | 44 | $result = []; |
45 | 45 | |
46 | - if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) { |
|
46 | + if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) { |
|
47 | 47 | $result['updateAvailable'] = true; |
48 | 48 | $result['updateVersion'] = $data['versionstring']; |
49 | 49 | $result['updaterEnabled'] = $data['autoupdater'] === '1'; |
50 | - if(substr($data['web'], 0, 8) === 'https://') { |
|
50 | + if (substr($data['web'], 0, 8) === 'https://') { |
|
51 | 51 | $result['updateLink'] = $data['web']; |
52 | 52 | } |
53 | - if(substr($data['url'], 0, 8) === 'https://') { |
|
53 | + if (substr($data['url'], 0, 8) === 'https://') { |
|
54 | 54 | $result['downloadLink'] = $data['url']; |
55 | 55 | } |
56 | 56 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * @param array $data |
65 | 65 | */ |
66 | 66 | public function getJavaScript(array $data) { |
67 | - $data['array']['oc_updateState'] = json_encode([ |
|
67 | + $data['array']['oc_updateState'] = json_encode([ |
|
68 | 68 | 'updateAvailable' => true, |
69 | 69 | 'updateVersion' => $this->getUpdateState()['updateVersion'], |
70 | 70 | 'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '', |
@@ -30,7 +30,7 @@ |
||
30 | 30 | use OCP\AppFramework\IAppContainer; |
31 | 31 | |
32 | 32 | class Application extends App { |
33 | - public function __construct (array $urlParams = array()) { |
|
33 | + public function __construct(array $urlParams = array()) { |
|
34 | 34 | parent::__construct('updatenotification', $urlParams); |
35 | 35 | $container = $this->getContainer(); |
36 | 36 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | */ |
70 | 70 | protected function run($argument) { |
71 | 71 | // Delete old tokens after 2 days |
72 | - if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
72 | + if ($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
73 | 73 | $this->config->deleteSystemValue('updater.secret'); |
74 | 74 | } |
75 | 75 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | * |
23 | 23 | */ |
24 | 24 | |
25 | -if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) { |
|
25 | +if (\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) { |
|
26 | 26 | $updater = new \OC\Updater\VersionCheck( |
27 | 27 | \OC::$server->getHTTPClientService(), |
28 | 28 | \OC::$server->getConfig() |
@@ -32,10 +32,10 @@ discard block |
||
32 | 32 | ); |
33 | 33 | |
34 | 34 | $userObject = \OC::$server->getUserSession()->getUser(); |
35 | - if($userObject !== null) { |
|
36 | - if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) && |
|
35 | + if ($userObject !== null) { |
|
36 | + if (\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) && |
|
37 | 37 | !\OC::$server->getAppManager()->isEnabledForUser('notifications')) { |
38 | - if($updateChecker->getUpdateState() !== []) { |
|
38 | + if ($updateChecker->getUpdateState() !== []) { |
|
39 | 39 | \OCP\Util::addScript('updatenotification', 'notification'); |
40 | 40 | OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript'); |
41 | 41 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | $uid = $user->getUID(); |
80 | 80 | foreach (range(1, min([$number, 20])) as $i) { |
81 | - $code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS); |
|
81 | + $code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS); |
|
82 | 82 | |
83 | 83 | $dbCode = new BackupCode(); |
84 | 84 | $dbCode->setUserId($uid); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | $codes = $this->mapper->getBackupCodes($user); |
133 | 133 | $total = count($codes); |
134 | 134 | $used = 0; |
135 | - array_walk($codes, function (BackupCode $code) use (&$used) { |
|
135 | + array_walk($codes, function(BackupCode $code) use (&$used) { |
|
136 | 136 | if (1 === (int) $code->getUsed()) { |
137 | 137 | $used++; |
138 | 138 | } |
@@ -47,7 +47,7 @@ |
||
47 | 47 | $rows = $result->fetchAll(); |
48 | 48 | $result->closeCursor(); |
49 | 49 | |
50 | - return array_map(function ($row) { |
|
50 | + return array_map(function($row) { |
|
51 | 51 | return BackupCode::fromRow($row); |
52 | 52 | }, $rows); |
53 | 53 | } |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | /** @var array $_ */ |
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", array($_['password']))); |
6 | -if ( isset($_['expiration']) ) { |
|
6 | +if (isset($_['expiration'])) { |
|
7 | 7 | print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); |
8 | 8 | print_unescaped("\n\n"); |
9 | 9 | } |
@@ -12,5 +12,5 @@ discard block |
||
12 | 12 | ?> |
13 | 13 | |
14 | 14 | -- |
15 | -<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?> |
|
15 | +<?php p($theme->getName().' - '.$theme->getSlogan()); ?> |
|
16 | 16 | <?php print_unescaped("\n".$theme->getBaseUrl()); |
@@ -7,19 +7,19 @@ discard block |
||
7 | 7 | ?> |
8 | 8 | <form id="ocDefaultEncryptionModule" class="sub-section"> |
9 | 9 | <h3><?php p($l->t("Default encryption module")); ?></h3> |
10 | - <?php if(!$_["initStatus"]): ?> |
|
10 | + <?php if (!$_["initStatus"]): ?> |
|
11 | 11 | <?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?> |
12 | 12 | <?php else: ?> |
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']) print_unescaped('checked="checked"'); ?> /> |
16 | - <label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br> |
|
17 | - <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> |
|
16 | + <label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage')); ?></label></br> |
|
17 | + <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 | 18 | </p> |
19 | 19 | <br /> |
20 | - <?php if($_['masterKeyEnabled'] === false): ?> |
|
20 | + <?php if ($_['masterKeyEnabled'] === false): ?> |
|
21 | 21 | <p id="encryptionSetRecoveryKey"> |
22 | - <?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?> |
|
22 | + <?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?> |
|
23 | 23 | <span class="msg"></span> |
24 | 24 | <br/> |
25 | 25 | <em> |
@@ -38,11 +38,11 @@ discard block |
||
38 | 38 | name="enableRecoveryKey" |
39 | 39 | id="enableRecoveryKey" |
40 | 40 | status="<?php p($_["recoveryEnabled"]) ?>" |
41 | - value="<?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/> |
|
41 | + value="<?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/> |
|
42 | 42 | </p> |
43 | 43 | <br/><br/> |
44 | 44 | |
45 | - <p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>> |
|
45 | + <p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if ($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"'); ?>> |
|
46 | 46 | <?php p($l->t("Change recovery key password:")); ?> |
47 | 47 | <span class="msg"></span> |
48 | 48 | <br/> |