@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | /** @var array $_ */ |
27 | 27 | |
28 | 28 | script('settings', [ |
29 | - 'usersettings', |
|
30 | - 'templates', |
|
31 | - 'federationsettingsview', |
|
32 | - 'federationscopemenu', |
|
33 | - 'settings/personalInfo', |
|
29 | + 'usersettings', |
|
30 | + 'templates', |
|
31 | + 'federationsettingsview', |
|
32 | + 'federationscopemenu', |
|
33 | + 'settings/personalInfo', |
|
34 | 34 | ]); |
35 | 35 | ?> |
36 | 36 | |
@@ -84,10 +84,10 @@ discard block |
||
84 | 84 | <p class="quotatext"> |
85 | 85 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> |
86 | 86 | <?php print_unescaped($l->t('You are using <strong>%s</strong>', |
87 | - [$_['usage']]));?> |
|
87 | + [$_['usage']]));?> |
|
88 | 88 | <?php else: ?> |
89 | 89 | <?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)', |
90 | - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> |
|
90 | + [$_['usage'], $_['total_space'], $_['usage_relative']]));?> |
|
91 | 91 | <?php endif ?> |
92 | 92 | </p> |
93 | 93 | </div> |
@@ -109,16 +109,16 @@ discard block |
||
109 | 109 | </h3> |
110 | 110 | <input type="text" id="displayname" name="displayname" |
111 | 111 | <?php if (!$_['displayNameChangeSupported']) { |
112 | - print_unescaped('class="hidden"'); |
|
113 | - } ?> |
|
112 | + print_unescaped('class="hidden"'); |
|
113 | + } ?> |
|
114 | 114 | value="<?php p($_['displayName']) ?>" |
115 | 115 | autocomplete="on" autocapitalize="none" autocorrect="off" /> |
116 | 116 | <?php if (!$_['displayNameChangeSupported']) { ?> |
117 | 117 | <span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { |
118 | - p($_['displayName']); |
|
119 | - } else { |
|
120 | - p($l->t('No display name set')); |
|
121 | - } ?></span> |
|
118 | + p($_['displayName']); |
|
119 | + } else { |
|
120 | + p($l->t('No display name set')); |
|
121 | + } ?></span> |
|
122 | 122 | <?php } ?> |
123 | 123 | <span class="icon-checkmark hidden"></span> |
124 | 124 | <span class="icon-error hidden" ></span> |
@@ -138,36 +138,36 @@ discard block |
||
138 | 138 | </a> |
139 | 139 | </h3> |
140 | 140 | <div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') { |
141 | - p('hidden'); |
|
142 | - } ?>"> |
|
141 | + p('hidden'); |
|
142 | + } ?>"> |
|
143 | 143 | <img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src=" |
144 | 144 | <?php |
145 | - switch ($_['emailVerification']) { |
|
146 | - case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
147 | - p(image_path('core', 'actions/verifying.svg')); |
|
148 | - break; |
|
149 | - case \OC\Accounts\AccountManager::VERIFIED: |
|
150 | - p(image_path('core', 'actions/verified.svg')); |
|
151 | - break; |
|
152 | - default: |
|
153 | - p(image_path('core', 'actions/verify.svg')); |
|
154 | - } |
|
155 | - ?>"> |
|
145 | + switch ($_['emailVerification']) { |
|
146 | + case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
147 | + p(image_path('core', 'actions/verifying.svg')); |
|
148 | + break; |
|
149 | + case \OC\Accounts\AccountManager::VERIFIED: |
|
150 | + p(image_path('core', 'actions/verified.svg')); |
|
151 | + break; |
|
152 | + default: |
|
153 | + p(image_path('core', 'actions/verify.svg')); |
|
154 | + } |
|
155 | + ?>"> |
|
156 | 156 | </div> |
157 | 157 | <input type="email" name="email" id="email" value="<?php p($_['email']); ?>" |
158 | 158 | <?php if (!$_['displayNameChangeSupported']) { |
159 | - print_unescaped('class="hidden"'); |
|
160 | - } ?> |
|
159 | + print_unescaped('class="hidden"'); |
|
160 | + } ?> |
|
161 | 161 | placeholder="<?php p($l->t('Your email address')); ?>" |
162 | 162 | autocomplete="on" autocapitalize="none" autocorrect="off" /> |
163 | 163 | <span class="icon-checkmark hidden"></span> |
164 | 164 | <span class="icon-error hidden" ></span> |
165 | 165 | <?php if (!$_['displayNameChangeSupported']) { ?> |
166 | 166 | <span><?php if (isset($_['email']) && !empty($_['email'])) { |
167 | - p($_['email']); |
|
168 | - } else { |
|
169 | - p($l->t('No email address set')); |
|
170 | - }?></span> |
|
167 | + p($_['email']); |
|
168 | + } else { |
|
169 | + p($l->t('No email address set')); |
|
170 | + }?></span> |
|
171 | 171 | <?php } ?> |
172 | 172 | <?php if ($_['displayNameChangeSupported']) { ?> |
173 | 173 | <em><?php p($l->t('For password reset and notifications')); ?></em> |
@@ -227,24 +227,24 @@ discard block |
||
227 | 227 | </h3> |
228 | 228 | <?php if ($_['lookupServerUploadEnabled']) { ?> |
229 | 229 | <div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') { |
230 | - p('hidden'); |
|
231 | - } ?>"> |
|
230 | + p('hidden'); |
|
231 | + } ?>"> |
|
232 | 232 | <img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src=" |
233 | 233 | <?php |
234 | - switch ($_['websiteVerification']) { |
|
235 | - case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
236 | - p(image_path('core', 'actions/verifying.svg')); |
|
237 | - break; |
|
238 | - case \OC\Accounts\AccountManager::VERIFIED: |
|
239 | - p(image_path('core', 'actions/verified.svg')); |
|
240 | - break; |
|
241 | - default: |
|
242 | - p(image_path('core', 'actions/verify.svg')); |
|
243 | - } |
|
244 | - ?>" |
|
234 | + switch ($_['websiteVerification']) { |
|
235 | + case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
236 | + p(image_path('core', 'actions/verifying.svg')); |
|
237 | + break; |
|
238 | + case \OC\Accounts\AccountManager::VERIFIED: |
|
239 | + p(image_path('core', 'actions/verified.svg')); |
|
240 | + break; |
|
241 | + default: |
|
242 | + p(image_path('core', 'actions/verify.svg')); |
|
243 | + } |
|
244 | + ?>" |
|
245 | 245 | <?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) { |
246 | - print_unescaped(' class="verify-action"'); |
|
247 | - } ?> |
|
246 | + print_unescaped(' class="verify-action"'); |
|
247 | + } ?> |
|
248 | 248 | > |
249 | 249 | <div class="verification-dialog popovermenu bubble menu"> |
250 | 250 | <div class="verification-dialog-content"> |
@@ -276,24 +276,24 @@ discard block |
||
276 | 276 | </h3> |
277 | 277 | <?php if ($_['lookupServerUploadEnabled']) { ?> |
278 | 278 | <div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') { |
279 | - p('hidden'); |
|
280 | - } ?>"> |
|
279 | + p('hidden'); |
|
280 | + } ?>"> |
|
281 | 281 | <img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src=" |
282 | 282 | <?php |
283 | - switch ($_['twitterVerification']) { |
|
284 | - case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
285 | - p(image_path('core', 'actions/verifying.svg')); |
|
286 | - break; |
|
287 | - case \OC\Accounts\AccountManager::VERIFIED: |
|
288 | - p(image_path('core', 'actions/verified.svg')); |
|
289 | - break; |
|
290 | - default: |
|
291 | - p(image_path('core', 'actions/verify.svg')); |
|
292 | - } |
|
293 | - ?>" |
|
283 | + switch ($_['twitterVerification']) { |
|
284 | + case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
285 | + p(image_path('core', 'actions/verifying.svg')); |
|
286 | + break; |
|
287 | + case \OC\Accounts\AccountManager::VERIFIED: |
|
288 | + p(image_path('core', 'actions/verified.svg')); |
|
289 | + break; |
|
290 | + default: |
|
291 | + p(image_path('core', 'actions/verify.svg')); |
|
292 | + } |
|
293 | + ?>" |
|
294 | 294 | <?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) { |
295 | - print_unescaped(' class="verify-action"'); |
|
296 | - } ?> |
|
295 | + print_unescaped(' class="verify-action"'); |
|
296 | + } ?> |
|
297 | 297 | > |
298 | 298 | <div class="verification-dialog popovermenu bubble menu"> |
299 | 299 | <div class="verification-dialog-content"> |
@@ -55,8 +55,11 @@ discard block |
||
55 | 55 | <button class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></button> |
56 | 56 | <input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield" accept="image/*"> |
57 | 57 | <p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p> |
58 | - <?php else: ?> |
|
59 | - <?php p($l->t('Picture provided by original account')); ?> |
|
58 | + <?php else { |
|
59 | + : ?> |
|
60 | + <?php p($l->t('Picture provided by original account')); |
|
61 | +} |
|
62 | +?> |
|
60 | 63 | <?php endif; ?> |
61 | 64 | </div> |
62 | 65 | |
@@ -85,9 +88,12 @@ discard block |
||
85 | 88 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> |
86 | 89 | <?php print_unescaped($l->t('You are using <strong>%s</strong>', |
87 | 90 | [$_['usage']]));?> |
88 | - <?php else: ?> |
|
91 | + <?php else { |
|
92 | + : ?> |
|
89 | 93 | <?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)', |
90 | - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> |
|
94 | + [$_['usage'], $_['total_space'], $_['usage_relative']])); |
|
95 | +} |
|
96 | +?> |
|
91 | 97 | <?php endif ?> |
92 | 98 | </p> |
93 | 99 | </div> |
@@ -6,11 +6,11 @@ discard block |
||
6 | 6 | |
7 | 7 | <?php |
8 | 8 | |
9 | - $pinned = 0; |
|
10 | - foreach ($_['navigationItems'] as $item) { |
|
11 | - $pinned = NavigationListElements($item, $l, $pinned); |
|
12 | - } |
|
13 | - ?> |
|
9 | + $pinned = 0; |
|
10 | + foreach ($_['navigationItems'] as $item) { |
|
11 | + $pinned = NavigationListElements($item, $l, $pinned); |
|
12 | + } |
|
13 | + ?> |
|
14 | 14 | |
15 | 15 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> |
16 | 16 | <li id="quota" class="pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>"> |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | * @return int Returns the pinned value |
72 | 72 | */ |
73 | 73 | function NavigationListElements($item, $l, $pinned) { |
74 | - strpos($item['classes'] ?? '', 'pinned') !== false ? $pinned++ : ''; ?> |
|
74 | + strpos($item['classes'] ?? '', 'pinned') !== false ? $pinned++ : ''; ?> |
|
75 | 75 | <li |
76 | 76 | data-id="<?php p($item['id']) ?>" |
77 | 77 | <?php if (isset($item['dir'])) { ?> data-dir="<?php p($item['dir']); ?>" <?php } ?> |
@@ -79,8 +79,8 @@ discard block |
||
79 | 79 | <?php if (isset($item['expandedState'])) { ?> data-expandedstate="<?php p($item['expandedState']); ?>" <?php } ?> |
80 | 80 | class="nav-<?php p($item['id']) ?> |
81 | 81 | <?php if (isset($item['classes'])) { |
82 | - p($item['classes']); |
|
83 | - } ?> |
|
82 | + p($item['classes']); |
|
83 | + } ?> |
|
84 | 84 | <?php p($pinned === 1 ? 'first-pinned' : '') ?> |
85 | 85 | <?php if (isset($item['defaultExpandedState']) && $item['defaultExpandedState']) { ?> open<?php } ?>" |
86 | 86 | <?php if (isset($item['folderPosition'])) { ?> folderposition="<?php p($item['folderPosition']); ?>" <?php } ?>> |
@@ -90,26 +90,26 @@ discard block |
||
90 | 90 | |
91 | 91 | |
92 | 92 | <?php |
93 | - NavigationElementMenu($item); |
|
94 | - if (isset($item['sublist'])) { |
|
95 | - ?> |
|
93 | + NavigationElementMenu($item); |
|
94 | + if (isset($item['sublist'])) { |
|
95 | + ?> |
|
96 | 96 | <button class="collapse app-navigation-noclose" |
97 | 97 | aria-label="<?php p($l->t('Toggle %1$s sublist', $item['name'])) ?>" |
98 | 98 | <?php if (sizeof($item['sublist']) == 0) { ?> style="display: none" <?php } ?>> |
99 | 99 | </button> |
100 | 100 | <ul id="sublist-<?php p($item['id']); ?>"> |
101 | 101 | <?php |
102 | - foreach ($item['sublist'] as $item) { |
|
103 | - $pinned = NavigationListElements($item, $l, $pinned); |
|
104 | - } ?> |
|
102 | + foreach ($item['sublist'] as $item) { |
|
103 | + $pinned = NavigationListElements($item, $l, $pinned); |
|
104 | + } ?> |
|
105 | 105 | </ul> |
106 | 106 | <?php |
107 | - } ?> |
|
107 | + } ?> |
|
108 | 108 | </li> |
109 | 109 | |
110 | 110 | |
111 | 111 | <?php |
112 | - return $pinned; |
|
112 | + return $pinned; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | /** |
@@ -120,8 +120,8 @@ discard block |
||
120 | 120 | * @return void |
121 | 121 | */ |
122 | 122 | function NavigationElementMenu($item) { |
123 | - if (isset($item['menubuttons']) && $item['menubuttons'] === 'true') { |
|
124 | - ?> |
|
123 | + if (isset($item['menubuttons']) && $item['menubuttons'] === 'true') { |
|
124 | + ?> |
|
125 | 125 | <div id="dotmenu-<?php p($item['id']); ?>" |
126 | 126 | class="app-navigation-entry-utils" <?php if (isset($item['enableMenuButton']) && $item['enableMenuButton'] === 0) { ?> style="display: none"<?php } ?>> |
127 | 127 | <ul> |
@@ -137,5 +137,5 @@ discard block |
||
137 | 137 | </ul> |
138 | 138 | </div> |
139 | 139 | <?php |
140 | - } |
|
140 | + } |
|
141 | 141 | } |