jenskooij / cloudcontrol

cloudcontrol/library/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

cloudcontrol/library/search/filters/StopWordsFilter.php

Indentation +30 added lines, -30 removed lines

@@ -11,37 +11,37 @@
 
 abstract class StopWordsFilter implements Filter
 {
-    protected $tokens;
-    protected $stopWords = array();
+	protected $tokens;
+	protected $stopWords = array();
 
-    /**
-     * StopWordsFilter constructor.
-     * @param array $tokens
-     */
-    public function __construct($tokens)
-    {
-        $this->tokens = $tokens;
-    }
+	/**
+	 * StopWordsFilter constructor.
+	 * @param array $tokens
+	 */
+	public function __construct($tokens)
+	{
+		$this->tokens = $tokens;
+	}
 
-    /**
-     * @return array
-     */
-    public function getFilterResults()
-    {
-        foreach ($this->stopWords as $stopWord) {
-            foreach ($this->tokens as $field => $tokens) {
-                if (isset($tokens[$stopWord])) {
-                    $tokens[$stopWord] = null;
-                    unset($tokens[$stopWord]);
-                    $tokens = array_filter($tokens);
-                    asort($tokens);
-                }
+	/**
+	 * @return array
+	 */
+	public function getFilterResults()
+	{
+		foreach ($this->stopWords as $stopWord) {
+			foreach ($this->tokens as $field => $tokens) {
+				if (isset($tokens[$stopWord])) {
+					$tokens[$stopWord] = null;
+					unset($tokens[$stopWord]);
+					$tokens = array_filter($tokens);
+					asort($tokens);
+				}
 
-                $this->tokens[$field] = $tokens;
-            }
-        }
-        $this->tokens = array_filter($this->tokens);
-        asort($this->tokens);
-        return $this->tokens;
-    }
+				$this->tokens[$field] = $tokens;
+			}
+		}
+		$this->tokens = array_filter($this->tokens);
+		asort($this->tokens);
+		return $this->tokens;
+	}
 }
\ No newline at end of file

cloudcontrol/library/cc/ErrorHandlingUtil.php

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,9 @@ 
 	 */
 	public static function renderError($message = '', $file = '', $line = '', $code = 0, $trace = array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error')
 	{
-		if (ob_get_contents()) ob_end_clean();
+		if (ob_get_contents()) {
+			ob_end_clean();
+		}
 		$line = intval($line);
 
 		if (self::canShowError()) {
@@ -85,7 +87,9 @@ 
 
 	private static function renderCliException($message, $file, $line, $trace, $lines)
 	{
-		if (ob_get_contents()) ob_end_clean();
+		if (ob_get_contents()) {
+			ob_end_clean();
+		}
 		include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcli.php');
 		exit;
 	}

cloudcontrol/library/cc/errorhandler.php

Indentation +4 added lines, -4 removed lines

@@ -32,11 +32,11 @@
  */
 function shutdownHandler () {
 	$error = error_get_last(); 
-    if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
+	if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
 		\library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']);
-    }elseif ($error['type'] == 1) {
-        dump($error);
-    }
+	}elseif ($error['type'] == 1) {
+		dump($error);
+	}
 }
 
 

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	$error = error_get_last(); 
     if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
 		\library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']);
-    }elseif ($error['type'] == 1) {
+    } elseif ($error['type'] == 1) {
         dump($error);
     }
 }

cloudcontrol/library/components/cms/ImagesRouting.php

Indentation +15 added lines, -15 removed lines

@@ -13,26 +13,26 @@
 class ImagesRouting implements CmsRouting
 {
 
-    /**
-     * ImagesRouting constructor.
-     * @param \library\cc\Request $request
-     * @param mixed|string $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/images') {
+	/**
+	 * ImagesRouting constructor.
+	 * @param \library\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

cloudcontrol/library/cc/StringUtil.php

Braces +9 added lines, -6 removed lines

@@ -78,12 +78,15 @@
 	 */
 	public static function humanFileSize($size, $unit = "")
 	{
-		if ((!$unit && $size >= 1 << 30) || $unit == "GB")
-			return number_format($size / (1 << 30), 2) . "GB";
-		if ((!$unit && $size >= 1 << 20) || $unit == "MB")
-			return number_format($size / (1 << 20), 2) . "MB";
-		if ((!$unit && $size >= 1 << 10) || $unit == "KB")
-			return number_format($size / (1 << 10), 2) . "KB";
+		if ((!$unit && $size >= 1 << 30) || $unit == "GB") {
+					return number_format($size / (1 << 30), 2) . "GB";
+		}
+		if ((!$unit && $size >= 1 << 20) || $unit == "MB") {
+					return number_format($size / (1 << 20), 2) . "MB";
+		}
+		if ((!$unit && $size >= 1 << 10) || $unit == "KB") {
+					return number_format($size / (1 << 10), 2) . "KB";
+		}
 
 		return number_format($size) . " bytes";
 	}

cloudcontrol/templates/cms/documents/document-form-form.php

Braces +16 added lines, -6 removed lines

@@ -1,7 +1,8 @@ 
 <form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#' . $formId : '' ?>">
     <? if (!isset($hideTitleAndState)) : ?>
     <input type="hidden" name="path" value="<?=$request::$get['path']?>" />
-    <? else : ?>
+    <? else {
+	: ?>
     <input type="hidden" name="formId" value="<?=$formId?>" />
     <a name="<?=$formId?>"></a>
     <? endif ?>
@@ -17,15 +18,19 @@ 
                     <input required="required" value="<?=isset($document) ? $document->title : '' ?>" type="text" id="title" name="title" placeholder="Title" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix='fields';
+}
+?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
 					<? if (isset($document)) :
 						$fieldSlug = $field->slug;
 						$value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
-					else :
+					else {
+						:
 						$value = '';
+					}
 					endif ?>
 					<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 					<ul class="grid-wrapper sortable">
@@ -135,8 +140,11 @@ 
 					</ul>
 					<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
 					<?$static_brick_nr += 1?>
-				<? else : ?>
-					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+				<? else {
+	: ?>
+					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';
+}
+?>
 					<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 					<? foreach ($brick->structure->fields as $field) : ?>
 						<div class="form-element">
@@ -145,8 +153,10 @@ 
 							$brickSlug = $brick->slug;
 							$fieldSlug = $field->slug;
 							$value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
-						else :
+						else {
+							:
 							$value = '';
+						}
 						endif ?>
 						<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 						<ul class="grid-wrapper sortable">

cloudcontrol/templates/cms/documents/function.renderDocument.php

Indentation +4 added lines, -4 removed lines

@@ -21,9 +21,9 @@ 
 	<div class="documentActions grid-box-2">
 		<? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?>
             <?renderAction('Publish',
-                'publish',
-                \library\cc\Request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
-                'check');?>
+				'publish',
+				\library\cc\Request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
+				'check');?>
 		<? endif ?>
 		<? if ($document->state == 'published') : ?>
 			<?renderAction('Unpublish',
@@ -40,7 +40,7 @@ 
 				'error',
 				\library\cc\Request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
 				'trash',
-                'return confirm(\'Are you sure you want to delete this document?\');');?>
+				'return confirm(\'Are you sure you want to delete this document?\');');?>
 		<? endif ?>
 	</div>
 <?}?>

cloudcontrol/library/storage/storage/ValuelistsStorage.php

Indentation +73 added lines, -73 removed lines

@@ -12,83 +12,83 @@
 
 class ValuelistsStorage extends AbstractStorage
 {
-    /**
-     * Get all valuelists
-     *
-     * @return mixed
-     */
-    public function getValuelists()
-    {
-        return $this->repository->valuelists;
-    }
+	/**
+	 * Get all valuelists
+	 *
+	 * @return mixed
+	 */
+	public function getValuelists()
+	{
+		return $this->repository->valuelists;
+	}
 
-    public function addValuelist($postValues)
-    {
-        $valueListObject = ValuelistFactory::createValuelistFromPostValues($postValues);
-        $valuelists = $this->repository->valuelists;
-        $valuelists[] = $valueListObject;
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+	public function addValuelist($postValues)
+	{
+		$valueListObject = ValuelistFactory::createValuelistFromPostValues($postValues);
+		$valuelists = $this->repository->valuelists;
+		$valuelists[] = $valueListObject;
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 
-    /**
-     * Save changes to a valuelist
-     *
-     * @param $slug
-     * @param $postValues
-     *
-     * @throws \Exception
-     */
-    public function saveValuelist($slug, $postValues)
-    {
-        $valuelistObject = ValuelistFactory::createValuelistFromPostValues($postValues);
+	/**
+	 * Save changes to a valuelist
+	 *
+	 * @param $slug
+	 * @param $postValues
+	 *
+	 * @throws \Exception
+	 */
+	public function saveValuelist($slug, $postValues)
+	{
+		$valuelistObject = ValuelistFactory::createValuelistFromPostValues($postValues);
 
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $key => $valuelist) {
-            if ($valuelist->slug == $slug) {
-                $valuelists[$key] = $valuelistObject;
-            }
-        }
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $key => $valuelist) {
+			if ($valuelist->slug == $slug) {
+				$valuelists[$key] = $valuelistObject;
+			}
+		}
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 
-    /**
-     * Get a valuelist by its slug
-     *
-     * @param $slug
-     *
-     * @return mixed
-     */
-    public function getValuelistBySlug($slug)
-    {
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $valuelist) {
-            if ($valuelist->slug == $slug) {
-                return $valuelist;
-            }
-        }
+	/**
+	 * Get a valuelist by its slug
+	 *
+	 * @param $slug
+	 *
+	 * @return mixed
+	 */
+	public function getValuelistBySlug($slug)
+	{
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $valuelist) {
+			if ($valuelist->slug == $slug) {
+				return $valuelist;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Delete a sitemap item by its slug
-     *
-     * @param $slug
-     *
-     * @throws \Exception
-     */
-    public function deleteValuelistBySlug($slug)
-    {
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $key => $valuelist) {
-            if ($valuelist->slug == $slug) {
-                unset($valuelists[$key]);
-            }
-        }
-        $valuelists = array_values($valuelists);
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+	/**
+	 * Delete a sitemap item by its slug
+	 *
+	 * @param $slug
+	 *
+	 * @throws \Exception
+	 */
+	public function deleteValuelistBySlug($slug)
+	{
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $key => $valuelist) {
+			if ($valuelist->slug == $slug) {
+				unset($valuelists[$key]);
+			}
+		}
+		$valuelists = array_values($valuelists);
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 }
\ No newline at end of file