jenskooij /
cloudcontrol
@@ -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,7 +84,7 @@ 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 | 89 | |
| 90 | 90 | if (canShowError()) { |
@@ -93,8 +93,8 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
@@ -47,21 +47,21 @@ |
||
| 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); |
@@ -99,9 +99,9 @@ |
||
| 99 | 99 | $this->sessionValues = $_SESSION['LanguageComponent']; |
| 100 | 100 | |
| 101 | 101 | if ($this->forceRedirect === true) { |
| 102 | - if (substr($request::$relativeUri, 0, 2) !== $lang ) { |
|
| 102 | + if (substr($request::$relativeUri, 0, 2) !== $lang) { |
|
| 103 | 103 | if ($lang !== $this->defaultLanguage) { |
| 104 | - header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri); |
|
| 104 | + header('Location: '.$request::$subfolders.$lang.'/'.$request::$relativeUri); |
|
| 105 | 105 | exit; |
| 106 | 106 | } |
| 107 | 107 | } |
