Passed
Push — develop ( 1d94a2...f31b27 )
by Jens
02:50
created
cloudcontrol/library/components/cms/FilesRouting.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -30,14 +30,14 @@  discard block
 block discarded – undo
30 30
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES);
31 31
 			if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) {
32 32
 				$cmsComponent->storage->addFile($_FILES[CmsComponent::FILES_PARAMETER_FILE]);
33
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
33
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
34 34
 				exit;
35 35
 			}
36 36
 		} elseif ($relativeCmsUri == '/files/get' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
37 37
 			$this->downloadFile($request::$get[CmsComponent::FILES_PARAMETER_FILE], $cmsComponent);
38 38
 		} elseif ($relativeCmsUri == '/files/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
39 39
 			$cmsComponent->storage->deleteFileByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]);
40
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
40
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
41 41
 			exit;
42 42
 		}
43 43
 	}
@@ -49,21 +49,21 @@  discard block
 block discarded – undo
49 49
 	private function downloadFile($slug, $cmsComponent)
50 50
 	{
51 51
 		$file = $cmsComponent->storage->getFileByName($slug);
52
-		$path = realpath(__DIR__ . '/../../../www/files/');
53
-		$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
54
-		$size = filesize($path . '/' . $file->file);
52
+		$path = realpath(__DIR__.'/../../../www/files/');
53
+		$quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\'));
54
+		$size = filesize($path.'/'.$file->file);
55 55
 
56 56
 		header('Content-Description: File Transfer');
57
-		header('Content-Type: ' . $file->type);
58
-		header('Content-Disposition: attachment; filename=' . $quoted);
57
+		header('Content-Type: '.$file->type);
58
+		header('Content-Disposition: attachment; filename='.$quoted);
59 59
 		header('Content-Transfer-Encoding: binary');
60 60
 		header('Connection: Keep-Alive');
61 61
 		header('Expires: 0');
62 62
 		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
63 63
 		header('Pragma: public');
64
-		header('Content-Length: ' . $size);
64
+		header('Content-Length: '.$size);
65 65
 
66
-		readfile($path . '/' . $file->file);
66
+		readfile($path.'/'.$file->file);
67 67
 		exit;
68 68
 	}
69 69
 
Please login to merge, or discard this patch.
cloudcontrol/library/components/CmsComponent.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
                 $whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
194 194
                 $whitelistIps = array_map("trim", $whitelistIps);
195 195
                 if (!in_array($remoteAddress, $whitelistIps)) {
196
-                    throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
196
+                    throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist');
197 197
                 }
198 198
             }
199 199
         }
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
                 $blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
209 209
                 $blacklistIps = array_map("trim", $blacklistIps);
210 210
                 if (in_array($remoteAddress, $blacklistIps)) {
211
-                    throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
211
+                    throw new \Exception('Ip address '.$remoteAddress.' is on blacklist');
212 212
                 }
213 213
             }
214 214
         }
@@ -279,12 +279,12 @@  discard block
 block discarded – undo
279 279
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
280 280
                 if (isset($_POST[self::POST_PARAMETER_USERNAME])) {
281 281
                     $this->storage->addUser($request::$post);
282
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
282
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/users');
283 283
                     exit;
284 284
                 }
285 285
             } elseif ($relativeCmsUri == '/configuration/users/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
286 286
                 $this->storage->deleteUserBySlug($request::$get[self::GET_PARAMETER_SLUG]);
287
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
287
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/users');
288 288
                 exit;
289 289
             } elseif ($relativeCmsUri == '/configuration/users/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
290 290
                 $this->subTemplate = 'cms/configuration/users-form';
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
                 $this->parameters[self::PARAMETER_USER] = $this->storage->getUserBySlug($request::$get[self::GET_PARAMETER_SLUG]);
293 293
                 if (isset($_POST[self::POST_PARAMETER_USERNAME])) {
294 294
                     $this->storage->saveUser($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
295
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
295
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/users');
296 296
                     exit;
297 297
                 }
298 298
             }
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
                 $bricks = $this->storage->getBricks();
315 315
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
316 316
                     $this->storage->addDocumentType($request::$post);
317
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
317
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/document-types');
318 318
                     exit;
319 319
                 }
320 320
                 $this->parameters[self::PARAMETER_BRICKS] = $bricks;
@@ -325,14 +325,14 @@  discard block
 block discarded – undo
325 325
                 $bricks = $this->storage->getBricks();
326 326
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
327 327
                     $this->storage->saveDocumentType($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
328
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
328
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/document-types');
329 329
                     exit;
330 330
                 }
331 331
                 $this->parameters[self::PARAMETER_DOCUMENT_TYPE] = $documentType;
332 332
                 $this->parameters[self::PARAMETER_BRICKS] = $bricks;
333 333
             } elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
334 334
                 $this->storage->deleteDocumentTypeBySlug($request::$get[self::GET_PARAMETER_SLUG]);
335
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
335
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/document-types');
336 336
                 exit;
337 337
             }
338 338
         }
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
353 353
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
354 354
                     $this->storage->addBrick($request::$post);
355
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
355
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/bricks');
356 356
                     exit;
357 357
                 }
358 358
             } elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
@@ -361,13 +361,13 @@  discard block
 block discarded – undo
361 361
                 $brick = $this->storage->getBrickBySlug($request::$get[self::GET_PARAMETER_SLUG]);
362 362
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
363 363
                     $this->storage->saveBrick($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
364
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
364
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/bricks');
365 365
                     exit;
366 366
                 }
367 367
                 $this->parameters[self::PARAMETER_BRICK] = $brick;
368 368
             } elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
369 369
                 $this->storage->deleteBrickBySlug($request::$get[self::GET_PARAMETER_SLUG]);
370
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
370
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/bricks');
371 371
                 exit;
372 372
             } elseif ($relativeCmsUri == '/configuration/image-set') {
373 373
                 $this->subTemplate = 'cms/configuration/image-set';
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
                 $imageSet = $this->storage->getImageSetBySlug($request::$get[self::GET_PARAMETER_SLUG]);
393 393
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
394 394
                     $this->storage->saveImageSet($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
395
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
395
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/image-set');
396 396
                     exit;
397 397
                 }
398 398
                 $this->parameters[self::PARAMETER_IMAGE_SET] = $imageSet;
@@ -401,12 +401,12 @@  discard block
 block discarded – undo
401 401
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
402 402
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
403 403
                     $this->storage->addImageSet($request::$post);
404
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
404
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/image-set');
405 405
                     exit;
406 406
                 }
407 407
             } elseif ($relativeCmsUri == '/configuration/image-set/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
408 408
                 $this->storage->deleteImageSetBySlug($request::$get[self::GET_PARAMETER_SLUG]);
409
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
409
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/image-set');
410 410
                 exit;
411 411
             }
412 412
         }
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
427 427
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
428 428
                     $this->storage->addApplicationComponent($request::$post);
429
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
429
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/application-components');
430 430
                     exit;
431 431
                 }
432 432
             } elseif ($relativeCmsUri == '/configuration/application-components/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
@@ -435,13 +435,13 @@  discard block
 block discarded – undo
435 435
                 $applicationComponent = $this->storage->getApplicationComponentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
436 436
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
437 437
                     $this->storage->saveApplicationComponent($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
438
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
438
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/application-components');
439 439
                     exit;
440 440
                 }
441 441
                 $this->parameters['applicationComponent'] = $applicationComponent;
442 442
             } elseif ($relativeCmsUri == '/configuration/application-components/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
443 443
                 $this->storage->deleteApplicationComponentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
444
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
444
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/application-components');
445 445
                 exit;
446 446
             }
447 447
         }
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
             if ($relativeCmsUri == '/log-off') {
452 452
                 $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
453 453
                 unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
454
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
454
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX]);
455 455
                 exit;
456 456
             }
457 457
         }
Please login to merge, or discard this patch.