@@ -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 | |
@@ -94,7 +94,10 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>"> |
| 96 | 96 | <h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2> |
| 97 | - <?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?> |
|
| 97 | + <?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) { |
|
| 98 | + print_unescaped(''.$_['dependencies'].''); |
|
| 99 | +} |
|
| 100 | +?> |
|
| 98 | 101 | <table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'> |
| 99 | 102 | <thead> |
| 100 | 103 | <tr> |
@@ -103,7 +106,10 @@ discard block |
||
| 103 | 106 | <th><?php p($l->t('External storage')); ?></th> |
| 104 | 107 | <th><?php p($l->t('Authentication')); ?></th> |
| 105 | 108 | <th><?php p($l->t('Configuration')); ?></th> |
| 106 | - <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?> |
|
| 109 | + <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) { |
|
| 110 | + print_unescaped('<th>'.$l->t('Available for').'</th>'); |
|
| 111 | +} |
|
| 112 | +?> |
|
| 107 | 113 | <th> </th> |
| 108 | 114 | <th> </th> |
| 109 | 115 | <th> </th> |
@@ -136,7 +142,10 @@ discard block |
||
| 136 | 142 | }); |
| 137 | 143 | ?> |
| 138 | 144 | <?php foreach ($sortedBackends as $backend): ?> |
| 139 | - <?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?> |
|
| 145 | + <?php if ($backend->getDeprecateTo()) { |
|
| 146 | + continue; |
|
| 147 | +} |
|
| 148 | +// ignore deprecated backends ?> |
|
| 140 | 149 | <option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option> |
| 141 | 150 | <?php endforeach; ?> |
| 142 | 151 | </select> |
@@ -164,7 +173,10 @@ discard block |
||
| 164 | 173 | |
| 165 | 174 | <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?> |
| 166 | 175 | <input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox" |
| 167 | - value="1" <?php if ($_['allowUserMounting']) print_unescaped(' checked="checked"'); ?> /> |
|
| 176 | + value="1" <?php if ($_['allowUserMounting']) { |
|
| 177 | + print_unescaped(' checked="checked"'); |
|
| 178 | +} |
|
| 179 | +?> /> |
|
| 168 | 180 | <label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span> |
| 169 | 181 | |
| 170 | 182 | <p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>> |
@@ -177,8 +189,14 @@ discard block |
||
| 177 | 189 | <?php $i = 0; foreach ($userBackends as $backend): ?> |
| 178 | 190 | <?php if ($deprecateTo = $backend->getDeprecateTo()): ?> |
| 179 | 191 | <input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" /> |
| 180 | - <?php else: ?> |
|
| 181 | - <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"'); ?> /> |
|
| 192 | + <?php else { |
|
| 193 | + : ?> |
|
| 194 | + <input type="checkbox" id="allowUserMountingBackends<?php p($i); |
|
| 195 | +} |
|
| 196 | +?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) { |
|
| 197 | + print_unescaped(' checked="checked"'); |
|
| 198 | +} |
|
| 199 | +?> /> |
|
| 182 | 200 | <label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br /> |
| 183 | 201 | <?php endif; ?> |
| 184 | 202 | <?php $i++; ?> |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | |
| 36 | 36 | if(OCA\Files_Versions\Storage::rollback( $file, $revision )) { |
| 37 | 37 | \OC_JSON::success(array("data" => array( "revision" => $revision, "file" => $file ))); |
| 38 | -}else{ |
|
| 38 | +} else{ |
|
| 39 | 39 | $l = \OC::$server->getL10N('files_versions'); |
| 40 | 40 | \OC_JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) )))); |
| 41 | 41 | } |
@@ -479,7 +479,7 @@ |
||
| 479 | 479 | } |
| 480 | 480 | if ($quota === 0) { |
| 481 | 481 | $quota = 'default'; |
| 482 | - }else if ($quota === -1) { |
|
| 482 | + } else if ($quota === -1) { |
|
| 483 | 483 | $quota = 'none'; |
| 484 | 484 | } else { |
| 485 | 485 | $quota = \OCP\Util::humanFileSize($quota); |
@@ -104,8 +104,7 @@ |
||
| 104 | 104 | $connection->executeUpdate($query); |
| 105 | 105 | $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'"; |
| 106 | 106 | $connection->executeUpdate($query); |
| 107 | - } |
|
| 108 | - catch (\Exception $ex){ |
|
| 107 | + } catch (\Exception $ex){ |
|
| 109 | 108 | $this->logger->logException($ex, [ |
| 110 | 109 | 'message' => 'Database user creation failed.', |
| 111 | 110 | 'level' => ILogger::ERROR, |
@@ -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, ILogger::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 = \OC::$server->getTempManager()->getTemporaryFile($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 | } |
@@ -459,7 +459,7 @@ |
||
| 459 | 459 | $appDir = OC_App::getInstallPath() . '/' . $appId; |
| 460 | 460 | OC_Helper::rmdirr($appDir); |
| 461 | 461 | return true; |
| 462 | - }else{ |
|
| 462 | + } else{ |
|
| 463 | 463 | \OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', ILogger::ERROR); |
| 464 | 464 | |
| 465 | 465 | return false; |
@@ -58,8 +58,11 @@ discard block |
||
| 58 | 58 | <div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div> |
| 59 | 59 | <input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield"> |
| 60 | 60 | <p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p> |
| 61 | - <?php else: ?> |
|
| 62 | - <?php p($l->t('Picture provided by original account')); ?> |
|
| 61 | + <?php else { |
|
| 62 | + : ?> |
|
| 63 | + <?php p($l->t('Picture provided by original account')); |
|
| 64 | +} |
|
| 65 | +?> |
|
| 63 | 66 | <?php endif; ?> |
| 64 | 67 | </div> |
| 65 | 68 | |
@@ -89,9 +92,12 @@ discard block |
||
| 89 | 92 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> |
| 90 | 93 | <?php print_unescaped($l->t('You are using <strong>%s</strong>', |
| 91 | 94 | [$_['usage']]));?> |
| 92 | - <?php else: ?> |
|
| 95 | + <?php else { |
|
| 96 | + : ?> |
|
| 93 | 97 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)', |
| 94 | - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> |
|
| 98 | + [$_['usage'], $_['total_space'], $_['usage_relative']])); |
|
| 99 | +} |
|
| 100 | +?> |
|
| 95 | 101 | <?php endif ?> |
| 96 | 102 | </p> |
| 97 | 103 | </div> |
@@ -135,7 +141,10 @@ discard block |
||
| 135 | 141 | </span> |
| 136 | 142 | </div> |
| 137 | 143 | </h2> |
| 138 | - <div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>"> |
|
| 144 | + <div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') { |
|
| 145 | + p('hidden'); |
|
| 146 | +} |
|
| 147 | +?>"> |
|
| 139 | 148 | <img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src=" |
| 140 | 149 | <?php |
| 141 | 150 | switch($_['emailVerification']) { |
@@ -178,7 +187,10 @@ discard block |
||
| 178 | 187 | </span> |
| 179 | 188 | </div> |
| 180 | 189 | </h2> |
| 181 | - <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 | +?> |
|
| 182 | 194 | value="<?php p($_['phone']) ?>" |
| 183 | 195 | placeholder="<?php p($l->t('Your phone number')); ?>" |
| 184 | 196 | autocomplete="on" autocapitalize="none" autocorrect="off" /> |
@@ -200,7 +212,10 @@ discard block |
||
| 200 | 212 | </span> |
| 201 | 213 | </div> |
| 202 | 214 | </h2> |
| 203 | - <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?> |
|
| 215 | + <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) { |
|
| 216 | + print_unescaped('disabled="1"'); |
|
| 217 | +} |
|
| 218 | +?> |
|
| 204 | 219 | placeholder="<?php p($l->t('Your postal address')); ?>" |
| 205 | 220 | value="<?php p($_['address']) ?>" |
| 206 | 221 | autocomplete="on" autocapitalize="none" autocorrect="off" /> |
@@ -223,7 +238,10 @@ discard block |
||
| 223 | 238 | </div> |
| 224 | 239 | </h2> |
| 225 | 240 | <?php if($_['lookupServerUploadEnabled']) { ?> |
| 226 | - <div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>"> |
|
| 241 | + <div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') { |
|
| 242 | + p('hidden'); |
|
| 243 | +} |
|
| 244 | +?>"> |
|
| 227 | 245 | <img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src=" |
| 228 | 246 | <?php |
| 229 | 247 | switch($_['websiteVerification']) { |
@@ -237,13 +255,16 @@ discard block |
||
| 237 | 255 | p(image_path('core', 'actions/verify.svg')); |
| 238 | 256 | } |
| 239 | 257 | ?>" |
| 240 | - <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
|
| 258 | + <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) { |
|
| 259 | + print_unescaped(' class="verify-action"') ?> |
|
| 241 | 260 | > |
| 242 | 261 | <div class="verification-dialog popovermenu bubble menu"> |
| 243 | 262 | <div class="verification-dialog-content"> |
| 244 | 263 | <p class="explainVerification"></p> |
| 245 | 264 | <p class="verificationCode"></p> |
| 246 | - <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> |
|
| 265 | + <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); |
|
| 266 | +} |
|
| 267 | +?></p> |
|
| 247 | 268 | </div> |
| 248 | 269 | </div> |
| 249 | 270 | </div> |
@@ -251,7 +272,10 @@ discard block |
||
| 251 | 272 | <input type="url" name="website" id="website" value="<?php p($_['website']); ?>" |
| 252 | 273 | placeholder="<?php p($l->t('Link https://…')); ?>" |
| 253 | 274 | autocomplete="on" autocapitalize="none" autocorrect="off" |
| 254 | - <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?> |
|
| 275 | + <?php if(!$_['lookupServerUploadEnabled']) { |
|
| 276 | + print_unescaped('disabled="1"'); |
|
| 277 | +} |
|
| 278 | +?> |
|
| 255 | 279 | /> |
| 256 | 280 | <span class="icon-checkmark hidden"></span> |
| 257 | 281 | <?php if($_['lookupServerUploadEnabled']) { ?> |
@@ -272,7 +296,10 @@ discard block |
||
| 272 | 296 | </div> |
| 273 | 297 | </h2> |
| 274 | 298 | <?php if($_['lookupServerUploadEnabled']) { ?> |
| 275 | - <div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>"> |
|
| 299 | + <div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') { |
|
| 300 | + p('hidden'); |
|
| 301 | +} |
|
| 302 | +?>"> |
|
| 276 | 303 | <img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src=" |
| 277 | 304 | <?php |
| 278 | 305 | switch($_['twitterVerification']) { |
@@ -286,13 +313,16 @@ discard block |
||
| 286 | 313 | p(image_path('core', 'actions/verify.svg')); |
| 287 | 314 | } |
| 288 | 315 | ?>" |
| 289 | - <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
|
| 316 | + <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) { |
|
| 317 | + print_unescaped(' class="verify-action"') ?> |
|
| 290 | 318 | > |
| 291 | 319 | <div class="verification-dialog popovermenu bubble menu"> |
| 292 | 320 | <div class="verification-dialog-content"> |
| 293 | 321 | <p class="explainVerification"></p> |
| 294 | 322 | <p class="verificationCode"></p> |
| 295 | - <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> |
|
| 323 | + <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); |
|
| 324 | +} |
|
| 325 | +?></p> |
|
| 296 | 326 | </div> |
| 297 | 327 | </div> |
| 298 | 328 | </div> |
@@ -300,7 +330,10 @@ discard block |
||
| 300 | 330 | <input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>" |
| 301 | 331 | placeholder="<?php p($l->t('Twitter handle @…')); ?>" |
| 302 | 332 | autocomplete="on" autocapitalize="none" autocorrect="off" |
| 303 | - <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?> |
|
| 333 | + <?php if(!$_['lookupServerUploadEnabled']) { |
|
| 334 | + print_unescaped('disabled="1"'); |
|
| 335 | +} |
|
| 336 | +?> |
|
| 304 | 337 | /> |
| 305 | 338 | <span class="icon-checkmark hidden"></span> |
| 306 | 339 | <?php if($_['lookupServerUploadEnabled']) { ?> |