Passed
Push — develop ( aef793...4622da )
by Jens
02:42
created
cloudcontrol/templates/cms/documents/brick.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,8 +9,10 @@
 block discarded – undo
9 9
 				<? if (isset($dynamicBrick)) :
10 10
 					$fieldSlug = $field->slug;
11 11
 					$value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
12
-				else :
12
+				else {
13
+					:
13 14
 					$value = '';
15
+				}
14 16
 				endif ?>
15 17
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
16 18
 				<ul class="grid-wrapper sortable">
Please login to merge, or discard this patch.
cloudcontrol/library/images/methods/Watermark.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -61,7 +61,9 @@  discard block
 block discarded – undo
61 61
 		 */
62 62
 		protected function calculateX($imageResource)
63 63
 		{
64
-			if (intval($this->_x) === $this->_x) return $this->_x;
64
+			if (intval($this->_x) === $this->_x) {
65
+				return $this->_x;
66
+			}
65 67
 			
66 68
 			$x = strtolower($this->_x);
67 69
 			
@@ -86,7 +88,9 @@  discard block
 block discarded – undo
86 88
 		 */
87 89
 		public function calculateY($imageResource)
88 90
 		{
89
-			if (intval($this->_y) === $this->_y) return $this->_y;
91
+			if (intval($this->_y) === $this->_y) {
92
+				return $this->_y;
93
+			}
90 94
 		
91 95
 			$y = strtolower($this->_y);
92 96
 			
@@ -123,7 +127,9 @@  discard block
 block discarded – undo
123 127
 		 */
124 128
 		public function GetWatermark()
125 129
 		{
126
-			if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark');
130
+			if ($this->_watermark == null) {
131
+				throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark');
132
+			}
127 133
 			return $this->_watermark;
128 134
 		}
129 135
 		
Please login to merge, or discard this patch.
cloudcontrol/library/images/methods/Crop.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -109,8 +109,8 @@
 block discarded – undo
109 109
 
110 110
 			// Preserve transparency
111 111
 			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
112
-            imagealphablending($new, false);
113
-            imagesavealpha($new, true);
112
+			imagealphablending($new, false);
113
+			imagesavealpha($new, true);
114 114
 			
115 115
 			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $this->_destWidth, $this->_destHeight);
116 116
 			
Please login to merge, or discard this patch.
cloudcontrol/library/images/methods/BoxCrop.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,9 @@
 block discarded – undo
26 26
 			
27 27
 			// Define which ratio will be used, depending on which is the smallest side
28 28
 			$ratio = min($hRatio, $wRatio);
29
-			if($ratio > 1) $ratio = 1;
29
+			if($ratio > 1) {
30
+				$ratio = 1;
31
+			}
30 32
 			
31 33
 			// Define sizes
32 34
 			$this->_destWidth = floor($originalWidth * $ratio);
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 		/**
18 18
 		 * @param resource $imageResource
19 19
 		 * @return resource
20
-         */
20
+		 */
21 21
 		public function Execute($imageResource)
22 22
 		{
23 23
 			// Define the origial width and height
Please login to merge, or discard this patch.
cloudcontrol/library/images/methods/SmartCrop.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,8 +62,8 @@
 block discarded – undo
62 62
 
63 63
 			// Preserve transparency
64 64
 			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
65
-            imagealphablending($new, false);
66
-            imagesavealpha($new, true);
65
+			imagealphablending($new, false);
66
+			imagesavealpha($new, true);
67 67
 			
68 68
 			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight);
69 69
 			
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,9 @@
 block discarded – undo
40 40
 			
41 41
 			// Define which ratio will be used, depending on which is the biggest side
42 42
 			$ratio = $wRatio < $hRatio ? $wRatio : $hRatio;
43
-			if ($ratio < 1) $ratio = 1;
43
+			if ($ratio < 1) {
44
+				$ratio = 1;
45
+			}
44 46
 			
45 47
 			// Calculate the destination width, height, x and y
46 48
 			$this->_destWidth = $originalWidth / $ratio;
Please login to merge, or discard this patch.
cloudcontrol/library/cc/errorhandler.php 2 patches
Indentation   +112 added lines, -112 removed lines patch added patch discarded remove patch
@@ -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
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
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();
Please login to merge, or discard this patch.
cloudcontrol/library/components/LanguageComponent.php 1 patch
Indentation   +118 added lines, -118 removed lines patch added patch discarded remove patch
@@ -7,124 +7,124 @@
 block discarded – undo
7 7
 
8 8
 class LanguageComponent implements Component
9 9
 {
10
-    protected $request;
11
-    protected $parameters;
12
-
13
-    protected $defaultLanguage = 'en';
14
-    protected $acceptedLanguages = null;
15
-    protected $languageParameterName = 'language';
16
-    protected $forceRedirect = false;
17
-    protected $sessionValues;
18
-
19
-    /**
20
-     * Component constructor.
21
-     *
22
-     * @param                     $template
23
-     * @param Request $request
24
-     * @param                     $parameters
25
-     * @param                     $matchedSitemapItem
26
-     */
27
-    public function __construct($template, Request $request, $parameters, $matchedSitemapItem)
28
-    {
29
-        $this->parameters = (array) $parameters;
30
-        $this->checkParameters();
31
-
32
-        $lang = substr(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : $this->defaultLanguage, 0, 2);
33
-        $_SESSION['LanguageComponent']['detectedLanguage'] = $lang;
34
-
35
-        $this->checkLanguageSwitch($request);
36
-
37
-        if (!isset($_SESSION['LanguageComponent'][$this->languageParameterName])) {
38
-            $this->detectLanguage($lang, $request);
39
-        } else {
40
-            if ($this->forceRedirect === true) {
41
-                $this->detectLanguage($_SESSION['LanguageComponent'][$this->languageParameterName], $request);
42
-            }
43
-        }
44
-
45
-        $this->parameters[$this->languageParameterName] = $_SESSION['LanguageComponent'][$this->languageParameterName];
46
-    }
47
-
48
-    /**
49
-     * Checks to see if any parameters are given from the configuration in the CMS
50
-     */
51
-    private function checkParameters()
52
-    {
53
-        if (isset($this->parameters['defaultLanguage'])) {
54
-            $this->defaultLanguage = $this->parameters['defaultLanguage'];
55
-            unset($this->parameters['defaultLanguage']);
56
-        }
57
-        if (isset($this->parameters['acceptedLanguages'])) {
58
-            $this->acceptedLanguages = explode(',', $this->parameters['acceptedLanguages']);
59
-            unset($this->parameters['acceptedLanguages']);
60
-        }
61
-        if (isset($this->parameters['languageParameterName'])) {
62
-            $this->languageParameterName = $this->parameters['languageParameterName'];
63
-            unset($this->parameters['languageParameterName']);
64
-        }
65
-        if (isset($this->parameters['forceRedirect'])) {
66
-            $this->forceRedirect = (bool) $this->parameters['forceRedirect'];
67
-            unset($this->parameters['forceRedirect']);
68
-        }
69
-    }
70
-
71
-    /**
72
-     * @return array
73
-     */
74
-    public function getParameters()
75
-    {
76
-        return $this->parameters;
77
-    }
78
-
79
-
80
-    /**
81
-     * Check if the found language is allowed and
82
-     * if an action is to be taken.
83
-     *
84
-     * @param $lang
85
-     * @param $request
86
-     */
87
-    private function detectLanguage($lang, $request)
88
-    {
89
-        $_SESSION['LanguageComponent'][$this->languageParameterName] = $this->defaultLanguage;
90
-
91
-        if ($this->acceptedLanguages === null) {
92
-            $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
93
-        } else if (in_array($lang, $this->acceptedLanguages)) {
94
-            $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
95
-        } else {
96
-            $lang = $this->defaultLanguage;
97
-        }
98
-
99
-        $this->sessionValues = $_SESSION['LanguageComponent'];
100
-
101
-        if ($this->forceRedirect === true) {
102
-            if (substr($request::$relativeUri, 0, 2) !== $lang ) {
103
-                if ($lang !== $this->defaultLanguage) {
104
-                    header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
105
-                    exit;
106
-                }
107
-            }
108
-        }
109
-    }
110
-
111
-    /**
112
-     * Detect if the language is switched manually
113
-     *
114
-     * @param $request
115
-     */
116
-    private function checkLanguageSwitch($request)
117
-    {
118
-        if (isset($request::$get['langSwitch'])) {
119
-            $this->forceRedirect = true;
120
-            $this->detectLanguage($request::$get['langSwitch'], $request);
121
-        }
122
-    }
123
-
124
-    /*
10
+	protected $request;
11
+	protected $parameters;
12
+
13
+	protected $defaultLanguage = 'en';
14
+	protected $acceptedLanguages = null;
15
+	protected $languageParameterName = 'language';
16
+	protected $forceRedirect = false;
17
+	protected $sessionValues;
18
+
19
+	/**
20
+	 * Component constructor.
21
+	 *
22
+	 * @param                     $template
23
+	 * @param Request $request
24
+	 * @param                     $parameters
25
+	 * @param                     $matchedSitemapItem
26
+	 */
27
+	public function __construct($template, Request $request, $parameters, $matchedSitemapItem)
28
+	{
29
+		$this->parameters = (array) $parameters;
30
+		$this->checkParameters();
31
+
32
+		$lang = substr(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : $this->defaultLanguage, 0, 2);
33
+		$_SESSION['LanguageComponent']['detectedLanguage'] = $lang;
34
+
35
+		$this->checkLanguageSwitch($request);
36
+
37
+		if (!isset($_SESSION['LanguageComponent'][$this->languageParameterName])) {
38
+			$this->detectLanguage($lang, $request);
39
+		} else {
40
+			if ($this->forceRedirect === true) {
41
+				$this->detectLanguage($_SESSION['LanguageComponent'][$this->languageParameterName], $request);
42
+			}
43
+		}
44
+
45
+		$this->parameters[$this->languageParameterName] = $_SESSION['LanguageComponent'][$this->languageParameterName];
46
+	}
47
+
48
+	/**
49
+	 * Checks to see if any parameters are given from the configuration in the CMS
50
+	 */
51
+	private function checkParameters()
52
+	{
53
+		if (isset($this->parameters['defaultLanguage'])) {
54
+			$this->defaultLanguage = $this->parameters['defaultLanguage'];
55
+			unset($this->parameters['defaultLanguage']);
56
+		}
57
+		if (isset($this->parameters['acceptedLanguages'])) {
58
+			$this->acceptedLanguages = explode(',', $this->parameters['acceptedLanguages']);
59
+			unset($this->parameters['acceptedLanguages']);
60
+		}
61
+		if (isset($this->parameters['languageParameterName'])) {
62
+			$this->languageParameterName = $this->parameters['languageParameterName'];
63
+			unset($this->parameters['languageParameterName']);
64
+		}
65
+		if (isset($this->parameters['forceRedirect'])) {
66
+			$this->forceRedirect = (bool) $this->parameters['forceRedirect'];
67
+			unset($this->parameters['forceRedirect']);
68
+		}
69
+	}
70
+
71
+	/**
72
+	 * @return array
73
+	 */
74
+	public function getParameters()
75
+	{
76
+		return $this->parameters;
77
+	}
78
+
79
+
80
+	/**
81
+	 * Check if the found language is allowed and
82
+	 * if an action is to be taken.
83
+	 *
84
+	 * @param $lang
85
+	 * @param $request
86
+	 */
87
+	private function detectLanguage($lang, $request)
88
+	{
89
+		$_SESSION['LanguageComponent'][$this->languageParameterName] = $this->defaultLanguage;
90
+
91
+		if ($this->acceptedLanguages === null) {
92
+			$_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
93
+		} else if (in_array($lang, $this->acceptedLanguages)) {
94
+			$_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
95
+		} else {
96
+			$lang = $this->defaultLanguage;
97
+		}
98
+
99
+		$this->sessionValues = $_SESSION['LanguageComponent'];
100
+
101
+		if ($this->forceRedirect === true) {
102
+			if (substr($request::$relativeUri, 0, 2) !== $lang ) {
103
+				if ($lang !== $this->defaultLanguage) {
104
+					header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
105
+					exit;
106
+				}
107
+			}
108
+		}
109
+	}
110
+
111
+	/**
112
+	 * Detect if the language is switched manually
113
+	 *
114
+	 * @param $request
115
+	 */
116
+	private function checkLanguageSwitch($request)
117
+	{
118
+		if (isset($request::$get['langSwitch'])) {
119
+			$this->forceRedirect = true;
120
+			$this->detectLanguage($request::$get['langSwitch'], $request);
121
+		}
122
+	}
123
+
124
+	/*
125 125
      * These functions are required by the interface, but not for the functionality
126 126
      */
127
-    public function run(Storage $storage) {}
128
-    public function render() {}
129
-    public function get() {}
127
+	public function run(Storage $storage) {}
128
+	public function render() {}
129
+	public function get() {}
130 130
 }
131 131
\ No newline at end of file
Please login to merge, or discard this patch.
cloudcontrol/templates/cms/documents/document-form-form.php 1 patch
Braces   +16 added lines, -6 removed lines patch added patch discarded remove patch
@@ -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">
Please login to merge, or discard this patch.
cloudcontrol/library/components/cms/SitemapRouting.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -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
Please login to merge, or discard this patch.