@@ -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/> |
@@ -61,8 +61,7 @@ |
||
61 | 61 | $fn = $this->l10n->getPluralFormFunction(); |
62 | 62 | $id = $fn($this->count); |
63 | 63 | $text = $translations[$this->text][$id]; |
64 | - } |
|
65 | - else{ |
|
64 | + } else{ |
|
66 | 65 | $text = $translations[$this->text]; |
67 | 66 | } |
68 | 67 | } |
@@ -62,8 +62,7 @@ |
||
62 | 62 | |
63 | 63 | if (isset($params['root'])){ |
64 | 64 | $root = '/' . ltrim($params['root'], '/'); |
65 | - } |
|
66 | - else{ |
|
65 | + } else{ |
|
67 | 66 | $root = '/'; |
68 | 67 | } |
69 | 68 |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $this->path=$source; |
48 | 48 | $this->zip=new \ZipArchive(); |
49 | 49 | if($this->zip->open($source, \ZipArchive::CREATE)) { |
50 | - }else{ |
|
50 | + } else{ |
|
51 | 51 | \OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, ILogger::WARN); |
52 | 52 | } |
53 | 53 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | public function addFile($path, $source='') { |
69 | 69 | if($source and $source[0]=='/' and file_exists($source)) { |
70 | 70 | $result=$this->zip->addFile($source, $path); |
71 | - }else{ |
|
71 | + } else{ |
|
72 | 72 | $result=$this->zip->addFromString($path, $source); |
73 | 73 | } |
74 | 74 | if($result) { |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | public function remove($path) { |
178 | 178 | if($this->fileExists($path.'/')) { |
179 | 179 | return $this->zip->deleteName($path.'/'); |
180 | - }else{ |
|
180 | + } else{ |
|
181 | 181 | return $this->zip->deleteName($path); |
182 | 182 | } |
183 | 183 | } |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | //in the archive when the stream is closed |
197 | 197 | if(strrpos($path, '.')!==false) { |
198 | 198 | $ext=substr($path, strrpos($path, '.')); |
199 | - }else{ |
|
199 | + } else{ |
|
200 | 200 | $ext=''; |
201 | 201 | } |
202 | 202 | $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext); |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | private function stripPath($path) { |
226 | 226 | if(!$path || $path[0]=='/') { |
227 | 227 | return substr($path, 1); |
228 | - }else{ |
|
228 | + } else{ |
|
229 | 229 | return $path; |
230 | 230 | } |
231 | 231 | } |
@@ -459,7 +459,7 @@ |
||
459 | 459 | $appDir = OC_App::getInstallPath() . '/' . $appId; |
460 | 460 | OC_Helper::rmdirr($appDir); |
461 | 461 | return true; |
462 | - }else{ |
|
462 | + } else{ |
|
463 | 463 | \OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', ILogger::ERROR); |
464 | 464 | |
465 | 465 | return false; |
@@ -247,8 +247,7 @@ |
||
247 | 247 | return new JSONResponse($e->getReturnMessage(), Http::STATUS_BAD_REQUEST); |
248 | 248 | } catch (AuthenticationFailedException $e) { |
249 | 249 | return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN); |
250 | - } |
|
251 | - catch (\Exception $e) { |
|
250 | + } catch (\Exception $e) { |
|
252 | 251 | return new JSONResponse( |
253 | 252 | ['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()], |
254 | 253 | Http::STATUS_BAD_REQUEST |
@@ -18,14 +18,20 @@ discard block |
||
18 | 18 | |
19 | 19 | <p> |
20 | 20 | <input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox" |
21 | - value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
21 | + value="1" <?php if ($_['outgoingServer2serverShareEnabled']) { |
|
22 | + print_unescaped('checked="checked"'); |
|
23 | +} |
|
24 | +?> /> |
|
22 | 25 | <label for="outgoingServer2serverShareEnabled"> |
23 | 26 | <?php p($l->t('Allow users on this server to send shares to other servers'));?> |
24 | 27 | </label> |
25 | 28 | </p> |
26 | 29 | <p> |
27 | 30 | <input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox" |
28 | - value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
31 | + value="1" <?php if ($_['incomingServer2serverShareEnabled']) { |
|
32 | + print_unescaped('checked="checked"'); |
|
33 | +} |
|
34 | +?> /> |
|
29 | 35 | <label for="incomingServer2serverShareEnabled"> |
30 | 36 | <?php p($l->t('Allow users on this server to receive shares from other servers'));?> |
31 | 37 | </label><br/> |
@@ -33,14 +39,20 @@ discard block |
||
33 | 39 | <?php if($_['federatedGroupSharingSupported']): ?> |
34 | 40 | <p> |
35 | 41 | <input type="checkbox" name="outgoing_server2server_group_share_enabled" id="outgoingServer2serverGroupShareEnabled" class="checkbox" |
36 | - value="1" <?php if ($_['outgoingServer2serverGroupShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
42 | + value="1" <?php if ($_['outgoingServer2serverGroupShareEnabled']) { |
|
43 | + print_unescaped('checked="checked"'); |
|
44 | +} |
|
45 | +?> /> |
|
37 | 46 | <label for="outgoingServer2serverGroupShareEnabled"> |
38 | 47 | <?php p($l->t('Allow users on this server to send shares to groups on other servers'));?> |
39 | 48 | </label> |
40 | 49 | </p> |
41 | 50 | <p> |
42 | 51 | <input type="checkbox" name="incoming_server2server_group_share_enabled" id="incomingServer2serverGroupShareEnabled" class="checkbox" |
43 | - value="1" <?php if ($_['incomingServer2serverGroupShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
52 | + value="1" <?php if ($_['incomingServer2serverGroupShareEnabled']) { |
|
53 | + print_unescaped('checked="checked"'); |
|
54 | +} |
|
55 | +?> /> |
|
44 | 56 | <label for="incomingServer2serverGroupShareEnabled"> |
45 | 57 | <?php p($l->t('Allow users on this server to receive group shares from other servers'));?> |
46 | 58 | </label><br/> |
@@ -48,14 +60,20 @@ discard block |
||
48 | 60 | <?php endif; ?> |
49 | 61 | <p> |
50 | 62 | <input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox" |
51 | - value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
63 | + value="1" <?php if ($_['lookupServerEnabled']) { |
|
64 | + print_unescaped('checked="checked"'); |
|
65 | +} |
|
66 | +?> /> |
|
52 | 67 | <label for="lookupServerEnabled"> |
53 | 68 | <?php p($l->t('Search global and public address book for users'));?> |
54 | 69 | </label><br/> |
55 | 70 | </p> |
56 | 71 | <p> |
57 | 72 | <input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox" |
58 | - value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
73 | + value="1" <?php if ($_['lookupServerUploadEnabled']) { |
|
74 | + print_unescaped('checked="checked"'); |
|
75 | +} |
|
76 | +?> /> |
|
59 | 77 | <label for="lookupServerUploadEnabled"> |
60 | 78 | <?php p($l->t('Allow users to publish their data to a global and public address book'));?> |
61 | 79 | </label><br/> |
@@ -226,7 +226,7 @@ |
||
226 | 226 | if ($share->getSharedWith() === null) { |
227 | 227 | throw new \InvalidArgumentException('SharedWith should not be empty'); |
228 | 228 | } |
229 | - } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) { |
|
229 | + } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) { |
|
230 | 230 | if ($share->getSharedWith() === null) { |
231 | 231 | throw new \InvalidArgumentException('SharedWith should not be empty'); |
232 | 232 | } |
@@ -50,17 +50,23 @@ |
||
50 | 50 | <div id="preview"> |
51 | 51 | <?php if (isset($_['folder'])): ?> |
52 | 52 | <?php print_unescaped($_['folder']); ?> |
53 | - <?php else: ?> |
|
53 | + <?php else { |
|
54 | + : ?> |
|
54 | 55 | <?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'audio'): ?> |
55 | 56 | <div id="imgframe"> |
56 | - <audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px"> |
|
57 | + <audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']); |
|
58 | +} |
|
59 | +?>px; max-height: <?php p($_['previewMaxY']); ?>px"> |
|
57 | 60 | <source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" /> |
58 | 61 | </audio> |
59 | 62 | </div> |
60 | - <?php else: ?> |
|
63 | + <?php else { |
|
64 | + : ?> |
|
61 | 65 | <!-- Preview frame is filled via JS to support SVG images for modern browsers --> |
62 | 66 | <div id="imgframe"></div> |
63 | - <?php endif; ?> |
|
67 | + <?php endif; |
|
68 | +} |
|
69 | +?> |
|
64 | 70 | <?php if ($_['previewURL'] === $_['downloadURL'] && !$_['hideDownload']): ?> |
65 | 71 | <div class="directDownload"> |
66 | 72 | <a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button"> |