@@ -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; |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * |
| 68 | 68 | * @throws \Exception |
| 69 | 69 | */ |
| 70 | - public function render($application=null) |
|
| 70 | + public function render($application = null) |
|
| 71 | 71 | { |
| 72 | 72 | $this->renderedContent = $this->renderTemplate($this->template, true, $application); |
| 73 | 73 | } |
@@ -93,9 +93,9 @@ discard block |
||
| 93 | 93 | * @return string |
| 94 | 94 | * @throws \Exception |
| 95 | 95 | */ |
| 96 | - public function renderTemplate($template='', $obClean = true, $application=null) |
|
| 96 | + public function renderTemplate($template = '', $obClean = true, $application = null) |
|
| 97 | 97 | { |
| 98 | - $templatePath = __DIR__ . '/../../templates/' . $template . '.php'; |
|
| 98 | + $templatePath = __DIR__.'/../../templates/'.$template.'.php'; |
|
| 99 | 99 | if (realpath($templatePath) !== false) { |
| 100 | 100 | if ($obClean) { |
| 101 | 101 | ob_clean(); |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | return ob_get_contents(); |
| 113 | 113 | } else { |
| 114 | 114 | if ($template !== null) { // If template is null, its a application component, which doesnt have a template |
| 115 | - throw new \Exception('Couldnt find template ' . $templatePath); |
|
| 115 | + throw new \Exception('Couldnt find template '.$templatePath); |
|
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | 118 | } |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | * @return string |
| 128 | 128 | * @throws \Exception |
| 129 | 129 | */ |
| 130 | - public function includeTemplate($template='', $parameters = array()) |
|
| 130 | + public function includeTemplate($template = '', $parameters = array()) |
|
| 131 | 131 | { |
| 132 | 132 | if (is_array($parameters)) { |
| 133 | 133 | foreach ($parameters as $name => $value) { |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | if (isset($this->parameters['document'])) { |
| 84 | 84 | $this->runByDocumentParameter(); |
| 85 | 85 | } else { |
| 86 | - throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: ' . $this->matchedSitemapItem->title); |
|
| 86 | + throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: '.$this->matchedSitemapItem->title); |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | |
@@ -100,9 +100,9 @@ discard block |
||
| 100 | 100 | $relativeDocumentUri = current($this->matchedSitemapItem->matches[1]); |
| 101 | 101 | if (isset($this->parameters['folder'])) { |
| 102 | 102 | if (substr($this->parameters['folder'], -1) !== '/') { |
| 103 | - $this->parameters['folder'] = $this->parameters['folder'] . '/'; |
|
| 103 | + $this->parameters['folder'] = $this->parameters['folder'].'/'; |
|
| 104 | 104 | } |
| 105 | - $relativeDocumentUri = $this->parameters['folder'] . $relativeDocumentUri; |
|
| 105 | + $relativeDocumentUri = $this->parameters['folder'].$relativeDocumentUri; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | $document = $this->storage->getDocumentBySlug($relativeDocumentUri); |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js"></script> |
| 4 | 4 | <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" rel="stylesheet"> |
| 5 | 5 | <script>var smallestImage = '<?=$smallestImage?>';</script> |
| 6 | -<?$copyable=''?> |
|
| 6 | +<?$copyable = ''?> |
|
| 7 | 7 | <section class="documents"> |
| 8 | 8 | <h2><i class="fa fa-file-text-o"></i> Documents</h2> |
| 9 | 9 | <nav class="actions"> |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | </div> |
| 24 | 24 | </li> |
| 25 | 25 | </ul> |
| 26 | - <?include('document-form-form.php');?> |
|
| 26 | + <?include('document-form-form.php'); ?> |
|
| 27 | 27 | </section> |
| 28 | 28 | |
| 29 | 29 | <script> |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | } |
| 44 | 44 | return $returnFileNames; |
| 45 | 45 | } else { |
| 46 | - throw new \Exception('Image doesnt exist: ' . $imagePath); |
|
| 46 | + throw new \Exception('Image doesnt exist: '.$imagePath); |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | |
@@ -54,10 +54,10 @@ discard block |
||
| 54 | 54 | * @return string |
| 55 | 55 | * @throws \Exception |
| 56 | 56 | */ |
| 57 | - public function resize($imagePath='', $width='',$height='') |
|
| 57 | + public function resize($imagePath = '', $width = '', $height = '') |
|
| 58 | 58 | { |
| 59 | - $modifier = '-r' . $width . 'x' . $height; |
|
| 60 | - return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier); |
|
| 59 | + $modifier = '-r'.$width.'x'.$height; |
|
| 60 | + return $this->applyMethod('Resize', $imagePath, $width, $height, $modifier); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | /** |
@@ -67,10 +67,10 @@ discard block |
||
| 67 | 67 | * @return string |
| 68 | 68 | * @throws \Exception |
| 69 | 69 | */ |
| 70 | - public function smartcrop($imagePath='', $width='',$height='') |
|
| 70 | + public function smartcrop($imagePath = '', $width = '', $height = '') |
|
| 71 | 71 | { |
| 72 | - $modifier = '-s' . $width . 'x' . $height; |
|
| 73 | - return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier); |
|
| 72 | + $modifier = '-s'.$width.'x'.$height; |
|
| 73 | + return $this->applyMethod('SmartCrop', $imagePath, $width, $height, $modifier); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
@@ -80,10 +80,10 @@ discard block |
||
| 80 | 80 | * @return string |
| 81 | 81 | * @throws \Exception |
| 82 | 82 | */ |
| 83 | - public function boxcrop($imagePath='', $width='',$height='') |
|
| 83 | + public function boxcrop($imagePath = '', $width = '', $height = '') |
|
| 84 | 84 | { |
| 85 | - $modifier = '-b' . $width . 'x' . $height; |
|
| 86 | - return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier); |
|
| 85 | + $modifier = '-b'.$width.'x'.$height; |
|
| 86 | + return $this->applyMethod('BoxCrop', $imagePath, $width, $height, $modifier); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | * |
| 93 | 93 | * @return string |
| 94 | 94 | */ |
| 95 | - private function modifyName($imagePath, $modifier='') |
|
| 95 | + private function modifyName($imagePath, $modifier = '') |
|
| 96 | 96 | { |
| 97 | 97 | $filename = basename($imagePath); |
| 98 | 98 | $path = dirname($imagePath); |
@@ -102,30 +102,30 @@ discard block |
||
| 102 | 102 | array_pop($fileParts); |
| 103 | 103 | $fileNameWithoutExtension = implode('-', $fileParts); |
| 104 | 104 | $fileNameWithoutExtension = slugify($fileNameWithoutExtension); |
| 105 | - $filename = $fileNameWithoutExtension . $modifier . '.' . $extension; |
|
| 105 | + $filename = $fileNameWithoutExtension.$modifier.'.'.$extension; |
|
| 106 | 106 | } else { |
| 107 | 107 | $filename = slugify($filename); |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - if (file_exists($path . '/' . $filename)) { |
|
| 110 | + if (file_exists($path.'/'.$filename)) { |
|
| 111 | 111 | $fileParts = explode('.', $filename); |
| 112 | 112 | if (count($fileParts) > 1) { |
| 113 | 113 | $extension = end($fileParts); |
| 114 | 114 | array_pop($fileParts); |
| 115 | 115 | $fileNameWithoutExtension = implode('-', $fileParts); |
| 116 | 116 | $fileNameWithoutExtension .= '-copy'; |
| 117 | - $filename = $fileNameWithoutExtension . '.' . $extension; |
|
| 117 | + $filename = $fileNameWithoutExtension.'.'.$extension; |
|
| 118 | 118 | } else { |
| 119 | 119 | $filename .= '-copy'; |
| 120 | 120 | } |
| 121 | - return $this->modifyName($path . '/' . $filename); |
|
| 121 | + return $this->modifyName($path.'/'.$filename); |
|
| 122 | 122 | } |
| 123 | - return $path . '/' . $filename; |
|
| 123 | + return $path.'/'.$filename; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | private function applyMethod($method, $imagePath, $width, $height, $modifier) |
| 127 | 127 | { |
| 128 | - $method = 'library\\images\\methods\\' . $method; |
|
| 128 | + $method = 'library\\images\\methods\\'.$method; |
|
| 129 | 129 | $destination = $this->modifyName($imagePath, $modifier); |
| 130 | 130 | if (file_exists($imagePath)) { |
| 131 | 131 | $image = new Image(); |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | $resizedImage->SaveImage($destination, $resizedImage->GetImageMimeType($imagePath), 80); |
| 140 | 140 | return basename($destination); |
| 141 | 141 | } else { |
| 142 | - throw new \Exception('Image doesnt exist: ' . $imagePath); |
|
| 142 | + throw new \Exception('Image doesnt exist: '.$imagePath); |
|
| 143 | 143 | } |
| 144 | 144 | } |
| 145 | 145 | } |
@@ -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 | /** |
@@ -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 | } |
@@ -1,4 +1,4 @@ discard block |
||
| 1 | -<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#' . $formId : '' ?>"> |
|
| 1 | +<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#'.$formId : '' ?>"> |
|
| 2 | 2 | <? if (!isset($hideTitleAndState)) : ?> |
| 3 | 3 | <input type="hidden" name="path" value="<?=$request::$get['path']?>" /> |
| 4 | 4 | <? else : ?> |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | <input<?=isset($document) && $document->state == 'published' ? ' checked="checked"' : '' ?> type="checkbox" id="state" name="state" placeholder="State" /> |
| 21 | 21 | </div> |
| 22 | 22 | <? endif ?> |
| 23 | - <?$fieldPrefix='fields';?> |
|
| 23 | + <?$fieldPrefix = 'fields'; ?> |
|
| 24 | 24 | <? foreach ($documentType->fields as $field) : ?> |
| 25 | 25 | <div class="form-element"> |
| 26 | 26 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
| 45 | 45 | <div class="form-element"> |
| 46 | 46 | <? endif ?> |
| 47 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 47 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 48 | 48 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
| 49 | 49 | |
| 50 | 50 | </div> |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | <li class="grid-container"> |
| 67 | 67 | <div class="grid-box-10"> |
| 68 | 68 | <div class="grid-inner form-element"> |
| 69 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 69 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 70 | 70 | </div> |
| 71 | 71 | </div> |
| 72 | 72 | <div class="grid-box-2"> |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | </div> |
| 77 | 77 | </div> |
| 78 | 78 | </li> |
| 79 | - <?$value='';?> |
|
| 79 | + <?$value = ''; ?> |
|
| 80 | 80 | <? endforeach ?> |
| 81 | 81 | <? endif ?> |
| 82 | 82 | </ul> |
@@ -93,10 +93,10 @@ discard block |
||
| 93 | 93 | <a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a> |
| 94 | 94 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
| 95 | 95 | <div class="form-element"> |
| 96 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 96 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 97 | 97 | </div> |
| 98 | 98 | </li> |
| 99 | - <?$value='';?> |
|
| 99 | + <?$value = ''; ?> |
|
| 100 | 100 | <? endforeach ?> |
| 101 | 101 | <? endif ?> |
| 102 | 102 | </div> |
@@ -105,17 +105,17 @@ discard block |
||
| 105 | 105 | <a class="btn js-addrtemultiple">+</a> |
| 106 | 106 | <? endif ?> |
| 107 | 107 | </div> |
| 108 | - <?$value='';?> |
|
| 108 | + <?$value = ''; ?> |
|
| 109 | 109 | <? endforeach ?> |
| 110 | 110 | <hr /> |
| 111 | - <? $static_brick_nr = 0;?> |
|
| 111 | + <? $static_brick_nr = 0; ?> |
|
| 112 | 112 | <? foreach ($documentType->bricks as $brick) : ?> |
| 113 | 113 | <div class="brick"> |
| 114 | 114 | <label><?=$brick->title?></label> |
| 115 | 115 | <? if ($brick->multiple == 'true') : ?> |
| 116 | 116 | <input type="hidden" value="<?=$brick->brickSlug?>"/> |
| 117 | 117 | <input type="hidden" value="<?=$brick->slug?>"/> |
| 118 | - <?$myBrickSlug=$brick->slug;?> |
|
| 118 | + <?$myBrickSlug = $brick->slug; ?> |
|
| 119 | 119 | <ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable"> |
| 120 | 120 | <? if (isset($document)) : ?> |
| 121 | 121 | <? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?> |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | <li class="brick form-element"> |
| 130 | 130 | <label><?=$brick->title?></label> |
| 131 | 131 | <?$static = true; ?> |
| 132 | - <?include(__DIR__ . '/brick.php')?> |
|
| 132 | + <?include(__DIR__.'/brick.php')?> |
|
| 133 | 133 | </li> |
| 134 | 134 | <? endif ?> |
| 135 | 135 | <? endforeach ?> |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | <a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a> |
| 140 | 140 | <?$static_brick_nr += 1?> |
| 141 | 141 | <? else : ?> |
| 142 | - <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?> |
|
| 142 | + <?$fieldPrefix = 'bricks['.$brick->slug.'][fields]'; ?> |
|
| 143 | 143 | <input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" /> |
| 144 | 144 | <? foreach ($brick->structure->fields as $field) : ?> |
| 145 | 145 | <div class="form-element"> |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
| 166 | 166 | <div class="form-element"> |
| 167 | 167 | <? endif ?> |
| 168 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 168 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 169 | 169 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
| 170 | 170 | |
| 171 | 171 | </div> |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | <li class="grid-container"> |
| 189 | 189 | <div class="grid-box-10"> |
| 190 | 190 | <div class="grid-inner form-element"> |
| 191 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 191 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 192 | 192 | </div> |
| 193 | 193 | </div> |
| 194 | 194 | <div class="grid-box-2"> |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | </div> |
| 199 | 199 | </div> |
| 200 | 200 | </li> |
| 201 | - <?$value='';?> |
|
| 201 | + <?$value = ''; ?> |
|
| 202 | 202 | <? endforeach ?> |
| 203 | 203 | <? endif ?> |
| 204 | 204 | </ul> |
@@ -216,10 +216,10 @@ discard block |
||
| 216 | 216 | <a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a> |
| 217 | 217 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
| 218 | 218 | <div class="form-element"> |
| 219 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 219 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 220 | 220 | </div> |
| 221 | 221 | </li> |
| 222 | - <?$value='';?> |
|
| 222 | + <?$value = ''; ?> |
|
| 223 | 223 | <? endforeach ?> |
| 224 | 224 | <? endif ?> |
| 225 | 225 | </div> |
@@ -228,12 +228,12 @@ discard block |
||
| 228 | 228 | <a class="btn js-addrtemultiple">+</a> |
| 229 | 229 | <? endif ?> |
| 230 | 230 | </div> |
| 231 | - <?$value='';?> |
|
| 231 | + <?$value = ''; ?> |
|
| 232 | 232 | <? endforeach ?> |
| 233 | 233 | <? endif ?> |
| 234 | 234 | </div> |
| 235 | 235 | <hr /> |
| 236 | - <? endforeach;?> |
|
| 236 | + <? endforeach; ?> |
|
| 237 | 237 | |
| 238 | 238 | |
| 239 | 239 | |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | <li class="brick form-element"> |
| 257 | 257 | <label><?=$brick->title?></label> |
| 258 | 258 | <?$static = false; ?> |
| 259 | - <?include(__DIR__ . '/brick.php')?> |
|
| 259 | + <?include(__DIR__.'/brick.php')?> |
|
| 260 | 260 | </li> |
| 261 | 261 | <? endforeach ?> |
| 262 | 262 | <? endif ?> |