@@ -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\'')); |
@@ -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 | } |
@@ -165,15 +165,20 @@ |
||
165 | 165 | <span class="crondate" title="<?php p($absolute_time);?>"> |
166 | 166 | <?php p($l->t("Last job ran %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 job execution ran %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("Background job didn’t run yet!")); |
181 | + } |
|
177 | 182 | endif; ?> |
178 | 183 | </p> |
179 | 184 | <a target="_blank" rel="noreferrer noopener" class="icon-info" |
@@ -34,73 +34,139 @@ discard block |
||
34 | 34 | <p class="settings-hint"><?php p($l->t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.'));?></p> |
35 | 35 | <p id="enable"> |
36 | 36 | <input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" class="checkbox" |
37 | - value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> /> |
|
37 | + value="1" <?php if ($_['shareAPIEnabled'] === 'yes') { |
|
38 | + print_unescaped('checked="checked"'); |
|
39 | +} |
|
40 | +?> /> |
|
38 | 41 | <label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/> |
39 | 42 | </p> |
40 | - <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>"> |
|
43 | + <p class="<?php if ($_['shareAPIEnabled'] === 'no') { |
|
44 | + p('hidden'); |
|
45 | +} |
|
46 | +?>"> |
|
41 | 47 | <input type="checkbox" name="shareapi_allow_links" id="allowLinks" class="checkbox" |
42 | - value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> /> |
|
48 | + value="1" <?php if ($_['allowLinks'] === 'yes') { |
|
49 | + print_unescaped('checked="checked"'); |
|
50 | +} |
|
51 | +?> /> |
|
43 | 52 | <label for="allowLinks"><?php p($l->t('Allow users to share via link'));?></label><br/> |
44 | 53 | </p> |
45 | 54 | |
46 | - <p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>"> |
|
55 | + <p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') { |
|
56 | + p('hidden'); |
|
57 | +} |
|
58 | +?>"> |
|
47 | 59 | <input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" class="checkbox" |
48 | - value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> /> |
|
60 | + value="1" <?php if ($_['allowPublicUpload'] == 'yes') { |
|
61 | + print_unescaped('checked="checked"'); |
|
62 | +} |
|
63 | +?> /> |
|
49 | 64 | <label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/> |
50 | 65 | <input type="checkbox" name="shareapi_enable_link_password_by_default" id="enableLinkPasswordByDefault" class="checkbox" |
51 | - value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') print_unescaped('checked="checked"'); ?> /> |
|
66 | + value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') { |
|
67 | + print_unescaped('checked="checked"'); |
|
68 | +} |
|
69 | +?> /> |
|
52 | 70 | <label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password'));?></label><br/> |
53 | 71 | <input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox" |
54 | - value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> /> |
|
72 | + value="1" <?php if ($_['enforceLinkPassword']) { |
|
73 | + print_unescaped('checked="checked"'); |
|
74 | +} |
|
75 | +?> /> |
|
55 | 76 | <label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/> |
56 | 77 | |
57 | 78 | <input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" class="checkbox" |
58 | - value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> /> |
|
79 | + value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') { |
|
80 | + print_unescaped('checked="checked"'); |
|
81 | +} |
|
82 | +?> /> |
|
59 | 83 | <label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/> |
60 | 84 | |
61 | 85 | </p> |
62 | - <p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>"> |
|
86 | + <p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') { |
|
87 | + p('hidden'); |
|
88 | +} |
|
89 | +?>"> |
|
63 | 90 | <?php p($l->t( 'Expire after ' )); ?> |
64 | 91 | <input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>" |
65 | 92 | value='<?php p($_['shareExpireAfterNDays']) ?>' /> |
66 | 93 | <?php p($l->t( 'days' )); ?> |
67 | 94 | <input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate" class="checkbox" |
68 | - value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> /> |
|
95 | + value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') { |
|
96 | + print_unescaped('checked="checked"'); |
|
97 | +} |
|
98 | +?> /> |
|
69 | 99 | <label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/> |
70 | 100 | </p> |
71 | - <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>"> |
|
101 | + <p class="<?php if ($_['shareAPIEnabled'] === 'no') { |
|
102 | + p('hidden'); |
|
103 | +} |
|
104 | +?>"> |
|
72 | 105 | <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" class="checkbox" |
73 | - value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> /> |
|
106 | + value="1" <?php if ($_['allowResharing'] === 'yes') { |
|
107 | + print_unescaped('checked="checked"'); |
|
108 | +} |
|
109 | +?> /> |
|
74 | 110 | <label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/> |
75 | 111 | </p> |
76 | - <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>"> |
|
112 | + <p class="<?php if ($_['shareAPIEnabled'] === 'no') { |
|
113 | + p('hidden'); |
|
114 | +} |
|
115 | +?>"> |
|
77 | 116 | <input type="checkbox" name="shareapi_allow_group_sharing" id="allowGroupSharing" class="checkbox" |
78 | - value="1" <?php if ($_['allowGroupSharing'] === 'yes') print_unescaped('checked="checked"'); ?> /> |
|
117 | + value="1" <?php if ($_['allowGroupSharing'] === 'yes') { |
|
118 | + print_unescaped('checked="checked"'); |
|
119 | +} |
|
120 | +?> /> |
|
79 | 121 | <label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups'));?></label><br /> |
80 | 122 | </p> |
81 | - <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>"> |
|
123 | + <p class="<?php if ($_['shareAPIEnabled'] === 'no') { |
|
124 | + p('hidden'); |
|
125 | +} |
|
126 | +?>"> |
|
82 | 127 | <input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers" class="checkbox" |
83 | - value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> /> |
|
128 | + value="1" <?php if ($_['onlyShareWithGroupMembers']) { |
|
129 | + print_unescaped('checked="checked"'); |
|
130 | +} |
|
131 | +?> /> |
|
84 | 132 | <label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/> |
85 | 133 | </p> |
86 | - <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>"> |
|
134 | + <p class="<?php if ($_['shareAPIEnabled'] === 'no') { |
|
135 | + p('hidden'); |
|
136 | +} |
|
137 | +?>"> |
|
87 | 138 | <input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups" class="checkbox" |
88 | - value="1" <?php if ($_['shareExcludeGroups']) print_unescaped('checked="checked"'); ?> /> |
|
139 | + value="1" <?php if ($_['shareExcludeGroups']) { |
|
140 | + print_unescaped('checked="checked"'); |
|
141 | +} |
|
142 | +?> /> |
|
89 | 143 | <label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/> |
90 | 144 | </p> |
91 | - <p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>"> |
|
145 | + <p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') { |
|
146 | + p('hidden'); |
|
147 | +} |
|
148 | +?>"> |
|
92 | 149 | <input name="shareapi_exclude_groups_list" type="hidden" id="excludedGroups" value="<?php p($_['shareExcludedGroupsList']) ?>" style="width: 400px" class="noJSAutoUpdate"/> |
93 | 150 | <br /> |
94 | 151 | <em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em> |
95 | 152 | </p> |
96 | - <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>"> |
|
153 | + <p class="<?php if ($_['shareAPIEnabled'] === 'no') { |
|
154 | + p('hidden'); |
|
155 | +} |
|
156 | +?>"> |
|
97 | 157 | <input type="checkbox" name="shareapi_allow_share_dialog_user_enumeration" value="1" id="shareapi_allow_share_dialog_user_enumeration" class="checkbox" |
98 | - <?php if ($_['allowShareDialogUserEnumeration'] === 'yes') print_unescaped('checked="checked"'); ?> /> |
|
158 | + <?php if ($_['allowShareDialogUserEnumeration'] === 'yes') { |
|
159 | + print_unescaped('checked="checked"'); |
|
160 | +} |
|
161 | +?> /> |
|
99 | 162 | <label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog. If this is disabled the full username or email address needs to be entered.'));?></label><br /> |
100 | 163 | </p> |
101 | 164 | <p> |
102 | 165 | <input type="checkbox" id="publicShareDisclaimer" class="checkbox noJSAutoUpdate" |
103 | - <?php if ($_['publicShareDisclaimerText'] !== null) print_unescaped('checked="checked"'); ?> /> |
|
166 | + <?php if ($_['publicShareDisclaimerText'] !== null) { |
|
167 | + print_unescaped('checked="checked"'); |
|
168 | +} |
|
169 | +?> /> |
|
104 | 170 | <label for="publicShareDisclaimer"><?php p($l->t('Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)'));?></label> |
105 | 171 | <span id="publicShareDisclaimerStatus" class="msg" style="display:none"></span> |
106 | 172 | <br/> |
@@ -110,10 +176,16 @@ discard block |
||
110 | 176 | <h3><?php p($l->t('Default share permissions'));?></h3> |
111 | 177 | <input type="hidden" name="shareapi_default_permissions" id="shareApiDefaultPermissions" class="checkbox" |
112 | 178 | value="<?php p($_['shareApiDefaultPermissions']) ?>" /> |
113 | - <p id="shareApiDefaultPermissionsSection" class="indent <?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>"> |
|
179 | + <p id="shareApiDefaultPermissionsSection" class="indent <?php if ($_['shareAPIEnabled'] === 'no') { |
|
180 | + p('hidden'); |
|
181 | +} |
|
182 | +?>"> |
|
114 | 183 | <?php foreach ($_['shareApiDefaultPermissionsCheckboxes'] as $perm): ?> |
115 | 184 | <input type="checkbox" name="shareapi_default_permission_<?php p($perm['id']) ?>" id="shareapi_default_permission_<?php p($perm['id']) ?>" |
116 | - class="noautosave checkbox" value="<?php p($perm['value']) ?>" <?php if (($_['shareApiDefaultPermissions'] & $perm['value']) !== 0) print_unescaped('checked="checked"'); ?> /> |
|
185 | + class="noautosave checkbox" value="<?php p($perm['value']) ?>" <?php if (($_['shareApiDefaultPermissions'] & $perm['value']) !== 0) { |
|
186 | + print_unescaped('checked="checked"'); |
|
187 | +} |
|
188 | +?> /> |
|
117 | 189 | <label for="shareapi_default_permission_<?php p($perm['id']) ?>"><?php p($perm['label']);?></label> |
118 | 190 | <?php endforeach ?> |
119 | 191 | </p> |
@@ -103,8 +103,7 @@ |
||
103 | 103 | $connection->executeUpdate($query); |
104 | 104 | $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'"; |
105 | 105 | $connection->executeUpdate($query); |
106 | - } |
|
107 | - catch (\Exception $ex){ |
|
106 | + } catch (\Exception $ex){ |
|
108 | 107 | $this->logger->logException($ex, [ |
109 | 108 | 'message' => 'Database user creation failed.', |
110 | 109 | 'level' => \OCP\Util::ERROR, |
@@ -34,17 +34,23 @@ |
||
34 | 34 | <div id="preview"> |
35 | 35 | <?php if (isset($_['folder'])): ?> |
36 | 36 | <?php print_unescaped($_['folder']); ?> |
37 | - <?php else: ?> |
|
37 | + <?php else { |
|
38 | + : ?> |
|
38 | 39 | <?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'audio'): ?> |
39 | 40 | <div id="imgframe"> |
40 | - <audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px"> |
|
41 | + <audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']); |
|
42 | +} |
|
43 | +?>px; max-height: <?php p($_['previewMaxY']); ?>px"> |
|
41 | 44 | <source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" /> |
42 | 45 | </audio> |
43 | 46 | </div> |
44 | - <?php else: ?> |
|
47 | + <?php else { |
|
48 | + : ?> |
|
45 | 49 | <!-- Preview frame is filled via JS to support SVG images for modern browsers --> |
46 | 50 | <div id="imgframe"></div> |
47 | - <?php endif; ?> |
|
51 | + <?php endif; |
|
52 | +} |
|
53 | +?> |
|
48 | 54 | <?php if ($_['previewURL'] === $_['downloadURL']): ?> |
49 | 55 | <div class="directDownload"> |
50 | 56 | <a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button"> |
@@ -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 |
@@ -46,9 +46,12 @@ discard block |
||
46 | 46 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> |
47 | 47 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>', |
48 | 48 | [$_['usage'], $_['total_space']]));?> |
49 | - <?php else: ?> |
|
49 | + <?php else { |
|
50 | + : ?> |
|
50 | 51 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)', |
51 | - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> |
|
52 | + [$_['usage'], $_['total_space'], $_['usage_relative']])); |
|
53 | +} |
|
54 | +?> |
|
52 | 55 | <?php endif ?> |
53 | 56 | </p> |
54 | 57 | </div> |
@@ -57,9 +60,12 @@ discard block |
||
57 | 60 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> |
58 | 61 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>', |
59 | 62 | [$_['usage'], $_['total_space']]));?> |
60 | - <?php else: ?> |
|
63 | + <?php else { |
|
64 | + : ?> |
|
61 | 65 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)', |
62 | - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> |
|
66 | + [$_['usage'], $_['total_space'], $_['usage_relative']])); |
|
67 | +} |
|
68 | +?> |
|
63 | 69 | <?php endif ?> |
64 | 70 | </p> |
65 | 71 | </div> |
@@ -83,8 +89,11 @@ discard block |
||
83 | 89 | <div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div> |
84 | 90 | <input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield"> |
85 | 91 | <p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p> |
86 | - <?php else: ?> |
|
87 | - <?php p($l->t('Picture provided by original account')); ?> |
|
92 | + <?php else { |
|
93 | + : ?> |
|
94 | + <?php p($l->t('Picture provided by original account')); |
|
95 | +} |
|
96 | +?> |
|
88 | 97 | <?php endif; ?> |
89 | 98 | </div> |
90 | 99 | |
@@ -133,7 +142,10 @@ discard block |
||
133 | 142 | <span class="icon-triangle-s"></span> |
134 | 143 | </span> |
135 | 144 | </h2> |
136 | - <div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>"> |
|
145 | + <div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') { |
|
146 | + p('hidden'); |
|
147 | +} |
|
148 | +?>"> |
|
137 | 149 | <img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src=" |
138 | 150 | <?php |
139 | 151 | switch($_['emailVerification']) { |
@@ -174,7 +186,10 @@ discard block |
||
174 | 186 | <span class="icon-triangle-s"></span> |
175 | 187 | </span> |
176 | 188 | </h2> |
177 | - <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?> |
|
189 | + <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) { |
|
190 | + print_unescaped('disabled="1"'); |
|
191 | +} |
|
192 | +?> |
|
178 | 193 | value="<?php p($_['phone']) ?>" |
179 | 194 | placeholder="<?php p($l->t('Your phone number')); ?>" |
180 | 195 | autocomplete="on" autocapitalize="none" autocorrect="off" /> |
@@ -194,7 +209,10 @@ discard block |
||
194 | 209 | <span class="icon-triangle-s"></span> |
195 | 210 | </span> |
196 | 211 | </h2> |
197 | - <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?> |
|
212 | + <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) { |
|
213 | + print_unescaped('disabled="1"'); |
|
214 | +} |
|
215 | +?> |
|
198 | 216 | placeholder="<?php p($l->t('Your postal address')); ?>" |
199 | 217 | value="<?php p($_['address']) ?>" |
200 | 218 | autocomplete="on" autocapitalize="none" autocorrect="off" /> |
@@ -215,7 +233,10 @@ discard block |
||
215 | 233 | </span> |
216 | 234 | </h2> |
217 | 235 | <?php if($_['lookupServerUploadEnabled']) { ?> |
218 | - <div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>"> |
|
236 | + <div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') { |
|
237 | + p('hidden'); |
|
238 | +} |
|
239 | +?>"> |
|
219 | 240 | <img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src=" |
220 | 241 | <?php |
221 | 242 | switch($_['websiteVerification']) { |
@@ -229,13 +250,16 @@ discard block |
||
229 | 250 | p(image_path('core', 'actions/verify.svg')); |
230 | 251 | } |
231 | 252 | ?>" |
232 | - <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
|
253 | + <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) { |
|
254 | + print_unescaped(' class="verify-action"') ?> |
|
233 | 255 | > |
234 | 256 | <div class="verification-dialog popovermenu bubble menu"> |
235 | 257 | <div class="verification-dialog-content"> |
236 | 258 | <p class="explainVerification"></p> |
237 | 259 | <p class="verificationCode"></p> |
238 | - <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> |
|
260 | + <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); |
|
261 | +} |
|
262 | +?></p> |
|
239 | 263 | </div> |
240 | 264 | </div> |
241 | 265 | </div> |
@@ -243,7 +267,10 @@ discard block |
||
243 | 267 | <input type="url" name="website" id="website" value="<?php p($_['website']); ?>" |
244 | 268 | placeholder="<?php p($l->t('Link https://…')); ?>" |
245 | 269 | autocomplete="on" autocapitalize="none" autocorrect="off" |
246 | - <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?> |
|
270 | + <?php if(!$_['lookupServerUploadEnabled']) { |
|
271 | + print_unescaped('disabled="1"'); |
|
272 | +} |
|
273 | +?> |
|
247 | 274 | /> |
248 | 275 | <span class="icon-checkmark hidden"></span> |
249 | 276 | <?php if($_['lookupServerUploadEnabled']) { ?> |
@@ -262,7 +289,10 @@ discard block |
||
262 | 289 | </span> |
263 | 290 | </h2> |
264 | 291 | <?php if($_['lookupServerUploadEnabled']) { ?> |
265 | - <div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>"> |
|
292 | + <div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') { |
|
293 | + p('hidden'); |
|
294 | +} |
|
295 | +?>"> |
|
266 | 296 | <img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src=" |
267 | 297 | <?php |
268 | 298 | switch($_['twitterVerification']) { |
@@ -276,13 +306,16 @@ discard block |
||
276 | 306 | p(image_path('core', 'actions/verify.svg')); |
277 | 307 | } |
278 | 308 | ?>" |
279 | - <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
|
309 | + <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) { |
|
310 | + print_unescaped(' class="verify-action"') ?> |
|
280 | 311 | > |
281 | 312 | <div class="verification-dialog popovermenu bubble menu"> |
282 | 313 | <div class="verification-dialog-content"> |
283 | 314 | <p class="explainVerification"></p> |
284 | 315 | <p class="verificationCode"></p> |
285 | - <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> |
|
316 | + <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); |
|
317 | +} |
|
318 | +?></p> |
|
286 | 319 | </div> |
287 | 320 | </div> |
288 | 321 | </div> |
@@ -290,7 +323,10 @@ discard block |
||
290 | 323 | <input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>" |
291 | 324 | placeholder="<?php p($l->t('Twitter handle @…')); ?>" |
292 | 325 | autocomplete="on" autocapitalize="none" autocorrect="off" |
293 | - <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?> |
|
326 | + <?php if(!$_['lookupServerUploadEnabled']) { |
|
327 | + print_unescaped('disabled="1"'); |
|
328 | +} |
|
329 | +?> |
|
294 | 330 | /> |
295 | 331 | <span class="icon-checkmark hidden"></span> |
296 | 332 | <?php if($_['lookupServerUploadEnabled']) { ?> |