@@ -74,8 +74,7 @@ |
||
74 | 74 | |
75 | 75 | try { |
76 | 76 | $value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists')); |
77 | - } |
|
78 | - catch (\UnexpectedValueException $e) { |
|
77 | + } catch (\UnexpectedValueException $e) { |
|
79 | 78 | $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>'); |
80 | 79 | return 1; |
81 | 80 | } |
@@ -165,15 +165,20 @@ |
||
165 | 165 | <span class="crondate" title="<?php p($absolute_time);?>"> |
166 | 166 | <?php p($l->t("Last cron job execution: %s.", [$relative_time]));?> |
167 | 167 | </span> |
168 | - <?php else: ?> |
|
168 | + <?php else { |
|
169 | + : ?> |
|
169 | 170 | <span class="status error"></span> |
170 | - <span class="crondate" title="<?php p($absolute_time);?>"> |
|
171 | + <span class="crondate" title="<?php p($absolute_time); |
|
172 | +} |
|
173 | +?>"> |
|
171 | 174 | <?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time]));?> |
172 | 175 | </span> |
173 | 176 | <?php endif; |
174 | - else: ?> |
|
177 | + else { |
|
178 | + : ?> |
|
175 | 179 | <span class="status error"></span> |
176 | 180 | <?php p($l->t("Cron was not executed yet!")); |
181 | + } |
|
177 | 182 | endif; ?> |
178 | 183 | </p> |
179 | 184 | <?php endif; ?> |
@@ -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\'')); |
@@ -3,12 +3,18 @@ discard block |
||
3 | 3 | <span><?php p($l->t('Default quota'));?></span> |
4 | 4 | <?php if((bool) $_['isAdmin']): ?> |
5 | 5 | <select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s"> |
6 | - <option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'> |
|
6 | + <option <?php if($_['default_quota'] === 'none') { |
|
7 | + print_unescaped('selected="selected"'); |
|
8 | +} |
|
9 | +?> value='none'> |
|
7 | 10 | <?php p($l->t('Unlimited'));?> |
8 | 11 | </option> |
9 | 12 | <?php foreach($_['quota_preset'] as $preset):?> |
10 | 13 | <?php if($preset !== 'default'):?> |
11 | - <option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'> |
|
14 | + <option <?php if($_['default_quota']==$preset) { |
|
15 | + print_unescaped('selected="selected"'); |
|
16 | +} |
|
17 | +?> value='<?php p($preset);?>'> |
|
12 | 18 | <?php p($preset);?> |
13 | 19 | </option> |
14 | 20 | <?php endif;?> |
@@ -28,8 +34,11 @@ discard block |
||
28 | 34 | : |
29 | 35 | <?php if( $_['default_quota'] === 'none'): ?> |
30 | 36 | <?php p($l->t('Unlimited'));?> |
31 | - <?php else: ?> |
|
32 | - <?php p($_['default_quota']);?> |
|
37 | + <?php else { |
|
38 | + : ?> |
|
39 | + <?php p($_['default_quota']); |
|
40 | +} |
|
41 | +?> |
|
33 | 42 | <?php endif; ?> |
34 | 43 | <?php endif; ?> |
35 | 44 | </div> |
@@ -23,8 +23,11 @@ |
||
23 | 23 | <?php p($rootCert->getIssuerName()) ?> |
24 | 24 | </td> |
25 | 25 | <td <?php if ($rootCert != ''): ?>class="remove" |
26 | - <?php else: ?>style="visibility:hidden;" |
|
27 | - <?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>" |
|
26 | + <?php else { |
|
27 | + : ?>style="visibility:hidden;" |
|
28 | + <?php endif; |
|
29 | +} |
|
30 | +?>><img alt="<?php p($l->t('Delete')); ?>" |
|
28 | 31 | title="<?php p($l->t('Delete')); ?>" |
29 | 32 | class="action" |
30 | 33 | src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/> |
@@ -66,7 +66,7 @@ |
||
66 | 66 | // Return Success story |
67 | 67 | if($username) { |
68 | 68 | $targetUserObject->setQuota($quota); |
69 | -}else{//set the default quota when no username is specified |
|
69 | +} else{//set the default quota when no username is specified |
|
70 | 70 | if($quota === 'default') {//'default' as default quota makes no sense |
71 | 71 | $quota='none'; |
72 | 72 | } |
@@ -87,7 +87,7 @@ |
||
87 | 87 | $ln = array('code' => $lang, 'name' => $potentialName); |
88 | 88 | } elseif ($lang === 'en') { |
89 | 89 | $ln = ['code' => $lang, 'name' => 'English (US)']; |
90 | - }else{//fallback to language code |
|
90 | + } else{//fallback to language code |
|
91 | 91 | $ln=array('code'=>$lang, 'name'=>$lang); |
92 | 92 | } |
93 | 93 |
@@ -82,7 +82,7 @@ |
||
82 | 82 | ]; |
83 | 83 | } |
84 | 84 | $subAdmins = $result; |
85 | -}else{ |
|
85 | +} else{ |
|
86 | 86 | /* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */ |
87 | 87 | $gids = array(); |
88 | 88 | foreach($groups as $group) { |
@@ -39,7 +39,7 @@ |
||
39 | 39 | $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' ); |
40 | 40 | $style1=''; |
41 | 41 | $style2=' active'; |
42 | -}else{ |
|
42 | +} else{ |
|
43 | 43 | $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' ); |
44 | 44 | $style1=' active'; |
45 | 45 | $style2=''; |