@@ -11,7 +11,10 @@ |
||
11 | 11 | <p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></p> |
12 | 12 | |
13 | 13 | <p> |
14 | - <input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> /> |
|
14 | + <input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) { |
|
15 | + p('checked'); |
|
16 | +} |
|
17 | +?> /> |
|
15 | 18 | <label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label> |
16 | 19 | </p> |
17 | 20 |
@@ -11,9 +11,15 @@ |
||
11 | 11 | <p class="settings-hint"><?php p($l->t('Allows users to share a personalized link to a file or folder by putting in an email address.')); ?></p> |
12 | 12 | |
13 | 13 | <p> |
14 | - <input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> /> |
|
14 | + <input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) { |
|
15 | + p('checked'); |
|
16 | +} |
|
17 | +?> /> |
|
15 | 18 | <label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label><br/> |
16 | - <input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if($_['enforcePasswordProtection']) p('checked'); ?> /> |
|
19 | + <input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if($_['enforcePasswordProtection']) { |
|
20 | + p('checked'); |
|
21 | +} |
|
22 | +?> /> |
|
17 | 23 | <label for="enforcePasswordProtection"><?php p($l->t('Enforce password protection')); ?></label> |
18 | 24 | </p> |
19 | 25 |
@@ -135,7 +135,7 @@ |
||
135 | 135 | $ln = array('code' => $lang, 'name' => $potentialName); |
136 | 136 | } elseif ($lang === 'en') { |
137 | 137 | $ln = ['code' => $lang, 'name' => 'English (US)']; |
138 | - }else{//fallback to language code |
|
138 | + } else{//fallback to language code |
|
139 | 139 | $ln=array('code'=>$lang, 'name'=>$lang); |
140 | 140 | } |
141 | 141 |
@@ -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/> |
@@ -15,7 +15,10 @@ discard block |
||
15 | 15 | |
16 | 16 | <p> |
17 | 17 | <input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox" |
18 | - value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
18 | + value="1" <?php if ($_['outgoingServer2serverShareEnabled']) { |
|
19 | + print_unescaped('checked="checked"'); |
|
20 | +} |
|
21 | +?> /> |
|
19 | 22 | <label for="outgoingServer2serverShareEnabled"> |
20 | 23 | <?php p($l->t('Allow users on this server to send shares to other servers'));?> |
21 | 24 | </label> |
@@ -23,21 +26,30 @@ discard block |
||
23 | 26 | |
24 | 27 | <p> |
25 | 28 | <input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox" |
26 | - value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
29 | + value="1" <?php if ($_['incomingServer2serverShareEnabled']) { |
|
30 | + print_unescaped('checked="checked"'); |
|
31 | +} |
|
32 | +?> /> |
|
27 | 33 | <label for="incomingServer2serverShareEnabled"> |
28 | 34 | <?php p($l->t('Allow users on this server to receive shares from other servers'));?> |
29 | 35 | </label><br/> |
30 | 36 | </p> |
31 | 37 | <p> |
32 | 38 | <input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox" |
33 | - value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
39 | + value="1" <?php if ($_['lookupServerEnabled']) { |
|
40 | + print_unescaped('checked="checked"'); |
|
41 | +} |
|
42 | +?> /> |
|
34 | 43 | <label for="lookupServerEnabled"> |
35 | 44 | <?php p($l->t('Search global and public address book for users'));?> |
36 | 45 | </label><br/> |
37 | 46 | </p> |
38 | 47 | <p> |
39 | 48 | <input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox" |
40 | - value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
49 | + value="1" <?php if ($_['lookupServerUploadEnabled']) { |
|
50 | + print_unescaped('checked="checked"'); |
|
51 | +} |
|
52 | +?> /> |
|
41 | 53 | <label for="lookupServerUploadEnabled"> |
42 | 54 | <?php p($l->t('Allow users to publish their data to a global and public address book'));?> |
43 | 55 | </label><br/> |
@@ -72,11 +72,17 @@ discard block |
||
72 | 72 | </select> |
73 | 73 | |
74 | 74 | <label id="mail_smtpsecure_label" for="mail_smtpsecure" |
75 | - <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>> |
|
75 | + <?php if ($_['mail_smtpmode'] !== 'smtp') { |
|
76 | + print_unescaped(' class="hidden"'); |
|
77 | +} |
|
78 | +?>> |
|
76 | 79 | <?php p($l->t('Encryption')); ?> |
77 | 80 | </label> |
78 | 81 | <select name="mail_smtpsecure" id="mail_smtpsecure" |
79 | - <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>> |
|
82 | + <?php if ($_['mail_smtpmode'] !== 'smtp') { |
|
83 | + print_unescaped(' class="hidden"'); |
|
84 | +} |
|
85 | +?>> |
|
80 | 86 | <?php foreach ($mail_smtpsecure as $secure => $name): |
81 | 87 | $selected = ''; |
82 | 88 | if ($secure == $_['mail_smtpsecure']): |
@@ -95,7 +101,10 @@ discard block |
||
95 | 101 | value="<?php p($_['mail_domain']) ?>" /> |
96 | 102 | </p> |
97 | 103 | |
98 | - <p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>> |
|
104 | + <p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') { |
|
105 | + print_unescaped(' class="hidden"'); |
|
106 | +} |
|
107 | +?>> |
|
99 | 108 | <label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label> |
100 | 109 | <select name="mail_smtpauthtype" id="mail_smtpauthtype'> |
101 | 110 | <?php foreach ($mail_smtpauthtype as $authtype => $name): |
@@ -108,11 +117,17 @@ discard block |
||
108 | 117 | </select> |
109 | 118 | |
110 | 119 | <input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1" |
111 | - <?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> /> |
|
120 | + <?php if ($_['mail_smtpauth']) { |
|
121 | + print_unescaped('checked="checked"'); |
|
122 | +} |
|
123 | +?> /> |
|
112 | 124 | <label for="mail_smtpauth"><?php p($l->t('Authentication required')); ?></label> |
113 | 125 | </p> |
114 | 126 | |
115 | - <p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>> |
|
127 | + <p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') { |
|
128 | + print_unescaped(' class="hidden"'); |
|
129 | +} |
|
130 | +?>> |
|
116 | 131 | <label for="mail_smtphost"><?php p($l->t('Server address')); ?></label> |
117 | 132 | <input type="text" name="mail_smtphost" id="mail_smtphost" placeholder="smtp.example.com" |
118 | 133 | value="<?php p($_['mail_smtphost']) ?>" /> |
@@ -122,7 +137,10 @@ discard block |
||
122 | 137 | </p> |
123 | 138 | </form> |
124 | 139 | <form class="mail_settings" id="mail_credentials_settings"> |
125 | - <p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>> |
|
140 | + <p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') { |
|
141 | + print_unescaped(' class="hidden"'); |
|
142 | +} |
|
143 | +?>> |
|
126 | 144 | <label for="mail_smtpname"><?php p($l->t('Credentials')); ?></label> |
127 | 145 | <input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>" |
128 | 146 | value="<?php p($_['mail_smtpname']) ?>" /> |
@@ -35,7 +35,10 @@ discard block |
||
35 | 35 | <p id="enable"> |
36 | 36 | <input type="checkbox" |
37 | 37 | id="enableEncryption" class="checkbox" |
38 | - value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked" disabled="disabled"'); ?> /> |
|
38 | + value="1" <?php if ($_['encryptionEnabled']) { |
|
39 | + print_unescaped('checked="checked" disabled="disabled"'); |
|
40 | +} |
|
41 | +?> /> |
|
39 | 42 | <label |
40 | 43 | for="enableEncryption"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/> |
41 | 44 | </p> |
@@ -54,8 +57,14 @@ discard block |
||
54 | 57 | value="<?php p($l->t("Enable encryption")); ?>" /></p> |
55 | 58 | </div> |
56 | 59 | |
57 | - <div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>"> |
|
58 | - <div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>"> |
|
60 | + <div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) { |
|
61 | + p('hidden'); |
|
62 | +} |
|
63 | +?>"> |
|
64 | + <div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) { |
|
65 | + p('hidden'); |
|
66 | +} |
|
67 | +?>"> |
|
59 | 68 | <?php |
60 | 69 | if (empty($_['encryptionModules'])) { |
61 | 70 | p($l->t('No encryption module loaded, please enable an encryption module in the app menu.')); |
@@ -76,7 +85,10 @@ discard block |
||
76 | 85 | </fieldset> |
77 | 86 | <?php } ?> |
78 | 87 | </div> |
79 | - <div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>"> |
|
88 | + <div id="migrationWarning" class="<?php if ($_['encryptionReady']) { |
|
89 | + p('hidden'); |
|
90 | +} |
|
91 | +?>"> |
|
80 | 92 | <?php |
81 | 93 | if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) { |
82 | 94 | p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "Default encryption module" and run \'occ encryption:migrate\'')); |
@@ -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, \OCP\Util::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=\OCP\Files::tmpFile($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 | } |
@@ -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 | } |