jenskooij / cloudcontrol

src/templates/documents/fieldTypes/Rich-Text.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?
 if (isset($summernoteInstances)) {
-    $summernoteInstances += 1;
+	$summernoteInstances += 1;
 } else {
-    $summernoteInstances = 1;
+	$summernoteInstances = 1;
 }
 ?>
 <div class="rte">
@@ -26,6 +26,6 @@ 
 </script>
 <?
 if (!isset($GLOBALS['rteList'])) {
-    $GLOBALS['rteList'] = array();
+	$GLOBALS['rteList'] = array();
 }
 $GLOBALS['rteList'][] = 'summernote_' . str_replace(']', '-', str_replace('[', '-', $fieldPrefix)) . $field->slug . '_rte_' . $summernoteInstances ?>

src/templates/documents/function.renderFolder.php

Indentation +7 added lines, -7 removed lines

@@ -17,14 +17,14 @@
   </div>
   <div class="documentActions grid-box-4">
       <? renderAction('Edit',
-          '',
-          $request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug,
-          'pencil'); ?>
+		  '',
+		  $request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug,
+		  'pencil'); ?>
       <? renderAction('Delete',
-          'error',
-          $request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug,
-          'trash',
-          'return confirm(\'Are you sure you want to delete this document?\');'); ?>
+		  'error',
+		  $request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug,
+		  'trash',
+		  'return confirm(\'Are you sure you want to delete this document?\');'); ?>
   </div>
   <ul class="documents grid-wrapper nested<?= $root ? ' root' : '' ?>">
       <? foreach ($document->getContent() as $subDocument) : ?>

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

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>

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/BaseComponent.php

Indentation +16 added lines, -16 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;
 
-    class BaseComponent implements Component
+	class BaseComponent implements Component
 	{
 		/**
 		 * @var string
@@ -93,7 +93,7 @@ 
 		 */
 		public function renderTemplate($template='', $obClean = true, $application=null)
 		{
-		    $templatePath = $this->getTemplatePath($template, $application);
+			$templatePath = $this->getTemplatePath($template, $application);
 			if (realpath($templatePath) !== false) {
 				if ($obClean) {
 					ob_clean();
@@ -140,16 +140,16 @@ 
 			return $this->parameters;
 		}
 
-        /**
-         * @param $template
-         * @param null $application
-         * @return string
-         */
-        protected function getTemplatePath($template, $application=null)
-        {
-            $templatePath = $application->getTemplatePath();
-            $templatePath = $templatePath . DIRECTORY_SEPARATOR . $template . '.php';
-            return $templatePath;
-        }
-    }
+		/**
+		 * @param $template
+		 * @param null $application
+		 * @return string
+		 */
+		protected function getTemplatePath($template, $application=null)
+		{
+			$templatePath = $application->getTemplatePath();
+			$templatePath = $templatePath . DIRECTORY_SEPARATOR . $template . '.php';
+			return $templatePath;
+		}
+	}
 }
\ 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