@@ -31,11 +31,11 @@ discard block |
||
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 |
||
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,57 +85,57 @@ discard block |
||
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(); |
|
89 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
90 | - header('X-Error-Message: ' . $message); |
|
91 | - header('X-Error-File: ' . $file); |
|
92 | - header('X-Error-Line: ' . $line); |
|
93 | - if (canShowError()) { |
|
94 | - $file_lines = file_exists($file) ? file($file) : array(); |
|
95 | - $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15); |
|
96 | - $lines = array(); |
|
88 | + if (ob_get_contents()) ob_end_clean(); |
|
89 | + header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
90 | + header('X-Error-Message: ' . $message); |
|
91 | + header('X-Error-File: ' . $file); |
|
92 | + header('X-Error-Line: ' . $line); |
|
93 | + if (canShowError()) { |
|
94 | + $file_lines = file_exists($file) ? file($file) : array(); |
|
95 | + $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15); |
|
96 | + $lines = array(); |
|
97 | 97 | |
98 | - foreach ($range as $line_number) { |
|
99 | - if(isset($file_lines[$line_number-1])) { |
|
100 | - $lines[$line_number] = $file_lines[$line_number-1]; |
|
101 | - } |
|
102 | - } |
|
98 | + foreach ($range as $line_number) { |
|
99 | + if(isset($file_lines[$line_number-1])) { |
|
100 | + $lines[$line_number] = $file_lines[$line_number-1]; |
|
101 | + } |
|
102 | + } |
|
103 | 103 | |
104 | - $error = array( |
|
105 | - 'message' => $message, |
|
106 | - 'file' => $file, |
|
107 | - 'line' => $line, |
|
108 | - 'code' => $code, |
|
109 | - 'lines' => $lines, |
|
110 | - 'trace' => $trace, |
|
111 | - 'httpHeader' => $httpHeader, |
|
112 | - ); |
|
113 | - if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) { |
|
114 | - include(realpath(__DIR__) . '/errorviewdetailed.php'); |
|
115 | - } else { |
|
116 | - header('Content-type: application/json'); |
|
117 | - die(json_encode($error)); |
|
118 | - } |
|
119 | - exit; |
|
120 | - } else { |
|
121 | - if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) { |
|
122 | - include(realpath(__DIR__) . '/errorviewcompact.php'); |
|
123 | - } else { |
|
124 | - header('Content-type: application/json'); |
|
125 | - die(json_encode('An error occured.')); |
|
126 | - } |
|
127 | - } |
|
104 | + $error = array( |
|
105 | + 'message' => $message, |
|
106 | + 'file' => $file, |
|
107 | + 'line' => $line, |
|
108 | + 'code' => $code, |
|
109 | + 'lines' => $lines, |
|
110 | + 'trace' => $trace, |
|
111 | + 'httpHeader' => $httpHeader, |
|
112 | + ); |
|
113 | + if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) { |
|
114 | + include(realpath(__DIR__) . '/errorviewdetailed.php'); |
|
115 | + } else { |
|
116 | + header('Content-type: application/json'); |
|
117 | + die(json_encode($error)); |
|
118 | + } |
|
119 | + exit; |
|
120 | + } else { |
|
121 | + if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) { |
|
122 | + include(realpath(__DIR__) . '/errorviewcompact.php'); |
|
123 | + } else { |
|
124 | + header('Content-type: application/json'); |
|
125 | + die(json_encode('An error occured.')); |
|
126 | + } |
|
127 | + } |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | function canShowError() |
131 | 131 | { |
132 | - if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) { |
|
133 | - $config = file_get_contents('../config.json'); |
|
134 | - $config = json_decode($config); |
|
135 | - if (isset($config->showErrorsToAll)) { |
|
136 | - return $config->showErrorsToAll; |
|
137 | - } |
|
138 | - } else { |
|
139 | - return true; |
|
140 | - } |
|
132 | + if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) { |
|
133 | + $config = file_get_contents('../config.json'); |
|
134 | + $config = json_decode($config); |
|
135 | + if (isset($config->showErrorsToAll)) { |
|
136 | + return $config->showErrorsToAll; |
|
137 | + } |
|
138 | + } else { |
|
139 | + return true; |
|
140 | + } |
|
141 | 141 | } |
142 | 142 | \ No newline at end of file |
@@ -9,8 +9,8 @@ discard block |
||
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 |
||
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 |
||
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,20 +84,20 @@ discard block |
||
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 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
90 | - header('X-Error-Message: ' . $message); |
|
91 | - header('X-Error-File: ' . $file); |
|
92 | - header('X-Error-Line: ' . $line); |
|
89 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
90 | + header('X-Error-Message: '.$message); |
|
91 | + header('X-Error-File: '.$file); |
|
92 | + header('X-Error-Line: '.$line); |
|
93 | 93 | if (canShowError()) { |
94 | 94 | $file_lines = file_exists($file) ? file($file) : array(); |
95 | 95 | $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15); |
96 | 96 | $lines = array(); |
97 | 97 | |
98 | 98 | foreach ($range as $line_number) { |
99 | - if(isset($file_lines[$line_number-1])) { |
|
100 | - $lines[$line_number] = $file_lines[$line_number-1]; |
|
99 | + if (isset($file_lines[$line_number - 1])) { |
|
100 | + $lines[$line_number] = $file_lines[$line_number - 1]; |
|
101 | 101 | } |
102 | 102 | } |
103 | 103 | |
@@ -110,16 +110,16 @@ discard block |
||
110 | 110 | 'trace' => $trace, |
111 | 111 | 'httpHeader' => $httpHeader, |
112 | 112 | ); |
113 | - if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) { |
|
114 | - include(realpath(__DIR__) . '/errorviewdetailed.php'); |
|
113 | + if (file_exists(realpath(__DIR__).'/errorviewdetailed.php')) { |
|
114 | + include(realpath(__DIR__).'/errorviewdetailed.php'); |
|
115 | 115 | } else { |
116 | 116 | header('Content-type: application/json'); |
117 | 117 | die(json_encode($error)); |
118 | 118 | } |
119 | 119 | exit; |
120 | 120 | } else { |
121 | - if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) { |
|
122 | - include(realpath(__DIR__) . '/errorviewcompact.php'); |
|
121 | + if (file_exists(realpath(__DIR__).'/errorviewcompact.php')) { |
|
122 | + include(realpath(__DIR__).'/errorviewcompact.php'); |
|
123 | 123 | } else { |
124 | 124 | header('Content-type: application/json'); |
125 | 125 | die(json_encode('An error occured.')); |
@@ -33,7 +33,7 @@ discard block |
||
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 |
||
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 | header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
90 | 92 | header('X-Error-Message: ' . $message); |
91 | 93 | header('X-Error-File: ' . $file); |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | */ |
66 | 66 | private function config() |
67 | 67 | { |
68 | - $configPath = __DIR__ . '/../../config.json'; |
|
68 | + $configPath = __DIR__.'/../../config.json'; |
|
69 | 69 | if (realpath($configPath) !== false) { |
70 | 70 | $json = file_get_contents($configPath); |
71 | 71 | $this->config = json_decode($json); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | private function sitemapMatching($request) |
95 | 95 | { |
96 | 96 | $sitemap = $this->storage->getSitemap(); |
97 | - $relativeUri = '/' . $request::$relativeUri; |
|
97 | + $relativeUri = '/'.$request::$relativeUri; |
|
98 | 98 | |
99 | 99 | foreach ($sitemap as $sitemapItem) { |
100 | 100 | if ($sitemapItem->regex) { |
@@ -157,17 +157,17 @@ discard block |
||
157 | 157 | * @return mixed |
158 | 158 | * @throws \Exception |
159 | 159 | */ |
160 | - private function getComponentObject($class='', $template='', $parameters=array(), $matchedSitemapItem) |
|
160 | + private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem) |
|
161 | 161 | { |
162 | - $libraryComponentName = '\\library\\components\\' . $class; |
|
163 | - $userComponentName = '\\components\\' . $class; |
|
162 | + $libraryComponentName = '\\library\\components\\'.$class; |
|
163 | + $userComponentName = '\\components\\'.$class; |
|
164 | 164 | |
165 | 165 | if (\autoLoad($libraryComponentName, false)) { |
166 | 166 | $component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem); |
167 | 167 | } elseif (\autoLoad($userComponentName, false)) { |
168 | 168 | $component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem); |
169 | 169 | } else { |
170 | - throw new \Exception('Could not load component ' . $class); |
|
170 | + throw new \Exception('Could not load component '.$class); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | if (!$component instanceof Component) { |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | public function setCachingHeaders() |
227 | 227 | { |
228 | 228 | header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days |
229 | - header("Cache-Control: max-age=" . (60 * 60 * 24 * 2)); |
|
229 | + header("Cache-Control: max-age=".(60 * 60 * 24 * 2)); |
|
230 | 230 | } |
231 | 231 | |
232 | 232 | /** |