@@ -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,14 +84,14 @@ 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 | $file_lines = file_exists($file) ? file($file) : array(); |
| 89 | 89 | $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15); |
| 90 | 90 | $lines = array(); |
| 91 | 91 | |
| 92 | 92 | foreach ($range as $line_number) { |
| 93 | - if(isset($file_lines[$line_number-1])) { |
|
| 94 | - $lines[$line_number] = $file_lines[$line_number-1]; |
|
| 93 | + if (isset($file_lines[$line_number - 1])) { |
|
| 94 | + $lines[$line_number] = $file_lines[$line_number - 1]; |
|
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | if (ob_get_contents()) ob_end_clean(); |
@@ -104,8 +104,8 @@ discard block |
||
| 104 | 104 | 'trace' => $trace, |
| 105 | 105 | 'httpHeader' => $httpHeader, |
| 106 | 106 | ); |
| 107 | - if (file_exists(realpath(__DIR__) . '/errorview.php')) { |
|
| 108 | - include(realpath(__DIR__) . '/errorview.php'); |
|
| 107 | + if (file_exists(realpath(__DIR__).'/errorview.php')) { |
|
| 108 | + include(realpath(__DIR__).'/errorview.php'); |
|
| 109 | 109 | } else { |
| 110 | 110 | header('Content-type: application/json'); |
| 111 | 111 | die(json_encode($error)); |
@@ -47,10 +47,10 @@ |
||
| 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::$requestUri = $_SERVER['REQUEST_URI']; |
| 52 | 52 | self::$queryString = $_SERVER['QUERY_STRING']; |
| 53 | - self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri)); |
|
| 53 | + self::$relativeUri = str_replace('?'.self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri)); |
|
| 54 | 54 | self::$requestParameters = explode('/', self::$relativeUri); |
| 55 | 55 | |
| 56 | 56 | self::$get = $_GET; |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | $imageContent = file_get_contents($imageContainer); |
| 33 | 33 | $this->_imageResource = imagecreatefromstring($imageContent); |
| 34 | 34 | } |
| 35 | - } elseif(is_string($imageContainer)) { |
|
| 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 | |
@@ -55,10 +55,10 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | if ($mimeTypeConstantValue == IMAGETYPE_GIF) { |
| 57 | 57 | return imagegif($imageResource, $path); |
| 58 | - } elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG) { |
|
| 58 | + } elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG) { |
|
| 59 | 59 | return imagejpeg($imageResource, $path, $quality); |
| 60 | 60 | } elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) { |
| 61 | - return imagepng($imageResource, $path, (intval($quality / 10) -1)); |
|
| 61 | + return imagepng($imageResource, $path, (intval($quality / 10) - 1)); |
|
| 62 | 62 | } |
| 63 | 63 | else { |
| 64 | 64 | throw new \Exception('Not a valid mimetypeconstant given see function documentation'); |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | if (function_exists('exif_imagetype')) { |
| 80 | 80 | $exif = exif_imagetype($imagePath); |
| 81 | 81 | } else { |
| 82 | - if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false ) { |
|
| 82 | + if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false) { |
|
| 83 | 83 | $exif = $type; |
| 84 | 84 | } else { |
| 85 | 85 | $exif = false; |
@@ -99,86 +99,86 @@ discard block |
||
| 99 | 99 | public function CreateImageFromBmp($p_sFile) |
| 100 | 100 | { |
| 101 | 101 | // Load the image into a string |
| 102 | - $file = fopen($p_sFile,"rb"); |
|
| 103 | - $read = fread($file,10); |
|
| 104 | - while(!feof($file)&&($read<>"")) |
|
| 105 | - $read .= fread($file,1024); |
|
| 102 | + $file = fopen($p_sFile, "rb"); |
|
| 103 | + $read = fread($file, 10); |
|
| 104 | + while (!feof($file) && ($read <> "")) |
|
| 105 | + $read .= fread($file, 1024); |
|
| 106 | 106 | |
| 107 | - $temp = unpack("H*",$read); |
|
| 108 | - $hex = $temp[1]; |
|
| 109 | - $header = substr($hex,0,108); |
|
| 110 | - $width=null; |
|
| 111 | - $height=null; |
|
| 107 | + $temp = unpack("H*", $read); |
|
| 108 | + $hex = $temp[1]; |
|
| 109 | + $header = substr($hex, 0, 108); |
|
| 110 | + $width = null; |
|
| 111 | + $height = null; |
|
| 112 | 112 | |
| 113 | 113 | // Process the header |
| 114 | 114 | // Structure: http://www.fastgraph.com/help/bmp_header_format.html |
| 115 | - if (substr($header,0,4)=="424d") |
|
| 115 | + if (substr($header, 0, 4) == "424d") |
|
| 116 | 116 | { |
| 117 | 117 | // Cut it in parts of 2 bytes |
| 118 | - $header_parts = str_split($header,2); |
|
| 118 | + $header_parts = str_split($header, 2); |
|
| 119 | 119 | |
| 120 | 120 | // Get the width 4 bytes |
| 121 | - $width = hexdec($header_parts[19].$header_parts[18]); |
|
| 121 | + $width = hexdec($header_parts[19].$header_parts[18]); |
|
| 122 | 122 | |
| 123 | 123 | // Get the height 4 bytes |
| 124 | - $height = hexdec($header_parts[23].$header_parts[22]); |
|
| 124 | + $height = hexdec($header_parts[23].$header_parts[22]); |
|
| 125 | 125 | |
| 126 | 126 | // Unset the header params |
| 127 | 127 | unset($header_parts); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | // Define starting X and Y |
| 131 | - $x = 0; |
|
| 132 | - $y = 1; |
|
| 131 | + $x = 0; |
|
| 132 | + $y = 1; |
|
| 133 | 133 | |
| 134 | 134 | // Create newimage |
| 135 | - $image = imagecreatetruecolor($width,$height); |
|
| 135 | + $image = imagecreatetruecolor($width, $height); |
|
| 136 | 136 | |
| 137 | 137 | // Grab the body from the image |
| 138 | - $body = substr($hex,108); |
|
| 138 | + $body = substr($hex, 108); |
|
| 139 | 139 | |
| 140 | 140 | // Calculate if padding at the end-line is needed |
| 141 | 141 | // Divided by two to keep overview. |
| 142 | 142 | // 1 byte = 2 HEX-chars |
| 143 | - $body_size = (strlen($body)/2); |
|
| 144 | - $header_size = ($width*$height); |
|
| 143 | + $body_size = (strlen($body) / 2); |
|
| 144 | + $header_size = ($width * $height); |
|
| 145 | 145 | |
| 146 | 146 | // Use end-line padding? Only when needed |
| 147 | - $usePadding = ($body_size>($header_size*3)+4); |
|
| 147 | + $usePadding = ($body_size > ($header_size * 3) + 4); |
|
| 148 | 148 | |
| 149 | 149 | // Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption |
| 150 | 150 | // Calculate the next DWORD-position in the body |
| 151 | - for ($i=0;$i<$body_size;$i+=3) |
|
| 151 | + for ($i = 0; $i < $body_size; $i += 3) |
|
| 152 | 152 | { |
| 153 | 153 | // Calculate line-ending and padding |
| 154 | - if ($x>=$width) |
|
| 154 | + if ($x >= $width) |
|
| 155 | 155 | { |
| 156 | 156 | // If padding needed, ignore image-padding |
| 157 | 157 | // Shift i to the ending of the current 32-bit-block |
| 158 | 158 | if ($usePadding) |
| 159 | - $i += $width%4; |
|
| 159 | + $i += $width % 4; |
|
| 160 | 160 | |
| 161 | 161 | // Reset horizontal position |
| 162 | - $x = 0; |
|
| 162 | + $x = 0; |
|
| 163 | 163 | |
| 164 | 164 | // Raise the height-position (bottom-up) |
| 165 | 165 | $y++; |
| 166 | 166 | |
| 167 | 167 | // Reached the image-height? Break the for-loop |
| 168 | - if ($y>$height) |
|
| 168 | + if ($y > $height) |
|
| 169 | 169 | break; |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | // Calculation of the RGB-pixel (defined as BGR in image-data) |
| 173 | 173 | // Define $i_pos as absolute position in the body |
| 174 | - $i_pos = $i*2; |
|
| 175 | - $r = hexdec($body[$i_pos+4].$body[$i_pos+5]); |
|
| 176 | - $g = hexdec($body[$i_pos+2].$body[$i_pos+3]); |
|
| 177 | - $b = hexdec($body[$i_pos].$body[$i_pos+1]); |
|
| 174 | + $i_pos = $i * 2; |
|
| 175 | + $r = hexdec($body[$i_pos + 4].$body[$i_pos + 5]); |
|
| 176 | + $g = hexdec($body[$i_pos + 2].$body[$i_pos + 3]); |
|
| 177 | + $b = hexdec($body[$i_pos].$body[$i_pos + 1]); |
|
| 178 | 178 | |
| 179 | 179 | // Calculate and draw the pixel |
| 180 | - $color = imagecolorallocate($image,$r,$g,$b); |
|
| 181 | - imagesetpixel($image,$x,$height-$y,$color); |
|
| 180 | + $color = imagecolorallocate($image, $r, $g, $b); |
|
| 181 | + imagesetpixel($image, $x, $height - $y, $color); |
|
| 182 | 182 | |
| 183 | 183 | // Raise the horizontal position |
| 184 | 184 | $x++; |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | return $returnFileNames; |
| 49 | 49 | } else { |
| 50 | - throw new \Exception('Image doesnt exist: ' . $imagePath); |
|
| 50 | + throw new \Exception('Image doesnt exist: '.$imagePath); |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | |
@@ -58,9 +58,9 @@ discard block |
||
| 58 | 58 | * @return string |
| 59 | 59 | * @throws \Exception |
| 60 | 60 | */ |
| 61 | - public function resize($imagePath='', $width='',$height='') |
|
| 61 | + public function resize($imagePath = '', $width = '', $height = '') |
|
| 62 | 62 | { |
| 63 | - $modifier = '-r' . $width . 'x' . $height; |
|
| 63 | + $modifier = '-r'.$width.'x'.$height; |
|
| 64 | 64 | $destination = $this->modifyName($imagePath, $modifier); |
| 65 | 65 | if (file_exists($imagePath)) { |
| 66 | 66 | $image = new Image(); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | $resizedImage->SaveImage($destination, $resizedImage->GetImageMimeType($imagePath), 80); |
| 75 | 75 | return basename($destination); |
| 76 | 76 | } else { |
| 77 | - throw new \Exception('Image doesnt exist: ' . $imagePath); |
|
| 77 | + throw new \Exception('Image doesnt exist: '.$imagePath); |
|
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | |
@@ -85,9 +85,9 @@ discard block |
||
| 85 | 85 | * @return string |
| 86 | 86 | * @throws \Exception |
| 87 | 87 | */ |
| 88 | - public function smartcrop($imagePath='', $width='',$height='') |
|
| 88 | + public function smartcrop($imagePath = '', $width = '', $height = '') |
|
| 89 | 89 | { |
| 90 | - $modifier = '-s' . $width . 'x' . $height; |
|
| 90 | + $modifier = '-s'.$width.'x'.$height; |
|
| 91 | 91 | $destination = $this->modifyName($imagePath, $modifier); |
| 92 | 92 | if (file_exists($imagePath)) { |
| 93 | 93 | $image = new Image(); |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $resizedImage->SaveImage($destination, $resizedImage->GetImageMimeType($imagePath), 80); |
| 102 | 102 | return basename($destination); |
| 103 | 103 | } else { |
| 104 | - throw new \Exception('Image doesnt exist: ' . $imagePath); |
|
| 104 | + throw new \Exception('Image doesnt exist: '.$imagePath); |
|
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | |
@@ -112,9 +112,9 @@ discard block |
||
| 112 | 112 | * @return string |
| 113 | 113 | * @throws \Exception |
| 114 | 114 | */ |
| 115 | - public function boxcrop($imagePath='', $width='',$height='') |
|
| 115 | + public function boxcrop($imagePath = '', $width = '', $height = '') |
|
| 116 | 116 | { |
| 117 | - $modifier = '-b' . $width . 'x' . $height; |
|
| 117 | + $modifier = '-b'.$width.'x'.$height; |
|
| 118 | 118 | $destination = $this->modifyName($imagePath, $modifier); |
| 119 | 119 | if (file_exists($imagePath)) { |
| 120 | 120 | $image = new Image(); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | $resizedImage->SaveImage($destination, $resizedImage->GetImageMimeType($imagePath), 80); |
| 129 | 129 | return basename($destination); |
| 130 | 130 | } else { |
| 131 | - throw new \Exception('Image doesnt exist: ' . $imagePath); |
|
| 131 | + throw new \Exception('Image doesnt exist: '.$imagePath); |
|
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | * |
| 139 | 139 | * @return string |
| 140 | 140 | */ |
| 141 | - private function modifyName($imagePath, $modifier='') |
|
| 141 | + private function modifyName($imagePath, $modifier = '') |
|
| 142 | 142 | { |
| 143 | 143 | $filename = basename($imagePath); |
| 144 | 144 | $path = dirname($imagePath); |
@@ -148,25 +148,25 @@ discard block |
||
| 148 | 148 | array_pop($fileParts); |
| 149 | 149 | $fileNameWithoutExtension = implode('-', $fileParts); |
| 150 | 150 | $fileNameWithoutExtension = slugify($fileNameWithoutExtension); |
| 151 | - $filename = $fileNameWithoutExtension . $modifier . '.' . $extension; |
|
| 151 | + $filename = $fileNameWithoutExtension.$modifier.'.'.$extension; |
|
| 152 | 152 | } else { |
| 153 | 153 | $filename = slugify($filename); |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - if (file_exists($path . '/' . $filename)) { |
|
| 156 | + if (file_exists($path.'/'.$filename)) { |
|
| 157 | 157 | $fileParts = explode('.', $filename); |
| 158 | 158 | if (count($fileParts) > 1) { |
| 159 | 159 | $extension = end($fileParts); |
| 160 | 160 | array_pop($fileParts); |
| 161 | 161 | $fileNameWithoutExtension = implode('-', $fileParts); |
| 162 | 162 | $fileNameWithoutExtension .= '-copy'; |
| 163 | - $filename = $fileNameWithoutExtension . '.' . $extension; |
|
| 163 | + $filename = $fileNameWithoutExtension.'.'.$extension; |
|
| 164 | 164 | } else { |
| 165 | 165 | $filename .= '-copy'; |
| 166 | 166 | } |
| 167 | - return $this->modifyName($path . '/' . $filename); |
|
| 167 | + return $this->modifyName($path.'/'.$filename); |
|
| 168 | 168 | } |
| 169 | - return $path . '/' . $filename; |
|
| 169 | + return $path.'/'.$filename; |
|
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | } |
| 173 | 173 | \ No newline at end of file |
@@ -3,9 +3,9 @@ discard block |
||
| 3 | 3 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
| 4 | 4 | </div> |
| 5 | 5 | <?if ($static == true) { |
| 6 | - $fieldPrefix = 'bricks[' . $myBrickSlug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . '][fields]'; |
|
| 6 | + $fieldPrefix = 'bricks['.$myBrickSlug.']['.str_replace('.', '', str_replace(' ', '', microtime())).'][fields]'; |
|
| 7 | 7 | } else { |
| 8 | - $fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . ']'; |
|
| 8 | + $fieldPrefix = 'dynamicBricks['.$brick->slug.']['.str_replace('.', '', str_replace(' ', '', microtime())).']'; |
|
| 9 | 9 | }?> |
| 10 | 10 | <? foreach ($brick->fields as $field) : ?> |
| 11 | 11 | <div class="form-element"> |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
| 31 | 31 | <div class="form-element"> |
| 32 | 32 | <? endif ?> |
| 33 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 33 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 34 | 34 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
| 35 | 35 | |
| 36 | 36 | </div> |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | <li class="grid-container"> |
| 53 | 53 | <div class="grid-box-10"> |
| 54 | 54 | <div class="grid-inner form-element"> |
| 55 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 55 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 56 | 56 | </div> |
| 57 | 57 | </div> |
| 58 | 58 | <div class="grid-box-2"> |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | </div> |
| 63 | 63 | </div> |
| 64 | 64 | </li> |
| 65 | - <?$value='';?> |
|
| 65 | + <?$value = ''; ?> |
|
| 66 | 66 | <? endforeach ?> |
| 67 | 67 | <? endif ?> |
| 68 | 68 | </ul> |
@@ -79,10 +79,10 @@ discard block |
||
| 79 | 79 | <a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a> |
| 80 | 80 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
| 81 | 81 | <div class="form-element"> |
| 82 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 82 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 83 | 83 | </div> |
| 84 | 84 | </li> |
| 85 | - <?$value='';?> |
|
| 85 | + <?$value = ''; ?> |
|
| 86 | 86 | <? endforeach ?> |
| 87 | 87 | <? endif ?> |
| 88 | 88 | </div> |
@@ -91,5 +91,5 @@ discard block |
||
| 91 | 91 | <a class="btn js-addrtemultiple">+</a> |
| 92 | 92 | <? endif ?> |
| 93 | 93 | </div> |
| 94 | - <?$value='';?> |
|
| 94 | + <?$value = ''; ?> |
|
| 95 | 95 | <? endforeach ?> |
@@ -6,12 +6,12 @@ discard block |
||
| 6 | 6 | } |
| 7 | 7 | ?> |
| 8 | 8 | <div class="rte"> |
| 9 | - <div id="summernote_<?=str_replace(']', '-', str_replace('[','-', $fieldPrefix)) . $field->slug?>_rte_<?=$summernoteInstances?>" class="summernote"><?=isset($value) ? $value : '' ?></div> |
|
| 9 | + <div id="summernote_<?=str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug?>_rte_<?=$summernoteInstances?>" class="summernote"><?=isset($value) ? $value : '' ?></div> |
|
| 10 | 10 | </div> |
| 11 | 11 | <textarea style="display:none;" id="summernote_<?=$field->slug?>_container_<?=$summernoteInstances?>" name="<?=$fieldPrefix?>[<?=$field->slug?>][]"></textarea> |
| 12 | 12 | <script> |
| 13 | 13 | $(document).ready(function () { |
| 14 | - $('#summernote_<?=str_replace(']', '-', str_replace('[','-', $fieldPrefix)) . $field->slug?>_rte_<?=$summernoteInstances?>').summernote({ |
|
| 14 | + $('#summernote_<?=str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug?>_rte_<?=$summernoteInstances?>').summernote({ |
|
| 15 | 15 | height: 300, |
| 16 | 16 | toolbar: [ |
| 17 | 17 | //[groupname, [button list]] |
@@ -29,4 +29,4 @@ discard block |
||
| 29 | 29 | if (!isset($GLOBALS['rteList'])) { |
| 30 | 30 | $GLOBALS['rteList'] = array(); |
| 31 | 31 | } |
| 32 | -$GLOBALS['rteList'][] = 'summernote_' . str_replace(']', '-', str_replace('[','-', $fieldPrefix)) . $field->slug . '_rte_' . $summernoteInstances ?> |
|
| 32 | +$GLOBALS['rteList'][] = 'summernote_'.str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug.'_rte_'.$summernoteInstances ?> |
|
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | if (isset($this->parameters['document'])) { |
| 21 | 21 | $this->parameters['document'] = $storage->getDocumentBySlug($this->parameters['document']); |
| 22 | 22 | } else { |
| 23 | - 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); |
|
| 23 | + 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); |
|
| 24 | 24 | } |
| 25 | 25 | } else { |
| 26 | 26 | if (isset($this->parameters['document'])) { |
@@ -29,9 +29,9 @@ discard block |
||
| 29 | 29 | $relativeDocumentUri = current($this->matchedSitemapItem->matches[1]); |
| 30 | 30 | if (isset($this->parameters['folder'])) { |
| 31 | 31 | if (substr($this->parameters['folder'], -1) !== '/') { |
| 32 | - $this->parameters['folder'] = $this->parameters['folder'] . '/'; |
|
| 32 | + $this->parameters['folder'] = $this->parameters['folder'].'/'; |
|
| 33 | 33 | } |
| 34 | - $relativeDocumentUri = $this->parameters['folder'] . $relativeDocumentUri; |
|
| 34 | + $relativeDocumentUri = $this->parameters['folder'].$relativeDocumentUri; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $document = $storage->getDocumentBySlug($relativeDocumentUri); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param array $parameters |
| 41 | 41 | * @param $matchedSitemapItem |
| 42 | 42 | */ |
| 43 | - public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem) |
|
| 43 | + public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem) |
|
| 44 | 44 | { |
| 45 | 45 | $this->template = $template; |
| 46 | 46 | $this->request = $request; |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | * @return string |
| 88 | 88 | * @throws \Exception |
| 89 | 89 | */ |
| 90 | - public function renderTemplate($template='', $obClean = true) |
|
| 90 | + public function renderTemplate($template = '', $obClean = true) |
|
| 91 | 91 | { |
| 92 | - $templatePath = __DIR__ . '/../../templates/' . $template . '.php'; |
|
| 92 | + $templatePath = __DIR__.'/../../templates/'.$template.'.php'; |
|
| 93 | 93 | if (realpath($templatePath) !== false) { |
| 94 | 94 | if ($obClean) { |
| 95 | 95 | ob_clean(); |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | include($templatePath); |
| 100 | 100 | return ob_get_contents(); |
| 101 | 101 | } else { |
| 102 | - throw new \Exception('Couldnt find template ' . $templatePath); |
|
| 102 | + throw new \Exception('Couldnt find template '.$templatePath); |
|
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | * @return string |
| 114 | 114 | * @throws \Exception |
| 115 | 115 | */ |
| 116 | - public function includeTemplate($template='', $parameters = array()) |
|
| 116 | + public function includeTemplate($template = '', $parameters = array()) |
|
| 117 | 117 | { |
| 118 | 118 | if (is_array($parameters)) { |
| 119 | 119 | foreach ($parameters as $name => $value) { |
@@ -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"> |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | <label for="state">Published</label> |
| 39 | 39 | <input<?=isset($document) && $document->state == 'published' ? ' checked="checked"' : '' ?> type="checkbox" id="state" name="state" placeholder="State" /> |
| 40 | 40 | </div> |
| 41 | - <?$fieldPrefix='fields';?> |
|
| 41 | + <?$fieldPrefix = 'fields'; ?> |
|
| 42 | 42 | <? foreach ($documentType->fields as $field) : ?> |
| 43 | 43 | <div class="form-element"> |
| 44 | 44 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
| 63 | 63 | <div class="form-element"> |
| 64 | 64 | <? endif ?> |
| 65 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 65 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 66 | 66 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
| 67 | 67 | |
| 68 | 68 | </div> |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | <li class="grid-container"> |
| 85 | 85 | <div class="grid-box-10"> |
| 86 | 86 | <div class="grid-inner form-element"> |
| 87 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 87 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 88 | 88 | </div> |
| 89 | 89 | </div> |
| 90 | 90 | <div class="grid-box-2"> |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | </div> |
| 95 | 95 | </div> |
| 96 | 96 | </li> |
| 97 | - <?$value='';?> |
|
| 97 | + <?$value = ''; ?> |
|
| 98 | 98 | <? endforeach ?> |
| 99 | 99 | <? endif ?> |
| 100 | 100 | </ul> |
@@ -111,10 +111,10 @@ discard block |
||
| 111 | 111 | <a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a> |
| 112 | 112 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
| 113 | 113 | <div class="form-element"> |
| 114 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 114 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 115 | 115 | </div> |
| 116 | 116 | </li> |
| 117 | - <?$value='';?> |
|
| 117 | + <?$value = ''; ?> |
|
| 118 | 118 | <? endforeach ?> |
| 119 | 119 | <? endif ?> |
| 120 | 120 | </div> |
@@ -123,17 +123,17 @@ discard block |
||
| 123 | 123 | <a class="btn js-addrtemultiple">+</a> |
| 124 | 124 | <? endif ?> |
| 125 | 125 | </div> |
| 126 | - <?$value='';?> |
|
| 126 | + <?$value = ''; ?> |
|
| 127 | 127 | <? endforeach ?> |
| 128 | 128 | <hr /> |
| 129 | - <? $static_brick_nr = 0;?> |
|
| 129 | + <? $static_brick_nr = 0; ?> |
|
| 130 | 130 | <? foreach ($documentType->bricks as $brick) : ?> |
| 131 | 131 | <div class="brick"> |
| 132 | 132 | <label><?=$brick->title?></label> |
| 133 | 133 | <? if ($brick->multiple == 'true') : ?> |
| 134 | 134 | <input type="hidden" value="<?=$brick->brickSlug?>"/> |
| 135 | 135 | <input type="hidden" value="<?=$brick->slug?>"/> |
| 136 | - <?$myBrickSlug=$brick->slug;?> |
|
| 136 | + <?$myBrickSlug = $brick->slug; ?> |
|
| 137 | 137 | <ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable"> |
| 138 | 138 | <? if (isset($document)) : ?> |
| 139 | 139 | <? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?> |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | <li class="brick form-element"> |
| 148 | 148 | <label><?=$brick->title?></label> |
| 149 | 149 | <?$static = true; ?> |
| 150 | - <?include(__DIR__ . '/brick.php')?> |
|
| 150 | + <?include(__DIR__.'/brick.php')?> |
|
| 151 | 151 | </li> |
| 152 | 152 | <? endif ?> |
| 153 | 153 | <? endforeach ?> |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | <a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a> |
| 158 | 158 | <?$static_brick_nr += 1?> |
| 159 | 159 | <? else : ?> |
| 160 | - <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?> |
|
| 160 | + <?$fieldPrefix = 'bricks['.$brick->slug.'][fields]'; ?> |
|
| 161 | 161 | <input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" /> |
| 162 | 162 | <? foreach ($brick->structure->fields as $field) : ?> |
| 163 | 163 | <div class="form-element"> |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
| 184 | 184 | <div class="form-element"> |
| 185 | 185 | <? endif ?> |
| 186 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 186 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 187 | 187 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
| 188 | 188 | |
| 189 | 189 | </div> |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | <li class="grid-container"> |
| 207 | 207 | <div class="grid-box-10"> |
| 208 | 208 | <div class="grid-inner form-element"> |
| 209 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 209 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 210 | 210 | </div> |
| 211 | 211 | </div> |
| 212 | 212 | <div class="grid-box-2"> |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | </div> |
| 217 | 217 | </div> |
| 218 | 218 | </li> |
| 219 | - <?$value='';?> |
|
| 219 | + <?$value = ''; ?> |
|
| 220 | 220 | <? endforeach ?> |
| 221 | 221 | <? endif ?> |
| 222 | 222 | </ul> |
@@ -234,10 +234,10 @@ discard block |
||
| 234 | 234 | <a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a> |
| 235 | 235 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
| 236 | 236 | <div class="form-element"> |
| 237 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
| 237 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
| 238 | 238 | </div> |
| 239 | 239 | </li> |
| 240 | - <?$value='';?> |
|
| 240 | + <?$value = ''; ?> |
|
| 241 | 241 | <? endforeach ?> |
| 242 | 242 | <? endif ?> |
| 243 | 243 | </div> |
@@ -246,12 +246,12 @@ discard block |
||
| 246 | 246 | <a class="btn js-addrtemultiple">+</a> |
| 247 | 247 | <? endif ?> |
| 248 | 248 | </div> |
| 249 | - <?$value='';?> |
|
| 249 | + <?$value = ''; ?> |
|
| 250 | 250 | <? endforeach ?> |
| 251 | 251 | <? endif ?> |
| 252 | 252 | </div> |
| 253 | 253 | <hr /> |
| 254 | - <? endforeach;?> |
|
| 254 | + <? endforeach; ?> |
|
| 255 | 255 | |
| 256 | 256 | |
| 257 | 257 | |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | <li class="brick form-element"> |
| 275 | 275 | <label><?=$brick->title?></label> |
| 276 | 276 | <?$static = false; ?> |
| 277 | - <?include(__DIR__ . '/brick.php')?> |
|
| 277 | + <?include(__DIR__.'/brick.php')?> |
|
| 278 | 278 | </li> |
| 279 | 279 | <? endforeach ?> |
| 280 | 280 | <? endif ?> |