@@ -79,13 +79,13 @@ discard block |
||
79 | 79 | if (!$stmt = $db->query($sql)) { |
80 | 80 | $errorInfo = $db->errorInfo(); |
81 | 81 | $errorMsg = $errorInfo[2]; |
82 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
82 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
83 | 83 | } |
84 | 84 | $result = $stmt->fetch(\PDO::FETCH_COLUMN); |
85 | 85 | if (false === $result) { |
86 | 86 | $errorInfo = $db->errorInfo(); |
87 | 87 | $errorMsg = $errorInfo[2]; |
88 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
88 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
89 | 89 | } |
90 | 90 | return intval($result); |
91 | 91 | } |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | protected function applyFilters($tokens) |
119 | 119 | { |
120 | 120 | foreach ($this->filters as $filterName) { |
121 | - $filterClassName = '\library\search\filters\\' . $filterName; |
|
121 | + $filterClassName = '\library\search\filters\\'.$filterName; |
|
122 | 122 | $filter = new $filterClassName($tokens); |
123 | 123 | $tokens = $filter->getFilterResults(); |
124 | 124 | } |
@@ -154,13 +154,13 @@ discard block |
||
154 | 154 | GROUP BY term_frequency.documentPath, term_frequency.term |
155 | 155 | ORDER BY score DESC |
156 | 156 | '; |
157 | - if(!$stmt = $db->prepare($sql)) { |
|
158 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
157 | + if (!$stmt = $db->prepare($sql)) { |
|
158 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
159 | 159 | } |
160 | 160 | $stmt->bindValue(':query', $token); |
161 | 161 | $stmt->bindValue(':queryNorm', $queryNorm); |
162 | 162 | if (!$stmt->execute()) { |
163 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
163 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
164 | 164 | } |
165 | 165 | return $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\search\results\SearchResult'); |
166 | 166 | } |
@@ -216,13 +216,13 @@ discard block |
||
216 | 216 | $sql = ' |
217 | 217 | SELECT (1 / sqrt(SUM(inverseDocumentFrequency))) as queryNorm |
218 | 218 | FROM inverse_document_frequency |
219 | - WHERE term IN (' . $terms . ') |
|
219 | + WHERE term IN (' . $terms.') |
|
220 | 220 | '; |
221 | - if(!$stmt = $db->prepare($sql)) { |
|
222 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
221 | + if (!$stmt = $db->prepare($sql)) { |
|
222 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
223 | 223 | } |
224 | 224 | if (!$stmt->execute()) { |
225 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
225 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
226 | 226 | } |
227 | 227 | $result = $stmt->fetch(\PDO::FETCH_OBJ); |
228 | 228 | return $result->queryNorm == null ? 1 : $result->queryNorm; |
@@ -272,11 +272,11 @@ discard block |
||
272 | 272 | '; |
273 | 273 | $stmt = $db->prepare($sql); |
274 | 274 | if ($stmt === false) { |
275 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
275 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
276 | 276 | } |
277 | 277 | $stmt->bindValue(':token', $token); |
278 | 278 | if (($stmt === false) | (!$stmt->execute())) { |
279 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
279 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
280 | 280 | } |
281 | 281 | $result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\search\results\SearchSuggestion'); |
282 | 282 | $allResults = array_merge($result, $allResults); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | } |
27 | 27 | |
28 | 28 | global $rootPath; |
29 | - $file = $rootPath . str_replace('\\', '/', $class) . ".php"; |
|
29 | + $file = $rootPath.str_replace('\\', '/', $class).".php"; |
|
30 | 30 | |
31 | 31 | if (file_exists($file)) { |
32 | 32 | return self::loadClassInExistingFile($class, $throwException, $file); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | require_once($file); |
61 | 61 | if ($throwException) { |
62 | 62 | if (class_exists($class, false) === false && interface_exists($class, false) === false) { |
63 | - throw new \Exception('Could not load class "' . $class . '" in file ' . $file); |
|
63 | + throw new \Exception('Could not load class "'.$class.'" in file '.$file); |
|
64 | 64 | } else { |
65 | 65 | return true; |
66 | 66 | } |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | private static function handleUnloadableClassWithBacktrace($class, $throwException, $rootPath, $file, $debug_backtrace) |
82 | 82 | { |
83 | 83 | if ($throwException) { |
84 | - errorHandler(0, 'Could not load class \'' . $class . '\' in file ' . $rootPath . $file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']); |
|
84 | + errorHandler(0, 'Could not load class \''.$class.'\' in file '.$rootPath.$file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']); |
|
85 | 85 | } else { |
86 | 86 | return false; |
87 | 87 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | private static function handleUnloadableClassWithoutBacktrace($class, $throwException, $file) |
99 | 99 | { |
100 | 100 | if ($throwException) { |
101 | - throw new \Exception('Could not load class "' . $class . '" in file ' . $file . "\n" . 'Called from unknown origin.'); |
|
101 | + throw new \Exception('Could not load class "'.$class.'" in file '.$file."\n".'Called from unknown origin.'); |
|
102 | 102 | } else { |
103 | 103 | return false; |
104 | 104 | } |
@@ -2,21 +2,21 @@ discard block |
||
2 | 2 | | THE FOLLOWING ERROR OCCURED | |
3 | 3 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
4 | 4 | |
5 | - <?php echo $message . PHP_EOL; ?> |
|
5 | + <?php echo $message.PHP_EOL; ?> |
|
6 | 6 | |
7 | 7 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
8 | 8 | | IN FILE | |
9 | 9 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
10 | 10 | |
11 | - <?php echo $file . ':' . $line . PHP_EOL; ?> |
|
11 | + <?php echo $file.':'.$line.PHP_EOL; ?> |
|
12 | 12 | |
13 | 13 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
14 | 14 | | CONTENTS OF THE FILE | |
15 | 15 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
16 | 16 | |
17 | 17 | <?php |
18 | -foreach($lines as $nr => $currentLine) { |
|
19 | - echo ($nr == $line ? '* ' : ' ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine; |
|
18 | +foreach ($lines as $nr => $currentLine) { |
|
19 | + echo ($nr == $line ? '* ' : ' ').str_pad($nr, 3, "0", STR_PAD_LEFT).' '.$currentLine; |
|
20 | 20 | } |
21 | 21 | ?> |
22 | 22 | |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
26 | 26 | |
27 | 27 | <?php |
28 | -foreach($trace as $row) { |
|
29 | - echo (isset($row['file']) ? basename($row['file']) : '') . ':' |
|
30 | - . (isset($row['line']) ? $row['line'] : '') . "\t\t\t" |
|
31 | - . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t" |
|
32 | - . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t" |
|
33 | - . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL; |
|
28 | +foreach ($trace as $row) { |
|
29 | + echo (isset($row['file']) ? basename($row['file']) : '').':' |
|
30 | + . (isset($row['line']) ? $row['line'] : '')."\t\t\t" |
|
31 | + . (isset($row['class']) ? $row['class'] : ' ')."\t\t\t" |
|
32 | + . (isset($row['type']) ? $row['type'] : ' ')."\t\t\t" |
|
33 | + . (isset($row['function']) ? $row['function'] : ' ').PHP_EOL; |
|
34 | 34 | } |
35 | 35 | ?> |
36 | 36 | \ No newline at end of file |
@@ -21,7 +21,9 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public static function renderError($message = '', $file = '', $line = '', $code = 0, $trace = array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') |
23 | 23 | { |
24 | - if (ob_get_contents()) ob_end_clean(); |
|
24 | + if (ob_get_contents()) { |
|
25 | + ob_end_clean(); |
|
26 | + } |
|
25 | 27 | $line = intval($line); |
26 | 28 | |
27 | 29 | if (self::canShowError()) { |
@@ -85,7 +87,9 @@ discard block |
||
85 | 87 | |
86 | 88 | private static function renderCliException($message, $file, $line, $trace, $lines) |
87 | 89 | { |
88 | - if (ob_get_contents()) ob_end_clean(); |
|
90 | + if (ob_get_contents()) { |
|
91 | + ob_end_clean(); |
|
92 | + } |
|
89 | 93 | include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcli.php'); |
90 | 94 | exit; |
91 | 95 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | private static function renderCliException($message, $file, $line, $trace, $lines) |
76 | 76 | { |
77 | 77 | if (ob_get_contents()) ob_end_clean(); |
78 | - include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcli.php'); |
|
78 | + include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcli.php'); |
|
79 | 79 | exit; |
80 | 80 | } |
81 | 81 | |
@@ -87,12 +87,12 @@ discard block |
||
87 | 87 | */ |
88 | 88 | private static function dontShowError($message, $file, $line, $httpHeader) |
89 | 89 | { |
90 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
91 | - header('X-Error-Message: ' . $message); |
|
92 | - header('X-Error-File: ' . $file); |
|
93 | - header('X-Error-Line: ' . $line); |
|
94 | - if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcompact.php')) { |
|
95 | - include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcompact.php'); |
|
90 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
91 | + header('X-Error-Message: '.$message); |
|
92 | + header('X-Error-File: '.$file); |
|
93 | + header('X-Error-Line: '.$line); |
|
94 | + if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcompact.php')) { |
|
95 | + include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcompact.php'); |
|
96 | 96 | } else { |
97 | 97 | header('Content-type: application/json'); |
98 | 98 | die(json_encode('An error occured.')); |
@@ -160,11 +160,11 @@ discard block |
||
160 | 160 | 'httpHeader' => $httpHeader, |
161 | 161 | ); |
162 | 162 | |
163 | - if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewdetailed.php')) { |
|
164 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
165 | - include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewdetailed.php'); |
|
163 | + if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewdetailed.php')) { |
|
164 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
165 | + include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewdetailed.php'); |
|
166 | 166 | } else { |
167 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
167 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
168 | 168 | header('Content-type: application/json'); |
169 | 169 | die(json_encode($error)); |
170 | 170 | } |
@@ -1,9 +1,9 @@ |
||
1 | 1 | <?php |
2 | -require_once(__DIR__ . DIRECTORY_SEPARATOR . 'AutoloadUtil.php'); |
|
2 | +require_once(__DIR__.DIRECTORY_SEPARATOR.'AutoloadUtil.php'); |
|
3 | 3 | spl_autoload_extensions('.php'); |
4 | 4 | spl_autoload_register("autoloader"); |
5 | 5 | |
6 | -$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/'); |
|
6 | +$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/'); |
|
7 | 7 | |
8 | 8 | /** |
9 | 9 | * The function to be registered as the default autoload function |
@@ -32,11 +32,11 @@ |
||
32 | 32 | */ |
33 | 33 | function shutdownHandler () { |
34 | 34 | $error = error_get_last(); |
35 | - if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
|
35 | + if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
|
36 | 36 | \library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']); |
37 | - }elseif ($error['type'] == 1) { |
|
38 | - dump($error); |
|
39 | - } |
|
37 | + }elseif ($error['type'] == 1) { |
|
38 | + dump($error); |
|
39 | + } |
|
40 | 40 | } |
41 | 41 | |
42 | 42 |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once(__DIR__ . DIRECTORY_SEPARATOR . 'ErrorHandlingUtil.php'); |
|
2 | +require_once(__DIR__.DIRECTORY_SEPARATOR.'ErrorHandlingUtil.php'); |
|
3 | 3 | set_exception_handler('exceptionHandler'); |
4 | 4 | set_error_handler('errorHandler'); |
5 | 5 | register_shutdown_function('shutdownHandler'); |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | * |
11 | 11 | * @param $e |
12 | 12 | */ |
13 | -function exceptionHandler ($e) { |
|
14 | - \library\cc\ErrorHandlingUtil::renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace()); |
|
13 | +function exceptionHandler($e) { |
|
14 | + \library\cc\ErrorHandlingUtil::renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace()); |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | /** |
@@ -22,18 +22,18 @@ discard block |
||
22 | 22 | * @param $errfile |
23 | 23 | * @param $errline |
24 | 24 | */ |
25 | -function errorHandler ($errno, $errstr, $errfile, $errline) { |
|
26 | - \library\cc\ErrorHandlingUtil::renderError($errstr,$errfile,$errline,$errno,debug_backtrace()); |
|
25 | +function errorHandler($errno, $errstr, $errfile, $errline) { |
|
26 | + \library\cc\ErrorHandlingUtil::renderError($errstr, $errfile, $errline, $errno, debug_backtrace()); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
30 | 30 | * When an error occurs that kills the process, still try |
31 | 31 | * to show it using a shutdownHandler. |
32 | 32 | */ |
33 | -function shutdownHandler () { |
|
33 | +function shutdownHandler() { |
|
34 | 34 | $error = error_get_last(); |
35 | 35 | if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
36 | - \library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']); |
|
36 | + \library\cc\ErrorHandlingUtil::renderError($error['message'], $error['file'], $error['line'], $error['type']); |
|
37 | 37 | }elseif ($error['type'] == 1) { |
38 | 38 | dump($error); |
39 | 39 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | $error = error_get_last(); |
35 | 35 | if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
36 | 36 | \library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']); |
37 | - }elseif ($error['type'] == 1) { |
|
37 | + } elseif ($error['type'] == 1) { |
|
38 | 38 | dump($error); |
39 | 39 | } |
40 | 40 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * @param array $parameters |
42 | 42 | * @param $matchedSitemapItem |
43 | 43 | */ |
44 | - public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem) |
|
44 | + public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem) |
|
45 | 45 | { |
46 | 46 | $this->template = $template; |
47 | 47 | $this->request = $request; |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * |
67 | 67 | * @throws \Exception |
68 | 68 | */ |
69 | - public function render($application=null) |
|
69 | + public function render($application = null) |
|
70 | 70 | { |
71 | 71 | $this->renderedContent = $this->renderTemplate($this->template, true, $application); |
72 | 72 | } |
@@ -92,9 +92,9 @@ discard block |
||
92 | 92 | * @return string |
93 | 93 | * @throws \Exception |
94 | 94 | */ |
95 | - public function renderTemplate($template='', $obClean = true, $application=null) |
|
95 | + public function renderTemplate($template = '', $obClean = true, $application = null) |
|
96 | 96 | { |
97 | - $templatePath = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php'; |
|
97 | + $templatePath = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR.$template.'.php'; |
|
98 | 98 | if (realpath($templatePath) !== false) { |
99 | 99 | if ($obClean) { |
100 | 100 | ob_clean(); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | return ob_get_contents(); |
112 | 112 | } else { |
113 | 113 | if ($template !== null) { // If template is null, its a application component, which doesnt have a template |
114 | - throw new \Exception('Couldnt find template ' . $templatePath); |
|
114 | + throw new \Exception('Couldnt find template '.$templatePath); |
|
115 | 115 | } |
116 | 116 | } |
117 | 117 | } |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * @return string |
127 | 127 | * @throws \Exception |
128 | 128 | */ |
129 | - public function includeTemplate($template='', $parameters = array()) |
|
129 | + public function includeTemplate($template = '', $parameters = array()) |
|
130 | 130 | { |
131 | 131 | if (is_array($parameters)) { |
132 | 132 | foreach ($parameters as $name => $value) { |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | } elseif (is_string($imageContainer)) { |
36 | 36 | $this->_imageResource = imagecreatefromstring($imageContainer); |
37 | 37 | } else { |
38 | - throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>' . var_export($imageContainer, true) . '</pre>'); |
|
38 | + throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>'.var_export($imageContainer, true).'</pre>'); |
|
39 | 39 | } |
40 | 40 | } |
41 | 41 | |
@@ -179,9 +179,9 @@ discard block |
||
179 | 179 | // Cut it in parts of 2 bytes |
180 | 180 | $header_parts = str_split($header, 2); |
181 | 181 | // Get the width 4 bytes |
182 | - $width = hexdec($header_parts[19] . $header_parts[18]); |
|
182 | + $width = hexdec($header_parts[19].$header_parts[18]); |
|
183 | 183 | // Get the height 4 bytes |
184 | - $height = hexdec($header_parts[23] . $header_parts[22]); |
|
184 | + $height = hexdec($header_parts[23].$header_parts[22]); |
|
185 | 185 | // Unset the header params |
186 | 186 | unset($header_parts); |
187 | 187 | |
@@ -226,9 +226,9 @@ discard block |
||
226 | 226 | } |
227 | 227 | // Calculation of the RGB-pixel (defined as BGR in image-data). Define $iPos as absolute position in the body |
228 | 228 | $iPos = $i * 2; |
229 | - $r = hexdec($body[$iPos + 4] . $body[$iPos + 5]); |
|
230 | - $g = hexdec($body[$iPos + 2] . $body[$iPos + 3]); |
|
231 | - $b = hexdec($body[$iPos] . $body[$iPos + 1]); |
|
229 | + $r = hexdec($body[$iPos + 4].$body[$iPos + 5]); |
|
230 | + $g = hexdec($body[$iPos + 2].$body[$iPos + 3]); |
|
231 | + $b = hexdec($body[$iPos].$body[$iPos + 1]); |
|
232 | 232 | // Calculate and draw the pixel |
233 | 233 | $color = imagecolorallocate($image, $r, $g, $b); |
234 | 234 | imagesetpixel($image, $x, $height - $y, $color); |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * @param string $imagePath |
77 | 77 | * @param bool $getExtension |
78 | 78 | * |
79 | - * @return bool|int|string |
|
79 | + * @return integer |
|
80 | 80 | */ |
81 | 81 | public function getImageMimeType($imagePath, $getExtension = false) |
82 | 82 | { |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | } |
150 | 150 | |
151 | 151 | /** |
152 | - * @param $pathToBitmapFile |
|
152 | + * @param string $pathToBitmapFile |
|
153 | 153 | * |
154 | 154 | * @return string |
155 | 155 | */ |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | } |
166 | 166 | |
167 | 167 | /** |
168 | - * @param $header |
|
168 | + * @param string $header |
|
169 | 169 | * |
170 | 170 | * @return array |
171 | 171 | */ |
@@ -195,14 +195,14 @@ discard block |
||
195 | 195 | * Loop through the data in the body of the bitmap |
196 | 196 | * file and calculate each individual pixel based on the |
197 | 197 | * bytes |
198 | - * @param $bodySize |
|
199 | - * @param $x |
|
198 | + * @param integer $bodySize |
|
199 | + * @param integer $x |
|
200 | 200 | * @param $width |
201 | - * @param $usePadding |
|
202 | - * @param $y |
|
201 | + * @param boolean $usePadding |
|
202 | + * @param integer $y |
|
203 | 203 | * @param $height |
204 | - * @param $body |
|
205 | - * @param $image |
|
204 | + * @param string $body |
|
205 | + * @param resource $image |
|
206 | 206 | */ |
207 | 207 | private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image) |
208 | 208 | { |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_IMAGES); |
65 | 65 | if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) { |
66 | 66 | $cmsComponent->storage->getImages()->addImage($_FILES[CmsComponent::FILES_PARAMETER_FILE]); |
67 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/images'); |
|
67 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/images'); |
|
68 | 68 | exit; |
69 | 69 | } |
70 | 70 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | private function deleteRoute($request, $cmsComponent) |
77 | 77 | { |
78 | 78 | $cmsComponent->storage->getImages()->deleteImageByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]); |
79 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/images'); |
|
79 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/images'); |
|
80 | 80 | exit; |
81 | 81 | } |
82 | 82 |
@@ -13,26 +13,26 @@ |
||
13 | 13 | class ImagesRouting implements CmsRouting |
14 | 14 | { |
15 | 15 | |
16 | - /** |
|
17 | - * ImagesRouting constructor. |
|
18 | - * @param \library\cc\Request $request |
|
19 | - * @param mixed|string $relativeCmsUri |
|
20 | - * @param CmsComponent $cmsComponent |
|
21 | - */ |
|
22 | - public function __construct($request, $relativeCmsUri, $cmsComponent) |
|
23 | - { |
|
24 | - if ($relativeCmsUri == '/images') { |
|
16 | + /** |
|
17 | + * ImagesRouting constructor. |
|
18 | + * @param \library\cc\Request $request |
|
19 | + * @param mixed|string $relativeCmsUri |
|
20 | + * @param CmsComponent $cmsComponent |
|
21 | + */ |
|
22 | + public function __construct($request, $relativeCmsUri, $cmsComponent) |
|
23 | + { |
|
24 | + if ($relativeCmsUri == '/images') { |
|
25 | 25 | $this->overviewRoute($cmsComponent); |
26 | - } elseif ($relativeCmsUri == '/images.json') { |
|
26 | + } elseif ($relativeCmsUri == '/images.json') { |
|
27 | 27 | $this->jsonRoute($cmsComponent); |
28 | - } elseif ($relativeCmsUri == '/images/new') { |
|
28 | + } elseif ($relativeCmsUri == '/images/new') { |
|
29 | 29 | $this->newRoute($request, $cmsComponent); |
30 | - } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
30 | + } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
31 | 31 | $this->deleteRoute($request, $cmsComponent); |
32 | - } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
32 | + } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
33 | 33 | $this->showRoute($request, $cmsComponent); |
34 | - } |
|
35 | - } |
|
34 | + } |
|
35 | + } |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * @param CmsComponent $cmsComponent |