jenskooij / cloudcontrol

cloudcontrol/library/cc/cc.php

Doc Comments +1 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
  * @param array  $replace
  * @param string $delimiter
  *
- * @return mixed|string
+ * @return string
  */
 function slugify($str, $replace=array(), $delimiter='-') {
 	if( !empty($replace) ) {
@@ -130,7 +130,6 @@ 
  * Dumps a var_dump of the passed arguments with <pre> tags surrounding it.
  * Dies afterwards
  *
- * @param mixed $data    The data to be displayed
  */
 function dump()
 {

cloudcontrol/library/storage/JsonStorage.php

Doc Comments +4 added lines, -1 removed lines

@@ -17,7 +17,7 @@ 
 		/**
 		 * JsonStorage constructor.
 		 *
-		 * @param $storagePath
+		 * @param string $storagePath
 		 */
 		public function __construct($storagePath)
 		{
@@ -837,6 +837,9 @@ 
 			}
 		}
 
+		/**
+		 * @param string $path
+		 */
 		private function validateFilename($filename, $path)
 		{
 			$fileParts = explode('.', $filename);

Indentation +3 added lines, -3 removed lines

@@ -786,7 +786,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getImageByName($filename)
 		{
 			$images = $this->getImages();
@@ -876,7 +876,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getFileByName($filename)
 		{
 			$files = $this->getFiles();
@@ -891,7 +891,7 @@ 
 		/**
 		 * @param $filename
 		 * @throws \Exception
-         */
+		 */
 		public function deleteFileByName($filename)
 		{
 			$destinationPath = realpath(__DIR__ . '/../../www/files/');

cloudcontrol/library/images/methods/SmartCrop.php

Indentation +2 added lines, -2 removed lines

@@ -62,8 +62,8 @@
 
 			// Preserve transparency
 			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-            imagealphablending($new, false);
-            imagesavealpha($new, true);
+			imagealphablending($new, false);
+			imagesavealpha($new, true);
 			
 			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight);
 			

cloudcontrol/library/cc/errorhandler.php

Indentation +34 added lines, -34 removed lines

@@ -31,11 +31,11 @@ 
  */
 function shutdownHandler () {
 	$error = error_get_last(); 
-    if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
-        errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
-    }elseif ($error['type'] == 1) {
-        dump($error);
-    }
+	if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
+		errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
+	}elseif ($error['type'] == 1) {
+		dump($error);
+	}
 }
 
 /**
@@ -49,28 +49,28 @@ 
 	$jsonErrorNr = json_last_error();
 	$errstr = '';
 	switch ($jsonErrorNr) {
-        case JSON_ERROR_NONE:
-            $errstr .= ' - No errors' . PHP_EOL;
-        break;
-        case JSON_ERROR_DEPTH:
-            $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
-        break;
-        case JSON_ERROR_STATE_MISMATCH:
-            $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
-        break;
-        case JSON_ERROR_CTRL_CHAR:
-            $errstr .= ' - Unexpected control character found' . PHP_EOL;
-        break;
-        case JSON_ERROR_SYNTAX:
-            $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
-        break;
-        case JSON_ERROR_UTF8:
-            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
-        break;
-        default:
-            $errstr = ' - Unknown error' . PHP_EOL;
-        break;
-    }
+		case JSON_ERROR_NONE:
+			$errstr .= ' - No errors' . PHP_EOL;
+		break;
+		case JSON_ERROR_DEPTH:
+			$errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
+		break;
+		case JSON_ERROR_STATE_MISMATCH:
+			$errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
+		break;
+		case JSON_ERROR_CTRL_CHAR:
+			$errstr .= ' - Unexpected control character found' . PHP_EOL;
+		break;
+		case JSON_ERROR_SYNTAX:
+			$errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
+		break;
+		case JSON_ERROR_UTF8:
+			$errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
+		break;
+		default:
+			$errstr = ' - Unknown error' . PHP_EOL;
+		break;
+	}
 	errorHandler ($jsonErrorNr, $errstr, $file, $line);
 }
 
@@ -86,14 +86,14 @@ 
  */
 function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
 	$file_lines = file_exists($file) ? file($file) : array();
-    $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
-    $lines = array();
+	$range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
+	$lines = array();
 
-    foreach ($range as $line_number) {
-        if(isset($file_lines[$line_number-1])) {
-            $lines[$line_number] = $file_lines[$line_number-1];
-        }
-    }
+	foreach ($range as $line_number) {
+		if(isset($file_lines[$line_number-1])) {
+			$lines[$line_number] = $file_lines[$line_number-1];
+		}
+	}
 	if (ob_get_contents()) ob_end_clean();
 	$error = array(
 		'message' 		=> $message,

cloudcontrol/library/images/methods/Crop.php

Indentation +2 added lines, -2 removed lines

@@ -62,8 +62,8 @@
 
 			// Preserve transparency
 			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-            imagealphablending($new, false);
-            imagesavealpha($new, true);
+			imagealphablending($new, false);
+			imagesavealpha($new, true);
 			
 			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight);
 			

cloudcontrol/library/images/Image.php

Doc Comments +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 		 * @see http://www.php.net/manual/en/function.image-type-to-mime-type.php
 		 * @param string $imagePath
 		 * @param bool $getExtension
-		 * @return bool|int|string
+		 * @return integer
 		 */
 		public function GetImageMimeType($imagePath, $getExtension = false)
 		{

cloudcontrol/library/images/methods/BoxCrop.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		/**
 		 * @param resource $imageResource
 		 * @return resource
-         */
+		 */
 		public function Execute($imageResource)
 		{
 			// Define the origial width and height

cloudcontrol/library/components/LanguageComponent.php

Doc Comments +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
     /**
      * Detect if the language is switched manually
      *
-     * @param $request
+     * @param Request $request
      */
     private function checkLanguageSwitch($request)
     {

Indentation +112 added lines, -112 removed lines

@@ -7,118 +7,118 @@
 
 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);
-        }
-
-        $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 && $lang !== $this->defaultLanguage) { // if default language detected, no redirect
-                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);
+		}
+
+		$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 && $lang !== $this->defaultLanguage) { // if default language detected, no redirect
+				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(Storage $storage) {}
-    public function render() {}
-    public function get() {}
+	public function run(Storage $storage) {}
+	public function render() {}
+	public function get() {}
 }
\ No newline at end of file

cloudcontrol/library/components/CmsComponent.php

Indentation +18 added lines, -18 removed lines

@@ -18,7 +18,7 @@ 
 
 		/**
 		 * @var null
-         */
+		 */
 		protected $subTemplate = null;
 
 		/**
@@ -139,7 +139,7 @@ 
 		/**
 		 * @param $remoteAddress
 		 * @throws \Exception
-         */
+		 */
 		private function checkWhiteList($remoteAddress)
 		{
 			if (isset($this->parameters['whitelistIps'])) {
@@ -154,7 +154,7 @@ 
 		/**
 		 * @param $remoteAddress
 		 * @throws \Exception
-         */
+		 */
 		private function checkBlackList($remoteAddress)
 		{
 			if (isset($this->parameters['blacklistIps'])) {
@@ -169,7 +169,7 @@ 
 		/**
 		 * @param $request
 		 * @return mixed|string
-         */
+		 */
 		private function getRelativeCmsUri($request)
 		{
 			// TODO Use regex match parameter instead of calculating relative uri
@@ -184,7 +184,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function documentsRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/documents') {
@@ -199,7 +199,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function sitemapRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/sitemap') {
@@ -237,7 +237,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function imagesRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/images') {
@@ -269,7 +269,7 @@ 
 
 		/**
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function apiRouting($relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/images.json') {
@@ -287,7 +287,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function filesRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/files') {
@@ -313,7 +313,7 @@ 
 
 		/**
 		 * @param $slug
-         */
+		 */
 		private function downloadFile($slug)
 		{
 			$file = $this->storage->getFileByName($slug);
@@ -338,7 +338,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function configurationRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration') {
@@ -357,7 +357,7 @@ 
 		 * @param $request
 		 * @param $relativeCmsUri
 		 * @throws \Exception
-         */
+		 */
 		private function documentRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/documents/new-document' && isset($request::$get['path'])) {
@@ -412,7 +412,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function folderRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get['path'])) {
@@ -453,7 +453,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function usersRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration/users') {
@@ -487,7 +487,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function documentTypesRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration/document-types') {
@@ -526,7 +526,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function bricksRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration/bricks') {
@@ -565,7 +565,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function imageSetRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration/image-set') {
@@ -600,7 +600,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function applicationComponentRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration/application-components') {