@@ -9,8 +9,10 @@ |
||
9 | 9 | <? if (isset($dynamicBrick)) : |
10 | 10 | $fieldSlug = $field->slug; |
11 | 11 | $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : ''; |
12 | - else : |
|
12 | + else { |
|
13 | + : |
|
13 | 14 | $value = ''; |
15 | + } |
|
14 | 16 | endif ?> |
15 | 17 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
16 | 18 | <ul class="grid-wrapper sortable"> |
@@ -59,8 +59,7 @@ discard block |
||
59 | 59 | return imagejpeg($imageResource, $path, $quality); |
60 | 60 | } elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) { |
61 | 61 | return imagepng($imageResource, $path, (intval($quality / 10) -1)); |
62 | - } |
|
63 | - else { |
|
62 | + } else { |
|
64 | 63 | throw new \Exception('Not a valid mimetypeconstant given see function documentation'); |
65 | 64 | } |
66 | 65 | return false; |
@@ -101,8 +100,9 @@ discard block |
||
101 | 100 | // Load the image into a string |
102 | 101 | $file = fopen($p_sFile,"rb"); |
103 | 102 | $read = fread($file,10); |
104 | - while(!feof($file)&&($read<>"")) |
|
105 | - $read .= fread($file,1024); |
|
103 | + while(!feof($file)&&($read<>"")) { |
|
104 | + $read .= fread($file,1024); |
|
105 | + } |
|
106 | 106 | |
107 | 107 | $temp = unpack("H*",$read); |
108 | 108 | $hex = $temp[1]; |
@@ -153,8 +153,9 @@ discard block |
||
153 | 153 | { |
154 | 154 | // If padding needed, ignore image-padding |
155 | 155 | // Shift i to the ending of the current 32-bit-block |
156 | - if ($usePadding) |
|
157 | - $i += $width%4; |
|
156 | + if ($usePadding) { |
|
157 | + $i += $width%4; |
|
158 | + } |
|
158 | 159 | |
159 | 160 | // Reset horizontal position |
160 | 161 | $x = 0; |
@@ -163,8 +164,9 @@ discard block |
||
163 | 164 | $y++; |
164 | 165 | |
165 | 166 | // Reached the image-height? Break the for-loop |
166 | - if ($y>$height) |
|
167 | - break; |
|
167 | + if ($y>$height) { |
|
168 | + break; |
|
169 | + } |
|
168 | 170 | } |
169 | 171 | |
170 | 172 | // Calculation of the RGB-pixel (defined as BGR in image-data) |
@@ -61,7 +61,9 @@ discard block |
||
61 | 61 | */ |
62 | 62 | protected function calculateX($imageResource) |
63 | 63 | { |
64 | - if (intval($this->_x) === $this->_x) return $this->_x; |
|
64 | + if (intval($this->_x) === $this->_x) { |
|
65 | + return $this->_x; |
|
66 | + } |
|
65 | 67 | |
66 | 68 | $x = strtolower($this->_x); |
67 | 69 | |
@@ -86,7 +88,9 @@ discard block |
||
86 | 88 | */ |
87 | 89 | public function calculateY($imageResource) |
88 | 90 | { |
89 | - if (intval($this->_y) === $this->_y) return $this->_y; |
|
91 | + if (intval($this->_y) === $this->_y) { |
|
92 | + return $this->_y; |
|
93 | + } |
|
90 | 94 | |
91 | 95 | $y = strtolower($this->_y); |
92 | 96 | |
@@ -123,7 +127,9 @@ discard block |
||
123 | 127 | */ |
124 | 128 | public function GetWatermark() |
125 | 129 | { |
126 | - if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark'); |
|
130 | + if ($this->_watermark == null) { |
|
131 | + throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark'); |
|
132 | + } |
|
127 | 133 | return $this->_watermark; |
128 | 134 | } |
129 | 135 |
@@ -26,7 +26,9 @@ |
||
26 | 26 | |
27 | 27 | // Define which ratio will be used, depending on which is the smallest side |
28 | 28 | $ratio = min($hRatio, $wRatio); |
29 | - if($ratio > 1) $ratio = 1; |
|
29 | + if($ratio > 1) { |
|
30 | + $ratio = 1; |
|
31 | + } |
|
30 | 32 | |
31 | 33 | // Define sizes |
32 | 34 | $this->_destWidth = floor($originalWidth * $ratio); |
@@ -40,7 +40,9 @@ |
||
40 | 40 | |
41 | 41 | // Define which ratio will be used, depending on which is the biggest side |
42 | 42 | $ratio = $wRatio < $hRatio ? $wRatio : $hRatio; |
43 | - if ($ratio < 1) $ratio = 1; |
|
43 | + if ($ratio < 1) { |
|
44 | + $ratio = 1; |
|
45 | + } |
|
44 | 46 | |
45 | 47 | // Calculate the destination width, height, x and y |
46 | 48 | $this->_destWidth = $originalWidth / $ratio; |
@@ -61,12 +61,15 @@ |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | function humanFileSize($size,$unit="") { |
64 | - if( (!$unit && $size >= 1<<30) || $unit == "GB") |
|
65 | - return number_format($size/(1<<30),2)."GB"; |
|
66 | - if( (!$unit && $size >= 1<<20) || $unit == "MB") |
|
67 | - return number_format($size/(1<<20),2)."MB"; |
|
68 | - if( (!$unit && $size >= 1<<10) || $unit == "KB") |
|
69 | - return number_format($size/(1<<10),2)."KB"; |
|
64 | + if( (!$unit && $size >= 1<<30) || $unit == "GB") { |
|
65 | + return number_format($size/(1<<30),2)."GB"; |
|
66 | + } |
|
67 | + if( (!$unit && $size >= 1<<20) || $unit == "MB") { |
|
68 | + return number_format($size/(1<<20),2)."MB"; |
|
69 | + } |
|
70 | + if( (!$unit && $size >= 1<<10) || $unit == "KB") { |
|
71 | + return number_format($size/(1<<10),2)."KB"; |
|
72 | + } |
|
70 | 73 | return number_format($size)." bytes"; |
71 | 74 | } |
72 | 75 |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $error = error_get_last(); |
34 | 34 | if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
35 | 35 | errorHandler($error['type'],$error['message'],$error['file'],$error['line']); |
36 | - }elseif ($error['type'] == 1) { |
|
36 | + } elseif ($error['type'] == 1) { |
|
37 | 37 | dump($error); |
38 | 38 | } |
39 | 39 | } |
@@ -94,7 +94,9 @@ discard block |
||
94 | 94 | $lines[$line_number] = $file_lines[$line_number-1]; |
95 | 95 | } |
96 | 96 | } |
97 | - if (ob_get_contents()) ob_end_clean(); |
|
97 | + if (ob_get_contents()) { |
|
98 | + ob_end_clean(); |
|
99 | + } |
|
98 | 100 | $error = array( |
99 | 101 | 'message' => $message, |
100 | 102 | 'file' => $file, |
@@ -45,8 +45,10 @@ discard block |
||
45 | 45 | <? if (isset($document)) : |
46 | 46 | $fieldSlug = $field->slug; |
47 | 47 | $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : ''; |
48 | - else : |
|
48 | + else { |
|
49 | + : |
|
49 | 50 | $value = ''; |
51 | + } |
|
50 | 52 | endif ?> |
51 | 53 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
52 | 54 | <ul class="grid-wrapper sortable"> |
@@ -152,8 +154,11 @@ discard block |
||
152 | 154 | <? endif ?> |
153 | 155 | </ul> |
154 | 156 | <a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone');">+</a> |
155 | - <? else : ?> |
|
156 | - <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?> |
|
157 | + <? else { |
|
158 | + : ?> |
|
159 | + <?$fieldPrefix='bricks[' . $brick->slug . '][fields]'; |
|
160 | +} |
|
161 | +?> |
|
157 | 162 | <input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" /> |
158 | 163 | <? foreach ($brick->structure->fields as $field) : ?> |
159 | 164 | <div class="form-element"> |
@@ -162,8 +167,10 @@ discard block |
||
162 | 167 | $brickSlug = $brick->slug; |
163 | 168 | $fieldSlug = $field->slug; |
164 | 169 | $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : ''; |
165 | - else : |
|
170 | + else { |
|
171 | + : |
|
166 | 172 | $value = ''; |
173 | + } |
|
167 | 174 | endif ?> |
168 | 175 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
169 | 176 | <ul class="grid-wrapper sortable"> |