Passed
Push — develop ( 51f80f...cde9d6 )
by Jens
03:13
created
cloudcontrol/library/cc/errorhandler.php 1 patch
Indentation   +74 added lines, -74 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,57 +85,57 @@  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();
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
Please login to merge, or discard this patch.