jenskooij / cloudcontrol

cloudcontrol/library/components/CmsComponent.php

Spacing +38 added lines, -38 removed lines

@@ -146,7 +146,7 @@ 
 				$whitelistIps = explode(',', $this->parameters['whitelistIps']);
 				$whitelistIps = array_map("trim", $whitelistIps);
 				if (!in_array($remoteAddress, $whitelistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
+					throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist');
 				}
 			}
 		}
@@ -161,7 +161,7 @@ 
 				$blacklistIps = explode(',', $this->parameters['blacklistIps']);
 				$blacklistIps = array_map("trim", $blacklistIps);
 				if (in_array($remoteAddress, $blacklistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
+					throw new \Exception('Ip address '.$remoteAddress.' is on blacklist');
 				}
 			}
 		}
@@ -214,7 +214,7 @@ 
 				$this->parameters['mainNavClass'] = 'sitemap';
 				if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) {
 					$this->storage->addSitemapItem($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get['slug'])) {
@@ -223,13 +223,13 @@ 
 				$sitemapItem = $this->storage->getSitemapItemBySlug($request::$get['slug']);
 				if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) {
 					$this->storage->saveSitemapItem($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 					exit;
 				}
 				$this->parameters['sitemapItem'] = $sitemapItem;
 			} elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteSitemapItemBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 				exit;
 			}
 		}
@@ -253,12 +253,12 @@ 
 				$this->parameters['mainNavClass'] = 'images';
 				if (isset($_FILES['file'])) {
 					$this->storage->addImage($_FILES['file']);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/images');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/images');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/images/delete' && isset($request::$get['file'])) {
 				$this->storage->deleteImageByName($request::$get['file']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/images');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/images');
 				exit;
 			} elseif ($relativeCmsUri == '/images/show' && isset($request::$get['file'])) {
 				$this->subTemplate = 'cms/images/show';
@@ -299,14 +299,14 @@ 
 				$this->parameters['mainNavClass'] = 'files';
 				if (isset($_FILES['file'])) {
 					$this->storage->addFile($_FILES['file']);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/files');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/files');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/files/get' && isset($request::$get['file'])) {
 				$this->downloadFile($request::$get['file']);
 			} elseif ($relativeCmsUri == '/files/delete' && isset($request::$get['file'])) {
 				$this->storage->deleteFileByName($request::$get['file']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/files');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/files');
 				exit;
 			}
 		}
@@ -317,21 +317,21 @@ 
 		private function downloadFile($slug)
 		{
 			$file = $this->storage->getFileByName($slug);
-			$path = realpath(__DIR__ . '/../../www/files/');
-			$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-			$size   = filesize($path . '/' . $file->file);
+			$path = realpath(__DIR__.'/../../www/files/');
+			$quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\'));
+			$size   = filesize($path.'/'.$file->file);
 
 			header('Content-Description: File Transfer');
-			header('Content-Type: ' . $file->type);
-			header('Content-Disposition: attachment; filename=' . $quoted);
+			header('Content-Type: '.$file->type);
+			header('Content-Disposition: attachment; filename='.$quoted);
 			header('Content-Transfer-Encoding: binary');
 			header('Connection: Keep-Alive');
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 			header('Pragma: public');
-			header('Content-Length: ' . $size);
+			header('Content-Length: '.$size);
 
-			readfile($path . '/' . $file->file);
+			readfile($path.'/'.$file->file);
 			exit;
 		}
 
@@ -367,7 +367,7 @@ 
 				if (isset($request::$get['documentType'])) {
 					if (isset($request::$post['title'], $request::$get['documentType'], $request::$get['path'])) {
 						$this->storage->addDocument($request::$post);
-						header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+						header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 						exit;
 					}
 					$this->parameters['documentType'] = $this->storage->getDocumentTypeBySlug($request::$get['documentType'], true);
@@ -381,7 +381,7 @@ 
 				$this->parameters['smallestImage'] = $this->storage->getSmallestImageSet()->slug;
 				if (isset($request::$post['title'], $request::$get['slug'])) {
 					$this->storage->saveDocument($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 				$this->parameters['document'] = $this->storage->getDocumentBySlug($request::$get['slug']);
@@ -404,7 +404,7 @@ 
 				die(json_encode($result));
 			} else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get['slug'])) {
 				$this->storage->deleteDocumentBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 				exit;
 			}
 		}
@@ -420,7 +420,7 @@ 
 				$this->parameters['mainNavClass'] = 'documents';
 				if (isset($request::$post['title'], $request::$post['path'])) {
 					$this->storage->addDocumentFolder($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 			} else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get['slug'])) {
@@ -433,11 +433,11 @@ 
 				array_pop($path);
 				$path = implode('/', $path);
 
-				$request::$get['path'] = '/' . $path;
+				$request::$get['path'] = '/'.$path;
 
 				if (isset($request::$post['title'], $request::$post['content'])) {
 					$this->storage->saveDocumentFolder($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 
@@ -445,7 +445,7 @@ 
 				$this->parameters['folder'] = $folder;
 			} else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get['slug'])) {
 				$this->storage->deleteDocumentFolderBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 				exit;
 			}
 		}
@@ -465,12 +465,12 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($_POST['username'])) {
 					$this->storage->addUser($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/users/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteUserBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration/users/edit' && isset($request::$get['slug'])) {
 				$this->subTemplate = 'cms/configuration/users-form';
@@ -478,7 +478,7 @@ 
 				$this->parameters['user'] = $this->storage->getUserBySlug($request::$get['slug']);
 				if (isset($_POST['username'])) {
 					$this->storage->saveUser($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 					exit;
 				}
 			}
@@ -500,7 +500,7 @@ 
 				$bricks = $this->storage->getBricks();
 				if (isset($request::$post['title'])) {
 					$this->storage->addDocumentType($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 					exit;
 				}
 				$this->parameters['bricks'] = $bricks;
@@ -511,14 +511,14 @@ 
 				$bricks = $this->storage->getBricks();
 				if (isset($request::$post['title'])) {
 					$this->storage->saveDocumentType($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 					exit;
 				}
 				$this->parameters['documentType'] = $documentType;
 				$this->parameters['bricks'] = $bricks;
 			} elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteDocumentTypeBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 				exit;
 			}
 		}
@@ -538,7 +538,7 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addBrick($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get['slug'])) {
@@ -547,13 +547,13 @@ 
 				$brick = $this->storage->getBrickBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveBrick($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 					exit;
 				}
 				$this->parameters['brick'] = $brick;
 			} elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteBrickBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration/image-set') {
 				$this->subTemplate = 'cms/configuration/image-set';
@@ -578,7 +578,7 @@ 
 				$imageSet = $this->storage->getImageSetBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveImageSet($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 					exit;
 				}
 				$this->parameters['imageSet'] = $imageSet;
@@ -587,12 +587,12 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addImageSet($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/image-set/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteImageSetBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 				exit;
 			}
 		}
@@ -612,7 +612,7 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addApplicationComponent($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/application-components');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/application-components');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/application-components/edit' && isset($request::$get['slug'])) {
@@ -621,13 +621,13 @@ 
 				$applicationComponent = $this->storage->getApplicationComponentBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveApplicationComponent($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/application-components');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/application-components');
 					exit;
 				}
 				$this->parameters['applicationComponent'] = $applicationComponent;
 			} elseif ($relativeCmsUri == '/configuration/application-components/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteApplicationComponentBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/application-components');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/application-components');
 				exit;
 			}
 		}