@@ -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) { |
@@ -18,87 +18,87 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | class Document |
| 20 | 20 | { |
| 21 | - public $id; |
|
| 22 | - public $path; |
|
| 23 | - public $title; |
|
| 24 | - public $slug; |
|
| 25 | - public $type; |
|
| 26 | - public $documentType; |
|
| 27 | - public $documentTypeSlug; |
|
| 28 | - public $state; |
|
| 29 | - public $lastModificationDate; |
|
| 30 | - public $creationDate; |
|
| 31 | - public $lastModifiedBy; |
|
| 32 | - protected $fields; |
|
| 33 | - protected $bricks; |
|
| 34 | - protected $dynamicBricks; |
|
| 35 | - protected $content; |
|
| 21 | + public $id; |
|
| 22 | + public $path; |
|
| 23 | + public $title; |
|
| 24 | + public $slug; |
|
| 25 | + public $type; |
|
| 26 | + public $documentType; |
|
| 27 | + public $documentTypeSlug; |
|
| 28 | + public $state; |
|
| 29 | + public $lastModificationDate; |
|
| 30 | + public $creationDate; |
|
| 31 | + public $lastModifiedBy; |
|
| 32 | + protected $fields; |
|
| 33 | + protected $bricks; |
|
| 34 | + protected $dynamicBricks; |
|
| 35 | + protected $content; |
|
| 36 | 36 | |
| 37 | - protected $dbHandle; |
|
| 37 | + protected $dbHandle; |
|
| 38 | 38 | |
| 39 | - protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks'); |
|
| 39 | + protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks'); |
|
| 40 | 40 | |
| 41 | - public function __get($name) { |
|
| 42 | - if (in_array($name, $this->jsonEncodedFields)) { |
|
| 43 | - if (is_string($this->$name)) { |
|
| 44 | - return json_decode($this->$name); |
|
| 45 | - } else { |
|
| 46 | - return $this->$name; |
|
| 47 | - } |
|
| 48 | - } elseif ($name === 'content') { |
|
| 49 | - if ($this->dbHandle === null) { |
|
| 50 | - throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')'); |
|
| 51 | - } else { |
|
| 52 | - if ($this->content === null) { |
|
| 53 | - $this->getContent(); |
|
| 54 | - } |
|
| 55 | - return $this->content; |
|
| 56 | - } |
|
| 57 | - } elseif ($name === 'dbHandle') { |
|
| 58 | - throw new \Exception('Trying to get protected property repository.'); |
|
| 59 | - } |
|
| 60 | - return $this->$name; |
|
| 61 | - } |
|
| 41 | + public function __get($name) { |
|
| 42 | + if (in_array($name, $this->jsonEncodedFields)) { |
|
| 43 | + if (is_string($this->$name)) { |
|
| 44 | + return json_decode($this->$name); |
|
| 45 | + } else { |
|
| 46 | + return $this->$name; |
|
| 47 | + } |
|
| 48 | + } elseif ($name === 'content') { |
|
| 49 | + if ($this->dbHandle === null) { |
|
| 50 | + throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')'); |
|
| 51 | + } else { |
|
| 52 | + if ($this->content === null) { |
|
| 53 | + $this->getContent(); |
|
| 54 | + } |
|
| 55 | + return $this->content; |
|
| 56 | + } |
|
| 57 | + } elseif ($name === 'dbHandle') { |
|
| 58 | + throw new \Exception('Trying to get protected property repository.'); |
|
| 59 | + } |
|
| 60 | + return $this->$name; |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - public function __set($name, $value) { |
|
| 64 | - if (in_array($name, $this->jsonEncodedFields)) { |
|
| 65 | - $this->$name = json_encode($value); |
|
| 66 | - } elseif ($name === 'content') { |
|
| 67 | - // Dont do anything for now.. |
|
| 68 | - return; |
|
| 69 | - } |
|
| 63 | + public function __set($name, $value) { |
|
| 64 | + if (in_array($name, $this->jsonEncodedFields)) { |
|
| 65 | + $this->$name = json_encode($value); |
|
| 66 | + } elseif ($name === 'content') { |
|
| 67 | + // Dont do anything for now.. |
|
| 68 | + return; |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - $this->$name = $value; |
|
| 72 | - } |
|
| 71 | + $this->$name = $value; |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * @throws \Exception |
|
| 76 | - */ |
|
| 77 | - protected function getContent() |
|
| 78 | - { |
|
| 79 | - $folderPathWithWildcard = $this->path . '%'; |
|
| 80 | - $sql = ' SELECT * |
|
| 74 | + /** |
|
| 75 | + * @throws \Exception |
|
| 76 | + */ |
|
| 77 | + protected function getContent() |
|
| 78 | + { |
|
| 79 | + $folderPathWithWildcard = $this->path . '%'; |
|
| 80 | + $sql = ' SELECT * |
|
| 81 | 81 | FROM documents |
| 82 | 82 | WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard) . ' |
| 83 | 83 | AND substr(`path`, ' . (strlen($this->path) + 2) . ') NOT LIKE "%/%" |
| 84 | 84 | AND substr(`path`, ' . (strlen($this->path) + 1) . ', 1) = "/" |
| 85 | 85 | AND path != ' . $this->dbHandle->quote($this->path) . ' |
| 86 | 86 | '; |
| 87 | - $stmt = $this->dbHandle->query($sql); |
|
| 88 | - if ($stmt === false) { |
|
| 89 | - $errorInfo = $this->dbHandle->errorInfo(); |
|
| 90 | - $errorMsg = $errorInfo[2]; |
|
| 91 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
| 92 | - } |
|
| 93 | - $contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document'); |
|
| 94 | - foreach ($contents as $key => $document) { |
|
| 95 | - if ($document->type === 'folder') { |
|
| 96 | - $document->dbHandle = $this->dbHandle; |
|
| 97 | - $contents[$key] = $document; |
|
| 98 | - } |
|
| 99 | - } |
|
| 100 | - $this->content = $contents; |
|
| 101 | - } |
|
| 87 | + $stmt = $this->dbHandle->query($sql); |
|
| 88 | + if ($stmt === false) { |
|
| 89 | + $errorInfo = $this->dbHandle->errorInfo(); |
|
| 90 | + $errorMsg = $errorInfo[2]; |
|
| 91 | + throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
| 92 | + } |
|
| 93 | + $contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document'); |
|
| 94 | + foreach ($contents as $key => $document) { |
|
| 95 | + if ($document->type === 'folder') { |
|
| 96 | + $document->dbHandle = $this->dbHandle; |
|
| 97 | + $contents[$key] = $document; |
|
| 98 | + } |
|
| 99 | + } |
|
| 100 | + $this->content = $contents; |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | 103 | /** |
| 104 | 104 | * @return string |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | } elseif ($name === 'content') { |
| 49 | 49 | if ($this->dbHandle === null) { |
| 50 | - throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')'); |
|
| 50 | + throw new \Exception('Document doesnt have a dbHandle handle. (path: '.$this->path.')'); |
|
| 51 | 51 | } else { |
| 52 | 52 | if ($this->content === null) { |
| 53 | 53 | $this->getContent(); |
@@ -76,19 +76,19 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | protected function getContent() |
| 78 | 78 | { |
| 79 | - $folderPathWithWildcard = $this->path . '%'; |
|
| 79 | + $folderPathWithWildcard = $this->path.'%'; |
|
| 80 | 80 | $sql = ' SELECT * |
| 81 | 81 | FROM documents |
| 82 | - WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard) . ' |
|
| 83 | - AND substr(`path`, ' . (strlen($this->path) + 2) . ') NOT LIKE "%/%" |
|
| 84 | - AND substr(`path`, ' . (strlen($this->path) + 1) . ', 1) = "/" |
|
| 85 | - AND path != ' . $this->dbHandle->quote($this->path) . ' |
|
| 82 | + WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard).' |
|
| 83 | + AND substr(`path`, ' . (strlen($this->path) + 2).') NOT LIKE "%/%" |
|
| 84 | + AND substr(`path`, ' . (strlen($this->path) + 1).', 1) = "/" |
|
| 85 | + AND path != ' . $this->dbHandle->quote($this->path).' |
|
| 86 | 86 | '; |
| 87 | 87 | $stmt = $this->dbHandle->query($sql); |
| 88 | 88 | if ($stmt === false) { |
| 89 | 89 | $errorInfo = $this->dbHandle->errorInfo(); |
| 90 | 90 | $errorMsg = $errorInfo[2]; |
| 91 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
| 91 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
| 92 | 92 | } |
| 93 | 93 | $contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document'); |
| 94 | 94 | foreach ($contents as $key => $document) { |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | */ |
| 106 | 106 | public function __toString() |
| 107 | 107 | { |
| 108 | - return 'Document:' . $this->title; |
|
| 108 | + return 'Document:'.$this->title; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | |
@@ -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 | { |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | */ |
| 64 | 64 | private function config() |
| 65 | 65 | { |
| 66 | - $configPath = __DIR__ . '/../../config.json'; |
|
| 66 | + $configPath = __DIR__.'/../../config.json'; |
|
| 67 | 67 | if (realpath($configPath) !== false) { |
| 68 | 68 | $json = file_get_contents($configPath); |
| 69 | 69 | $this->config = json_decode($json); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | private function sitemapMatching($request) |
| 91 | 91 | { |
| 92 | 92 | $sitemap = $this->storage->getSitemap()->getSitemap(); |
| 93 | - $relativeUri = '/' . $request::$relativeUri; |
|
| 93 | + $relativeUri = '/'.$request::$relativeUri; |
|
| 94 | 94 | |
| 95 | 95 | foreach ($sitemap as $sitemapItem) { |
| 96 | 96 | if ($sitemapItem->regex) { |
@@ -153,17 +153,17 @@ discard block |
||
| 153 | 153 | * @return mixed |
| 154 | 154 | * @throws \Exception |
| 155 | 155 | */ |
| 156 | - private function getComponentObject($class='', $template='', $parameters=array(), $matchedSitemapItem) |
|
| 156 | + private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem) |
|
| 157 | 157 | { |
| 158 | - $libraryComponentName = '\\library\\components\\' . $class; |
|
| 159 | - $userComponentName = '\\components\\' . $class; |
|
| 158 | + $libraryComponentName = '\\library\\components\\'.$class; |
|
| 159 | + $userComponentName = '\\components\\'.$class; |
|
| 160 | 160 | |
| 161 | 161 | if (AutoloadUtil::autoLoad($libraryComponentName, false)) { |
| 162 | 162 | $component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem); |
| 163 | 163 | } elseif (AutoloadUtil::autoLoad($userComponentName, false)) { |
| 164 | 164 | $component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem); |
| 165 | 165 | } else { |
| 166 | - throw new \Exception('Could not load component ' . $class); |
|
| 166 | + throw new \Exception('Could not load component '.$class); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | if (!$component instanceof Component) { |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | public function setCachingHeaders() |
| 223 | 223 | { |
| 224 | 224 | header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days |
| 225 | - header("Cache-Control: max-age=" . (60 * 60 * 24 * 2)); |
|
| 225 | + header("Cache-Control: max-age=".(60 * 60 * 24 * 2)); |
|
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | /** |
@@ -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 |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $imageSet = $cmsComponent->storage->getImageSet()->getImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]); |
| 57 | 57 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) { |
| 58 | 58 | $cmsComponent->storage->getImageSet()->saveImageSet($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post); |
| 59 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set'); |
|
| 59 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set'); |
|
| 60 | 60 | exit; |
| 61 | 61 | } |
| 62 | 62 | $cmsComponent->setParameter(CmsComponent::PARAMETER_IMAGE_SET, $imageSet); |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION); |
| 73 | 73 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) { |
| 74 | 74 | $cmsComponent->storage->getImageSet()->addImageSet($request::$post); |
| 75 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set'); |
|
| 75 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set'); |
|
| 76 | 76 | exit; |
| 77 | 77 | } |
| 78 | 78 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | private function deleteRoute($request, $cmsComponent) |
| 85 | 85 | { |
| 86 | 86 | $cmsComponent->storage->getImageSet()->deleteImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]); |
| 87 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set'); |
|
| 87 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set'); |
|
| 88 | 88 | exit; |
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | \ No newline at end of file |
@@ -33,13 +33,13 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | public function addImage($postValues) |
| 35 | 35 | { |
| 36 | - $destinationPath = realpath(__DIR__ . '/../../../www/images/'); |
|
| 36 | + $destinationPath = realpath(__DIR__.'/../../../www/images/'); |
|
| 37 | 37 | |
| 38 | 38 | $filename = $this->validateFilename($postValues['name'], $destinationPath); |
| 39 | - $destination = $destinationPath . '/' . $filename; |
|
| 39 | + $destination = $destinationPath.'/'.$filename; |
|
| 40 | 40 | |
| 41 | 41 | if ($postValues['error'] != '0') { |
| 42 | - throw new \Exception('Error uploading file. Error code: ' . $postValues['error']); |
|
| 42 | + throw new \Exception('Error uploading file. Error code: '.$postValues['error']); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | if (move_uploaded_file($postValues['tmp_name'], $destination)) { |
@@ -64,14 +64,14 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | public function deleteImageByName($filename) |
| 66 | 66 | { |
| 67 | - $destinationPath = realpath(__DIR__ . '/../../../www/images/'); |
|
| 67 | + $destinationPath = realpath(__DIR__.'/../../../www/images/'); |
|
| 68 | 68 | |
| 69 | 69 | $images = $this->getImages(); |
| 70 | 70 | |
| 71 | 71 | foreach ($images as $key => $image) { |
| 72 | 72 | if ($image->file == $filename) { |
| 73 | 73 | foreach ($image->set as $imageSetFilename) { |
| 74 | - $destination = $destinationPath . '/' . $imageSetFilename; |
|
| 74 | + $destination = $destinationPath.'/'.$imageSetFilename; |
|
| 75 | 75 | if (file_exists($destination)) { |
| 76 | 76 | unlink($destination); |
| 77 | 77 | } else { |