jenskooij / cloudcontrol

cloudcontrol/library/components/FormComponent.php

Spacing +3 added lines, -3 removed lines

@@ -162,7 +162,7 @@ 
 		if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) {
 			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
 		} else {
-			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true);
+			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string) microtime(true);
 			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false;
 			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
 		}
@@ -190,7 +190,7 @@ 
 		$postValues = $request::$post;
 		$postValues[self::PARAMETER_DOCUMENT_TYPE] = $this->documentType;
 		$postValues[self::GET_PARAMETER_PATH] = $this->responseFolder;
-		$postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
+		$postValues['title'] = date('r').' - From: '.$request::$requestUri;
 
 		return $postValues;
 	}
@@ -325,7 +325,7 @@ 
 	private function setFormParameter($form)
 	{
 		if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) {
-			$this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
+			$this->parameters[$this->formParameterName] = '<a name="'.$this->formId.'"></a>'.$this->thankYouMessage;
 		} else {
 			$this->parameters[$this->formParameterName] = $form;
 		}

Doc Comments +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
 	 * submitting the form
 	 *
 	 * @param $postValues
-	 * @param $storage
+	 * @param JsonStorage $storage
 	 */
 	protected function postSubmit($postValues, $storage)
 	{}
@@ -318,7 +318,7 @@ 
 	}
 
 	/**
-	 * @param $form
+	 * @param string|null $form
 	 */
 	private function setFormParameter($form)
 	{

cloudcontrol/library/components/CmsComponent.php

Spacing +3 added lines, -3 removed lines

@@ -159,7 +159,7 @@ 
 				$whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
 				$whitelistIps = array_map("trim", $whitelistIps);
 				if (!in_array($remoteAddress, $whitelistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
+					throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist');
 				}
 			}
 		}
@@ -175,7 +175,7 @@ 
 				$blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
 				$blacklistIps = array_map("trim", $blacklistIps);
 				if (in_array($remoteAddress, $blacklistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
+					throw new \Exception('Ip address '.$remoteAddress.' is on blacklist');
 				}
 			}
 		}
@@ -219,7 +219,7 @@ 
 			if ($relativeCmsUri == '/log-off') {
 				$_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
 				unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
-				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
+				header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX]);
 				exit;
 			}
 		}

cloudcontrol/library/cc/errorhandler.php

Braces +4 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	$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) {
+    } elseif ($error['type'] == 1) {
         dump($error);
     }
 }
@@ -85,7 +85,9 @@ 
  * @param string $httpHeader
  */
 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();
+    }
 
     if (canShowError()) {
         $file_lines = file_exists($file) ? file($file) : array();

Indentation +112 added lines, -112 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);
 }
 
@@ -85,102 +85,102 @@ 
  * @param string $httpHeader
  */
 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();
 
-    if (canShowError()) {
-        $file_lines = file_exists($file) ? file($file) : array();
-        $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
-        $lines = array();
+	if (canShowError()) {
+		$file_lines = file_exists($file) ? file($file) : 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];
+			}
+		}
 
-        $error = array(
-            'message' 		=> $message,
-            'file' 			=> $file,
-            'line' 			=> $line,
-            'code' 			=> $code,
-            'lines' 		=> $lines,
-            'trace' 		=> $trace,
-            'httpHeader' 	=> $httpHeader,
-        );
+		$error = array(
+			'message' 		=> $message,
+			'file' 			=> $file,
+			'line' 			=> $line,
+			'code' 			=> $code,
+			'lines' 		=> $lines,
+			'trace' 		=> $trace,
+			'httpHeader' 	=> $httpHeader,
+		);
 
-        if (PHP_SAPI === 'cli') {
-            renderCliException($message, $file, $line, $trace, $lines);
-        }
+		if (PHP_SAPI === 'cli') {
+			renderCliException($message, $file, $line, $trace, $lines);
+		}
 
-        if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
-            include(realpath(__DIR__) . '/errorviewdetailed.php');
-        } else {
-            header('Content-type: application/json');
-            die(json_encode($error));
-        }
-        exit;
-    } else {
-        header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-        header('X-Error-Message: ' . $message);
-        header('X-Error-File: ' . $file);
-        header('X-Error-Line: ' . $line);
-        if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
-            include(realpath(__DIR__) . '/errorviewcompact.php');
-        } else {
-            header('Content-type: application/json');
-            die(json_encode('An error occured.'));
-        }
-    }
+		if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
+			include(realpath(__DIR__) . '/errorviewdetailed.php');
+		} else {
+			header('Content-type: application/json');
+			die(json_encode($error));
+		}
+		exit;
+	} else {
+		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+		header('X-Error-Message: ' . $message);
+		header('X-Error-File: ' . $file);
+		header('X-Error-Line: ' . $line);
+		if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
+			include(realpath(__DIR__) . '/errorviewcompact.php');
+		} else {
+			header('Content-type: application/json');
+			die(json_encode('An error occured.'));
+		}
+	}
 }
 
 function canShowError()
 {
-    if (PHP_SAPI === 'cli') {
-        return true;
-    }
-    if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
-        $config = file_get_contents('../config.json');
-        $config = json_decode($config);
-        if (isset($config->showErrorsToAll)) {
-            return $config->showErrorsToAll;
-        }
-    } else {
-        return true;
-    }
+	if (PHP_SAPI === 'cli') {
+		return true;
+	}
+	if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
+		$config = file_get_contents('../config.json');
+		$config = json_decode($config);
+		if (isset($config->showErrorsToAll)) {
+			return $config->showErrorsToAll;
+		}
+	} else {
+		return true;
+	}
 }
 
 function renderCliException($message, $file, $line, $trace, $lines)
 {
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| THE FOLLOWING ERROR OCCURED                                                                                                                  |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo PHP_EOL;
-    echo '  ' . $message . PHP_EOL;
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| IN FILE                                                                                                                                      |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo PHP_EOL;
-    echo '  ' . $file . ':' . $line . PHP_EOL;
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| CONTENTS OF THE FILE                                                                                                                         |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo PHP_EOL;
-    foreach($lines as $nr => $currentLine) {
-        echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
-    }
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| STACK TRACE                                                                                                                                  |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    foreach($trace as $row) {
-        echo (isset($row['file']) ? basename($row['file']) : '') . ':'
-            . (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
-            . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
-            . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
-            . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
-    }
-    exit;
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| THE FOLLOWING ERROR OCCURED                                                                                                                  |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo PHP_EOL;
+	echo '  ' . $message . PHP_EOL;
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| IN FILE                                                                                                                                      |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo PHP_EOL;
+	echo '  ' . $file . ':' . $line . PHP_EOL;
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| CONTENTS OF THE FILE                                                                                                                         |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo PHP_EOL;
+	foreach($lines as $nr => $currentLine) {
+		echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+	}
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| STACK TRACE                                                                                                                                  |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	foreach($trace as $row) {
+		echo (isset($row['file']) ? basename($row['file']) : '') . ':'
+			. (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
+			. (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
+			. (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
+			. (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
+	}
+	exit;
 }
\ No newline at end of file

Spacing +47 added lines, -47 removed lines

@@ -9,8 +9,8 @@ 
  *
  * @param $e
  */
-function exceptionHandler ($e) {
-	renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace());
+function exceptionHandler($e) {
+	renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace());
 }
 
 /**
@@ -21,18 +21,18 @@ 
  * @param $errfile
  * @param $errline
  */
-function errorHandler ($errno, $errstr, $errfile, $errline) {
-	renderError($errstr,$errfile,$errline,$errno,debug_backtrace());
+function errorHandler($errno, $errstr, $errfile, $errline) {
+	renderError($errstr, $errfile, $errline, $errno, debug_backtrace());
 }
 
 /**
  * When an error occurs that kills the process, still try
  * to show it using a shutdownHandler.
  */
-function shutdownHandler () {
+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']);
+        errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
     }elseif ($error['type'] == 1) {
         dump($error);
     }
@@ -50,28 +50,28 @@ 
 	$errstr = '';
 	switch ($jsonErrorNr) {
         case JSON_ERROR_NONE:
-            $errstr .= ' - No errors' . PHP_EOL;
+            $errstr .= ' - No errors'.PHP_EOL;
         break;
         case JSON_ERROR_DEPTH:
-            $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
+            $errstr .= ' - Maximum stack depth exceeded'.PHP_EOL;
         break;
         case JSON_ERROR_STATE_MISMATCH:
-            $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
+            $errstr .= ' - Underflow or the modes mismatch'.PHP_EOL;
         break;
         case JSON_ERROR_CTRL_CHAR:
-            $errstr .= ' - Unexpected control character found' . PHP_EOL;
+            $errstr .= ' - Unexpected control character found'.PHP_EOL;
         break;
         case JSON_ERROR_SYNTAX:
-            $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
+            $errstr .= ' - Syntax error, malformed JSON'.PHP_EOL;
         break;
         case JSON_ERROR_UTF8:
-            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
+            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded'.PHP_EOL;
         break;
         default:
-            $errstr = ' - Unknown error' . PHP_EOL;
+            $errstr = ' - Unknown error'.PHP_EOL;
         break;
     }
-	errorHandler ($jsonErrorNr, $errstr, $file, $line);
+	errorHandler($jsonErrorNr, $errstr, $file, $line);
 }
 
 /**
@@ -84,7 +84,7 @@ 
  * @param array  $trace
  * @param string $httpHeader
  */
-function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
+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 (canShowError()) {
@@ -93,8 +93,8 @@ 
         $lines = array();
 
         foreach ($range as $line_number) {
-            if(isset($file_lines[$line_number-1])) {
-                $lines[$line_number] = $file_lines[$line_number-1];
+            if (isset($file_lines[$line_number - 1])) {
+                $lines[$line_number] = $file_lines[$line_number - 1];
             }
         }
 
@@ -112,20 +112,20 @@ 
             renderCliException($message, $file, $line, $trace, $lines);
         }
 
-        if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
-            include(realpath(__DIR__) . '/errorviewdetailed.php');
+        if (file_exists(realpath(__DIR__).'/errorviewdetailed.php')) {
+            include(realpath(__DIR__).'/errorviewdetailed.php');
         } else {
             header('Content-type: application/json');
             die(json_encode($error));
         }
         exit;
     } else {
-        header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-        header('X-Error-Message: ' . $message);
-        header('X-Error-File: ' . $file);
-        header('X-Error-Line: ' . $line);
-        if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
-            include(realpath(__DIR__) . '/errorviewcompact.php');
+        header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
+        header('X-Error-Message: '.$message);
+        header('X-Error-File: '.$file);
+        header('X-Error-Line: '.$line);
+        if (file_exists(realpath(__DIR__).'/errorviewcompact.php')) {
+            include(realpath(__DIR__).'/errorviewcompact.php');
         } else {
             header('Content-type: application/json');
             die(json_encode('An error occured.'));
@@ -152,35 +152,35 @@ 
 function renderCliException($message, $file, $line, $trace, $lines)
 {
     echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| THE FOLLOWING ERROR OCCURED                                                                                                                  |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
+    echo '| THE FOLLOWING ERROR OCCURED                                                                                                                  |'.PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
     echo PHP_EOL;
-    echo '  ' . $message . PHP_EOL;
+    echo '  '.$message.PHP_EOL;
     echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| IN FILE                                                                                                                                      |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
+    echo '| IN FILE                                                                                                                                      |'.PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
     echo PHP_EOL;
-    echo '  ' . $file . ':' . $line . PHP_EOL;
+    echo '  '.$file.':'.$line.PHP_EOL;
     echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| CONTENTS OF THE FILE                                                                                                                         |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
+    echo '| CONTENTS OF THE FILE                                                                                                                         |'.PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
     echo PHP_EOL;
-    foreach($lines as $nr => $currentLine) {
-        echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+    foreach ($lines as $nr => $currentLine) {
+        echo ($nr == $line ? '* ' : '  ').str_pad($nr, 3, "0", STR_PAD_LEFT).' '.$currentLine;
     }
     echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| STACK TRACE                                                                                                                                  |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    foreach($trace as $row) {
-        echo (isset($row['file']) ? basename($row['file']) : '') . ':'
-            . (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
-            . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
-            . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
-            . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
+    echo '| STACK TRACE                                                                                                                                  |'.PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
+    foreach ($trace as $row) {
+        echo (isset($row['file']) ? basename($row['file']) : '').':'
+            . (isset($row['line']) ? $row['line'] : '')."\t\t\t"
+            . (isset($row['class']) ? $row['class'] : ' ')."\t\t\t"
+            . (isset($row['type']) ? $row['type'] : ' ')."\t\t\t"
+            . (isset($row['function']) ? $row['function'] : ' ').PHP_EOL;
     }
     exit;
 }
\ No newline at end of file

cloudcontrol/library/cc/autoloader.php

Spacing +5 added lines, -5 removed lines

@@ -2,7 +2,7 @@ 
 spl_autoload_extensions('.php');
 spl_autoload_register("autoloader");
 
-$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
+$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/');
 
 /**
  * The function to be registered as the default autoload functino
@@ -32,14 +32,14 @@ 
 	}
 	
 	global $rootPath;
-	$file = $rootPath . str_replace('\\', '/', $class) . ".php";
+	$file = $rootPath.str_replace('\\', '/', $class).".php";
 	$debug_backtrace = debug_backtrace();
 	
 	if (file_exists($file)) {
 		require_once($file);
 		if ($throwException) {
 			if (class_exists($class, false) === false && interface_exists($class, false) === false) {
-				throw new \Exception('Could not load class "' . $class . '" in file ' . $file);
+				throw new \Exception('Could not load class "'.$class.'" in file '.$file);
 			} else {
 				return true;
 			}
@@ -48,13 +48,13 @@ 
 	} else {
 		if (isset($debug_backtrace[2]) && isset($debug_backtrace[2]['file']) && isset($debug_backtrace[2]['line'])) {			
 			if ($throwException) {
-				errorHandler(0, 'Could not load class \'' . $class . '\' in file ' . $rootPath . $file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
+				errorHandler(0, 'Could not load class \''.$class.'\' in file '.$rootPath.$file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
 			} else {
 				return false;
 			}			
 		} else {
 			if ($throwException) {
-				throw new \Exception('Could not load class "' . $class . '" in file ' . $file . "\n" . 'Called from unknown origin.');
+				throw new \Exception('Could not load class "'.$class.'" in file '.$file."\n".'Called from unknown origin.');
 			} else {
 				return false;
 			}

cloudcontrol/library/cc/cc.php

Braces +9 added lines, -6 removed lines

@@ -74,12 +74,15 @@
  * @return string
  */
 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";
 }
 

Spacing +17 added lines, -17 removed lines

@@ -38,14 +38,14 @@ 
 		return '0 seconds';
 	}
 
-	$a = array( 365 * 24 * 60 * 60  =>  'year',
+	$a = array(365 * 24 * 60 * 60  =>  'year',
 				30 * 24 * 60 * 60  =>  'month',
 				24 * 60 * 60  =>  'day',
 				60 * 60  =>  'hour',
 				60  =>  'minute',
 				1  =>  'second'
 	);
-	$a_plural = array( 'year'   => 'years',
+	$a_plural = array('year'   => 'years',
 					   'month'  => 'months',
 					   'day'    => 'days',
 					   'hour'   => 'hours',
@@ -59,7 +59,7 @@ 
 		if ($d >= 1)
 		{
 			$r = round($d);
-			return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
+			return $r.' '.($r > 1 ? $a_plural[$str] : $str).' ago';
 		}
 	}
 	return 0;
@@ -73,13 +73,13 @@ 
  * @param string $unit
  * @return string
  */
-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";
+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";
 	return number_format($size)." bytes";
 }
 
@@ -133,9 +133,9 @@ 
  *
  * @return mixed|string
  */
-function slugify($str, $replace=array(), $delimiter='-') {
-	if( !empty($replace) ) {
-		$str = str_replace((array)$replace, ' ', $str);
+function slugify($str, $replace = array(), $delimiter = '-') {
+	if (!empty($replace)) {
+		$str = str_replace((array) $replace, ' ', $str);
 	}
 
 	$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
@@ -158,13 +158,13 @@ 
 {
 	$debug_backtrace = current(debug_backtrace());
 	if (PHP_SAPI == 'cli') {
-		echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+		echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
 		foreach (func_get_args() as $data) {
 			var_dump($data);
 		}
 	} else {
 		ob_clean();
-		echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+		echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
 		echo '<pre>';
 		foreach (func_get_args() as $data) {
 			echo "<code>";
@@ -212,8 +212,8 @@ 
  */
 function utf8Convert($array)
 {
-	array_walk_recursive($array, function(&$item){
-		if(!mb_detect_encoding($item, 'utf-8', true)){
+	array_walk_recursive($array, function(&$item) {
+		if (!mb_detect_encoding($item, 'utf-8', true)) {
 			$item = utf8_encode($item);
 		}
 	});

cloudcontrol/library/storage/Document.php

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
             }
         } elseif ($name === 'content') {
             if ($this->dbHandle === null) {
-                throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
+                throw new \Exception('Document doesnt have a dbHandle handle. (path: '.$this->path.')');
             } else {
                 if ($this->content === null) {
                     $this->getContent();
@@ -68,19 +68,19 @@ 
      */
     protected function getContent()
     {
-        $folderPathWithWildcard = $this->path . '%';
+        $folderPathWithWildcard = $this->path.'%';
         $sql = '    SELECT *
                       FROM documents
-                     WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard) . '
-                       AND substr(`path`, ' . (strlen($this->path) + 2) . ') NOT LIKE "%/%"
-                       AND substr(`path`, ' . (strlen($this->path) + 1) . ', 1) = "/"
-                       AND path != ' . $this->dbHandle->quote($this->path) . '
+                     WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard).'
+                       AND substr(`path`, ' . (strlen($this->path) + 2).') NOT LIKE "%/%"
+                       AND substr(`path`, ' . (strlen($this->path) + 1).', 1) = "/"
+                       AND path != ' . $this->dbHandle->quote($this->path).'
                     ';
         $stmt = $this->dbHandle->query($sql);
         if ($stmt === false) {
             $errorInfo = $this->dbHandle->errorInfo();
             $errorMsg = $errorInfo[2];
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+            throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
         }
         $contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document');
         foreach ($contents as $key => $document) {

Indentation +69 added lines, -69 removed lines

@@ -18,85 +18,85 @@
  */
 class Document
 {
-    public $id;
-    public $path;
-    public $title;
-    public $slug;
-    public $type;
-    public $documentType;
-    public $documentTypeSlug;
-    public $state;
-    public $lastModificationDate;
-    public $creationDate;
-    public $lastModifiedBy;
-    protected $fields;
-    protected $bricks;
-    protected $dynamicBricks;
-    protected $content;
+	public $id;
+	public $path;
+	public $title;
+	public $slug;
+	public $type;
+	public $documentType;
+	public $documentTypeSlug;
+	public $state;
+	public $lastModificationDate;
+	public $creationDate;
+	public $lastModifiedBy;
+	protected $fields;
+	protected $bricks;
+	protected $dynamicBricks;
+	protected $content;
 
-    protected $dbHandle;
+	protected $dbHandle;
 
-    protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks');
+	protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks');
 
-    public function __get($name) {
-        if (in_array($name, $this->jsonEncodedFields)) {
-            if (is_string($this->$name)) {
-                return json_decode($this->$name);
-            } else {
-                return $this->$name;
-            }
-        } elseif ($name === 'content') {
-            if ($this->dbHandle === null) {
-                throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
-            } else {
-                if ($this->content === null) {
-                    $this->getContent();
-                }
-                return $this->content;
-            }
-        } elseif ($name === 'dbHandle') {
-            throw new \Exception('Trying to get protected property repository.');
-        }
-        return $this->$name;
-    }
+	public function __get($name) {
+		if (in_array($name, $this->jsonEncodedFields)) {
+			if (is_string($this->$name)) {
+				return json_decode($this->$name);
+			} else {
+				return $this->$name;
+			}
+		} elseif ($name === 'content') {
+			if ($this->dbHandle === null) {
+				throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
+			} else {
+				if ($this->content === null) {
+					$this->getContent();
+				}
+				return $this->content;
+			}
+		} elseif ($name === 'dbHandle') {
+			throw new \Exception('Trying to get protected property repository.');
+		}
+		return $this->$name;
+	}
 
-    public function __set($name, $value) {
-        if (in_array($name, $this->jsonEncodedFields)) {
-            $this->$name = json_encode($value);
-        } elseif ($name === 'content') {
-            // Dont do anything for now..
-            return;
-        }
+	public function __set($name, $value) {
+		if (in_array($name, $this->jsonEncodedFields)) {
+			$this->$name = json_encode($value);
+		} elseif ($name === 'content') {
+			// Dont do anything for now..
+			return;
+		}
 
-        $this->$name = $value;
-    }
+		$this->$name = $value;
+	}
 
-    /**
-     * @throws \Exception
-     */
-    protected function getContent()
-    {
-        $folderPathWithWildcard = $this->path . '%';
-        $sql = '    SELECT *
+	/**
+	 * @throws \Exception
+	 */
+	protected function getContent()
+	{
+		$folderPathWithWildcard = $this->path . '%';
+		$sql = '    SELECT *
                       FROM documents
                      WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard) . '
                        AND substr(`path`, ' . (strlen($this->path) + 2) . ') NOT LIKE "%/%"
                        AND substr(`path`, ' . (strlen($this->path) + 1) . ', 1) = "/"
                        AND path != ' . $this->dbHandle->quote($this->path) . '
                     ';
-        $stmt = $this->dbHandle->query($sql);
-        if ($stmt === false) {
-            $errorInfo = $this->dbHandle->errorInfo();
-            $errorMsg = $errorInfo[2];
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-        }
-        $contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document');
-        foreach ($contents as $key => $document) {
-            if ($document->type === 'folder') {
-                $document->dbHandle = $this->dbHandle;
-                $contents[$key] = $document;
-            }
-        }
-        $this->content = $contents;
-    }
+		$stmt = $this->dbHandle->query($sql);
+		if ($stmt === false) {
+			$errorInfo = $this->dbHandle->errorInfo();
+			$errorMsg = $errorInfo[2];
+			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+		}
+		$contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document');
+		foreach ($contents as $key => $document) {
+			if ($document->type === 'folder') {
+				$document->dbHandle = $this->dbHandle;
+				$contents[$key] = $document;
+			}
+		}
+		$this->content = $contents;
+	}
 }
\ No newline at end of file

cloudcontrol/library/storage/Repository.php

Spacing +32 added lines, -32 removed lines

@@ -103,13 +103,13 @@ 
             if (in_array($name, $this->fileBasedSubsets)) {
                 return $this->$name;
             } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
             }
         } else {
             if (in_array($name, $this->fileBasedSubsets)) {
                 return $this->loadSubset($name);
             } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
             }
         }
     }
@@ -124,10 +124,10 @@ 
     {
         if (in_array($name, $this->fileBasedSubsets)) {
             $this->$name = $value;
-            $changes = $name . 'Changes';
+            $changes = $name.'Changes';
             $this->$changes = true;
         } else {
-            throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>');
+            throw new \Exception('Trying to persist unknown subset in repository: '.$name.' <br /><pre>'.print_r($value, true).'</pre>');
         }
     }
 
@@ -153,9 +153,9 @@ 
     protected function saveSubset($subset)
     {
         $json = json_encode($this->$subset);
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
         file_put_contents($subsetStoragePath, $json);
-        $changes = $subset . 'Changes';
+        $changes = $subset.'Changes';
         $this->$changes = false;
     }
 
@@ -166,7 +166,7 @@ 
      */
     protected function loadSubset($subset)
     {
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
         $json = file_get_contents($subsetStoragePath);
         $json = json_decode($json);
         $this->$subset = $json;
@@ -214,7 +214,7 @@ 
     protected function getContentDbHandle()
     {
         if ($this->contentDbHandle === null) {
-            $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
+            $this->contentDbHandle = new \PDO('sqlite:'.$this->storagePath.DIRECTORY_SEPARATOR.'content.db');
         }
         return $this->contentDbHandle;
     }
@@ -237,14 +237,14 @@ 
     public function getDocumentsByPath($folderPath)
     {
         $db = $this->getContentDbHandle();
-        $folderPathWithWildcard = $folderPath . '%';
+        $folderPathWithWildcard = $folderPath.'%';
 
         $stmt = $this->getDbStatement('
             SELECT *
               FROM documents
-             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . '
-               AND substr(`path`, ' . (strlen($folderPath) + 1) . ') NOT LIKE "%/%"
-               AND path != ' . $db->quote($folderPath) . '
+             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard).'
+               AND substr(`path`, ' . (strlen($folderPath) + 1).') NOT LIKE "%/%"
+               AND path != ' . $db->quote($folderPath).'
           ORDER BY `type` DESC, `path` ASC
         ');
 
@@ -288,7 +288,7 @@ 
         $document = $this->fetchDocument('
             SELECT *
               FROM documents
-             WHERE path = ' . $db->quote($path) . '
+             WHERE path = ' . $db->quote($path).'
         ');
         if ($document instanceof Document && $document->type === 'folder') {
             $document->dbHandle = $db;
@@ -333,7 +333,7 @@ 
         if ($stmt === false) {
             $errorInfo = $db->errorInfo();
             $errorMsg = $errorInfo[2];
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+            throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
         }
         return $stmt;
     }
@@ -363,19 +363,19 @@ 
         $stmt = $this->getDbStatement('
             INSERT OR REPLACE INTO documents (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
             VALUES(
-              ' . $db->quote($documentObject->path) . ',
-              ' . $db->quote($documentObject->title) . ',
-              ' . $db->quote($documentObject->slug) . ',
-              ' . $db->quote($documentObject->type) . ',
-              ' . $db->quote($documentObject->documentType) . ',
-              ' . $db->quote($documentObject->documentTypeSlug) . ',
-              ' . $db->quote($documentObject->state) . ',
-              ' . $db->quote($documentObject->lastModificationDate) . ',
-              ' . $db->quote($documentObject->creationDate) . ',
-              ' . $db->quote($documentObject->lastModifiedBy) . ',
-              ' . $db->quote(json_encode($documentObject->fields)) . ',
-              ' . $db->quote(json_encode($documentObject->bricks)) . ',
-              ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
+              ' . $db->quote($documentObject->path).',
+              ' . $db->quote($documentObject->title).',
+              ' . $db->quote($documentObject->slug).',
+              ' . $db->quote($documentObject->type).',
+              ' . $db->quote($documentObject->documentType).',
+              ' . $db->quote($documentObject->documentTypeSlug).',
+              ' . $db->quote($documentObject->state).',
+              ' . $db->quote($documentObject->lastModificationDate).',
+              ' . $db->quote($documentObject->creationDate).',
+              ' . $db->quote($documentObject->lastModifiedBy).',
+              ' . $db->quote(json_encode($documentObject->fields)).',
+              ' . $db->quote(json_encode($documentObject->bricks)).',
+              ' . $db->quote(json_encode($documentObject->dynamicBricks)).'
             )
         ');
         $result = $stmt->execute();
@@ -396,16 +396,16 @@ 
             if ($documentToDelete->type == 'document') {
                 $stmt = $this->getDbStatement('
                     DELETE FROM documents
-                          WHERE path = ' . $db->quote($path) . '
+                          WHERE path = ' . $db->quote($path).'
                 ');
                 $stmt->execute();
             } elseif ($documentToDelete->type == 'folder') {
-                $folderPathWithWildcard = $path . '%';
+                $folderPathWithWildcard = $path.'%';
                 $stmt = $this->getDbStatement('
                     DELETE FROM documents
-                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . '
-                            AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/")
-                            OR path = ' . $db->quote($path) . '
+                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard).'
+                            AND substr(`path`, ' . (strlen($path) + 1).', 1) = "/")
+                            OR path = ' . $db->quote($path).'
                 ');
                 $stmt->execute();
             }

Indentation +355 added lines, -355 removed lines

@@ -21,227 +21,227 @@ 
  */
 class Repository
 {
-    protected $storagePath;
-
-    protected $fileBasedSubsets = array('sitemap', 'applicationComponents', 'documentTypes', 'bricks', 'imageSet', 'images', 'files', 'users');
-
-    protected $sitemap;
-    protected $sitemapChanges = false;
-
-    protected $applicationComponents;
-    protected $applicationComponentsChanges = false;
-
-    protected $documentTypes;
-    protected $documentTypesChanges = false;
-
-    protected $bricks;
-    protected $bricksChanges = false;
-
-    protected $imageSet;
-    protected $imageSetChanges = false;
-
-    protected $images;
-    protected $imagesChanges = false;
-
-    protected $files;
-    protected $filesChanges = false;
-
-    protected $users;
-    protected $usersChanges = false;
-
-    protected $contentDbHandle;
-
-    /**
-     * Repository constructor.
-     * @param $storagePath
-     * @throws \Exception
-     */
-    public function __construct($storagePath)
-    {
-        $storagePath = realpath($storagePath);
-        if (is_dir($storagePath) && $storagePath !== false) {
-            $this->storagePath = $storagePath;
-        } else {
-            throw new \Exception('Repository not yet initialized.');
-        }
-    }
-
-    /**
-     * Creates the folder in which to create all storage related files
-     *
-     * @param $storagePath
-     * @return bool
-     */
-    public static function create($storagePath)
-    {
-        return mkdir($storagePath);
-    }
-
-    /**
-     * Initiates default storage
-     * @throws \Exception
-     */
-    public function init()
-    {
-        $storageDefaultPath = realpath('../library/cc/install/_storage.json');
-        $contentSqlPath = realpath('../library/cc/install/content.sql');
-
-        $this->initConfigStorage($storageDefaultPath);
-        $this->initContentDb($contentSqlPath);
-
-        $this->save();
-    }
-
-    /**
-     * Load filebased subset and return it's contents
-     *
-     * @param $name
-     * @return mixed|string
-     * @throws \Exception
-     */
-    public function __get($name)
-    {
-        if (isset($this->$name)) {
-            if (in_array($name, $this->fileBasedSubsets)) {
-                return $this->$name;
-            } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
-            }
-        } else {
-            if (in_array($name, $this->fileBasedSubsets)) {
-                return $this->loadSubset($name);
-            } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
-            }
-        }
-    }
-
-    /**
-     * Set filebased subset contents
-     * @param $name
-     * @param $value
-     * @throws \Exception
-     */
-    public function __set($name, $value)
-    {
-        if (in_array($name, $this->fileBasedSubsets)) {
-            $this->$name = $value;
-            $changes = $name . 'Changes';
-            $this->$changes = true;
-        } else {
-            throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>');
-        }
-    }
-
-    /**
-     * Persist all subsets
-     */
-    public function save()
-    {
-        $this->sitemapChanges ? $this->saveSubset('sitemap') : null;
-        $this->applicationComponentsChanges ? $this->saveSubset('applicationComponents') : null;
-        $this->documentTypesChanges ? $this->saveSubset('documentTypes') : null;
-        $this->bricksChanges ? $this->saveSubset('bricks') : null;
-        $this->imageSetChanges ? $this->saveSubset('imageSet') : null;
-        $this->imagesChanges ? $this->saveSubset('images') : null;
-        $this->filesChanges ? $this->saveSubset('files') : null;
-        $this->usersChanges ? $this->saveSubset('users') : null;
-    }
-
-    /**
-     * Persist subset to disk
-     * @param $subset
-     */
-    protected function saveSubset($subset)
-    {
-        $json = json_encode($this->$subset);
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
-        file_put_contents($subsetStoragePath, $json);
-        $changes = $subset . 'Changes';
-        $this->$changes = false;
-    }
-
-    /**
-     * Load subset from disk
-     * @param $subset
-     * @return mixed|string
-     */
-    protected function loadSubset($subset)
-    {
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
-        $json = file_get_contents($subsetStoragePath);
-        $json = json_decode($json);
-        $this->$subset = $json;
-        return $json;
-    }
-
-    /**
-     * @param $contentSqlPath
-     */
-    protected function initContentDb($contentSqlPath)
-    {
-        $db = $this->getContentDbHandle();
-        $sql = file_get_contents($contentSqlPath);
-        $db->exec($sql);
-    }
-
-    /**
-     * @param $storageDefaultPath
-     */
-    protected function initConfigStorage($storageDefaultPath)
-    {
-        $json = file_get_contents($storageDefaultPath);
-        $json = json_decode($json);
-        $this->sitemap = $json->sitemap;
-        $this->sitemapChanges = true;
-        $this->applicationComponents = $json->applicationComponents;
-        $this->applicationComponentsChanges = true;
-        $this->documentTypes = $json->documentTypes;
-        $this->documentTypesChanges = true;
-        $this->bricks = $json->bricks;
-        $this->bricksChanges = true;
-        $this->imageSet = $json->imageSet;
-        $this->imageSetChanges = true;
-        $this->images = $json->images;
-        $this->imagesChanges = true;
-        $this->files = $json->files;
-        $this->filesChanges = true;
-        $this->users = $json->users;
-        $this->usersChanges = true;
-    }
-
-    /**
-     * @return \PDO
-     */
-    protected function getContentDbHandle()
-    {
-        if ($this->contentDbHandle === null) {
-            $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
-        }
-        return $this->contentDbHandle;
-    }
-
-    /**
-     * Get all documents
-     * @return array
-     */
-    public function getDocuments()
-    {
-        return $this->getDocumentsByPath('/');
-    }
-
-    /**
-     * Get all documents and folders in a certain path
-     * @param $folderPath
-     * @return array
-     * @throws \Exception
-     */
-    public function getDocumentsByPath($folderPath)
-    {
-        $db = $this->getContentDbHandle();
-        $folderPathWithWildcard = $folderPath . '%';
-
-        $stmt = $this->getDbStatement('
+	protected $storagePath;
+
+	protected $fileBasedSubsets = array('sitemap', 'applicationComponents', 'documentTypes', 'bricks', 'imageSet', 'images', 'files', 'users');
+
+	protected $sitemap;
+	protected $sitemapChanges = false;
+
+	protected $applicationComponents;
+	protected $applicationComponentsChanges = false;
+
+	protected $documentTypes;
+	protected $documentTypesChanges = false;
+
+	protected $bricks;
+	protected $bricksChanges = false;
+
+	protected $imageSet;
+	protected $imageSetChanges = false;
+
+	protected $images;
+	protected $imagesChanges = false;
+
+	protected $files;
+	protected $filesChanges = false;
+
+	protected $users;
+	protected $usersChanges = false;
+
+	protected $contentDbHandle;
+
+	/**
+	 * Repository constructor.
+	 * @param $storagePath
+	 * @throws \Exception
+	 */
+	public function __construct($storagePath)
+	{
+		$storagePath = realpath($storagePath);
+		if (is_dir($storagePath) && $storagePath !== false) {
+			$this->storagePath = $storagePath;
+		} else {
+			throw new \Exception('Repository not yet initialized.');
+		}
+	}
+
+	/**
+	 * Creates the folder in which to create all storage related files
+	 *
+	 * @param $storagePath
+	 * @return bool
+	 */
+	public static function create($storagePath)
+	{
+		return mkdir($storagePath);
+	}
+
+	/**
+	 * Initiates default storage
+	 * @throws \Exception
+	 */
+	public function init()
+	{
+		$storageDefaultPath = realpath('../library/cc/install/_storage.json');
+		$contentSqlPath = realpath('../library/cc/install/content.sql');
+
+		$this->initConfigStorage($storageDefaultPath);
+		$this->initContentDb($contentSqlPath);
+
+		$this->save();
+	}
+
+	/**
+	 * Load filebased subset and return it's contents
+	 *
+	 * @param $name
+	 * @return mixed|string
+	 * @throws \Exception
+	 */
+	public function __get($name)
+	{
+		if (isset($this->$name)) {
+			if (in_array($name, $this->fileBasedSubsets)) {
+				return $this->$name;
+			} else {
+				throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+			}
+		} else {
+			if (in_array($name, $this->fileBasedSubsets)) {
+				return $this->loadSubset($name);
+			} else {
+				throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+			}
+		}
+	}
+
+	/**
+	 * Set filebased subset contents
+	 * @param $name
+	 * @param $value
+	 * @throws \Exception
+	 */
+	public function __set($name, $value)
+	{
+		if (in_array($name, $this->fileBasedSubsets)) {
+			$this->$name = $value;
+			$changes = $name . 'Changes';
+			$this->$changes = true;
+		} else {
+			throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>');
+		}
+	}
+
+	/**
+	 * Persist all subsets
+	 */
+	public function save()
+	{
+		$this->sitemapChanges ? $this->saveSubset('sitemap') : null;
+		$this->applicationComponentsChanges ? $this->saveSubset('applicationComponents') : null;
+		$this->documentTypesChanges ? $this->saveSubset('documentTypes') : null;
+		$this->bricksChanges ? $this->saveSubset('bricks') : null;
+		$this->imageSetChanges ? $this->saveSubset('imageSet') : null;
+		$this->imagesChanges ? $this->saveSubset('images') : null;
+		$this->filesChanges ? $this->saveSubset('files') : null;
+		$this->usersChanges ? $this->saveSubset('users') : null;
+	}
+
+	/**
+	 * Persist subset to disk
+	 * @param $subset
+	 */
+	protected function saveSubset($subset)
+	{
+		$json = json_encode($this->$subset);
+		$subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+		file_put_contents($subsetStoragePath, $json);
+		$changes = $subset . 'Changes';
+		$this->$changes = false;
+	}
+
+	/**
+	 * Load subset from disk
+	 * @param $subset
+	 * @return mixed|string
+	 */
+	protected function loadSubset($subset)
+	{
+		$subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+		$json = file_get_contents($subsetStoragePath);
+		$json = json_decode($json);
+		$this->$subset = $json;
+		return $json;
+	}
+
+	/**
+	 * @param $contentSqlPath
+	 */
+	protected function initContentDb($contentSqlPath)
+	{
+		$db = $this->getContentDbHandle();
+		$sql = file_get_contents($contentSqlPath);
+		$db->exec($sql);
+	}
+
+	/**
+	 * @param $storageDefaultPath
+	 */
+	protected function initConfigStorage($storageDefaultPath)
+	{
+		$json = file_get_contents($storageDefaultPath);
+		$json = json_decode($json);
+		$this->sitemap = $json->sitemap;
+		$this->sitemapChanges = true;
+		$this->applicationComponents = $json->applicationComponents;
+		$this->applicationComponentsChanges = true;
+		$this->documentTypes = $json->documentTypes;
+		$this->documentTypesChanges = true;
+		$this->bricks = $json->bricks;
+		$this->bricksChanges = true;
+		$this->imageSet = $json->imageSet;
+		$this->imageSetChanges = true;
+		$this->images = $json->images;
+		$this->imagesChanges = true;
+		$this->files = $json->files;
+		$this->filesChanges = true;
+		$this->users = $json->users;
+		$this->usersChanges = true;
+	}
+
+	/**
+	 * @return \PDO
+	 */
+	protected function getContentDbHandle()
+	{
+		if ($this->contentDbHandle === null) {
+			$this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
+		}
+		return $this->contentDbHandle;
+	}
+
+	/**
+	 * Get all documents
+	 * @return array
+	 */
+	public function getDocuments()
+	{
+		return $this->getDocumentsByPath('/');
+	}
+
+	/**
+	 * Get all documents and folders in a certain path
+	 * @param $folderPath
+	 * @return array
+	 * @throws \Exception
+	 */
+	public function getDocumentsByPath($folderPath)
+	{
+		$db = $this->getContentDbHandle();
+		$folderPathWithWildcard = $folderPath . '%';
+
+		$stmt = $this->getDbStatement('
             SELECT *
               FROM documents
              WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . '
@@ -250,119 +250,119 @@ 
           ORDER BY `type` DESC, `path` ASC
         ');
 
-        $documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document');
-        foreach ($documents as $key => $document) {
-            if ($document->type === 'folder') {
-                $document->dbHandle = $db;
-                $documents[$key] = $document;
-            }
-        }
-        return $documents;
-    }
-
-
-    /**
-     * @param $path
-     * @return bool|Document
-     */
-    public function getDocumentContainerByPath($path)
-    {
-        $document = $this->getDocumentByPath($path);
-        if ($document === false) {
-            return false;
-        }
-        $slugLength = strlen($document->slug);
-        $containerPath = substr($path, 0, -$slugLength);
-        if ($containerPath === '/') {
-            return $this->getRootFolder();
-        }
-        $containerFolder = $this->getDocumentByPath($containerPath);
-        return $containerFolder;
-    }
-
-    /**
-     * @param $path
-     * @return bool|Document
-     */
-    public function getDocumentByPath($path)
-    {
-        $db = $this->getContentDbHandle();
-        $document = $this->fetchDocument('
+		$documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document');
+		foreach ($documents as $key => $document) {
+			if ($document->type === 'folder') {
+				$document->dbHandle = $db;
+				$documents[$key] = $document;
+			}
+		}
+		return $documents;
+	}
+
+
+	/**
+	 * @param $path
+	 * @return bool|Document
+	 */
+	public function getDocumentContainerByPath($path)
+	{
+		$document = $this->getDocumentByPath($path);
+		if ($document === false) {
+			return false;
+		}
+		$slugLength = strlen($document->slug);
+		$containerPath = substr($path, 0, -$slugLength);
+		if ($containerPath === '/') {
+			return $this->getRootFolder();
+		}
+		$containerFolder = $this->getDocumentByPath($containerPath);
+		return $containerFolder;
+	}
+
+	/**
+	 * @param $path
+	 * @return bool|Document
+	 */
+	public function getDocumentByPath($path)
+	{
+		$db = $this->getContentDbHandle();
+		$document = $this->fetchDocument('
             SELECT *
               FROM documents
              WHERE path = ' . $db->quote($path) . '
         ');
-        if ($document instanceof Document && $document->type === 'folder') {
-            $document->dbHandle = $db;
-        }
-        return $document;
-    }
-
-    /**
-     * Return the results of the query as array of Documents
-     * @param $sql
-     * @return array
-     * @throws \Exception
-     */
-    protected function fetchAllDocuments($sql)
-    {
-        $stmt = $this->getDbStatement($sql);
-        return $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document');
-    }
-
-    /**
-     * Return the result of the query as Document
-     * @param $sql
-     * @return mixed
-     * @throws \Exception
-     */
-    protected function fetchDocument($sql)
-    {
-        $stmt = $this->getDbStatement($sql);
-        return $stmt->fetchObject('\library\storage\Document');
-    }
-
-    /**
-     * Prepare the sql statement
-     * @param $sql
-     * @return \PDOStatement
-     * @throws \Exception
-     */
-    protected function getDbStatement($sql)
-    {
-        $db = $this->getContentDbHandle();
-        $stmt = $db->query($sql);
-        if ($stmt === false) {
-            $errorInfo = $db->errorInfo();
-            $errorMsg = $errorInfo[2];
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-        }
-        return $stmt;
-    }
-
-    /**
-     * Create a (non-existent) root folder Document and return it
-     * @return Document
-     */
-    protected function getRootFolder()
-    {
-        $rootFolder = new Document();
-        $rootFolder->path = '/';
-        $rootFolder->type = 'folder';
-        return $rootFolder;
-    }
-
-    /**
-     * Save the document to the database
-     * @param Document $documentObject
-     * @return bool
-     * @throws \Exception
-     * @internal param $path
-     */
-    public function saveDocument($documentObject)
-    {
-        $db = $this->getContentDbHandle();
-        $stmt = $this->getDbStatement('
+		if ($document instanceof Document && $document->type === 'folder') {
+			$document->dbHandle = $db;
+		}
+		return $document;
+	}
+
+	/**
+	 * Return the results of the query as array of Documents
+	 * @param $sql
+	 * @return array
+	 * @throws \Exception
+	 */
+	protected function fetchAllDocuments($sql)
+	{
+		$stmt = $this->getDbStatement($sql);
+		return $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document');
+	}
+
+	/**
+	 * Return the result of the query as Document
+	 * @param $sql
+	 * @return mixed
+	 * @throws \Exception
+	 */
+	protected function fetchDocument($sql)
+	{
+		$stmt = $this->getDbStatement($sql);
+		return $stmt->fetchObject('\library\storage\Document');
+	}
+
+	/**
+	 * Prepare the sql statement
+	 * @param $sql
+	 * @return \PDOStatement
+	 * @throws \Exception
+	 */
+	protected function getDbStatement($sql)
+	{
+		$db = $this->getContentDbHandle();
+		$stmt = $db->query($sql);
+		if ($stmt === false) {
+			$errorInfo = $db->errorInfo();
+			$errorMsg = $errorInfo[2];
+			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+		}
+		return $stmt;
+	}
+
+	/**
+	 * Create a (non-existent) root folder Document and return it
+	 * @return Document
+	 */
+	protected function getRootFolder()
+	{
+		$rootFolder = new Document();
+		$rootFolder->path = '/';
+		$rootFolder->type = 'folder';
+		return $rootFolder;
+	}
+
+	/**
+	 * Save the document to the database
+	 * @param Document $documentObject
+	 * @return bool
+	 * @throws \Exception
+	 * @internal param $path
+	 */
+	public function saveDocument($documentObject)
+	{
+		$db = $this->getContentDbHandle();
+		$stmt = $this->getDbStatement('
             INSERT OR REPLACE INTO documents (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
             VALUES(
               ' . $db->quote($documentObject->path) . ',
@@ -380,37 +380,37 @@ 
               ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
             )
         ');
-        $result = $stmt->execute();
-        return $result;
-    }
-
-    /**
-     * Delete the document from the database
-     * If it's a folder, also delete it's contents
-     * @param $path
-     * @throws \Exception
-     */
-    public function deleteDocumentByPath($path)
-    {
-        $db = $this->getContentDbHandle();
-        $documentToDelete = $this->getDocumentByPath($path);
-        if ($documentToDelete instanceof Document) {
-            if ($documentToDelete->type == 'document') {
-                $stmt = $this->getDbStatement('
+		$result = $stmt->execute();
+		return $result;
+	}
+
+	/**
+	 * Delete the document from the database
+	 * If it's a folder, also delete it's contents
+	 * @param $path
+	 * @throws \Exception
+	 */
+	public function deleteDocumentByPath($path)
+	{
+		$db = $this->getContentDbHandle();
+		$documentToDelete = $this->getDocumentByPath($path);
+		if ($documentToDelete instanceof Document) {
+			if ($documentToDelete->type == 'document') {
+				$stmt = $this->getDbStatement('
                     DELETE FROM documents
                           WHERE path = ' . $db->quote($path) . '
                 ');
-                $stmt->execute();
-            } elseif ($documentToDelete->type == 'folder') {
-                $folderPathWithWildcard = $path . '%';
-                $stmt = $this->getDbStatement('
+				$stmt->execute();
+			} elseif ($documentToDelete->type == 'folder') {
+				$folderPathWithWildcard = $path . '%';
+				$stmt = $this->getDbStatement('
                     DELETE FROM documents
                           WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . '
                             AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/")
                             OR path = ' . $db->quote($path) . '
                 ');
-                $stmt->execute();
-            }
-        }
-    }
+				$stmt->execute();
+			}
+		}
+	}
 }
\ No newline at end of file

cloudcontrol/library/storage/JsonStorage.php

Indentation +97 added lines, -97 removed lines

@@ -2,19 +2,19 @@ 
 namespace library\storage
 {
 
-    use library\crypt\Crypt;
-    use library\images\ImageResizer;
+	use library\crypt\Crypt;
+	use library\images\ImageResizer;
 
-    /**
+	/**
 	 * Class JsonStorage
 	 * @package library\storage
 	 */
 	class JsonStorage implements Storage
 	{
 		private $storageDir;
-        /**
-         * @var Repository
-         */
+		/**
+		 * @var Repository
+		 */
 		private $repository;
 
 		/**
@@ -76,12 +76,12 @@ 
 			return $return;
 		}
 
-        /**
-         * Get user by slug
-         *
-         * @param $slug
-         * @return array
-         */
+		/**
+		 * Get user by slug
+		 *
+		 * @param $slug
+		 * @return array
+		 */
 		public function getUserBySlug($slug)
 		{
 			$return = array();
@@ -97,23 +97,23 @@ 
 			return $return;
 		}
 
-        /**
-         * Get all users
-         *
-         * @return mixed
-         */
+		/**
+		 * Get all users
+		 *
+		 * @return mixed
+		 */
 		public function getUsers()
 		{
 			return $this->repository->users;
 		}
 
-        /**
-         * Save user
-         *
-         * @param $slug
-         * @param $postValues
-         * @throws \Exception
-         */
+		/**
+		 * Save user
+		 *
+		 * @param $slug
+		 * @param $postValues
+		 * @throws \Exception
+		 */
 		public function saveUser($slug, $postValues)
 		{
 			$userObj = $this->createUserFromPostValues($postValues);
@@ -134,12 +134,12 @@ 
 			$this->save();
 		}
 
-        /**
-         * Add user
-         *
-         * @param $postValues
-         * @throws \Exception
-         */
+		/**
+		 * Add user
+		 *
+		 * @param $postValues
+		 * @throws \Exception
+		 */
 		public function addUser($postValues)
 		{
 			$userObj = $this->createUserFromPostValues($postValues);
@@ -148,17 +148,17 @@ 
 			if (!empty($doesItExist)) {
 				throw new \Exception('Trying to add username that already exists.');
 			}
-            $users = $this->repository->users;
-            $users[] = $userObj;
-            $this->repository->users = $users;
+			$users = $this->repository->users;
+			$users[] = $userObj;
+			$this->repository->users = $users;
 			$this->save();
 		}
 
-        /**
-         * Delete user by slug
-         * @param $slug
-         * @throws \Exception
-         */
+		/**
+		 * Delete user by slug
+		 * @param $slug
+		 * @throws \Exception
+		 */
 		public function deleteUserBySlug($slug)
 		{
 			$userToDelete = $this->getUserBySlug($slug);
@@ -175,12 +175,12 @@ 
 			$this->save();
 		}
 
-        /**
-         * Create user from POST values
-         * @param $postValues
-         * @return \stdClass
-         * @throws \Exception
-         */
+		/**
+		 * Create user from POST values
+		 * @param $postValues
+		 * @return \stdClass
+		 * @throws \Exception
+		 */
 		private function createUserFromPostValues($postValues)
 		{
 			if (isset($postValues['username'])) {
@@ -229,40 +229,40 @@ 
 		 */
 		public function getDocumentBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			return $this->repository->getDocumentByPath($path);
 		}
 
 		public function saveDocument($postValues)
 		{
-            $oldPath = '/' . $postValues['path'];
-
-            $container = $this->getDocumentContainerByPath($oldPath);
-            $documentObject = $this->createDocumentFromPostValues($postValues);
-            if ($container->path === '/') {
-                $newPath = $container->path . $documentObject->slug;
-            } else {
-                $newPath = $container->path . '/' . $documentObject->slug;
-            }
-            $documentObject->path = $newPath;
-            $this->repository->saveDocument($documentObject);
-        }
+			$oldPath = '/' . $postValues['path'];
+
+			$container = $this->getDocumentContainerByPath($oldPath);
+			$documentObject = $this->createDocumentFromPostValues($postValues);
+			if ($container->path === '/') {
+				$newPath = $container->path . $documentObject->slug;
+			} else {
+				$newPath = $container->path . '/' . $documentObject->slug;
+			}
+			$documentObject->path = $newPath;
+			$this->repository->saveDocument($documentObject);
+		}
 
 		public function addDocument($postValues)
 		{
 			$documentObject = $this->createDocumentFromPostValues($postValues);
-            if ($postValues['path'] === '/') {
-                $documentObject->path = $postValues['path'] . $documentObject->slug;
-            } else {
-                $documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
-            }
+			if ($postValues['path'] === '/') {
+				$documentObject->path = $postValues['path'] . $documentObject->slug;
+			} else {
+				$documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
+			}
 
-            $this->repository->saveDocument($documentObject);
+			$this->repository->saveDocument($documentObject);
 		}
 
 		public function deleteDocumentBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -313,13 +313,13 @@ 
 							$brickArray[] = $brickObj;
 						}
 
-                        $bricks = $documentObj->bricks;
+						$bricks = $documentObj->bricks;
 						$bricks[$brickSlug] = $brickArray;
-                        $documentObj->bricks = $bricks;
+						$documentObj->bricks = $bricks;
 					} else {
-                        $bricks = $documentObj->bricks;
+						$bricks = $documentObj->bricks;
 						$bricks[$brickSlug] = $brick;
-                        $documentObj->bricks = $bricks;
+						$documentObj->bricks = $bricks;
 					}
 				}
 			}
@@ -330,9 +330,9 @@ 
 						$brickObj = new \stdClass();
 						$brickObj->type = $brickTypeSlug;
 						$brickObj->fields = $brickContent;
-                        $dynamicBricks = $documentObj->dynamicBricks;
+						$dynamicBricks = $documentObj->dynamicBricks;
 						$dynamicBricks[] = $brickObj;
-                        $documentObj->dynamicBricks = $dynamicBricks;
+						$documentObj->dynamicBricks = $dynamicBricks;
 					}
 				}
 			}
@@ -348,13 +348,13 @@ 
 		 */
 		public function addDocumentFolder($postValues)
 		{
-            $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues);
-            if ($postValues['path'] === '/') {
-                $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
-            } else {
-                $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
-            }
-            $this->repository->saveDocument($documentFolderObject);
+			$documentFolderObject = $this->createDocumentFolderFromPostValues($postValues);
+			if ($postValues['path'] === '/') {
+				$documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
+			} else {
+				$documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
+			}
+			$this->repository->saveDocument($documentFolderObject);
 		}
 
 		/**
@@ -366,7 +366,7 @@ 
 		 */
 		public function deleteDocumentFolderBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -380,7 +380,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			return $this->repository->getDocumentByPath($path);
 		}
 
@@ -393,7 +393,7 @@ 
 		 */
 		public function saveDocumentFolder($postValues)
 		{
-            $this->addDocumentFolder($postValues);
+			$this->addDocumentFolder($postValues);
 		}
 
 		/**
@@ -406,7 +406,7 @@ 
 		 */
 		private function getDocumentContainerByPath($path)
 		{
-            return $this->repository->getDocumentContainerByPath($path);
+			return $this->repository->getDocumentContainerByPath($path);
 		}
 
 		/**
@@ -610,9 +610,9 @@ 
 				$imageObject->size = $postValues['size'];
 				$imageObject->set = $fileNames;
 
-                $images = $this->repository->images;
+				$images = $this->repository->images;
 				$images[] = $imageObject;
-                $this->repository->images = $images;
+				$this->repository->images = $images;
 
 				$this->save();
 			} else {
@@ -647,7 +647,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getImageByName($filename)
 		{
 			$images = $this->getImages();
@@ -698,9 +698,9 @@ 
 				$file->type = $postValues['type'];
 				$file->size = $postValues['size'];
 
-                $files = $this->repository->files;
+				$files = $this->repository->files;
 				$files[] = $file;
-                $this->repository->files = $files;
+				$this->repository->files = $files;
 				$this->save();
 			} else {
 				throw new \Exception('Error moving uploaded file');
@@ -739,7 +739,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getFileByName($filename)
 		{
 			$files = $this->getFiles();
@@ -754,7 +754,7 @@ 
 		/**
 		 * @param $filename
 		 * @throws \Exception
-         */
+		 */
 		public function deleteFileByName($filename)
 		{
 			$destinationPath = realpath(__DIR__ . '/../../www/files/');
@@ -799,9 +799,9 @@ 
 		{
 			$documentTypeObject = $this->createDocumentTypeFromPostValues($postValues);
 
-            $documentTypes = $this->repository->documentTypes;
-            $documentTypes[] = $documentTypeObject;
-            $this->repository->documentTypes = $documentTypes;
+			$documentTypes = $this->repository->documentTypes;
+			$documentTypes[] = $documentTypeObject;
+			$this->repository->documentTypes = $documentTypes;
 
 			$this->save();
 		}
@@ -947,9 +947,9 @@ 
 		{
 			$brickObject = $this->createBrickFromPostValues($postValues);
 
-            $bricks = $this->repository->bricks;
-            $bricks[] = $brickObject;
-            $this->repository->bricks = $bricks;
+			$bricks = $this->repository->bricks;
+			$bricks[] = $brickObject;
+			$this->repository->bricks = $bricks;
 
 			$this->save();
 		}
@@ -1154,9 +1154,9 @@ 
 		{
 			$imageSetObject = $this->createImageSetFromPostValues($postValues);
 
-            $imageSet = $this->repository->imageSet;
-            $imageSet[] = $imageSetObject;
-            $this->repository->imageSet = $imageSet;
+			$imageSet = $this->repository->imageSet;
+			$imageSet[] = $imageSetObject;
+			$this->repository->imageSet = $imageSet;
 
 			$this->save();
 		}

Spacing +28 added lines, -28 removed lines

@@ -36,7 +36,7 @@ 
 		 */
 		private function config()
 		{
-			$storagePath = __DIR__ . '/../../' . $this->storageDir;
+			$storagePath = __DIR__.'/../../'.$this->storageDir;
 			if (realpath($storagePath) === false) {
 				initFramework();
 				if (Repository::create($storagePath)) {
@@ -44,7 +44,7 @@ 
 					$repository->init();
 					$this->repository = $repository;
 				} else {
-					throw new \Exception('Could not create repository directory: ' . $storagePath);
+					throw new \Exception('Could not create repository directory: '.$storagePath);
 				}
 			} else {
 				$this->repository = new Repository($storagePath);
@@ -229,20 +229,20 @@ 
 		 */
 		public function getDocumentBySlug($slug)
 		{
-            $path = '/' . $slug;
+            $path = '/'.$slug;
 			return $this->repository->getDocumentByPath($path);
 		}
 
 		public function saveDocument($postValues)
 		{
-            $oldPath = '/' . $postValues['path'];
+            $oldPath = '/'.$postValues['path'];
 
             $container = $this->getDocumentContainerByPath($oldPath);
             $documentObject = $this->createDocumentFromPostValues($postValues);
             if ($container->path === '/') {
-                $newPath = $container->path . $documentObject->slug;
+                $newPath = $container->path.$documentObject->slug;
             } else {
-                $newPath = $container->path . '/' . $documentObject->slug;
+                $newPath = $container->path.'/'.$documentObject->slug;
             }
             $documentObject->path = $newPath;
             $this->repository->saveDocument($documentObject);
@@ -252,9 +252,9 @@ 
 		{
 			$documentObject = $this->createDocumentFromPostValues($postValues);
             if ($postValues['path'] === '/') {
-                $documentObject->path = $postValues['path'] . $documentObject->slug;
+                $documentObject->path = $postValues['path'].$documentObject->slug;
             } else {
-                $documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
+                $documentObject->path = $postValues['path'].'/'.$documentObject->slug;
             }
 
             $this->repository->saveDocument($documentObject);
@@ -262,7 +262,7 @@ 
 
 		public function deleteDocumentBySlug($slug)
 		{
-            $path = '/' . $slug;
+            $path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -350,9 +350,9 @@ 
 		{
             $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues);
             if ($postValues['path'] === '/') {
-                $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
+                $documentFolderObject->path = $postValues['path'].$documentFolderObject->slug;
             } else {
-                $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
+                $documentFolderObject->path = $postValues['path'].'/'.$documentFolderObject->slug;
             }
             $this->repository->saveDocument($documentFolderObject);
 		}
@@ -366,7 +366,7 @@ 
 		 */
 		public function deleteDocumentFolderBySlug($slug)
 		{
-            $path = '/' . $slug;
+            $path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -380,7 +380,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-            $path = '/' . $slug;
+            $path = '/'.$slug;
 			return $this->repository->getDocumentByPath($path);
 		}
 
@@ -591,13 +591,13 @@ 
 
 		public function addImage($postValues)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/images/');
+			$destinationPath = realpath(__DIR__.'/../../www/images/');
 
 			$filename = $this->validateFilename($postValues['name'], $destinationPath);
-			$destination = $destinationPath . '/' . $filename;
+			$destination = $destinationPath.'/'.$filename;
 
 			if ($postValues['error'] != '0') {
-				throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+				throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
 			}
 
 			if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -622,14 +622,14 @@ 
 
 		public function deleteImageByName($filename)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/images/');
+			$destinationPath = realpath(__DIR__.'/../../www/images/');
 
 			$images = $this->getImages();
 
 			foreach ($images as $key => $image) {
 				if ($image->file == $filename) {
 					foreach ($image->set as $imageSetFilename) {
-						$destination = $destinationPath . '/' . $imageSetFilename;
+						$destination = $destinationPath.'/'.$imageSetFilename;
 						if (file_exists($destination)) {
 							unlink($destination);
 						} else {
@@ -671,7 +671,7 @@ 
 		 */
 		public function getFiles()
 		{
-			$files =  $this->repository->files;
+			$files = $this->repository->files;
 			usort($files, array($this, 'compareFiles'));
 			return $files;
 		}
@@ -683,13 +683,13 @@ 
 
 		public function addFile($postValues)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/files/');
+			$destinationPath = realpath(__DIR__.'/../../www/files/');
 
 			$filename = $this->validateFilename($postValues['name'], $destinationPath);
-			$destination = $destinationPath . '/' . $filename;
+			$destination = $destinationPath.'/'.$filename;
 
 			if ($postValues['error'] != '0') {
-				throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+				throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
 			}
 
 			if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -715,23 +715,23 @@ 
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension = slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . '.' . $extension;
+				$filename = $fileNameWithoutExtension.'.'.$extension;
 			} else {
 				$filename = slugify($filename);
 			}
 
-			if (file_exists($path . '/' . $filename)) {
+			if (file_exists($path.'/'.$filename)) {
 				$fileParts = explode('.', $filename);
 				if (count($fileParts) > 1) {
 					$extension = end($fileParts);
 					array_pop($fileParts);
 					$fileNameWithoutExtension = implode('-', $fileParts);
 					$fileNameWithoutExtension .= '-copy';
-					$filename = $fileNameWithoutExtension . '.' . $extension;
+					$filename = $fileNameWithoutExtension.'.'.$extension;
 				} else {
 					$filename .= '-copy';
 				}
-				return $this->validateFilename($filename,$path);
+				return $this->validateFilename($filename, $path);
 			}
 			return $filename;
 		}
@@ -757,8 +757,8 @@ 
          */
 		public function deleteFileByName($filename)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/files/');
-			$destination = $destinationPath . '/' . $filename;
+			$destinationPath = realpath(__DIR__.'/../../www/files/');
+			$destination = $destinationPath.'/'.$filename;
 
 			if (file_exists($destination)) {
 				$files = $this->getFiles();