@@ -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 | } |
@@ -61,10 +61,19 @@ |
||
| 61 | 61 | <p id="oca_updatenotification_groups"> |
| 62 | 62 | <?php p($l->t('Notify members of the following groups about available updates:')); ?> |
| 63 | 63 | <input name="oca_updatenotification_groups_list" type="hidden" id="oca_updatenotification_groups_list" value="<?php p($_['notify_groups']) ?>" style="width: 400px"><br /> |
| 64 | - <em class="<?php if (!in_array($currentChannel, ['daily', 'git'])) p('hidden'); ?>"> |
|
| 64 | + <em class="<?php if (!in_array($currentChannel, ['daily', 'git'])) { |
|
| 65 | + p('hidden'); |
|
| 66 | +} |
|
| 67 | +?>"> |
|
| 65 | 68 | <?php p($l->t('Only notification for app updates are available.')); ?> |
| 66 | - <?php if ($currentChannel === 'daily') p($l->t('The selected update channel makes dedicated notifications for the server obsolete.')); ?> |
|
| 67 | - <?php if ($currentChannel === 'git') p($l->t('The selected update channel does not support updates of the server.')); ?> |
|
| 69 | + <?php if ($currentChannel === 'daily') { |
|
| 70 | + p($l->t('The selected update channel makes dedicated notifications for the server obsolete.')); |
|
| 71 | +} |
|
| 72 | +?> |
|
| 73 | + <?php if ($currentChannel === 'git') { |
|
| 74 | + p($l->t('The selected update channel does not support updates of the server.')); |
|
| 75 | +} |
|
| 76 | +?> |
|
| 68 | 77 | </em> |
| 69 | 78 | </p> |
| 70 | 79 | </form> |
@@ -34,73 +34,139 @@ |
||
| 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/> |
@@ -47,9 +47,12 @@ discard block |
||
| 47 | 47 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> |
| 48 | 48 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>', |
| 49 | 49 | [$_['usage'], $_['total_space']]));?> |
| 50 | - <?php else: ?> |
|
| 50 | + <?php else { |
|
| 51 | + : ?> |
|
| 51 | 52 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)', |
| 52 | - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> |
|
| 53 | + [$_['usage'], $_['total_space'], $_['usage_relative']])); |
|
| 54 | +} |
|
| 55 | +?> |
|
| 53 | 56 | <?php endif ?> |
| 54 | 57 | </p> |
| 55 | 58 | </div> |
@@ -58,9 +61,12 @@ discard block |
||
| 58 | 61 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> |
| 59 | 62 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>', |
| 60 | 63 | [$_['usage'], $_['total_space']]));?> |
| 61 | - <?php else: ?> |
|
| 64 | + <?php else { |
|
| 65 | + : ?> |
|
| 62 | 66 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)', |
| 63 | - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> |
|
| 67 | + [$_['usage'], $_['total_space'], $_['usage_relative']])); |
|
| 68 | +} |
|
| 69 | +?> |
|
| 64 | 70 | <?php endif ?> |
| 65 | 71 | </p> |
| 66 | 72 | </div> |
@@ -84,8 +90,11 @@ discard block |
||
| 84 | 90 | <div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div> |
| 85 | 91 | <input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield"> |
| 86 | 92 | <p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p> |
| 87 | - <?php else: ?> |
|
| 88 | - <?php p($l->t('Picture provided by original account')); ?> |
|
| 93 | + <?php else { |
|
| 94 | + : ?> |
|
| 95 | + <?php p($l->t('Picture provided by original account')); |
|
| 96 | +} |
|
| 97 | +?> |
|
| 89 | 98 | <?php endif; ?> |
| 90 | 99 | </div> |
| 91 | 100 | |
@@ -134,7 +143,10 @@ discard block |
||
| 134 | 143 | <span class="icon-triangle-s"></span> |
| 135 | 144 | </span> |
| 136 | 145 | </h2> |
| 137 | - <div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>"> |
|
| 146 | + <div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') { |
|
| 147 | + p('hidden'); |
|
| 148 | +} |
|
| 149 | +?>"> |
|
| 138 | 150 | <img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src=" |
| 139 | 151 | <?php |
| 140 | 152 | switch($_['emailVerification']) { |
@@ -175,7 +187,10 @@ discard block |
||
| 175 | 187 | <span class="icon-triangle-s"></span> |
| 176 | 188 | </span> |
| 177 | 189 | </h2> |
| 178 | - <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?> |
|
| 190 | + <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) { |
|
| 191 | + print_unescaped('disabled="1"'); |
|
| 192 | +} |
|
| 193 | +?> |
|
| 179 | 194 | value="<?php p($_['phone']) ?>" |
| 180 | 195 | placeholder="<?php p($l->t('Your phone number')); ?>" |
| 181 | 196 | autocomplete="on" autocapitalize="none" autocorrect="off" /> |
@@ -195,7 +210,10 @@ discard block |
||
| 195 | 210 | <span class="icon-triangle-s"></span> |
| 196 | 211 | </span> |
| 197 | 212 | </h2> |
| 198 | - <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?> |
|
| 213 | + <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) { |
|
| 214 | + print_unescaped('disabled="1"'); |
|
| 215 | +} |
|
| 216 | +?> |
|
| 199 | 217 | placeholder="<?php p($l->t('Your postal address')); ?>" |
| 200 | 218 | value="<?php p($_['address']) ?>" |
| 201 | 219 | autocomplete="on" autocapitalize="none" autocorrect="off" /> |
@@ -216,7 +234,10 @@ discard block |
||
| 216 | 234 | </span> |
| 217 | 235 | </h2> |
| 218 | 236 | <?php if($_['lookupServerUploadEnabled']) { ?> |
| 219 | - <div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>"> |
|
| 237 | + <div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') { |
|
| 238 | + p('hidden'); |
|
| 239 | +} |
|
| 240 | +?>"> |
|
| 220 | 241 | <img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src=" |
| 221 | 242 | <?php |
| 222 | 243 | switch($_['websiteVerification']) { |
@@ -230,13 +251,16 @@ discard block |
||
| 230 | 251 | p(image_path('core', 'actions/verify.svg')); |
| 231 | 252 | } |
| 232 | 253 | ?>" |
| 233 | - <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
|
| 254 | + <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) { |
|
| 255 | + print_unescaped(' class="verify-action"') ?> |
|
| 234 | 256 | > |
| 235 | 257 | <div class="verification-dialog popovermenu bubble menu"> |
| 236 | 258 | <div class="verification-dialog-content"> |
| 237 | 259 | <p class="explainVerification"></p> |
| 238 | 260 | <p class="verificationCode"></p> |
| 239 | - <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> |
|
| 261 | + <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); |
|
| 262 | +} |
|
| 263 | +?></p> |
|
| 240 | 264 | </div> |
| 241 | 265 | </div> |
| 242 | 266 | </div> |
@@ -244,7 +268,10 @@ discard block |
||
| 244 | 268 | <input type="text" name="website" id="website" value="<?php p($_['website']); ?>" |
| 245 | 269 | placeholder="<?php p($l->t('Link https://…')); ?>" |
| 246 | 270 | autocomplete="on" autocapitalize="none" autocorrect="off" |
| 247 | - <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?> |
|
| 271 | + <?php if(!$_['lookupServerUploadEnabled']) { |
|
| 272 | + print_unescaped('disabled="1"'); |
|
| 273 | +} |
|
| 274 | +?> |
|
| 248 | 275 | /> |
| 249 | 276 | <span class="icon-checkmark hidden"></span> |
| 250 | 277 | <?php if($_['lookupServerUploadEnabled']) { ?> |
@@ -263,7 +290,10 @@ discard block |
||
| 263 | 290 | </span> |
| 264 | 291 | </h2> |
| 265 | 292 | <?php if($_['lookupServerUploadEnabled']) { ?> |
| 266 | - <div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>"> |
|
| 293 | + <div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') { |
|
| 294 | + p('hidden'); |
|
| 295 | +} |
|
| 296 | +?>"> |
|
| 267 | 297 | <img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src=" |
| 268 | 298 | <?php |
| 269 | 299 | switch($_['twitterVerification']) { |
@@ -277,13 +307,16 @@ discard block |
||
| 277 | 307 | p(image_path('core', 'actions/verify.svg')); |
| 278 | 308 | } |
| 279 | 309 | ?>" |
| 280 | - <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
|
| 310 | + <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) { |
|
| 311 | + print_unescaped(' class="verify-action"') ?> |
|
| 281 | 312 | > |
| 282 | 313 | <div class="verification-dialog popovermenu bubble menu"> |
| 283 | 314 | <div class="verification-dialog-content"> |
| 284 | 315 | <p class="explainVerification"></p> |
| 285 | 316 | <p class="verificationCode"></p> |
| 286 | - <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> |
|
| 317 | + <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); |
|
| 318 | +} |
|
| 319 | +?></p> |
|
| 287 | 320 | </div> |
| 288 | 321 | </div> |
| 289 | 322 | </div> |
@@ -291,7 +324,10 @@ discard block |
||
| 291 | 324 | <input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>" |
| 292 | 325 | placeholder="<?php p($l->t('Twitter handle @…')); ?>" |
| 293 | 326 | autocomplete="on" autocapitalize="none" autocorrect="off" |
| 294 | - <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?> |
|
| 327 | + <?php if(!$_['lookupServerUploadEnabled']) { |
|
| 328 | + print_unescaped('disabled="1"'); |
|
| 329 | +} |
|
| 330 | +?> |
|
| 295 | 331 | /> |
| 296 | 332 | <span class="icon-checkmark hidden"></span> |
| 297 | 333 | <?php if($_['lookupServerUploadEnabled']) { ?> |
@@ -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" |
@@ -230,7 +230,7 @@ |
||
| 230 | 230 | $r = $l; |
| 231 | 231 | $g = $l; |
| 232 | 232 | $b = $l; // achromatic |
| 233 | - }else{ |
|
| 233 | + } else{ |
|
| 234 | 234 | $q = $l < 0.5 ? $l * (1 + $s) : $l + $s - $l * $s; |
| 235 | 235 | $p = 2 * $l - $q; |
| 236 | 236 | $r = $hue2rgb($p, $q, $h + 1/3); |
@@ -89,7 +89,10 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>"> |
| 91 | 91 | <h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2> |
| 92 | - <?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?> |
|
| 92 | + <?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) { |
|
| 93 | + print_unescaped(''.$_['dependencies'].''); |
|
| 94 | +} |
|
| 95 | +?> |
|
| 93 | 96 | <table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'> |
| 94 | 97 | <thead> |
| 95 | 98 | <tr> |
@@ -98,7 +101,10 @@ discard block |
||
| 98 | 101 | <th><?php p($l->t('External storage')); ?></th> |
| 99 | 102 | <th><?php p($l->t('Authentication')); ?></th> |
| 100 | 103 | <th><?php p($l->t('Configuration')); ?></th> |
| 101 | - <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?> |
|
| 104 | + <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) { |
|
| 105 | + print_unescaped('<th>'.$l->t('Available for').'</th>'); |
|
| 106 | +} |
|
| 107 | +?> |
|
| 102 | 108 | <th> </th> |
| 103 | 109 | <th> </th> |
| 104 | 110 | </tr> |
@@ -130,7 +136,10 @@ discard block |
||
| 130 | 136 | }); |
| 131 | 137 | ?> |
| 132 | 138 | <?php foreach ($sortedBackends as $backend): ?> |
| 133 | - <?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?> |
|
| 139 | + <?php if ($backend->getDeprecateTo()) { |
|
| 140 | + continue; |
|
| 141 | +} |
|
| 142 | +// ignore deprecated backends ?> |
|
| 134 | 143 | <option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option> |
| 135 | 144 | <?php endforeach; ?> |
| 136 | 145 | </select> |
@@ -169,7 +178,10 @@ discard block |
||
| 169 | 178 | |
| 170 | 179 | <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?> |
| 171 | 180 | <input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox" |
| 172 | - value="1" <?php if ($_['allowUserMounting']) print_unescaped(' checked="checked"'); ?> /> |
|
| 181 | + value="1" <?php if ($_['allowUserMounting']) { |
|
| 182 | + print_unescaped(' checked="checked"'); |
|
| 183 | +} |
|
| 184 | +?> /> |
|
| 173 | 185 | <label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span> |
| 174 | 186 | |
| 175 | 187 | <p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>> |
@@ -182,8 +194,14 @@ discard block |
||
| 182 | 194 | <?php $i = 0; foreach ($userBackends as $backend): ?> |
| 183 | 195 | <?php if ($deprecateTo = $backend->getDeprecateTo()): ?> |
| 184 | 196 | <input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" /> |
| 185 | - <?php else: ?> |
|
| 186 | - <input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> /> |
|
| 197 | + <?php else { |
|
| 198 | + : ?> |
|
| 199 | + <input type="checkbox" id="allowUserMountingBackends<?php p($i); |
|
| 200 | +} |
|
| 201 | +?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) { |
|
| 202 | + print_unescaped(' checked="checked"'); |
|
| 203 | +} |
|
| 204 | +?> /> |
|
| 187 | 205 | <label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br /> |
| 188 | 206 | <?php endif; ?> |
| 189 | 207 | <?php $i++; ?> |
@@ -90,10 +90,13 @@ discard block |
||
| 90 | 90 | <div id="preview"> |
| 91 | 91 | <?php if (isset($_['folder'])): ?> |
| 92 | 92 | <?php print_unescaped($_['folder']); ?> |
| 93 | - <?php else: ?> |
|
| 93 | + <?php else { |
|
| 94 | + : ?> |
|
| 94 | 95 | <?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) === 'video'): ?> |
| 95 | 96 | <div id="imgframe"> |
| 96 | - <video tabindex="0" controls="" preload="none" style="max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px"> |
|
| 97 | + <video tabindex="0" controls="" preload="none" style="max-width: <?php p($_['previewMaxX']); |
|
| 98 | +} |
|
| 99 | +?>px; max-height: <?php p($_['previewMaxY']); ?>px"> |
|
| 97 | 100 | <source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" /> |
| 98 | 101 | </video> |
| 99 | 102 | </div> |
@@ -103,10 +106,13 @@ discard block |
||
| 103 | 106 | <source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" /> |
| 104 | 107 | </audio> |
| 105 | 108 | </div> |
| 106 | - <?php else: ?> |
|
| 109 | + <?php else { |
|
| 110 | + : ?> |
|
| 107 | 111 | <!-- Preview frame is filled via JS to support SVG images for modern browsers --> |
| 108 | 112 | <div id="imgframe"></div> |
| 109 | - <?php endif; ?> |
|
| 113 | + <?php endif; |
|
| 114 | +} |
|
| 115 | +?> |
|
| 110 | 116 | <?php if ($_['previewURL'] === $_['downloadURL']): ?> |
| 111 | 117 | <div class="directDownload"> |
| 112 | 118 | <a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button"> |