jenskooij / cloudcontrol

src/templates/documents/function.renderDocument.php

Indentation +13 added lines, -13 removed lines

@@ -31,26 +31,26 @@
   <div class="documentActions grid-box-2">
       <? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?>
           <? renderAction('Publish',
-              'publish',
-              $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
-              'check'); ?>
+			  'publish',
+			  $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
+			  'check'); ?>
       <? endif ?>
       <? if ($document->state == 'published') : ?>
           <? renderAction('Unpublish',
-              'unpublish',
-              $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug,
-              'times'); ?>
+			  'unpublish',
+			  $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug,
+			  'times'); ?>
       <? endif ?>
       <? renderAction('Edit',
-          '',
-          $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug,
-          'pencil'); ?>
+		  '',
+		  $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug,
+		  'pencil'); ?>
       <? if ($document->state == 'unpublished') : ?>
           <? renderAction('Delete',
-              'error',
-              $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
-              'trash',
-              'return confirm(\'Are you sure you want to delete this document?\');'); ?>
+			  'error',
+			  $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
+			  'trash',
+			  'return confirm(\'Are you sure you want to delete this document?\');'); ?>
       <? endif ?>
   </div>
 <? } ?>

src/templates/documents/brick.php

Indentation +2 added lines, -2 removed lines

@@ -4,9 +4,9 @@
 </div>
 <label><?= $brick->title ?></label>
 <? if ($static == true) {
-    $fieldPrefix = 'bricks[' . $myBrickSlug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . '][fields]';
+	$fieldPrefix = 'bricks[' . $myBrickSlug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . '][fields]';
 } else {
-    $fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . ']';
+	$fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . ']';
 } ?>
 <? foreach ($brick->fields as $field) : ?>
 			<div class="form-element">

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

Indentation +5 added lines, -5 removed lines

@@ -12,10 +12,10 @@
 
 class NotFoundComponent extends BaseComponent
 {
-    public function run(Storage $storage)
-    {
-        parent::run($storage);
-        header("HTTP/1.0 404 Not Found");
-    }
+	public function run(Storage $storage)
+	{
+		parent::run($storage);
+		header("HTTP/1.0 404 Not Found");
+	}
 
 }
\ No newline at end of file

src/components/LanguageComponent.php

Indentation +118 added lines, -118 removed lines

@@ -6,124 +6,124 @@
 
 class LanguageComponent implements Component
 {
-    protected $request;
-    protected $parameters;
-
-    protected $defaultLanguage = 'en';
-    protected $acceptedLanguages = null;
-    protected $languageParameterName = 'language';
-    protected $forceRedirect = false;
-    protected $sessionValues;
-
-    /**
-     * Component constructor.
-     *
-     * @param                     $template
-     * @param Request $request
-     * @param                     $parameters
-     * @param                     $matchedSitemapItem
-     */
-    public function __construct($template, Request $request, $parameters, $matchedSitemapItem)
-    {
-        $this->parameters = (array) $parameters;
-        $this->checkParameters();
-
-        $lang = substr(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : $this->defaultLanguage, 0, 2);
-        $_SESSION['LanguageComponent']['detectedLanguage'] = $lang;
-
-        $this->checkLanguageSwitch($request);
-
-        if (!isset($_SESSION['LanguageComponent'][$this->languageParameterName])) {
-            $this->detectLanguage($lang, $request);
-        } else {
-            if ($this->forceRedirect === true) {
-                $this->detectLanguage($_SESSION['LanguageComponent'][$this->languageParameterName], $request);
-            }
-        }
-
-        $this->parameters[$this->languageParameterName] = $_SESSION['LanguageComponent'][$this->languageParameterName];
-    }
-
-    /**
-     * Checks to see if any parameters are given from the configuration in the CMS
-     */
-    private function checkParameters()
-    {
-        if (isset($this->parameters['defaultLanguage'])) {
-            $this->defaultLanguage = $this->parameters['defaultLanguage'];
-            unset($this->parameters['defaultLanguage']);
-        }
-        if (isset($this->parameters['acceptedLanguages'])) {
-            $this->acceptedLanguages = explode(',', $this->parameters['acceptedLanguages']);
-            unset($this->parameters['acceptedLanguages']);
-        }
-        if (isset($this->parameters['languageParameterName'])) {
-            $this->languageParameterName = $this->parameters['languageParameterName'];
-            unset($this->parameters['languageParameterName']);
-        }
-        if (isset($this->parameters['forceRedirect'])) {
-            $this->forceRedirect = (bool) $this->parameters['forceRedirect'];
-            unset($this->parameters['forceRedirect']);
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
-
-
-    /**
-     * Check if the found language is allowed and
-     * if an action is to be taken.
-     *
-     * @param $lang
-     * @param $request
-     */
-    private function detectLanguage($lang, $request)
-    {
-        $_SESSION['LanguageComponent'][$this->languageParameterName] = $this->defaultLanguage;
-
-        if ($this->acceptedLanguages === null) {
-            $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
-        } else if (in_array($lang, $this->acceptedLanguages)) {
-            $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
-        } else {
-            $lang = $this->defaultLanguage;
-        }
-
-        $this->sessionValues = $_SESSION['LanguageComponent'];
-
-        if ($this->forceRedirect === true) {
-            if (substr($request::$relativeUri, 0, 2) !== $lang ) {
-                if ($lang !== $this->defaultLanguage) {
-                    header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
-                    exit;
-                }
-            }
-        }
-    }
-
-    /**
-     * Detect if the language is switched manually
-     *
-     * @param $request
-     */
-    private function checkLanguageSwitch($request)
-    {
-        if (isset($request::$get['langSwitch'])) {
-            $this->forceRedirect = true;
-            $this->detectLanguage($request::$get['langSwitch'], $request);
-        }
-    }
-
-    /*
+	protected $request;
+	protected $parameters;
+
+	protected $defaultLanguage = 'en';
+	protected $acceptedLanguages = null;
+	protected $languageParameterName = 'language';
+	protected $forceRedirect = false;
+	protected $sessionValues;
+
+	/**
+	 * Component constructor.
+	 *
+	 * @param                     $template
+	 * @param Request $request
+	 * @param                     $parameters
+	 * @param                     $matchedSitemapItem
+	 */
+	public function __construct($template, Request $request, $parameters, $matchedSitemapItem)
+	{
+		$this->parameters = (array) $parameters;
+		$this->checkParameters();
+
+		$lang = substr(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : $this->defaultLanguage, 0, 2);
+		$_SESSION['LanguageComponent']['detectedLanguage'] = $lang;
+
+		$this->checkLanguageSwitch($request);
+
+		if (!isset($_SESSION['LanguageComponent'][$this->languageParameterName])) {
+			$this->detectLanguage($lang, $request);
+		} else {
+			if ($this->forceRedirect === true) {
+				$this->detectLanguage($_SESSION['LanguageComponent'][$this->languageParameterName], $request);
+			}
+		}
+
+		$this->parameters[$this->languageParameterName] = $_SESSION['LanguageComponent'][$this->languageParameterName];
+	}
+
+	/**
+	 * Checks to see if any parameters are given from the configuration in the CMS
+	 */
+	private function checkParameters()
+	{
+		if (isset($this->parameters['defaultLanguage'])) {
+			$this->defaultLanguage = $this->parameters['defaultLanguage'];
+			unset($this->parameters['defaultLanguage']);
+		}
+		if (isset($this->parameters['acceptedLanguages'])) {
+			$this->acceptedLanguages = explode(',', $this->parameters['acceptedLanguages']);
+			unset($this->parameters['acceptedLanguages']);
+		}
+		if (isset($this->parameters['languageParameterName'])) {
+			$this->languageParameterName = $this->parameters['languageParameterName'];
+			unset($this->parameters['languageParameterName']);
+		}
+		if (isset($this->parameters['forceRedirect'])) {
+			$this->forceRedirect = (bool) $this->parameters['forceRedirect'];
+			unset($this->parameters['forceRedirect']);
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getParameters()
+	{
+		return $this->parameters;
+	}
+
+
+	/**
+	 * Check if the found language is allowed and
+	 * if an action is to be taken.
+	 *
+	 * @param $lang
+	 * @param $request
+	 */
+	private function detectLanguage($lang, $request)
+	{
+		$_SESSION['LanguageComponent'][$this->languageParameterName] = $this->defaultLanguage;
+
+		if ($this->acceptedLanguages === null) {
+			$_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
+		} else if (in_array($lang, $this->acceptedLanguages)) {
+			$_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
+		} else {
+			$lang = $this->defaultLanguage;
+		}
+
+		$this->sessionValues = $_SESSION['LanguageComponent'];
+
+		if ($this->forceRedirect === true) {
+			if (substr($request::$relativeUri, 0, 2) !== $lang ) {
+				if ($lang !== $this->defaultLanguage) {
+					header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
+					exit;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Detect if the language is switched manually
+	 *
+	 * @param $request
+	 */
+	private function checkLanguageSwitch($request)
+	{
+		if (isset($request::$get['langSwitch'])) {
+			$this->forceRedirect = true;
+			$this->detectLanguage($request::$get['langSwitch'], $request);
+		}
+	}
+
+	/*
      * These functions are required by the interface, but not for the functionality
      */
-    public function run(JsonStorage $storage) {}
-    public function render() {}
-    public function get() {}
+	public function run(JsonStorage $storage) {}
+	public function render() {}
+	public function get() {}
 }
\ No newline at end of file

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)
 	{