jenskooij / cloudcontrol

cloudcontrol/library/components/CmsComponent.php

Spacing +40 added lines, -40 removed lines

@@ -188,7 +188,7 @@ 
                 $whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
                 $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');
                 }
             }
         }
@@ -203,7 +203,7 @@ 
                 $blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
                 $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');
                 }
             }
         }
@@ -256,7 +256,7 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_SITEMAP;
                 if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$post[self::POST_PARAMETER_TEMPLATE], $request::$post[self::POST_PARAMETER_COMPONENT])) {
                     $this->storage->addSitemapItem($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/sitemap');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
@@ -265,13 +265,13 @@ 
                 $sitemapItem = $this->storage->getSitemapItemBySlug($request::$get[self::GET_PARAMETER_SLUG]);
                 if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$post[self::POST_PARAMETER_TEMPLATE], $request::$post[self::POST_PARAMETER_COMPONENT])) {
                     $this->storage->saveSitemapItem($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/sitemap');
                     exit;
                 }
                 $this->parameters[self::PARAMETER_SITEMAP_ITEM] = $sitemapItem;
             } elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteSitemapItemBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/sitemap');
                 exit;
             }
         }
@@ -295,12 +295,12 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_IMAGES;
                 if (isset($_FILES[self::FILES_PARAMETER_FILE])) {
                     $this->storage->addImage($_FILES[self::FILES_PARAMETER_FILE]);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/images');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/images');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
                 $this->storage->deleteImageByName($request::$get[self::FILES_PARAMETER_FILE]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/images');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/images');
                 exit;
             } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
                 $this->subTemplate = 'cms/images/show';
@@ -341,14 +341,14 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_FILES;
                 if (isset($_FILES[self::FILES_PARAMETER_FILE])) {
                     $this->storage->addFile($_FILES[self::FILES_PARAMETER_FILE]);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/files');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/files');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/files/get' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
                 $this->downloadFile($request::$get[self::FILES_PARAMETER_FILE]);
             } elseif ($relativeCmsUri == '/files/delete' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
                 $this->storage->deleteFileByName($request::$get[self::FILES_PARAMETER_FILE]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/files');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/files');
                 exit;
             }
         }
@@ -359,21 +359,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;
         }
 
@@ -409,7 +409,7 @@ 
                 if (isset($request::$get[self::PARAMETER_DOCUMENT_TYPE])) {
                     if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$get[self::PARAMETER_DOCUMENT_TYPE], $request::$get[self::GET_PARAMETER_PATH])) {
                         $this->storage->addDocument($request::$post);
-                        header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/documents');
+                        header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/documents');
                         exit;
                     }
                     $this->parameters[self::PARAMETER_DOCUMENT_TYPE] = $this->storage->getDocumentTypeBySlug($request::$get[self::PARAMETER_DOCUMENT_TYPE], true);
@@ -417,7 +417,7 @@ 
                 } else {
                     $documentTypes = $this->storage->getDocumentTypes();
                     if (count($documentTypes) < 1) {
-                        throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types/new">Please do so first.</a>');
+                        throw new \Exception('No Document Types defined yet. <a href="'.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/document-types/new">Please do so first.</a>');
                     }
                     $this->parameters[self::PARAMETER_DOCUMENT_TYPES] = $documentTypes;
                 }
@@ -427,7 +427,7 @@ 
                 $this->parameters[self::PARAMETER_SMALLEST_IMAGE] = $this->storage->getSmallestImageSet()->slug;
                 if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$get[self::GET_PARAMETER_SLUG])) {
                     $this->storage->saveDocument($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/documents');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/documents');
                     exit;
                 }
                 $this->parameters[self::PARAMETER_DOCUMENT] = $this->storage->getDocumentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
@@ -450,7 +450,7 @@ 
                 die(json_encode($result));
             } else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteDocumentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/documents');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/documents');
                 exit;
             }
         }
@@ -466,7 +466,7 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_DOCUMENTS;
                 if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$post[self::GET_PARAMETER_PATH])) {
                     $this->storage->addDocumentFolder($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/documents');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/documents');
                     exit;
                 }
             } else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
@@ -479,11 +479,11 @@ 
                 array_pop($path);
                 $path = implode('/', $path);
 
-                $request::$get[self::GET_PARAMETER_PATH] = '/' . $path;
+                $request::$get[self::GET_PARAMETER_PATH] = '/'.$path;
 
                 if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$post['content'])) {
                     $this->storage->saveDocumentFolder($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/documents');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/documents');
                     exit;
                 }
 
@@ -491,7 +491,7 @@ 
                 $this->parameters['folder'] = $folder;
             } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteDocumentFolderBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/documents');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/documents');
                 exit;
             }
         }
@@ -511,12 +511,12 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
                 if (isset($_POST[self::POST_PARAMETER_USERNAME])) {
                     $this->storage->addUser($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/users');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/configuration/users/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteUserBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/users');
                 exit;
             } elseif ($relativeCmsUri == '/configuration/users/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->subTemplate = 'cms/configuration/users-form';
@@ -524,7 +524,7 @@ 
                 $this->parameters[self::PARAMETER_USER] = $this->storage->getUserBySlug($request::$get[self::GET_PARAMETER_SLUG]);
                 if (isset($_POST[self::POST_PARAMETER_USERNAME])) {
                     $this->storage->saveUser($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/users');
                     exit;
                 }
             }
@@ -546,7 +546,7 @@ 
                 $bricks = $this->storage->getBricks();
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->addDocumentType($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/document-types');
                     exit;
                 }
                 $this->parameters[self::PARAMETER_BRICKS] = $bricks;
@@ -557,14 +557,14 @@ 
                 $bricks = $this->storage->getBricks();
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->saveDocumentType($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/document-types');
                     exit;
                 }
                 $this->parameters[self::PARAMETER_DOCUMENT_TYPE] = $documentType;
                 $this->parameters[self::PARAMETER_BRICKS] = $bricks;
             } elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteDocumentTypeBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/document-types');
                 exit;
             }
         }
@@ -584,7 +584,7 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->addBrick($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/bricks');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
@@ -593,13 +593,13 @@ 
                 $brick = $this->storage->getBrickBySlug($request::$get[self::GET_PARAMETER_SLUG]);
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->saveBrick($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/bricks');
                     exit;
                 }
                 $this->parameters[self::PARAMETER_BRICK] = $brick;
             } elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteBrickBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/bricks');
                 exit;
             } elseif ($relativeCmsUri == '/configuration/image-set') {
                 $this->subTemplate = 'cms/configuration/image-set';
@@ -624,7 +624,7 @@ 
                 $imageSet = $this->storage->getImageSetBySlug($request::$get[self::GET_PARAMETER_SLUG]);
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->saveImageSet($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/image-set');
                     exit;
                 }
                 $this->parameters[self::PARAMETER_IMAGE_SET] = $imageSet;
@@ -633,12 +633,12 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->addImageSet($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/image-set');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/configuration/image-set/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteImageSetBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/image-set');
                 exit;
             }
         }
@@ -658,7 +658,7 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->addApplicationComponent($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/application-components');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/configuration/application-components/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
@@ -667,13 +667,13 @@ 
                 $applicationComponent = $this->storage->getApplicationComponentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->saveApplicationComponent($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/application-components');
                     exit;
                 }
                 $this->parameters['applicationComponent'] = $applicationComponent;
             } elseif ($relativeCmsUri == '/configuration/application-components/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteApplicationComponentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/application-components');
                 exit;
             }
         }
@@ -683,7 +683,7 @@ 
             if ($relativeCmsUri == '/log-off') {
                 $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
                 unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX]);
                 exit;
             }
         }