jenskooij / cloudcontrol

src/CloudControl.php

Indentation +126 added lines, -126 removed lines

@@ -11,131 +11,131 @@
 
 class CloudControl
 {
-    public static function run()
-    {
-        new Application();
-    }
-
-    public static function postInstall(Event $event)
-    {
-        $event->getIO()->write("Post install");
-        self::checkInstall($event);
-    }
-
-    public static function postUpdate(Event $event)
-    {
-        $event->getIO()->write("Post update");
-        self::checkInstall($event);
-    }
-
-    /**
-     * @param Event $event
-     */
-    private static function checkInstall(Event $event)
-    {
-        $event->getIO()->write("*** Checking installation of Cloud Control framework ***");
-
-        $vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
-        $rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
-
-        $baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
-        $configObject = self::getConfig($baseConfigTargetPath);
-
-        $configObject->{'vendorDir'} = realpath($vendorDir);
-        $configObject->{'rootDir'} = $rootDir;
-        $configObject->{'templateDir'} = self::createDir($event, $rootDir, 'templates');
-        $configObject->{'storageDir'} = self::createDir($event, $rootDir, $configObject->{'storageDir'});
-        $configObject->{'publicDir'} = self::createDir($event, $rootDir, 'public');
-        $configObject->{'jsDir'} = self::createDir($event, $configObject->{'publicDir'}, 'js');
-        $configObject->{'cssDir'} = self::createDir($event, $configObject->{'publicDir'}, 'css');
-        $configObject->{'imagesDir'} = self::createDir($event, $configObject->{'publicDir'}, 'images');
-        $configObject->{'filesDir'} = self::createDir($event, $configObject->{'publicDir'}, 'files');
-
-        // TODO Fie FilesStorage to use filesDir from config, similar to ImagesStorage
-
-        $baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
-        $baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
-
-        self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
-        self::saveConfig($event, $baseConfigTargetPath, $configObject);
-        self::copyInstallFile($event, 'public.htaccess', $configObject->{'publicDir'}, '.htaccess');
-        self::copyInstallFile($event, 'root.htaccess', $configObject->{'rootDir'}, '.htaccess');
-        self::copyInstallFile($event, 'base.php', $configObject->{'templateDir'});
-        self::copyInstallFile($event, 'cms.css', $configObject->{'cssDir'});
-        self::copyInstallFile($event, 'cms.js', $configObject->{'jsDir'});
-        self::copyInstallFile($event, 'index.php', $configObject->{'publicDir'});
-    }
-
-    /**
-     * @param Event $event
-     * @param $baseConfigTargetPath
-     * @param $configObject
-     * @internal param $rootDir
-     * @internal param $vendorDir
-     * @internal param $templateDir
-     * @internal param $storageDir
-     * @internal param $baseConfigDefaultPath
-     * @internal param $baseConfigTargetPath
-     * @internal param $storageDir
-     */
-    private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
-    {
-        file_put_contents($baseConfigTargetPath, json_encode($configObject));
-        $event->getIO()->write("Saved config to: " . $baseConfigTargetPath);
-    }
-
-    private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
-    {
-        $sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
-
-        if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
-            if ($destinationFileName !== null) {
-                copy($sourceFilePath, realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName);
-            } else {
-                copy($sourceFilePath, realpath($destinationPath) . DIRECTORY_SEPARATOR . $sourceFileName);
-            }
-
-            $event->getIO()->write("Copied file: " . $sourceFileName . ' to ' . $destinationPath);
-        } else {
-            $event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
-        }
-    }
-
-    /**
-     * @param $storageDir
-     * @param $baseStorageDefaultPath
-     * @param $baseStorageSqlPath
-     */
-    private static function createStorage($storageDir, $baseStorageDefaultPath, $baseStorageSqlPath)
-    {
-        $repository = new Repository($storageDir);
-        $repository->init($baseStorageDefaultPath, $baseStorageSqlPath);
-    }
-
-    private static function createDir(Event $event, $rootDir, $dirName)
-    {
-        $dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
-        if (!is_dir($dir)) {
-            mkdir($dir);
-            $event->getIO()->write("Created dir: " . $dir);
-        }
-        return realpath($dir);
-    }
-
-    /**
-     * @param $configTargetPath
-     * @return mixed
-     */
-    private static function getConfig($configTargetPath)
-    {
-        $baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_config.json');
-
-        if (file_exists($configTargetPath)) {
-            $config = json_decode(file_get_contents($configTargetPath));
-        } else {
-            $config = json_decode(file_get_contents($baseConfigDefaultPath));
-        }
-        return $config;
-    }
+	public static function run()
+	{
+		new Application();
+	}
+
+	public static function postInstall(Event $event)
+	{
+		$event->getIO()->write("Post install");
+		self::checkInstall($event);
+	}
+
+	public static function postUpdate(Event $event)
+	{
+		$event->getIO()->write("Post update");
+		self::checkInstall($event);
+	}
+
+	/**
+	 * @param Event $event
+	 */
+	private static function checkInstall(Event $event)
+	{
+		$event->getIO()->write("*** Checking installation of Cloud Control framework ***");
+
+		$vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
+		$rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+
+		$baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
+		$configObject = self::getConfig($baseConfigTargetPath);
+
+		$configObject->{'vendorDir'} = realpath($vendorDir);
+		$configObject->{'rootDir'} = $rootDir;
+		$configObject->{'templateDir'} = self::createDir($event, $rootDir, 'templates');
+		$configObject->{'storageDir'} = self::createDir($event, $rootDir, $configObject->{'storageDir'});
+		$configObject->{'publicDir'} = self::createDir($event, $rootDir, 'public');
+		$configObject->{'jsDir'} = self::createDir($event, $configObject->{'publicDir'}, 'js');
+		$configObject->{'cssDir'} = self::createDir($event, $configObject->{'publicDir'}, 'css');
+		$configObject->{'imagesDir'} = self::createDir($event, $configObject->{'publicDir'}, 'images');
+		$configObject->{'filesDir'} = self::createDir($event, $configObject->{'publicDir'}, 'files');
+
+		// TODO Fie FilesStorage to use filesDir from config, similar to ImagesStorage
+
+		$baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
+		$baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
+
+		self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
+		self::saveConfig($event, $baseConfigTargetPath, $configObject);
+		self::copyInstallFile($event, 'public.htaccess', $configObject->{'publicDir'}, '.htaccess');
+		self::copyInstallFile($event, 'root.htaccess', $configObject->{'rootDir'}, '.htaccess');
+		self::copyInstallFile($event, 'base.php', $configObject->{'templateDir'});
+		self::copyInstallFile($event, 'cms.css', $configObject->{'cssDir'});
+		self::copyInstallFile($event, 'cms.js', $configObject->{'jsDir'});
+		self::copyInstallFile($event, 'index.php', $configObject->{'publicDir'});
+	}
+
+	/**
+	 * @param Event $event
+	 * @param $baseConfigTargetPath
+	 * @param $configObject
+	 * @internal param $rootDir
+	 * @internal param $vendorDir
+	 * @internal param $templateDir
+	 * @internal param $storageDir
+	 * @internal param $baseConfigDefaultPath
+	 * @internal param $baseConfigTargetPath
+	 * @internal param $storageDir
+	 */
+	private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
+	{
+		file_put_contents($baseConfigTargetPath, json_encode($configObject));
+		$event->getIO()->write("Saved config to: " . $baseConfigTargetPath);
+	}
+
+	private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
+	{
+		$sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
+
+		if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
+			if ($destinationFileName !== null) {
+				copy($sourceFilePath, realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName);
+			} else {
+				copy($sourceFilePath, realpath($destinationPath) . DIRECTORY_SEPARATOR . $sourceFileName);
+			}
+
+			$event->getIO()->write("Copied file: " . $sourceFileName . ' to ' . $destinationPath);
+		} else {
+			$event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
+		}
+	}
+
+	/**
+	 * @param $storageDir
+	 * @param $baseStorageDefaultPath
+	 * @param $baseStorageSqlPath
+	 */
+	private static function createStorage($storageDir, $baseStorageDefaultPath, $baseStorageSqlPath)
+	{
+		$repository = new Repository($storageDir);
+		$repository->init($baseStorageDefaultPath, $baseStorageSqlPath);
+	}
+
+	private static function createDir(Event $event, $rootDir, $dirName)
+	{
+		$dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
+		if (!is_dir($dir)) {
+			mkdir($dir);
+			$event->getIO()->write("Created dir: " . $dir);
+		}
+		return realpath($dir);
+	}
+
+	/**
+	 * @param $configTargetPath
+	 * @return mixed
+	 */
+	private static function getConfig($configTargetPath)
+	{
+		$baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_config.json');
+
+		if (file_exists($configTargetPath)) {
+			$config = json_decode(file_get_contents($configTargetPath));
+		} else {
+			$config = json_decode(file_get_contents($baseConfigDefaultPath));
+		}
+		return $config;
+	}
 
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -36,9 +36,9 @@ 
         $event->getIO()->write("*** Checking installation of Cloud Control framework ***");
 
         $vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
-        $rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+        $rootDir = realpath($vendorDir.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR);
 
-        $baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
+        $baseConfigTargetPath = $rootDir.DIRECTORY_SEPARATOR.'config.json';
         $configObject = self::getConfig($baseConfigTargetPath);
 
         $configObject->{'vendorDir'} = realpath($vendorDir);
@@ -53,8 +53,8 @@ 
 
         // TODO Fie FilesStorage to use filesDir from config, similar to ImagesStorage
 
-        $baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
-        $baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
+        $baseStorageDefaultPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.json';
+        $baseStorageSqlPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.sql';
 
         self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
         self::saveConfig($event, $baseConfigTargetPath, $configObject);
@@ -81,23 +81,23 @@ 
     private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
     {
         file_put_contents($baseConfigTargetPath, json_encode($configObject));
-        $event->getIO()->write("Saved config to: " . $baseConfigTargetPath);
+        $event->getIO()->write("Saved config to: ".$baseConfigTargetPath);
     }
 
     private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
     {
-        $sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
+        $sourceFilePath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install/_'.$sourceFileName);
 
         if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
             if ($destinationFileName !== null) {
-                copy($sourceFilePath, realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName);
+                copy($sourceFilePath, realpath($destinationPath).DIRECTORY_SEPARATOR.$destinationFileName);
             } else {
-                copy($sourceFilePath, realpath($destinationPath) . DIRECTORY_SEPARATOR . $sourceFileName);
+                copy($sourceFilePath, realpath($destinationPath).DIRECTORY_SEPARATOR.$sourceFileName);
             }
 
-            $event->getIO()->write("Copied file: " . $sourceFileName . ' to ' . $destinationPath);
+            $event->getIO()->write("Copied file: ".$sourceFileName.' to '.$destinationPath);
         } else {
-            $event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
+            $event->getIO()->write("[ERROR] Couldnt copy file: ".$sourceFileName.' to '.$destinationPath);
         }
     }
 
@@ -114,10 +114,10 @@ 
 
     private static function createDir(Event $event, $rootDir, $dirName)
     {
-        $dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
+        $dir = $rootDir.DIRECTORY_SEPARATOR.$dirName.DIRECTORY_SEPARATOR;
         if (!is_dir($dir)) {
             mkdir($dir);
-            $event->getIO()->write("Created dir: " . $dir);
+            $event->getIO()->write("Created dir: ".$dir);
         }
         return realpath($dir);
     }
@@ -128,7 +128,7 @@ 
      */
     private static function getConfig($configTargetPath)
     {
-        $baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_config.json');
+        $baseConfigDefaultPath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install/_config.json');
 
         if (file_exists($configTargetPath)) {
             $config = json_decode(file_get_contents($configTargetPath));

src/util/functions.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		}
 	} else {
 		ob_clean();
-        echo <<<END
+		echo <<<END
 <!DOCTYPE html>
 <html>
 <head>

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
 {
 	$debug_backtrace = current(debug_backtrace());
 	if (PHP_SAPI == 'cli') {
-		echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+		echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
 		foreach (func_get_args() as $data) {
 			var_dump($data);
 		}
@@ -29,7 +29,7 @@ 
 <body>
 END;
 
-		echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+		echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
 		echo '<pre>';
 		foreach (func_get_args() as $data) {
 			echo "<code>";
@@ -53,8 +53,8 @@ 
  */
 function utf8Convert($array)
 {
-	array_walk_recursive($array, function(&$item){
-		if(!mb_detect_encoding($item, 'utf-8', true)){
+	array_walk_recursive($array, function(&$item) {
+		if (!mb_detect_encoding($item, 'utf-8', true)) {
 			$item = utf8_encode($item);
 		}
 	});

src/components/cms/FilesRouting.php

Spacing +9 added lines, -9 removed lines

@@ -40,21 +40,21 @@ 
 	{
 		$file = $cmsComponent->storage->getFiles()->getFileByName($slug);
 		// TODO FIX THIS PATH
-		$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;
 	}
 
@@ -78,7 +78,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES);
 		if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) {
 			$cmsComponent->storage->getFiles()->addFile($_FILES[CmsComponent::FILES_PARAMETER_FILE]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 			exit;
 		}
 	}
@@ -90,7 +90,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getFiles()->deleteFileByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 		exit;
 	}
 

src/components/cms/DocumentRouting.php

Indentation +37 added lines, -37 removed lines

@@ -12,33 +12,33 @@ 
 
 class DocumentRouting implements CmsRouting
 {
-    /**
-     * DocumentRouting constructor.
-     * @param $request
-     * @param $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/documents') {
-            $cmsComponent->subTemplate = 'documents';
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENTS, $cmsComponent->storage->getDocuments()->getDocumentsWithState());
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-        }
-        $this->documentRouting($request, $relativeCmsUri, $cmsComponent);
-        $this->folderRouting($request, $relativeCmsUri, $cmsComponent);
+	/**
+	 * DocumentRouting constructor.
+	 * @param $request
+	 * @param $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	public function __construct($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/documents') {
+			$cmsComponent->subTemplate = 'documents';
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENTS, $cmsComponent->storage->getDocuments()->getDocumentsWithState());
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+		}
+		$this->documentRouting($request, $relativeCmsUri, $cmsComponent);
+		$this->folderRouting($request, $relativeCmsUri, $cmsComponent);
 		$this->valuelistsRouting($request, $relativeCmsUri, $cmsComponent);
-    }
+	}
 
 
-    /**
-     * @param $request
-     * @param $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     * @throws \Exception
-     */
-    private function documentRouting($request, $relativeCmsUri, $cmsComponent)
-    {
+	/**
+	 * @param $request
+	 * @param $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 * @throws \Exception
+	 */
+	private function documentRouting($request, $relativeCmsUri, $cmsComponent)
+	{
 		if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
 			$this->documentNewRoute($request, $cmsComponent);
 		} elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])){
@@ -50,23 +50,23 @@ 
 				case '/documents/unpublish-document': $this->unpublishDocumentRoute($request, $cmsComponent); break;
 			}
 		}
-    }
+	}
 
-    /**
-     * @param $request
-     * @param $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    private function folderRouting($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
+	/**
+	 * @param $request
+	 * @param $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	private function folderRouting($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
 			$this->newFolderRoute($request, $cmsComponent);
-        } else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->editFolderRoute($request, $cmsComponent);
-        } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->deleteFolderRoute($request, $cmsComponent);
-        }
-    }
+		}
+	}
 
 	private function valuelistsRouting($request, $relativeCmsUri, $cmsComponent)
 	{

src/components/cms/ImagesRouting.php

Indentation +15 added lines, -15 removed lines

@@ -13,26 +13,26 @@
 class ImagesRouting implements CmsRouting
 {
 
-    /**
-     * ImagesRouting constructor.
-     * @param \CloudControl\Cms\cc\Request $request
-     * @param mixed|string $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/images') {
+	/**
+	 * ImagesRouting constructor.
+	 * @param \CloudControl\Cms\cc\Request $request
+	 * @param mixed|string $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	public function __construct($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/images') {
 			$this->overviewRoute($cmsComponent);
-        } elseif ($relativeCmsUri == '/images.json') {
+		} elseif ($relativeCmsUri == '/images.json') {
 			$this->jsonRoute($cmsComponent);
-        } elseif ($relativeCmsUri == '/images/new') {
+		} elseif ($relativeCmsUri == '/images/new') {
 			$this->newRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
+		} elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
 			$this->deleteRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
+		} elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
 			$this->showRoute($request, $cmsComponent);
-        }
-    }
+		}
+	}
 
 	/**
 	 * @param CmsComponent $cmsComponent

src/components/cms/SitemapRouting.php

Indentation +62 added lines, -62 removed lines

@@ -14,26 +14,26 @@ 
 class SitemapRouting implements CmsRouting
 {
 
-    /**
-     * SitemapRouting constructor.
-     * @param \CloudControl\Cms\cc\Request $request
-     * @param mixed|string $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/sitemap') {
+	/**
+	 * SitemapRouting constructor.
+	 * @param \CloudControl\Cms\cc\Request $request
+	 * @param mixed|string $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	public function __construct($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/sitemap') {
 			$this->overviewRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/new') {
+		} elseif ($relativeCmsUri == '/sitemap/new') {
 			$this->newRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->editRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->deleteRoute($request, $cmsComponent);
-        } else {
-            $this->redirectRoutes($relativeCmsUri, $request, $cmsComponent);
-        }
-    }
+		} else {
+			$this->redirectRoutes($relativeCmsUri, $request, $cmsComponent);
+		}
+	}
 
 	/**
 	 * @param $request
@@ -92,54 +92,54 @@ 
 		exit;
 	}
 
-    private function redirectRoutes($relativeCmsUri, $request, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/sitemap/redirects') {
-            $this->redirectsOverviewRoute($cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/redirects/new') {
-            $this->redirectsNewRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/redirects/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-            $this->redirectEditRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/redirects/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-            $this->redirectDeleteRoute($request, $cmsComponent);
-        }
-    }
+	private function redirectRoutes($relativeCmsUri, $request, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/sitemap/redirects') {
+			$this->redirectsOverviewRoute($cmsComponent);
+		} elseif ($relativeCmsUri == '/sitemap/redirects/new') {
+			$this->redirectsNewRoute($request, $cmsComponent);
+		} elseif ($relativeCmsUri == '/sitemap/redirects/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+			$this->redirectEditRoute($request, $cmsComponent);
+		} elseif ($relativeCmsUri == '/sitemap/redirects/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+			$this->redirectDeleteRoute($request, $cmsComponent);
+		}
+	}
 
-    private function redirectsOverviewRoute($cmsComponent)
-    {
-        $cmsComponent->subTemplate = 'sitemap/redirects';
-        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
-        $cmsComponent->setParameter(CmsComponent::PARAMETER_REDIRECTS, $cmsComponent->storage->getRedirects()->getRedirects());
-    }
+	private function redirectsOverviewRoute($cmsComponent)
+	{
+		$cmsComponent->subTemplate = 'sitemap/redirects';
+		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
+		$cmsComponent->setParameter(CmsComponent::PARAMETER_REDIRECTS, $cmsComponent->storage->getRedirects()->getRedirects());
+	}
 
-    private function redirectsNewRoute($request, $cmsComponent)
-    {
-        $cmsComponent->subTemplate = 'sitemap/redirects-form';
-        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
-        if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
-            $cmsComponent->storage->getRedirects()->addRedirect($request::$post);
-            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
-            exit;
-        }
-    }
+	private function redirectsNewRoute($request, $cmsComponent)
+	{
+		$cmsComponent->subTemplate = 'sitemap/redirects-form';
+		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
+		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
+			$cmsComponent->storage->getRedirects()->addRedirect($request::$post);
+			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
+			exit;
+		}
+	}
 
-    private function redirectEditRoute($request, $cmsComponent)
-    {
-        $cmsComponent->subTemplate = 'sitemap/redirects-form';
-        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
-        $redirect = $cmsComponent->storage->getRedirects()->getRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-        if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
-            $cmsComponent->storage->getRedirects()->saveRedirect($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
-            exit;
-        }
-        $cmsComponent->setParameter(CmsComponent::PARAMETER_REDIRECT, $redirect);
-    }
+	private function redirectEditRoute($request, $cmsComponent)
+	{
+		$cmsComponent->subTemplate = 'sitemap/redirects-form';
+		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
+		$redirect = $cmsComponent->storage->getRedirects()->getRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
+			$cmsComponent->storage->getRedirects()->saveRedirect($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
+			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
+			exit;
+		}
+		$cmsComponent->setParameter(CmsComponent::PARAMETER_REDIRECT, $redirect);
+	}
 
-    private function redirectDeleteRoute($request, $cmsComponent)
-    {
-        $cmsComponent->storage->getRedirects()->deleteRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-        header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
-        exit;
-    }
+	private function redirectDeleteRoute($request, $cmsComponent)
+	{
+		$cmsComponent->storage->getRedirects()->deleteRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
+		exit;
+	}
 }
\ No newline at end of file

src/components/DocumentComponent.php

Indentation +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 namespace CloudControl\Cms\components {
 
-    use storage\Storage;
+	use storage\Storage;
 
-    /**
+	/**
 	 * Class DocumentComponent
 	 *
 	 * Has optional parameter `folder` to prefix the relative url with a folder

src/components/CmsComponent.php

Indentation +26 added lines, -26 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 namespace CloudControl\Cms\components {
 
-    use CloudControl\Cms\components\cms\ConfigurationRouting;
-    use CloudControl\Cms\components\cms\DocumentRouting;
-    use CloudControl\Cms\components\cms\FilesRouting;
-    use CloudControl\Cms\components\cms\ImagesRouting;
-    use CloudControl\Cms\components\cms\SearchRouting;
-    use CloudControl\Cms\components\cms\SitemapRouting;
-    use CloudControl\Cms\crypt\Crypt;
-    use CloudControl\Cms\storage\Storage;
-
-    class CmsComponent extends BaseComponent
+	use CloudControl\Cms\components\cms\ConfigurationRouting;
+	use CloudControl\Cms\components\cms\DocumentRouting;
+	use CloudControl\Cms\components\cms\FilesRouting;
+	use CloudControl\Cms\components\cms\ImagesRouting;
+	use CloudControl\Cms\components\cms\SearchRouting;
+	use CloudControl\Cms\components\cms\SitemapRouting;
+	use CloudControl\Cms\crypt\Crypt;
+	use CloudControl\Cms\storage\Storage;
+
+	class CmsComponent extends BaseComponent
 	{
-        /**
+		/**
 		 * @var \CloudControl\Cms\storage\Storage
 		 */
 		public $storage;
@@ -41,8 +41,8 @@ 
 		const PARAMETER_IMAGE_SET = 'imageSet';
 		const PARAMETER_MAIN_NAV_CLASS = 'mainNavClass';
 		const PARAMETER_MY_BRICK_SLUG = 'myBrickSlug';
-        const PARAMETER_REDIRECT = 'redirect';
-        const PARAMETER_REDIRECTS = 'redirects';
+		const PARAMETER_REDIRECT = 'redirect';
+		const PARAMETER_REDIRECTS = 'redirects';
 		const PARAMETER_SEARCH = 'search';
 		const PARAMETER_SEARCH_LOG = "searchLog";
 		const PARAMETER_SEARCH_NEEDS_UPDATE = "searchNeedsUpdate";
@@ -57,14 +57,14 @@ 
 		const PARAMETER_VALUELISTS = "valuelists";
 		const PARAMETER_WHITELIST_IPS = 'whitelistIps';
 
-        const POST_PARAMETER_COMPONENT = 'component';
-        const POST_PARAMETER_FROM_URL = "fromUrl";
-        const POST_PARAMETER_PASSWORD = 'password';
-        const POST_PARAMETER_SAVE = 'save';
-        const POST_PARAMETER_TEMPLATE = 'template';
-        const POST_PARAMETER_TITLE = 'title';
-        const POST_PARAMETER_TO_URL = "toUrl";
-        const POST_PARAMETER_USERNAME = 'username';
+		const POST_PARAMETER_COMPONENT = 'component';
+		const POST_PARAMETER_FROM_URL = "fromUrl";
+		const POST_PARAMETER_PASSWORD = 'password';
+		const POST_PARAMETER_SAVE = 'save';
+		const POST_PARAMETER_TEMPLATE = 'template';
+		const POST_PARAMETER_TITLE = 'title';
+		const POST_PARAMETER_TO_URL = "toUrl";
+		const POST_PARAMETER_USERNAME = 'username';
 
 		const GET_PARAMETER_PATH = 'path';
 		const GET_PARAMETER_SLUG = 'slug';
@@ -369,9 +369,9 @@ 
 			}
 		}
 
-        protected function getTemplatePath($template, $application = null)
-        {
-            return __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
-        }
-    }
+		protected function getTemplatePath($template, $application = null)
+		{
+			return __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
+		}
+	}
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -170,7 +170,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');
 				}
 			}
 		}
@@ -186,7 +186,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');
 				}
 			}
 		}
@@ -230,7 +230,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;
 			}
 		}
@@ -371,7 +371,7 @@ 
 
         protected function getTemplatePath($template, $application = null)
         {
-            return __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
+            return __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR.$template.'.php';
         }
     }
 }
\ No newline at end of file

src/components/Component.php

Indentation +3 added lines, -3 removed lines

@@ -2,10 +2,10 @@
 namespace CloudControl\Cms\components
 {
 
-    use CloudControl\Cms\cc\Request;
-    use CloudControl\Cms\storage\Storage;
+	use CloudControl\Cms\cc\Request;
+	use CloudControl\Cms\storage\Storage;
 
-    /**
+	/**
 	 * Interface Component
 	 * @package CloudControl\Cms\components
 	 */