Completed
Pull Request — master (#9388)
by Robin
19:40
created
lib/private/Archive/ZIP.php 1 patch
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
lib/private/Installer.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -459,7 +459,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
settings/templates/settings/personal/personal.info.php 1 patch
Braces   +48 added lines, -15 removed lines patch added patch discarded remove patch
@@ -55,8 +55,11 @@  discard block
 block discarded – undo
55 55
 						<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
56 56
 						<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
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
 
@@ -86,9 +89,12 @@  discard block
 block discarded – undo
86 89
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
87 90
 							<?php print_unescaped($l->t('You are using <strong>%s</strong>',
88 91
 								[$_['usage']]));?>
89
-						<?php else: ?>
92
+						<?php else {
93
+    : ?>
90 94
 							<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
91
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
95
+								[$_['usage'], $_['total_space'],  $_['usage_relative']]));
96
+}
97
+?>
92 98
 						<?php endif ?>
93 99
 					</p>
94 100
 				</div>
@@ -128,7 +134,10 @@  discard block
 block discarded – undo
128 134
 						<span class="icon-triangle-s"></span>
129 135
 					</span>
130 136
 				</h2>
131
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
137
+				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
138
+    p('hidden');
139
+}
140
+?>">
132 141
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
133 142
 				<?php
134 143
 					switch($_['emailVerification']) {
@@ -169,7 +178,10 @@  discard block
 block discarded – undo
169 178
 						<span class="icon-triangle-s"></span>
170 179
 					</span>
171 180
 				</h2>
172
-				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
181
+				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
182
+    print_unescaped('disabled="1"');
183
+}
184
+?>
173 185
 					   value="<?php p($_['phone']) ?>"
174 186
 					   placeholder="<?php p($l->t('Your phone number')); ?>"
175 187
 				       autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -189,7 +201,10 @@  discard block
 block discarded – undo
189 201
 						<span class="icon-triangle-s"></span>
190 202
 					</span>
191 203
 				</h2>
192
-				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
204
+				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
205
+    print_unescaped('disabled="1"');
206
+}
207
+?>
193 208
 					   placeholder="<?php p($l->t('Your postal address')); ?>"
194 209
 					   value="<?php p($_['address']) ?>"
195 210
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -210,7 +225,10 @@  discard block
 block discarded – undo
210 225
 					</span>
211 226
 				</h2>
212 227
 				<?php if($_['lookupServerUploadEnabled']) { ?>
213
-				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
228
+				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
229
+    p('hidden');
230
+}
231
+?>">
214 232
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
215 233
 					<?php
216 234
 					switch($_['websiteVerification']) {
@@ -224,13 +242,16 @@  discard block
 block discarded – undo
224 242
 							p(image_path('core', 'actions/verify.svg'));
225 243
 					}
226 244
 					?>"
227
-					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
245
+					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
246
+    print_unescaped(' class="verify-action"') ?>
228 247
 					>
229 248
 					<div class="verification-dialog popovermenu bubble menu">
230 249
 						<div class="verification-dialog-content">
231 250
 							<p class="explainVerification"></p>
232 251
 							<p class="verificationCode"></p>
233
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
252
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
253
+}
254
+?></p>
234 255
 						</div>
235 256
 					</div>
236 257
 				</div>
@@ -238,7 +259,10 @@  discard block
 block discarded – undo
238 259
 				<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
239 260
 				       placeholder="<?php p($l->t('Link https://…')); ?>"
240 261
 				       autocomplete="on" autocapitalize="none" autocorrect="off"
241
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
262
+					   <?php if(!$_['lookupServerUploadEnabled']) {
263
+    print_unescaped('disabled="1"');
264
+}
265
+?>
242 266
 				/>
243 267
 				<span class="icon-checkmark hidden"></span>
244 268
 				<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -257,7 +281,10 @@  discard block
 block discarded – undo
257 281
 					</span>
258 282
 				</h2>
259 283
 				<?php if($_['lookupServerUploadEnabled']) { ?>
260
-				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
284
+				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
285
+    p('hidden');
286
+}
287
+?>">
261 288
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
262 289
 					<?php
263 290
 					switch($_['twitterVerification']) {
@@ -271,13 +298,16 @@  discard block
 block discarded – undo
271 298
 							p(image_path('core', 'actions/verify.svg'));
272 299
 					}
273 300
 					?>"
274
-					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
301
+					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
302
+    print_unescaped(' class="verify-action"') ?>
275 303
 					>
276 304
 					<div class="verification-dialog popovermenu bubble menu">
277 305
 						<div class="verification-dialog-content">
278 306
 							<p class="explainVerification"></p>
279 307
 							<p class="verificationCode"></p>
280
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
308
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
309
+}
310
+?></p>
281 311
 						</div>
282 312
 					</div>
283 313
 				</div>
@@ -285,7 +315,10 @@  discard block
 block discarded – undo
285 315
 				<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
286 316
 					   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
287 317
 					   autocomplete="on" autocapitalize="none" autocorrect="off"
288
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
318
+					   <?php if(!$_['lookupServerUploadEnabled']) {
319
+    print_unescaped('disabled="1"');
320
+}
321
+?>
289 322
 				/>
290 323
 				<span class="icon-checkmark hidden"></span>
291 324
 				<?php if($_['lookupServerUploadEnabled']) { ?>
Please login to merge, or discard this patch.