@@ -25,5 +25,5 @@ |
||
25 | 25 | \CloudControl\Cms\CloudControl::run(); |
26 | 26 | |
27 | 27 | if (php_sapi_name() != "cli") { |
28 | - ob_end_flush(); |
|
28 | + ob_end_flush(); |
|
29 | 29 | } |
30 | 30 | \ No newline at end of file |
@@ -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); |
@@ -12,10 +12,10 @@ |
||
12 | 12 | namespace CloudControl\Cms\images\methods |
13 | 13 | { |
14 | 14 | |
15 | - use CloudControl\Cms\images\Image; |
|
16 | - use CloudControl\Cms\images\IMethod; |
|
15 | + use CloudControl\Cms\images\Image; |
|
16 | + use CloudControl\Cms\images\IMethod; |
|
17 | 17 | |
18 | - class Watermark extends IMethod |
|
18 | + class Watermark extends IMethod |
|
19 | 19 | { |
20 | 20 | protected $_x = 0; |
21 | 21 | protected $_y = 0; |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | namespace CloudControl\Cms\images\methods |
12 | 12 | { |
13 | 13 | |
14 | - use CloudControl\Cms\images\IMethod; |
|
14 | + use CloudControl\Cms\images\IMethod; |
|
15 | 15 | |
16 | - class Crop extends IMethod |
|
16 | + class Crop extends IMethod |
|
17 | 17 | { |
18 | 18 | protected $_width; |
19 | 19 | protected $_height; |
@@ -116,8 +116,8 @@ discard block |
||
116 | 116 | |
117 | 117 | // Preserve transparency |
118 | 118 | imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127)); |
119 | - imagealphablending($new, false); |
|
120 | - imagesavealpha($new, true); |
|
119 | + imagealphablending($new, false); |
|
120 | + imagesavealpha($new, true); |
|
121 | 121 | |
122 | 122 | imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $this->_destWidth, $this->_destHeight); |
123 | 123 |
@@ -11,9 +11,9 @@ |
||
11 | 11 | namespace CloudControl\Cms\images\methods |
12 | 12 | { |
13 | 13 | |
14 | - use CloudControl\Cms\images\IMethod; |
|
14 | + use CloudControl\Cms\images\IMethod; |
|
15 | 15 | |
16 | - class Resize extends IMethod |
|
16 | + class Resize extends IMethod |
|
17 | 17 | { |
18 | 18 | protected $_width; |
19 | 19 | protected $_height; |
@@ -63,7 +63,7 @@ |
||
63 | 63 | |
64 | 64 | // Define the ratio and adjust the width and height |
65 | 65 | if ($this->_preserveAspectRatio) { |
66 | - $ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight); |
|
66 | + $ratio = min($this->_width / $originalWidth, $this->_height / $originalHeight); |
|
67 | 67 | $this->_width = $originalWidth * $ratio; |
68 | 68 | $this->_height = $originalHeight * $ratio; |
69 | 69 | } |
@@ -62,8 +62,8 @@ |
||
62 | 62 | |
63 | 63 | // Preserve transparency |
64 | 64 | imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127)); |
65 | - imagealphablending($new, false); |
|
66 | - imagesavealpha($new, true); |
|
65 | + imagealphablending($new, false); |
|
66 | + imagesavealpha($new, true); |
|
67 | 67 | |
68 | 68 | imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight); |
69 | 69 |
@@ -17,7 +17,7 @@ |
||
17 | 17 | /** |
18 | 18 | * @param resource $imageResource |
19 | 19 | * @return resource |
20 | - */ |
|
20 | + */ |
|
21 | 21 | public function Execute($imageResource) |
22 | 22 | { |
23 | 23 | // Define the origial width and height |
@@ -26,14 +26,14 @@ |
||
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) $ratio = 1; |
|
30 | 30 | |
31 | 31 | // Define sizes |
32 | 32 | $this->_destWidth = floor($originalWidth * $ratio); |
33 | 33 | $this->_destHeight = floor($originalHeight * $ratio); |
34 | 34 | |
35 | 35 | // Define margins |
36 | - $this->_destX = floor(($this->_width - $this->_destWidth) / 2); |
|
36 | + $this->_destX = floor(($this->_width - $this->_destWidth) / 2); |
|
37 | 37 | $this->_destY = floor(($this->_height - $this->_destHeight) / 2); |
38 | 38 | |
39 | 39 | // Execute the Crop method with the given parameters |
@@ -9,9 +9,9 @@ |
||
9 | 9 | namespace CloudControl\Cms\images\methods |
10 | 10 | { |
11 | 11 | |
12 | - use CloudControl\Cms\images\IMethod; |
|
12 | + use CloudControl\Cms\images\IMethod; |
|
13 | 13 | |
14 | - class Grayscale extends IMethod |
|
14 | + class Grayscale extends IMethod |
|
15 | 15 | { |
16 | 16 | public function Execute($imageResource) |
17 | 17 | { |
@@ -2,9 +2,9 @@ |
||
2 | 2 | namespace CloudControl\Cms\images |
3 | 3 | { |
4 | 4 | |
5 | - use CloudControl\Cms\cc\StringUtil; |
|
5 | + use CloudControl\Cms\cc\StringUtil; |
|
6 | 6 | |
7 | - /** |
|
7 | + /** |
|
8 | 8 | * Class ImageResizer |
9 | 9 | * @package CloudControl\Cms\images |
10 | 10 | */ |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | } |
46 | 46 | return $returnFileNames; |
47 | 47 | } else { |
48 | - throw new \Exception('Image doesnt exist: ' . $imagePath); |
|
48 | + throw new \Exception('Image doesnt exist: '.$imagePath); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
@@ -56,10 +56,10 @@ discard block |
||
56 | 56 | * @return string |
57 | 57 | * @throws \Exception |
58 | 58 | */ |
59 | - public function resize($imagePath='', $width='',$height='') |
|
59 | + public function resize($imagePath = '', $width = '', $height = '') |
|
60 | 60 | { |
61 | - $modifier = '-r' . $width . 'x' . $height; |
|
62 | - return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier); |
|
61 | + $modifier = '-r'.$width.'x'.$height; |
|
62 | + return $this->applyMethod('Resize', $imagePath, $width, $height, $modifier); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -69,10 +69,10 @@ discard block |
||
69 | 69 | * @return string |
70 | 70 | * @throws \Exception |
71 | 71 | */ |
72 | - public function smartcrop($imagePath='', $width='',$height='') |
|
72 | + public function smartcrop($imagePath = '', $width = '', $height = '') |
|
73 | 73 | { |
74 | - $modifier = '-s' . $width . 'x' . $height; |
|
75 | - return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier); |
|
74 | + $modifier = '-s'.$width.'x'.$height; |
|
75 | + return $this->applyMethod('SmartCrop', $imagePath, $width, $height, $modifier); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -82,10 +82,10 @@ discard block |
||
82 | 82 | * @return string |
83 | 83 | * @throws \Exception |
84 | 84 | */ |
85 | - public function boxcrop($imagePath='', $width='',$height='') |
|
85 | + public function boxcrop($imagePath = '', $width = '', $height = '') |
|
86 | 86 | { |
87 | - $modifier = '-b' . $width . 'x' . $height; |
|
88 | - return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier); |
|
87 | + $modifier = '-b'.$width.'x'.$height; |
|
88 | + return $this->applyMethod('BoxCrop', $imagePath, $width, $height, $modifier); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * |
95 | 95 | * @return string |
96 | 96 | */ |
97 | - private function modifyName($imagePath, $modifier='') |
|
97 | + private function modifyName($imagePath, $modifier = '') |
|
98 | 98 | { |
99 | 99 | $filename = basename($imagePath); |
100 | 100 | $path = dirname($imagePath); |
@@ -104,30 +104,30 @@ discard block |
||
104 | 104 | array_pop($fileParts); |
105 | 105 | $fileNameWithoutExtension = implode('-', $fileParts); |
106 | 106 | $fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension); |
107 | - $filename = $fileNameWithoutExtension . $modifier . '.' . $extension; |
|
107 | + $filename = $fileNameWithoutExtension.$modifier.'.'.$extension; |
|
108 | 108 | } else { |
109 | 109 | $filename = StringUtil::slugify($filename); |
110 | 110 | } |
111 | 111 | |
112 | - if (file_exists($path . '/' . $filename)) { |
|
112 | + if (file_exists($path.'/'.$filename)) { |
|
113 | 113 | $fileParts = explode('.', $filename); |
114 | 114 | if (count($fileParts) > 1) { |
115 | 115 | $extension = end($fileParts); |
116 | 116 | array_pop($fileParts); |
117 | 117 | $fileNameWithoutExtension = implode('-', $fileParts); |
118 | 118 | $fileNameWithoutExtension .= '-copy'; |
119 | - $filename = $fileNameWithoutExtension . '.' . $extension; |
|
119 | + $filename = $fileNameWithoutExtension.'.'.$extension; |
|
120 | 120 | } else { |
121 | 121 | $filename .= '-copy'; |
122 | 122 | } |
123 | - return $this->modifyName($path . '/' . $filename); |
|
123 | + return $this->modifyName($path.'/'.$filename); |
|
124 | 124 | } |
125 | - return $path . '/' . $filename; |
|
125 | + return $path.'/'.$filename; |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | private function applyMethod($method, $imagePath, $width, $height, $modifier) |
129 | 129 | { |
130 | - $method = 'CloudControl\Cms\\images\\methods\\' . $method; |
|
130 | + $method = 'CloudControl\Cms\\images\\methods\\'.$method; |
|
131 | 131 | $destination = $this->modifyName($imagePath, $modifier); |
132 | 132 | if (file_exists($imagePath)) { |
133 | 133 | $image = new Image(); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | $resizedImage->saveImage($destination, $resizedImage->getImageMimeType($imagePath), 80); |
142 | 142 | return basename($destination); |
143 | 143 | } else { |
144 | - throw new \Exception('Image doesnt exist: ' . $imagePath); |
|
144 | + throw new \Exception('Image doesnt exist: '.$imagePath); |
|
145 | 145 | } |
146 | 146 | } |
147 | 147 | } |