Inspection of "Added @property comments to document to describe p..." - jenskooij/cloudcontrol - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — develop ( 4622da...bbf2e4 )

by Jens

created 2017-02-17 15:50 UTC

Status

Doc Comments +5 added lines patch added patch discarded remove patch

@@ -149,6 +149,11 @@
 block discarded – undo
     }
 }
 
+/**
+ * @param string $message
+ * @param string $file
+ * @param integer $code
+ */
 function renderCliException($message, $file, $line, $code, $trace, $lines)
 {
     echo PHP_EOL;

Please login to merge, or discard this patch.

Indentation +112 added lines, -112 removed lines patch added patch discarded remove patch

@@ -31,11 +31,11 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
  * @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, $code, $trace, $lines);
-        }
+		if (PHP_SAPI === 'cli') {
+			renderCliException($message, $file, $line, $code, $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, $code, $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

Please login to merge, or discard this patch.

Spacing +47 added lines, -47 removed lines patch added patch discarded remove patch

		@@ -9,8 +9,8 @@ discard block
		block discarded – undo
9	9	*
10	10	* @param $e
11	11	*/
12		-function exceptionHandler ($e) {
13		- renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace());
	12	+function exceptionHandler($e) {
	13	+ renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace());
14	14	}
15	15
16	16	/**
		@@ -21,18 +21,18 @@ discard block
		block discarded – undo
21	21	* @param $errfile
22	22	* @param $errline
23	23	*/
24		-function errorHandler ($errno, $errstr, $errfile, $errline) {
25		- renderError($errstr,$errfile,$errline,$errno,debug_backtrace());
	24	+function errorHandler($errno, $errstr, $errfile, $errline) {
	25	+ renderError($errstr, $errfile, $errline, $errno, debug_backtrace());
26	26	}
27	27
28	28	/**
29	29	* When an error occurs that kills the process, still try
30	30	* to show it using a shutdownHandler.
31	31	*/
32		-function shutdownHandler () {
	32	+function shutdownHandler() {
33	33	$error = error_get_last();
34	34	if (isset($error['type'], $error['message'], $error['file'], $error['line'])) {
35		- errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
	35	+ errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
36	36	}elseif ($error['type'] == 1) {
37	37	dump($error);
38	38	}
		@@ -50,28 +50,28 @@ discard block
		block discarded – undo
50	50	$errstr = '';
51	51	switch ($jsonErrorNr) {
52	52	case JSON_ERROR_NONE:
53		- $errstr .= ' - No errors' . PHP_EOL;
	53	+ $errstr .= ' - No errors'.PHP_EOL;
54	54	break;
55	55	case JSON_ERROR_DEPTH:
56		- $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
	56	+ $errstr .= ' - Maximum stack depth exceeded'.PHP_EOL;
57	57	break;
58	58	case JSON_ERROR_STATE_MISMATCH:
59		- $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
	59	+ $errstr .= ' - Underflow or the modes mismatch'.PHP_EOL;
60	60	break;
61	61	case JSON_ERROR_CTRL_CHAR:
62		- $errstr .= ' - Unexpected control character found' . PHP_EOL;
	62	+ $errstr .= ' - Unexpected control character found'.PHP_EOL;
63	63	break;
64	64	case JSON_ERROR_SYNTAX:
65		- $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
	65	+ $errstr .= ' - Syntax error, malformed JSON'.PHP_EOL;
66	66	break;
67	67	case JSON_ERROR_UTF8:
68		- $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
	68	+ $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded'.PHP_EOL;
69	69	break;
70	70	default:
71		- $errstr = ' - Unknown error' . PHP_EOL;
	71	+ $errstr = ' - Unknown error'.PHP_EOL;
72	72	break;
73	73	}
74		- errorHandler ($jsonErrorNr, $errstr, $file, $line);
	74	+ errorHandler($jsonErrorNr, $errstr, $file, $line);
75	75	}
76	76
77	77	/**
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	* @param array $trace
85	85	* @param string $httpHeader
86	86	*/
87		-function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
	87	+function renderError($message = '', $file = '', $line = '', $code = 0, $trace = array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
88	88	if (ob_get_contents()) ob_end_clean();
89	89
90	90	if (canShowError()) {
		@@ -93,8 +93,8 @@ discard block
		block discarded – undo
93	93	$lines = array();
94	94
95	95	foreach ($range as $line_number) {
96		- if(isset($file_lines[$line_number-1])) {
97		- $lines[$line_number] = $file_lines[$line_number-1];
	96	+ if (isset($file_lines[$line_number - 1])) {
	97	+ $lines[$line_number] = $file_lines[$line_number - 1];
98	98	}
99	99	}
100	100
		@@ -112,20 +112,20 @@ discard block
		block discarded – undo
112	112	renderCliException($message, $file, $line, $code, $trace, $lines);
113	113	}
114	114
115		- if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
116		- include(realpath(__DIR__) . '/errorviewdetailed.php');
	115	+ if (file_exists(realpath(__DIR__).'/errorviewdetailed.php')) {
	116	+ include(realpath(__DIR__).'/errorviewdetailed.php');
117	117	} else {
118	118	header('Content-type: application/json');
119	119	die(json_encode($error));
120	120	}
121	121	exit;
122	122	} else {
123		- header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
124		- header('X-Error-Message: ' . $message);
125		- header('X-Error-File: ' . $file);
126		- header('X-Error-Line: ' . $line);
127		- if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
128		- include(realpath(__DIR__) . '/errorviewcompact.php');
	123	+ header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
	124	+ header('X-Error-Message: '.$message);
	125	+ header('X-Error-File: '.$file);
	126	+ header('X-Error-Line: '.$line);
	127	+ if (file_exists(realpath(__DIR__).'/errorviewcompact.php')) {
	128	+ include(realpath(__DIR__).'/errorviewcompact.php');
129	129	} else {
130	130	header('Content-type: application/json');
131	131	die(json_encode('An error occured.'));
		@@ -152,35 +152,35 @@ discard block
		block discarded – undo
152	152	function renderCliException($message, $file, $line, $code, $trace, $lines)
153	153	{
154	154	echo PHP_EOL;
155		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
156		- echo '\| THE FOLLOWING ERROR OCCURED \|' . PHP_EOL;
157		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
	155	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
	156	+ echo '\| THE FOLLOWING ERROR OCCURED \|'.PHP_EOL;
	157	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
158	158	echo PHP_EOL;
159		- echo ' ' . $message . PHP_EOL;
	159	+ echo ' '.$message.PHP_EOL;
160	160	echo PHP_EOL;
161		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
162		- echo '\| IN FILE \|' . PHP_EOL;
163		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
	161	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
	162	+ echo '\| IN FILE \|'.PHP_EOL;
	163	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
164	164	echo PHP_EOL;
165		- echo ' ' . $file . ':' . $line . PHP_EOL;
	165	+ echo ' '.$file.':'.$line.PHP_EOL;
166	166	echo PHP_EOL;
167		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
168		- echo '\| CONTENTS OF THE FILE \|' . PHP_EOL;
169		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
	167	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
	168	+ echo '\| CONTENTS OF THE FILE \|'.PHP_EOL;
	169	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
170	170	echo PHP_EOL;
171		- foreach($lines as $nr => $currentLine) {
172		- echo ($nr == $line ? '* ' : ' ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
	171	+ foreach ($lines as $nr => $currentLine) {
	172	+ echo ($nr == $line ? '* ' : ' ').str_pad($nr, 3, "0", STR_PAD_LEFT).' '.$currentLine;
173	173	}
174	174	echo PHP_EOL;
175		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
176		- echo '\| STACK TRACE \|' . PHP_EOL;
177		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
178		- foreach($trace as $row) {
179		- echo (isset($row['file']) ? basename($row['file']) : '') . ':'
180		- . (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
181		- . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
182		- . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
183		- . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
	175	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
	176	+ echo '\| STACK TRACE \|'.PHP_EOL;
	177	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
	178	+ foreach ($trace as $row) {
	179	+ echo (isset($row['file']) ? basename($row['file']) : '').':'
	180	+ . (isset($row['line']) ? $row['line'] : '')."\t\t\t"
	181	+ . (isset($row['class']) ? $row['class'] : ' ')."\t\t\t"
	182	+ . (isset($row['type']) ? $row['type'] : ' ')."\t\t\t"
	183	+ . (isset($row['function']) ? $row['function'] : ' ').PHP_EOL;
184	184	}
185	185	exit;
186	186	}
187	187	\ No newline at end of file

Please login to merge, or discard this patch.

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch

@@ -33,7 +33,7 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
  * @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();

Please login to merge, or discard this patch.

cloudcontrol/library/cc/Request.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -47,21 +47,21 @@
 block discarded – undo
 		{
 			global $rootPath;
 			
-			self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
+			self::$subfolders = '/'.str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
 			self::$subfolders = str_replace('//', '/', self::$subfolders);
 			if (PHP_SAPI === 'cli') {
 				global $argv;
 				array_shift($argv);
 				self::$queryString = '';
-				self::$requestUri = self::$subfolders . implode('/', $argv);
+				self::$requestUri = self::$subfolders.implode('/', $argv);
 			} else {
 				self::$requestUri = $_SERVER['REQUEST_URI'];
 				self::$queryString = $_SERVER['QUERY_STRING'];
 			}
 			if (self::$subfolders === '/') {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', substr(self::$requestUri, 1));
 			} else {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
 			}
 
 			self::$requestParameters = explode('/', self::$relativeUri);

Please login to merge, or discard this patch.

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

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

		@@ -1,4 +1,4 @@ discard block
		block discarded – undo
1		-<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#' . $formId : '' ?>">
	1	+<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#'.$formId : '' ?>">
2	2	<? if (!isset($hideTitleAndState)) : ?>
3	3	<input type="hidden" name="path" value="<?=$request::$get['path']?>" />
4	4	<? else : ?>
		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	<input<?=isset($document) && $document->state == 'published' ? ' checked="checked"' : '' ?> type="checkbox" id="state" name="state" placeholder="State" />
21	21	</div>
22	22	<? endif ?>
23		- <?$fieldPrefix='fields';?>
	23	+ <?$fieldPrefix = 'fields'; ?>
24	24	<? foreach ($documentType->fields as $field) : ?>
25	25	<div class="form-element">
26	26	<label for="<?=$field->slug?>"><?=$field->title?></label>
		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
45	45	<div class="form-element">
46	46	<? endif ?>
47		- <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
	47	+ <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
48	48	<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
49	49
50	50	</div>
		@@ -66,7 +66,7 @@ discard block
		block discarded – undo
66	66	<li class="grid-container">
67	67	<div class="grid-box-10">
68	68	<div class="grid-inner form-element">
69		- <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
	69	+ <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
70	70	</div>
71	71	</div>
72	72	<div class="grid-box-2">
		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	</div>
77	77	</div>
78	78	</li>
79		- <?$value='';?>
	79	+ <?$value = ''; ?>
80	80	<? endforeach ?>
81	81	<? endif ?>
82	82	</ul>
		@@ -93,10 +93,10 @@ discard block
		block discarded – undo
93	93	<a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a>
94	94	<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
95	95	<div class="form-element">
96		- <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
	96	+ <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
97	97	</div>
98	98	</li>
99		- <?$value='';?>
	99	+ <?$value = ''; ?>
100	100	<? endforeach ?>
101	101	<? endif ?>
102	102	</div>
		@@ -105,17 +105,17 @@ discard block
		block discarded – undo
105	105	<a class="btn js-addrtemultiple">+</a>
106	106	<? endif ?>
107	107	</div>
108		- <?$value='';?>
	108	+ <?$value = ''; ?>
109	109	<? endforeach ?>
110	110	<hr />
111		- <? $static_brick_nr = 0;?>
	111	+ <? $static_brick_nr = 0; ?>
112	112	<? foreach ($documentType->bricks as $brick) : ?>
113	113	<div class="brick">
114	114	<label><?=$brick->title?></label>
115	115	<? if ($brick->multiple == 'true') : ?>
116	116	<input type="hidden" value="<?=$brick->brickSlug?>"/>
117	117	<input type="hidden" value="<?=$brick->slug?>"/>
118		- <?$myBrickSlug=$brick->slug;?>
	118	+ <?$myBrickSlug = $brick->slug; ?>
119	119	<ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable">
120	120	<? if (isset($document)) : ?>
121	121	<? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?>
		@@ -129,7 +129,7 @@ discard block
		block discarded – undo
129	129	<li class="brick form-element">
130	130	<label><?=$brick->title?></label>
131	131	<?$static = true; ?>
132		- <?include(__DIR__ . '/brick.php')?>
	132	+ <?include(__DIR__.'/brick.php')?>
133	133	</li>
134	134	<? endif ?>
135	135	<? endforeach ?>
		@@ -139,7 +139,7 @@ discard block
		block discarded – undo
139	139	<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
140	140	<?$static_brick_nr += 1?>
141	141	<? else : ?>
142		- <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
	142	+ <?$fieldPrefix = 'bricks['.$brick->slug.'][fields]'; ?>
143	143	<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
144	144	<? foreach ($brick->structure->fields as $field) : ?>
145	145	<div class="form-element">
		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165	<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
166	166	<div class="form-element">
167	167	<? endif ?>
168		- <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
	168	+ <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
169	169	<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
170	170
171	171	</div>
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	<li class="grid-container">
189	189	<div class="grid-box-10">
190	190	<div class="grid-inner form-element">
191		- <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
	191	+ <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
192	192	</div>
193	193	</div>
194	194	<div class="grid-box-2">
		@@ -198,7 +198,7 @@ discard block
		block discarded – undo
198	198	</div>
199	199	</div>
200	200	</li>
201		- <?$value='';?>
	201	+ <?$value = ''; ?>
202	202	<? endforeach ?>
203	203	<? endif ?>
204	204	</ul>
		@@ -216,10 +216,10 @@ discard block
		block discarded – undo
216	216	<a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a>
217	217	<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
218	218	<div class="form-element">
219		- <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
	219	+ <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
220	220	</div>
221	221	</li>
222		- <?$value='';?>
	222	+ <?$value = ''; ?>
223	223	<? endforeach ?>
224	224	<? endif ?>
225	225	</div>
		@@ -228,12 +228,12 @@ discard block
		block discarded – undo
228	228	<a class="btn js-addrtemultiple">+</a>
229	229	<? endif ?>
230	230	</div>
231		- <?$value='';?>
	231	+ <?$value = ''; ?>
232	232	<? endforeach ?>
233	233	<? endif ?>
234	234	</div>
235	235	<hr />
236		- <? endforeach;?>
	236	+ <? endforeach; ?>
237	237
238	238
239	239
		@@ -256,7 +256,7 @@ discard block
		block discarded – undo
256	256	<li class="brick form-element">
257	257	<label><?=$brick->title?></label>
258	258	<?$static = false; ?>
259		- <?include(__DIR__ . '/brick.php')?>
	259	+ <?include(__DIR__.'/brick.php')?>
260	260	</li>
261	261	<? endforeach ?>
262	262	<? endif ?>

Please login to merge, or discard this patch.

Braces +16 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,7 +1,8 @@  discard block
 block discarded – undo
 <form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#' . $formId : '' ?>">
     <? if (!isset($hideTitleAndState)) : ?>
     <input type="hidden" name="path" value="<?=$request::$get['path']?>" />
-    <? else : ?>
+    <? else {
+	: ?>
     <input type="hidden" name="formId" value="<?=$formId?>" />
     <a name="<?=$formId?>"></a>
     <? endif ?>
@@ -20,15 +21,19 @@  discard block
 block discarded – undo
                     <input<?=isset($document) && $document->state == 'published' ? ' checked="checked"' : '' ?> type="checkbox" id="state" name="state" placeholder="State" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix='fields';
+}
+?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
 					<? if (isset($document)) :
 						$fieldSlug = $field->slug;
 						$value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
-					else :
+					else {
+						:
 						$value = '';
+					}
 					endif ?>
 					<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 					<ul class="grid-wrapper sortable">
@@ -138,8 +143,11 @@  discard block
 block discarded – undo
 					</ul>
 					<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
 					<?$static_brick_nr += 1?>
-				<? else : ?>
-					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+				<? else {
+	: ?>
+					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';
+}
+?>
 					<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 					<? foreach ($brick->structure->fields as $field) : ?>
 						<div class="form-element">
@@ -148,8 +156,10 @@  discard block
 block discarded – undo
 							$brickSlug = $brick->slug;
 							$fieldSlug = $field->slug;
 							$value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
-						else :
+						else {
+							:
 							$value = '';
+						}
 						endif ?>
 						<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 						<ul class="grid-wrapper sortable">

Please login to merge, or discard this patch.

cloudcontrol/library/components/cms/configuration/BricksRouting.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->addBrick($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 			exit;
 		}
 	}
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 		$brick = $cmsComponent->storage->getBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->saveBrick($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICK, $brick);
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->deleteBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 		exit;
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

cloudcontrol/library/components/cms/configuration/ImageSetRouting.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 		$imageSet = $cmsComponent->storage->getImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->saveImageSet($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_IMAGE_SET, $imageSet);
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->addImageSet($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 			exit;
 		}
 	}
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->deleteImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 		exit;
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

library/components/cms/configuration/ApplicationComponentRouting.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->addApplicationComponent($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/application-components');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/application-components');
 			exit;
 		}
 	}
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 		$applicationComponent = $cmsComponent->storage->getApplicationComponentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->saveApplicationComponent($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/application-components');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/application-components');
 			exit;
 		}
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->deleteApplicationComponentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/application-components');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/application-components');
 		exit;
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

cloudcontrol/library/components/cms/configuration/DocumentTypeRouting.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 		$bricks = $cmsComponent->storage->getBricks();
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->addDocumentType($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $bricks);
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
 		$bricks = $cmsComponent->storage->getBricks();
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->saveDocumentType($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $documentType);
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->deleteDocumentTypeBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
 		exit;
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

cloudcontrol/library/components/cms/configuration/UsersRouting.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_USERNAME])) {
 			$cmsComponent->storage->addUser($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 			exit;
 		}
 	}
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->deleteUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 		exit;
 	}
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_USER, $cmsComponent->storage->getUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
 		if (isset($_POST[CmsComponent::POST_PARAMETER_USERNAME])) {
 			$cmsComponent->storage->saveUser($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 			exit;
 		}
 	}

Please login to merge, or discard this patch.

cloudcontrol/library/components/cms/SitemapRouting.php 2 patches

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -14,24 +14,24 @@
 block discarded – undo
 class SitemapRouting implements CmsRouting
 {
 
-    /**
-     * SitemapRouting constructor.
-     * @param \library\cc\Request $request
-     * @param mixed|string $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/sitemap') {
+	/**
+	 * SitemapRouting constructor.
+	 * @param \library\cc\Request $request
+	 * @param mixed|string $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	public function __construct($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/sitemap') {
 			$this->overviewRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/new') {
+		} elseif ($relativeCmsUri == '/sitemap/new') {
 			$this->newRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->editRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->deleteRoute($request, $cmsComponent);
-        }
-    }
+		}
+	}
 
 	/**
 	 * @param $request

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
 			$cmsComponent->storage->addSitemapItem($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 			exit;
 		}
 	}
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
 		$sitemapItem = $cmsComponent->storage->getSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
 			$cmsComponent->storage->saveSitemapItem($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_SITEMAP_ITEM, $sitemapItem);
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->deleteSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 		exit;
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -149,6 +149,11 @@
		block discarded – undo
149	149	}
150	150	}
151	151
	152	+/**
	153	+ * @param string $message
	154	+ * @param string $file
	155	+ * @param integer $code
	156	+ */
152	157	function renderCliException($message, $file, $line, $code, $trace, $lines)
153	158	{
154	159	echo PHP_EOL;

		@@ -31,11 +31,11 @@ discard block
		block discarded – undo
31	31	*/
32	32	function shutdownHandler () {
33	33	$error = error_get_last();
34		- if (isset($error['type'], $error['message'], $error['file'], $error['line'])) {
35		- errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
36		- }elseif ($error['type'] == 1) {
37		- dump($error);
38		- }
	34	+ if (isset($error['type'], $error['message'], $error['file'], $error['line'])) {
	35	+ errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
	36	+ }elseif ($error['type'] == 1) {
	37	+ dump($error);
	38	+ }
39	39	}
40	40
41	41	/**
		@@ -49,28 +49,28 @@ discard block
		block discarded – undo
49	49	$jsonErrorNr = json_last_error();
50	50	$errstr = '';
51	51	switch ($jsonErrorNr) {
52		- case JSON_ERROR_NONE:
53		- $errstr .= ' - No errors' . PHP_EOL;
54		- break;
55		- case JSON_ERROR_DEPTH:
56		- $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
57		- break;
58		- case JSON_ERROR_STATE_MISMATCH:
59		- $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
60		- break;
61		- case JSON_ERROR_CTRL_CHAR:
62		- $errstr .= ' - Unexpected control character found' . PHP_EOL;
63		- break;
64		- case JSON_ERROR_SYNTAX:
65		- $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
66		- break;
67		- case JSON_ERROR_UTF8:
68		- $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
69		- break;
70		- default:
71		- $errstr = ' - Unknown error' . PHP_EOL;
72		- break;
73		- }
	52	+ case JSON_ERROR_NONE:
	53	+ $errstr .= ' - No errors' . PHP_EOL;
	54	+ break;
	55	+ case JSON_ERROR_DEPTH:
	56	+ $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
	57	+ break;
	58	+ case JSON_ERROR_STATE_MISMATCH:
	59	+ $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
	60	+ break;
	61	+ case JSON_ERROR_CTRL_CHAR:
	62	+ $errstr .= ' - Unexpected control character found' . PHP_EOL;
	63	+ break;
	64	+ case JSON_ERROR_SYNTAX:
	65	+ $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
	66	+ break;
	67	+ case JSON_ERROR_UTF8:
	68	+ $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
	69	+ break;
	70	+ default:
	71	+ $errstr = ' - Unknown error' . PHP_EOL;
	72	+ break;
	73	+ }
74	74	errorHandler ($jsonErrorNr, $errstr, $file, $line);
75	75	}
76	76
		@@ -85,102 +85,102 @@ discard block
		block discarded – undo
85	85	* @param string $httpHeader
86	86	*/
87	87	function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
88		- if (ob_get_contents()) ob_end_clean();
	88	+ if (ob_get_contents()) ob_end_clean();
89	89
90		- if (canShowError()) {
91		- $file_lines = file_exists($file) ? file($file) : array();
92		- $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
93		- $lines = array();
	90	+ if (canShowError()) {
	91	+ $file_lines = file_exists($file) ? file($file) : array();
	92	+ $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
	93	+ $lines = array();
94	94
95		- foreach ($range as $line_number) {
96		- if(isset($file_lines[$line_number-1])) {
97		- $lines[$line_number] = $file_lines[$line_number-1];
98		- }
99		- }
	95	+ foreach ($range as $line_number) {
	96	+ if(isset($file_lines[$line_number-1])) {
	97	+ $lines[$line_number] = $file_lines[$line_number-1];
	98	+ }
	99	+ }
100	100
101		- $error = array(
102		- 'message' => $message,
103		- 'file' => $file,
104		- 'line' => $line,
105		- 'code' => $code,
106		- 'lines' => $lines,
107		- 'trace' => $trace,
108		- 'httpHeader' => $httpHeader,
109		- );
	101	+ $error = array(
	102	+ 'message' => $message,
	103	+ 'file' => $file,
	104	+ 'line' => $line,
	105	+ 'code' => $code,
	106	+ 'lines' => $lines,
	107	+ 'trace' => $trace,
	108	+ 'httpHeader' => $httpHeader,
	109	+ );
110	110
111		- if (PHP_SAPI === 'cli') {
112		- renderCliException($message, $file, $line, $code, $trace, $lines);
113		- }
	111	+ if (PHP_SAPI === 'cli') {
	112	+ renderCliException($message, $file, $line, $code, $trace, $lines);
	113	+ }
114	114
115		- if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
116		- include(realpath(__DIR__) . '/errorviewdetailed.php');
117		- } else {
118		- header('Content-type: application/json');
119		- die(json_encode($error));
120		- }
121		- exit;
122		- } else {
123		- header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
124		- header('X-Error-Message: ' . $message);
125		- header('X-Error-File: ' . $file);
126		- header('X-Error-Line: ' . $line);
127		- if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
128		- include(realpath(__DIR__) . '/errorviewcompact.php');
129		- } else {
130		- header('Content-type: application/json');
131		- die(json_encode('An error occured.'));
132		- }
133		- }
	115	+ if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
	116	+ include(realpath(__DIR__) . '/errorviewdetailed.php');
	117	+ } else {
	118	+ header('Content-type: application/json');
	119	+ die(json_encode($error));
	120	+ }
	121	+ exit;
	122	+ } else {
	123	+ header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
	124	+ header('X-Error-Message: ' . $message);
	125	+ header('X-Error-File: ' . $file);
	126	+ header('X-Error-Line: ' . $line);
	127	+ if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
	128	+ include(realpath(__DIR__) . '/errorviewcompact.php');
	129	+ } else {
	130	+ header('Content-type: application/json');
	131	+ die(json_encode('An error occured.'));
	132	+ }
	133	+ }
134	134	}
135	135
136	136	function canShowError()
137	137	{
138		- if (PHP_SAPI === 'cli') {
139		- return true;
140		- }
141		- if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
142		- $config = file_get_contents('../config.json');
143		- $config = json_decode($config);
144		- if (isset($config->showErrorsToAll)) {
145		- return $config->showErrorsToAll;
146		- }
147		- } else {
148		- return true;
149		- }
	138	+ if (PHP_SAPI === 'cli') {
	139	+ return true;
	140	+ }
	141	+ if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
	142	+ $config = file_get_contents('../config.json');
	143	+ $config = json_decode($config);
	144	+ if (isset($config->showErrorsToAll)) {
	145	+ return $config->showErrorsToAll;
	146	+ }
	147	+ } else {
	148	+ return true;
	149	+ }
150	150	}
151	151
152	152	function renderCliException($message, $file, $line, $code, $trace, $lines)
153	153	{
154		- echo PHP_EOL;
155		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
156		- echo '\| THE FOLLOWING ERROR OCCURED \|' . PHP_EOL;
157		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
158		- echo PHP_EOL;
159		- echo ' ' . $message . PHP_EOL;
160		- echo PHP_EOL;
161		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
162		- echo '\| IN FILE \|' . PHP_EOL;
163		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
164		- echo PHP_EOL;
165		- echo ' ' . $file . ':' . $line . PHP_EOL;
166		- echo PHP_EOL;
167		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
168		- echo '\| CONTENTS OF THE FILE \|' . PHP_EOL;
169		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
170		- echo PHP_EOL;
171		- foreach($lines as $nr => $currentLine) {
172		- echo ($nr == $line ? '* ' : ' ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
173		- }
174		- echo PHP_EOL;
175		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
176		- echo '\| STACK TRACE \|' . PHP_EOL;
177		- echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
178		- foreach($trace as $row) {
179		- echo (isset($row['file']) ? basename($row['file']) : '') . ':'
180		- . (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
181		- . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
182		- . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
183		- . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
184		- }
185		- exit;
	154	+ echo PHP_EOL;
	155	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
	156	+ echo '\| THE FOLLOWING ERROR OCCURED \|' . PHP_EOL;
	157	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
	158	+ echo PHP_EOL;
	159	+ echo ' ' . $message . PHP_EOL;
	160	+ echo PHP_EOL;
	161	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
	162	+ echo '\| IN FILE \|' . PHP_EOL;
	163	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
	164	+ echo PHP_EOL;
	165	+ echo ' ' . $file . ':' . $line . PHP_EOL;
	166	+ echo PHP_EOL;
	167	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
	168	+ echo '\| CONTENTS OF THE FILE \|' . PHP_EOL;
	169	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
	170	+ echo PHP_EOL;
	171	+ foreach($lines as $nr => $currentLine) {
	172	+ echo ($nr == $line ? '* ' : ' ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
	173	+ }
	174	+ echo PHP_EOL;
	175	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
	176	+ echo '\| STACK TRACE \|' . PHP_EOL;
	177	+ echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
	178	+ foreach($trace as $row) {
	179	+ echo (isset($row['file']) ? basename($row['file']) : '') . ':'
	180	+ . (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
	181	+ . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
	182	+ . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
	183	+ . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
	184	+ }
	185	+ exit;
186	186	}
187	187	\ No newline at end of file

		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	$error = error_get_last();
34	34	if (isset($error['type'], $error['message'], $error['file'], $error['line'])) {
35	35	errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
36		- }elseif ($error['type'] == 1) {
	36	+ } elseif ($error['type'] == 1) {
37	37	dump($error);
38	38	}
39	39	}
		@@ -85,7 +85,9 @@ discard block
		block discarded – undo
85	85	* @param string $httpHeader
86	86	*/
87	87	function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
88		- if (ob_get_contents()) ob_end_clean();
	88	+ if (ob_get_contents()) {
	89	+ ob_end_clean();
	90	+ }
89	91
90	92	if (canShowError()) {
91	93	$file_lines = file_exists($file) ? file($file) : array();

		@@ -47,21 +47,21 @@
		block discarded – undo
47	47	{
48	48	global $rootPath;
49	49
50		- self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
	50	+ self::$subfolders = '/'.str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
51	51	self::$subfolders = str_replace('//', '/', self::$subfolders);
52	52	if (PHP_SAPI === 'cli') {
53	53	global $argv;
54	54	array_shift($argv);
55	55	self::$queryString = '';
56		- self::$requestUri = self::$subfolders . implode('/', $argv);
	56	+ self::$requestUri = self::$subfolders.implode('/', $argv);
57	57	} else {
58	58	self::$requestUri = $_SERVER['REQUEST_URI'];
59	59	self::$queryString = $_SERVER['QUERY_STRING'];
60	60	}
61	61	if (self::$subfolders === '/') {
62		- self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
	62	+ self::$relativeUri = str_replace('?'.self::$queryString, '', substr(self::$requestUri, 1));
63	63	} else {
64		- self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
	64	+ self::$relativeUri = str_replace('?'.self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
65	65	}
66	66
67	67	self::$requestParameters = explode('/', self::$relativeUri);

		@@ -1,7 +1,8 @@ discard block
		block discarded – undo
1	1	<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#' . $formId : '' ?>">
2	2	<? if (!isset($hideTitleAndState)) : ?>
3	3	<input type="hidden" name="path" value="<?=$request::$get['path']?>" />
4		- <? else : ?>
	4	+ <? else {
	5	+ : ?>
5	6	<input type="hidden" name="formId" value="<?=$formId?>" />
6	7	<a name="<?=$formId?>"></a>
7	8	<? endif ?>
		@@ -20,15 +21,19 @@ discard block
		block discarded – undo
20	21	<input<?=isset($document) && $document->state == 'published' ? ' checked="checked"' : '' ?> type="checkbox" id="state" name="state" placeholder="State" />
21	22	</div>
22	23	<? endif ?>
23		- <?$fieldPrefix='fields';?>
	24	+ <?$fieldPrefix='fields';
	25	+}
	26	+?>
24	27	<? foreach ($documentType->fields as $field) : ?>
25	28	<div class="form-element">
26	29	<label for="<?=$field->slug?>"><?=$field->title?></label>
27	30	<? if (isset($document)) :
28	31	$fieldSlug = $field->slug;
29	32	$value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
30		- else :
	33	+ else {
	34	+ :
31	35	$value = '';
	36	+ }
32	37	endif ?>
33	38	<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
34	39	<ul class="grid-wrapper sortable">
		@@ -138,8 +143,11 @@ discard block
		block discarded – undo
138	143	</ul>
139	144	<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
140	145	<?$static_brick_nr += 1?>
141		- <? else : ?>
142		- <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
	146	+ <? else {
	147	+ : ?>
	148	+ <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';
	149	+}
	150	+?>
143	151	<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
144	152	<? foreach ($brick->structure->fields as $field) : ?>
145	153	<div class="form-element">
		@@ -148,8 +156,10 @@ discard block
		block discarded – undo
148	156	$brickSlug = $brick->slug;
149	157	$fieldSlug = $field->slug;
150	158	$value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
151		- else :
	159	+ else {
	160	+ :
152	161	$value = '';
	162	+ }
153	163	endif ?>
154	164	<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
155	165	<ul class="grid-wrapper sortable">

		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
56	56	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
57	57	$cmsComponent->storage->addBrick($request::$post);
58		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
	58	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
59	59	exit;
60	60	}
61	61	}
		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	$brick = $cmsComponent->storage->getBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
72	72	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
73	73	$cmsComponent->storage->saveBrick($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
74		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
	74	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
75	75	exit;
76	76	}
77	77	$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICK, $brick);
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	private function deleteRoute($request, $cmsComponent)
85	85	{
86	86	$cmsComponent->storage->deleteBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
87		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
	87	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
88	88	exit;
89	89	}
90	90	}
91	91	\ No newline at end of file

		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	$imageSet = $cmsComponent->storage->getImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
57	57	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
58	58	$cmsComponent->storage->saveImageSet($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
59		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
	59	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
60	60	exit;
61	61	}
62	62	$cmsComponent->setParameter(CmsComponent::PARAMETER_IMAGE_SET, $imageSet);
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
73	73	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
74	74	$cmsComponent->storage->addImageSet($request::$post);
75		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
	75	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
76	76	exit;
77	77	}
78	78	}
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	private function deleteRoute($request, $cmsComponent)
85	85	{
86	86	$cmsComponent->storage->deleteImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
87		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
	87	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
88	88	exit;
89	89	}
90	90	}
91	91	\ No newline at end of file

		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	$bricks = $cmsComponent->storage->getBricks();
57	57	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
58	58	$cmsComponent->storage->addDocumentType($request::$post);
59		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
	59	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
60	60	exit;
61	61	}
62	62	$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $bricks);
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	$bricks = $cmsComponent->storage->getBricks();
75	75	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
76	76	$cmsComponent->storage->saveDocumentType($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
77		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
	77	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
78	78	exit;
79	79	}
80	80	$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $documentType);
		@@ -88,7 +88,7 @@ discard block
		block discarded – undo
88	88	private function deleteRoute($request, $cmsComponent)
89	89	{
90	90	$cmsComponent->storage->deleteDocumentTypeBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
91		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
	91	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
92	92	exit;
93	93	}
94	94	}
95	95	\ No newline at end of file

		@@ -14,24 +14,24 @@
		block discarded – undo
14	14	class SitemapRouting implements CmsRouting
15	15	{
16	16
17		- /**
18		- * SitemapRouting constructor.
19		- * @param \library\cc\Request $request
20		- * @param mixed\|string $relativeCmsUri
21		- * @param CmsComponent $cmsComponent
22		- */
23		- public function __construct($request, $relativeCmsUri, $cmsComponent)
24		- {
25		- if ($relativeCmsUri == '/sitemap') {
	17	+ /**
	18	+ * SitemapRouting constructor.
	19	+ * @param \library\cc\Request $request
	20	+ * @param mixed\|string $relativeCmsUri
	21	+ * @param CmsComponent $cmsComponent
	22	+ */
	23	+ public function __construct($request, $relativeCmsUri, $cmsComponent)
	24	+ {
	25	+ if ($relativeCmsUri == '/sitemap') {
26	26	$this->overviewRoute($request, $cmsComponent);
27		- } elseif ($relativeCmsUri == '/sitemap/new') {
	27	+ } elseif ($relativeCmsUri == '/sitemap/new') {
28	28	$this->newRoute($request, $cmsComponent);
29		- } elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
	29	+ } elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
30	30	$this->editRoute($request, $cmsComponent);
31		- } elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
	31	+ } elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
32	32	$this->deleteRoute($request, $cmsComponent);
33		- }
34		- }
	33	+ }
	34	+ }
35	35
36	36	/**
37	37	* @param $request

		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
58	58	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
59	59	$cmsComponent->storage->addSitemapItem($request::$post);
60		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
	60	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
61	61	exit;
62	62	}
63	63	}
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	$sitemapItem = $cmsComponent->storage->getSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
74	74	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
75	75	$cmsComponent->storage->saveSitemapItem($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
76		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
	76	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
77	77	exit;
78	78	}
79	79	$cmsComponent->setParameter(CmsComponent::PARAMETER_SITEMAP_ITEM, $sitemapItem);
		@@ -86,7 +86,7 @@ discard block
		block discarded – undo
86	86	private function deleteRoute($request, $cmsComponent)
87	87	{
88	88	$cmsComponent->storage->deleteSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
89		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
	89	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
90	90	exit;
91	91	}
92	92	}
93	93	\ No newline at end of file

jenskooij / cloudcontrol

Push — develop ( 4622da...bbf2e4 )

Status

Category

Doc Comments +5 added lines patch added patch discarded remove patch

Indentation +112 added lines, -112 removed lines patch added patch discarded remove patch

Spacing +47 added lines, -47 removed lines patch added patch discarded remove patch

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

Braces +16 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch