@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | header("Content-Type: text/javascript"); |
19 | 19 | die; |
20 | 20 | } |
21 | -$file = "lang/" . $input->get['lng'] . ".php"; |
|
21 | +$file = "lang/".$input->get['lng'].".php"; |
|
22 | 22 | $files = dir::content("lang", array( |
23 | 23 | 'types' => "file", |
24 | 24 | 'pattern' => '/^.*\.php$/' |
@@ -33,4 +33,4 @@ discard block |
||
33 | 33 | header("Content-Type: text/javascript; charset={$lang['_charset']}"); |
34 | 34 | foreach ($lang as $english => $native) |
35 | 35 | if (substr($english, 0, 1) != "_") |
36 | - echo "browser.labels['" . text::jsValue($english) . "']=\"" . text::jsValue($native) . "\";"; |
|
36 | + echo "browser.labels['".text::jsValue($english)."']=\"".text::jsValue($native)."\";"; |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | * @link http://kcfinder.sunhater.com |
13 | 13 | */ |
14 | 14 | |
15 | -class gd { |
|
15 | +class gd{ |
|
16 | 16 | |
17 | 17 | /** GD resource |
18 | 18 | * @var resource */ |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * @param mixed $image |
41 | 41 | * @return array */ |
42 | 42 | |
43 | - protected function build_image($image) { |
|
43 | + protected function build_image($image){ |
|
44 | 44 | |
45 | 45 | if ($image instanceof gd) { |
46 | 46 | $width = $image->get_width(); |
@@ -58,12 +58,12 @@ discard block |
||
58 | 58 | |
59 | 59 | } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) { |
60 | 60 | $image = |
61 | - ($type == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : ( |
|
62 | - ($type == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : ( |
|
63 | - ($type == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : ( |
|
61 | + ($type == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : ( |
|
62 | + ($type == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : ( |
|
63 | + ($type == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : ( |
|
64 | 64 | ($type == IMAGETYPE_JPEG2000) ? @imagecreatefromjpeg($image) : ( |
65 | - ($type == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : ( |
|
66 | - ($type == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false |
|
65 | + ($type == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : ( |
|
66 | + ($type == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false |
|
67 | 67 | ))))); |
68 | 68 | |
69 | 69 | if ($type == IMAGETYPE_PNG) |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | * @param integer $bigger_size |
99 | 99 | * @return gd */ |
100 | 100 | |
101 | - public function __construct($image, $bigger_size=null) { |
|
101 | + public function __construct($image, $bigger_size = null){ |
|
102 | 102 | $this->image = $this->width = $this->height = null; |
103 | 103 | |
104 | 104 | $image_details = $this->build_image($image); |
@@ -126,21 +126,21 @@ discard block |
||
126 | 126 | /** Returns the GD resource |
127 | 127 | * @return resource */ |
128 | 128 | |
129 | - public function get_image() { |
|
129 | + public function get_image(){ |
|
130 | 130 | return $this->image; |
131 | 131 | } |
132 | 132 | |
133 | 133 | /** Returns the image width |
134 | 134 | * @return integer */ |
135 | 135 | |
136 | - public function get_width() { |
|
136 | + public function get_width(){ |
|
137 | 137 | return $this->width; |
138 | 138 | } |
139 | 139 | |
140 | 140 | /** Returns the image height |
141 | 141 | * @return integer */ |
142 | 142 | |
143 | - public function get_height() { |
|
143 | + public function get_height(){ |
|
144 | 144 | return $this->height; |
145 | 145 | } |
146 | 146 | |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | * @param integer $resized_height |
149 | 149 | * @return integer */ |
150 | 150 | |
151 | - public function get_prop_width($resized_height) { |
|
151 | + public function get_prop_width($resized_height){ |
|
152 | 152 | $width = intval(($this->width * $resized_height) / $this->height); |
153 | 153 | if (!$width) $width = 1; |
154 | 154 | return $width; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | * @param integer $resized_width |
159 | 159 | * @return integer */ |
160 | 160 | |
161 | - public function get_prop_height($resized_width) { |
|
161 | + public function get_prop_height($resized_width){ |
|
162 | 162 | $height = intval(($this->height * $resized_width) / $this->width); |
163 | 163 | if (!$height) $height = 1; |
164 | 164 | return $height; |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | * @param integer $bigger_size |
171 | 171 | * @return array */ |
172 | 172 | |
173 | - public function get_prop_size($bigger_size) { |
|
173 | + public function get_prop_size($bigger_size){ |
|
174 | 174 | |
175 | 175 | if ($this->width > $this->height) { |
176 | 176 | $width = $bigger_size; |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | * @param integer $height |
192 | 192 | * @return bool */ |
193 | 193 | |
194 | - public function resize($width, $height) { |
|
194 | + public function resize($width, $height){ |
|
195 | 195 | if (!$width) $width = 1; |
196 | 196 | if (!$height) $height = 1; |
197 | 197 | return ( |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | * @param mixed $src |
209 | 209 | * @return bool */ |
210 | 210 | |
211 | - public function resize_crop($src) { |
|
211 | + public function resize_crop($src){ |
|
212 | 212 | $image_details = $this->build_image($src); |
213 | 213 | |
214 | 214 | if ($image_details !== false) { |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | * @param integer $height |
239 | 239 | * @return bool */ |
240 | 240 | |
241 | - public function resize_fit($width, $height) { |
|
241 | + public function resize_fit($width, $height){ |
|
242 | 242 | if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height))) |
243 | 243 | return true; |
244 | 244 | if (!$width || (($height / $width) < ($this->height / $this->width))) |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | * @param integer $height |
258 | 258 | * @return bool */ |
259 | 259 | |
260 | - public function resize_overflow($width, $height) { |
|
260 | + public function resize_overflow($width, $height){ |
|
261 | 261 | |
262 | 262 | $big = (($this->width / $this->height) > ($width / $height)) |
263 | 263 | ? ($this->width * $height) / $this->height |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | return $return; |
276 | 276 | } |
277 | 277 | |
278 | - public function gd_color() { |
|
278 | + public function gd_color(){ |
|
279 | 279 | $args = func_get_args(); |
280 | 280 | |
281 | 281 | $expr_rgb = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i'; |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | return imagecolorallocate($this->image, $r, $g, $b); |
318 | 318 | } |
319 | 319 | |
320 | - public function fill_color($color) { |
|
320 | + public function fill_color($color){ |
|
321 | 321 | return $this->imagefilledrectangle(0, 0, $this->width - 1, $this->height - 1, $color); |
322 | 322 | } |
323 | 323 | |
@@ -326,11 +326,11 @@ discard block |
||
326 | 326 | |
327 | 327 | public function imagecopy( |
328 | 328 | $src, |
329 | - $dst_x=0, $dst_y=0, |
|
330 | - $src_x=0, $src_y=0, |
|
331 | - $dst_w=null, $dst_h=null, |
|
332 | - $src_w=null, $src_h=null |
|
333 | - ) { |
|
329 | + $dst_x = 0, $dst_y = 0, |
|
330 | + $src_x = 0, $src_y = 0, |
|
331 | + $dst_w = null, $dst_h = null, |
|
332 | + $src_w = null, $src_h = null |
|
333 | + ){ |
|
334 | 334 | $image_details = $this->build_image($src); |
335 | 335 | |
336 | 336 | if ($image_details !== false) { |
@@ -348,11 +348,11 @@ discard block |
||
348 | 348 | |
349 | 349 | public function imagecopyresampled( |
350 | 350 | $src, |
351 | - $dst_x=0, $dst_y=0, |
|
352 | - $src_x=0, $src_y=0, |
|
353 | - $dst_w=null, $dst_h=null, |
|
354 | - $src_w=null, $src_h=null |
|
355 | - ) { |
|
351 | + $dst_x = 0, $dst_y = 0, |
|
352 | + $src_x = 0, $src_y = 0, |
|
353 | + $dst_w = null, $dst_h = null, |
|
354 | + $src_w = null, $src_h = null |
|
355 | + ){ |
|
356 | 356 | $image_details = $this->build_image($src); |
357 | 357 | |
358 | 358 | if ($image_details !== false) { |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | if (is_null($src_w)) $src_w = $src_width - $src_x; |
364 | 364 | if (is_null($src_h)) $src_h = $src_height - $src_y; |
365 | 365 | imagealphablending($this->image, false); |
366 | - imagesavealpha($this->image,true); |
|
366 | + imagesavealpha($this->image, true); |
|
367 | 367 | |
368 | 368 | |
369 | 369 | |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | |
373 | 373 | $transindex = imagecolortransparent($src); |
374 | 374 | $palletsize = imagecolorstotal($src); |
375 | - if($transindex >= 0 && $transindex < $palletsize) { |
|
375 | + if ($transindex >= 0 && $transindex < $palletsize) { |
|
376 | 376 | $transcol = imagecolorsforindex($src, $transindex); |
377 | 377 | |
378 | 378 | /*** end gif transparent fix ***/ |
@@ -381,9 +381,9 @@ discard block |
||
381 | 381 | imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex); |
382 | 382 | imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h); |
383 | 383 | imagecolortransparent($this->image, $transindex); |
384 | - for($y=0; $y<$dst_h; ++$y) |
|
385 | - for($x=0; $x<$dst_w; ++$x) |
|
386 | - if(((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex); |
|
384 | + for ($y = 0; $y < $dst_h; ++$y) |
|
385 | + for ($x = 0; $x < $dst_w; ++$x) |
|
386 | + if (((imagecolorat($this->image, $x, $y) >> 24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex); |
|
387 | 387 | imagetruecolortopalette($this->image, true, 255); |
388 | 388 | } |
389 | 389 | else { |
@@ -397,26 +397,26 @@ discard block |
||
397 | 397 | return false; |
398 | 398 | } |
399 | 399 | |
400 | - public function imagefilledrectangle($x1, $y1, $x2, $y2, $color) { |
|
400 | + public function imagefilledrectangle($x1, $y1, $x2, $y2, $color){ |
|
401 | 401 | $color = $this->gd_color($color); |
402 | 402 | if ($color === false) return false; |
403 | 403 | return imagefilledrectangle($this->image, $x1, $y1, $x2, $y2, $color); |
404 | 404 | } |
405 | 405 | |
406 | - public function imagepng($filename=null, $quality=null, $filters=null) { |
|
406 | + public function imagepng($filename = null, $quality = null, $filters = null){ |
|
407 | 407 | if (is_null($filename) && !headers_sent()) |
408 | 408 | header("Content-Type: image/png"); |
409 | 409 | @imagesavealpha($this->image, true); |
410 | 410 | return imagepng($this->image, $filename, $quality, $filters); |
411 | 411 | } |
412 | 412 | |
413 | - public function imagejpeg($filename=null, $quality=75) { |
|
413 | + public function imagejpeg($filename = null, $quality = 75){ |
|
414 | 414 | if (is_null($filename) && !headers_sent()) |
415 | 415 | header("Content-Type: image/jpeg"); |
416 | 416 | return imagejpeg($this->image, $filename, $quality); |
417 | 417 | } |
418 | 418 | |
419 | - public function imagegif($filename=null) { |
|
419 | + public function imagegif($filename = null){ |
|
420 | 420 | if (is_null($filename) && !headers_sent()) |
421 | 421 | header("Content-Type: image/gif"); |
422 | 422 | @imagesavealpha($this->image, true); |
@@ -10,12 +10,12 @@ discard block |
||
10 | 10 | * Filename: /install/lang.php |
11 | 11 | */ |
12 | 12 | |
13 | -$_lang = array (); |
|
13 | +$_lang = array(); |
|
14 | 14 | |
15 | 15 | #default fallback language file - english |
16 | 16 | $install_language = "english"; |
17 | 17 | |
18 | -$_langFiles= array ( |
|
18 | +$_langFiles = array( |
|
19 | 19 | "en" => "english", |
20 | 20 | "bg" => "bulgarian", |
21 | 21 | "cs" => "czech", |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | "es" => "spanish-utf8", |
37 | 37 | "sv" => "svenska" |
38 | 38 | ); |
39 | -$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2); |
|
39 | +$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2); |
|
40 | 40 | if (!empty($_langFiles[$_langISO6391])) $install_language = $_langFiles[$_langISO6391]; |
41 | 41 | |
42 | 42 | |
43 | -if (isset($_POST['language']) && !stristr($_POST['language'],"..")) { |
|
43 | +if (isset($_POST['language']) && !stristr($_POST['language'], "..")) { |
|
44 | 44 | $install_language = $_POST['language']; |
45 | 45 | } else { |
46 | - if (isset($_GET['language']) && !stristr($_GET['language'],"..")) |
|
46 | + if (isset($_GET['language']) && !stristr($_GET['language'], "..")) |
|
47 | 47 | $install_language = $_GET['language']; |
48 | 48 | } |
49 | 49 | # load language file |
@@ -52,15 +52,15 @@ discard block |
||
52 | 52 | |
53 | 53 | $manager_language = $install_language; |
54 | 54 | |
55 | -if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'],"..")) { |
|
55 | +if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'], "..")) { |
|
56 | 56 | $manager_language = $_POST['managerlanguage']; |
57 | 57 | } else { |
58 | - if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],"..")) |
|
58 | + if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'], "..")) |
|
59 | 59 | $manager_language = $_GET['managerlanguage']; |
60 | 60 | } |
61 | 61 | |
62 | -foreach($_lang as $k=>$v) |
|
62 | +foreach ($_lang as $k=>$v) |
|
63 | 63 | { |
64 | - if(strpos($v,'[+MGR_DIR+]')!==false) |
|
64 | + if (strpos($v, '[+MGR_DIR+]') !== false) |
|
65 | 65 | $_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v); |
66 | 66 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! function_exists('getLangOptions')) { |
|
2 | +if (!function_exists('getLangOptions')) { |
|
3 | 3 | /** |
4 | 4 | * @param string $install_language |
5 | 5 | * @return string |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | $abrv_language = explode('-', $language); |
22 | 22 | $selected = ($language === $install_language) ? 'selected' : ''; |
23 | 23 | $_[] = sprintf('<option value="%s" %s>%s</option>', $language, $selected, |
24 | - ucwords($abrv_language[0])) . "\n"; |
|
24 | + ucwords($abrv_language[0]))."\n"; |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | return implode("\n", $_); |
@@ -32,6 +32,6 @@ discard block |
||
32 | 32 | $content = parse($content, array( |
33 | 33 | 'langOptions' => getLangOptions($install_language)) |
34 | 34 | ); |
35 | -$content = parse($content, $_lang,'[%','%]'); |
|
35 | +$content = parse($content, $_lang, '[%', '%]'); |
|
36 | 36 | |
37 | 37 | echo $content; |
@@ -50,16 +50,16 @@ discard block |
||
50 | 50 | include_once($autoloader); |
51 | 51 | } |
52 | 52 | |
53 | -if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true); |
|
53 | +if (!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true); |
|
54 | 54 | |
55 | -$base_path = str_replace('\\','/',dirname(__FILE__)) . '/'; |
|
56 | -if(is_file($base_path . 'assets/cache/siteManager.php')) |
|
57 | - include_once($base_path . 'assets/cache/siteManager.php'); |
|
58 | -if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) |
|
55 | +$base_path = str_replace('\\', '/', dirname(__FILE__)).'/'; |
|
56 | +if (is_file($base_path.'assets/cache/siteManager.php')) |
|
57 | + include_once($base_path.'assets/cache/siteManager.php'); |
|
58 | +if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) |
|
59 | 59 | define('MGR_DIR', 'manager'); |
60 | -if(is_file($base_path . 'assets/cache/siteHostnames.php')) |
|
61 | - include_once($base_path . 'assets/cache/siteHostnames.php'); |
|
62 | -if(!defined('MODX_SITE_HOSTNAMES')) |
|
60 | +if (is_file($base_path.'assets/cache/siteHostnames.php')) |
|
61 | + include_once($base_path.'assets/cache/siteHostnames.php'); |
|
62 | +if (!defined('MODX_SITE_HOSTNAMES')) |
|
63 | 63 | define('MODX_SITE_HOSTNAMES', ''); |
64 | 64 | |
65 | 65 | // get start time |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | // set some settings, and address some IE issues |
72 | 72 | @ini_set('url_rewriter.tags', ''); |
73 | 73 | @ini_set('session.use_trans_sid', 0); |
74 | -@ini_set('session.use_only_cookies',1); |
|
74 | +@ini_set('session.use_only_cookies', 1); |
|
75 | 75 | session_cache_limiter(''); |
76 | 76 | header('P3P: CP="NOI NID ADMa OUR IND UNI COM NAV"'); // header for weird cookie stuff. Blame IE. |
77 | 77 | header('Cache-Control: private, must-revalidate'); |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | */ |
84 | 84 | |
85 | 85 | define('IN_PARSER_MODE', true); |
86 | -if ( ! defined('IN_MANAGER_MODE')) { |
|
86 | +if (!defined('IN_MANAGER_MODE')) { |
|
87 | 87 | define('IN_MANAGER_MODE', false); |
88 | 88 | } |
89 | 89 | if (!defined('MODX_API_MODE')) { |
@@ -91,10 +91,10 @@ discard block |
||
91 | 91 | } |
92 | 92 | |
93 | 93 | // get the required includes |
94 | -if(!isset($database_user) || $database_user=="") { |
|
94 | +if (!isset($database_user) || $database_user == "") { |
|
95 | 95 | $rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php'); |
96 | 96 | // Be sure config.inc.php is there and that it contains some important values |
97 | - if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) { |
|
97 | + if (!$rt || !$database_type || !$database_server || !$database_user || !$dbase) { |
|
98 | 98 | readfile('install/not_installed.tpl'); |
99 | 99 | exit; |
100 | 100 | } |
@@ -125,8 +125,8 @@ discard block |
||
125 | 125 | $modx->stopOnNotice = false; |
126 | 126 | |
127 | 127 | // Don't show PHP errors to the public |
128 | -if(!isset($_SESSION['mgrValidated']) || !$_SESSION['mgrValidated']) { |
|
129 | - @ini_set("display_errors","0"); |
|
128 | +if (!isset($_SESSION['mgrValidated']) || !$_SESSION['mgrValidated']) { |
|
129 | + @ini_set("display_errors", "0"); |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | // execute the parser if index.php was not included |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | * @link http://kcfinder.sunhater.com |
13 | 13 | */ |
14 | 14 | |
15 | -class image_imagick extends image { |
|
15 | +class image_imagick extends image{ |
|
16 | 16 | |
17 | 17 | static $MIMES = array( |
18 | 18 | //'tif' => "image/tiff" |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | |
22 | 22 | // ABSTRACT PUBLIC METHODS |
23 | 23 | |
24 | - public function resize($width, $height) {// |
|
24 | + public function resize($width, $height){// |
|
25 | 25 | if (!$width) $width = 1; |
26 | 26 | if (!$height) $height = 1; |
27 | 27 | try { |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | return true; |
35 | 35 | } |
36 | 36 | |
37 | - public function resizeFit($width, $height, $background=false) {// |
|
37 | + public function resizeFit($width, $height, $background = false){// |
|
38 | 38 | if (!$width) $width = 1; |
39 | 39 | if (!$height) $height = 1; |
40 | 40 | |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | } |
66 | 66 | } |
67 | 67 | |
68 | - public function resizeCrop($width, $height, $offset=false) { |
|
68 | + public function resizeCrop($width, $height, $offset = false){ |
|
69 | 69 | if (!$width) $width = 1; |
70 | 70 | if (!$height) $height = 1; |
71 | 71 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | return true; |
116 | 116 | } |
117 | 117 | |
118 | - public function rotate($angle, $background="#000000") { |
|
118 | + public function rotate($angle, $background = "#000000"){ |
|
119 | 119 | try { |
120 | 120 | $this->image->rotateImage(new ImagickPixel($background), $angle); |
121 | 121 | $size = $this->image->getImageGeometry(); |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | return true; |
128 | 128 | } |
129 | 129 | |
130 | - public function flipHorizontal() { |
|
130 | + public function flipHorizontal(){ |
|
131 | 131 | try { |
132 | 132 | $this->image->flopImage(); |
133 | 133 | } catch (Exception $e) { |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | return true; |
137 | 137 | } |
138 | 138 | |
139 | - public function flipVertical() { |
|
139 | + public function flipVertical(){ |
|
140 | 140 | try { |
141 | 141 | $this->image->flipImage(); |
142 | 142 | } catch (Exception $e) { |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | return true; |
146 | 146 | } |
147 | 147 | |
148 | - public function watermark($file, $left=false, $top=false) { |
|
148 | + public function watermark($file, $left = false, $top = false){ |
|
149 | 149 | try { |
150 | 150 | $wm = new Imagick($file); |
151 | 151 | $size = $wm->getImageGeometry(); |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | |
182 | 182 | // ABSTRACT PROTECTED METHODS |
183 | 183 | |
184 | - protected function getBlankImage($width, $height) { |
|
184 | + protected function getBlankImage($width, $height){ |
|
185 | 185 | try { |
186 | 186 | $img = new Imagick(); |
187 | 187 | $img->newImage($width, $height, "none"); |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | return $img; |
193 | 193 | } |
194 | 194 | |
195 | - protected function getImage($image, &$width, &$height) { |
|
195 | + protected function getImage($image, &$width, &$height){ |
|
196 | 196 | |
197 | 197 | if (is_object($image) && ($image instanceof image_imagick)) { |
198 | 198 | try { |
@@ -234,11 +234,11 @@ discard block |
||
234 | 234 | |
235 | 235 | // PSEUDO-ABSTRACT STATIC METHODS |
236 | 236 | |
237 | - static function available() { |
|
237 | + static function available(){ |
|
238 | 238 | return class_exists("Imagick"); |
239 | 239 | } |
240 | 240 | |
241 | - static function checkImage($file) { |
|
241 | + static function checkImage($file){ |
|
242 | 242 | try { |
243 | 243 | new Imagick($file); |
244 | 244 | } catch (Exception $e) { |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | |
251 | 251 | // INHERIT METHODS |
252 | 252 | |
253 | - public function output($type="jpeg", array $options=array()) { |
|
253 | + public function output($type = "jpeg", array $options = array()){ |
|
254 | 254 | $type = strtolower($type); |
255 | 255 | try { |
256 | 256 | $this->image->setImageFormat($type); |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | echo $this->image; |
270 | 270 | |
271 | 271 | } else { |
272 | - $file = $options['file'] . ".$type"; |
|
272 | + $file = $options['file'].".$type"; |
|
273 | 273 | try { |
274 | 274 | $this->image->writeImage($file); |
275 | 275 | } catch (Exception $e) { |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | |
290 | 290 | // OWN METHODS |
291 | 291 | |
292 | - protected function optimize_jpeg(array $options=array()) { |
|
292 | + protected function optimize_jpeg(array $options = array()){ |
|
293 | 293 | $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY; |
294 | 294 | try { |
295 | 295 | $this->image->setImageCompression(Imagick::COMPRESSION_JPEG); |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | * @link http://kcfinder.sunhater.com |
13 | 13 | */ |
14 | 14 | |
15 | -class image_gmagick extends image { |
|
15 | +class image_gmagick extends image{ |
|
16 | 16 | |
17 | 17 | static $MIMES = array( |
18 | 18 | //'tif' => "image/tiff" |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | |
22 | 22 | // ABSTRACT PUBLIC METHODS |
23 | 23 | |
24 | - public function resize($width, $height) {// |
|
24 | + public function resize($width, $height){// |
|
25 | 25 | if (!$width) $width = 1; |
26 | 26 | if (!$height) $height = 1; |
27 | 27 | try { |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | return true; |
35 | 35 | } |
36 | 36 | |
37 | - public function resizeFit($width, $height, $background=false) {// |
|
37 | + public function resizeFit($width, $height, $background = false){// |
|
38 | 38 | if (!$width) $width = 1; |
39 | 39 | if (!$height) $height = 1; |
40 | 40 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } |
70 | 70 | } |
71 | 71 | |
72 | - public function resizeCrop($width, $height, $offset=false) { |
|
72 | + public function resizeCrop($width, $height, $offset = false){ |
|
73 | 73 | if (!$width) $width = 1; |
74 | 74 | if (!$height) $height = 1; |
75 | 75 | |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | return true; |
120 | 120 | } |
121 | 121 | |
122 | - public function rotate($angle, $background="#000000") { |
|
122 | + public function rotate($angle, $background = "#000000"){ |
|
123 | 123 | try { |
124 | 124 | $this->image->rotateImage($background, $angle); |
125 | 125 | $w = $this->image->getImageWidth(); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | return true; |
133 | 133 | } |
134 | 134 | |
135 | - public function flipHorizontal() { |
|
135 | + public function flipHorizontal(){ |
|
136 | 136 | try { |
137 | 137 | $this->image->flopImage(); |
138 | 138 | } catch (Exception $e) { |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | return true; |
142 | 142 | } |
143 | 143 | |
144 | - public function flipVertical() { |
|
144 | + public function flipVertical(){ |
|
145 | 145 | try { |
146 | 146 | $this->image->flipImage(); |
147 | 147 | } catch (Exception $e) { |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | return true; |
151 | 151 | } |
152 | 152 | |
153 | - public function watermark($file, $left=false, $top=false) { |
|
153 | + public function watermark($file, $left = false, $top = false){ |
|
154 | 154 | try { |
155 | 155 | $wm = new Gmagick($file); |
156 | 156 | $w = $wm->getImageWidth(); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | |
186 | 186 | // ABSTRACT PROTECTED METHODS |
187 | 187 | |
188 | - protected function getBlankImage($width, $height) { |
|
188 | + protected function getBlankImage($width, $height){ |
|
189 | 189 | try { |
190 | 190 | $img = new Gmagick(); |
191 | 191 | $img->newImage($width, $height, "none"); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | return $img; |
196 | 196 | } |
197 | 197 | |
198 | - protected function getImage($image, &$width, &$height) { |
|
198 | + protected function getImage($image, &$width, &$height){ |
|
199 | 199 | |
200 | 200 | if (is_object($image) && ($image instanceof image_gmagick)) { |
201 | 201 | $width = $image->width; |
@@ -232,11 +232,11 @@ discard block |
||
232 | 232 | |
233 | 233 | // PSEUDO-ABSTRACT STATIC METHODS |
234 | 234 | |
235 | - static function available() { |
|
235 | + static function available(){ |
|
236 | 236 | return class_exists("Gmagick"); |
237 | 237 | } |
238 | 238 | |
239 | - static function checkImage($file) { |
|
239 | + static function checkImage($file){ |
|
240 | 240 | try { |
241 | 241 | new Gmagick($file); |
242 | 242 | } catch (Exception $e) { |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | |
249 | 249 | // INHERIT METHODS |
250 | 250 | |
251 | - public function output($type="jpeg", array $options=array()) { |
|
251 | + public function output($type = "jpeg", array $options = array()){ |
|
252 | 252 | $type = strtolower($type); |
253 | 253 | try { |
254 | 254 | $this->image->setImageFormat($type); |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | echo $this->image; |
268 | 268 | |
269 | 269 | } else { |
270 | - $file = $options['file'] . ".$type"; |
|
270 | + $file = $options['file'].".$type"; |
|
271 | 271 | try { |
272 | 272 | $this->image->writeImage($file); |
273 | 273 | } catch (Exception $e) { |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | |
288 | 288 | // OWN METHODS |
289 | 289 | |
290 | - protected function optimize_jpeg(array $options=array()) { |
|
290 | + protected function optimize_jpeg(array $options = array()){ |
|
291 | 291 | $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY; |
292 | 292 | try { |
293 | 293 | $this->image->setCompressionQuality($quality); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | $modx = new DocumentParser; |
27 | 27 | $modx->db->connect(); |
28 | 28 | startCMSSession(); |
29 | -if(!isset($_SESSION['mgrValidated'])) { |
|
29 | +if (!isset($_SESSION['mgrValidated'])) { |
|
30 | 30 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
31 | 31 | } |
32 | 32 | define('IN_MANAGER_MODE', true); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | $manager_language = $modx->config['manager_language']; |
36 | 36 | // Pass language code from MODX to KCFinder |
37 | -if(!file_exists("../../../includes/lang/".$manager_language.".inc.php")) { |
|
37 | +if (!file_exists("../../../includes/lang/".$manager_language.".inc.php")) { |
|
38 | 38 | $manager_language = "english"; // if not set, get the english language file. |
39 | 39 | } |
40 | 40 | include_once "../../../includes/lang/".$manager_language.".inc.php"; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | // PHP VERSION CHECK |
44 | 44 | if (substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.')) < 5) |
45 | - die("You are using PHP " . PHP_VERSION . " when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution."); |
|
45 | + die("You are using PHP ".PHP_VERSION." when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution."); |
|
46 | 46 | |
47 | 47 | |
48 | 48 | // SAFE MODE CHECK |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | |
52 | 52 | |
53 | 53 | // MAGIC AUTOLOAD CLASSES FUNCTION |
54 | -function autoloadda9d06472ccb71b84928677ce2a6ca89($class) { |
|
54 | +function autoloadda9d06472ccb71b84928677ce2a6ca89($class){ |
|
55 | 55 | static $classes = null; |
56 | 56 | if ($classes === null) { |
57 | 57 | $classes = array( |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | ); |
76 | 76 | } |
77 | 77 | if (isset($classes[$class])) { |
78 | - require dirname(__FILE__) . $classes[$class]; |
|
78 | + require dirname(__FILE__).$classes[$class]; |
|
79 | 79 | } |
80 | 80 | } |
81 | 81 | spl_autoload_register('autoloadda9d06472ccb71b84928677ce2a6ca89', true); |
@@ -84,18 +84,18 @@ discard block |
||
84 | 84 | // json_encode() IMPLEMENTATION IF JSON EXTENSION IS MISSING |
85 | 85 | if (!function_exists("json_encode")) { |
86 | 86 | |
87 | - function kcfinder_json_string_encode($string) { |
|
88 | - return '"' . |
|
87 | + function kcfinder_json_string_encode($string){ |
|
88 | + return '"'. |
|
89 | 89 | str_replace('/', "\\/", |
90 | 90 | str_replace("\t", "\\t", |
91 | 91 | str_replace("\r", "\\r", |
92 | 92 | str_replace("\n", "\\n", |
93 | 93 | str_replace('"', "\\\"", |
94 | 94 | str_replace("\\", "\\\\", |
95 | - $string)))))) . '"'; |
|
95 | + $string)))))).'"'; |
|
96 | 96 | } |
97 | 97 | |
98 | - function json_encode($data) { |
|
98 | + function json_encode($data){ |
|
99 | 99 | |
100 | 100 | if (is_array($data)) { |
101 | 101 | $ret = array(); |
@@ -103,14 +103,14 @@ discard block |
||
103 | 103 | // OBJECT |
104 | 104 | if (array_keys($data) !== range(0, count($data) - 1)) { |
105 | 105 | foreach ($data as $key => $val) |
106 | - $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val); |
|
107 | - return "{" . implode(",", $ret) . "}"; |
|
106 | + $ret[] = kcfinder_json_string_encode($key).':'.json_encode($val); |
|
107 | + return "{".implode(",", $ret)."}"; |
|
108 | 108 | |
109 | 109 | // ARRAY |
110 | 110 | } else { |
111 | 111 | foreach ($data as $val) |
112 | 112 | $ret[] = json_encode($val); |
113 | - return "[" . implode(",", $ret) . "]"; |
|
113 | + return "[".implode(",", $ret)."]"; |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | // BOOLEAN OR NULL |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
4 | 4 | } |
5 | -if(!$modx->hasPermission('view_eventlog')) { |
|
5 | +if (!$modx->hasPermission('view_eventlog')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | ?> |
@@ -17,9 +17,9 @@ discard block |
||
17 | 17 | <div class="form-group" id="lyr1"> |
18 | 18 | <b><?= $_lang["publish_events"] ?></b> |
19 | 19 | <?php |
20 | - $rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC'); |
|
20 | + $rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > ".time()."", 'pub_date ASC'); |
|
21 | 21 | $limit = $modx->db->getRecordCount($rs); |
22 | - if($limit < 1) { |
|
22 | + if ($limit < 1) { |
|
23 | 23 | ?> |
24 | 24 | <p><?= $_lang["no_docs_pending_publishing"] ?></p> |
25 | 25 | <?php |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | </thead> |
37 | 37 | <tbody> |
38 | 38 | <?php |
39 | - while($row = $modx->db->getRow($rs)) { |
|
39 | + while ($row = $modx->db->getRow($rs)) { |
|
40 | 40 | ?> |
41 | 41 | <tr> |
42 | 42 | <td class="text-right"><?= $row['id'] ?></td> |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | <div class="form-group" id="lyr2"> |
57 | 57 | <b><?= $_lang["unpublish_events"] ?></b> |
58 | 58 | <?php |
59 | - $rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC'); |
|
59 | + $rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > ".time()."", 'unpub_date ASC'); |
|
60 | 60 | $limit = $modx->db->getRecordCount($rs); |
61 | - if($limit < 1) { |
|
61 | + if ($limit < 1) { |
|
62 | 62 | ?> |
63 | 63 | <p><?= $_lang["no_docs_pending_unpublishing"] ?></p> |
64 | 64 | <?php |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | </thead> |
76 | 76 | <tbody> |
77 | 77 | <?php |
78 | - while($row = $modx->db->getRow($rs)) { |
|
78 | + while ($row = $modx->db->getRow($rs)) { |
|
79 | 79 | ?> |
80 | 80 | <tr> |
81 | 81 | <td class="text-right"><?= $row['id'] ?></td> |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | <?php |
98 | 98 | $rs = $modx->db->select('id, pagetitle, pub_date, unpub_date', $modx->getFullTableName('site_content'), "pub_date > 0 OR unpub_date > 0", "pub_date DESC"); |
99 | 99 | $limit = $modx->db->getRecordCount($rs); |
100 | - if($limit < 1) { |
|
100 | + if ($limit < 1) { |
|
101 | 101 | ?> |
102 | 102 | <p><?= $_lang["no_docs_pending_pubunpub"] ?></p> |
103 | 103 | <?php |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | </thead> |
116 | 116 | <tbody> |
117 | 117 | <?php |
118 | - while($row = $modx->db->getRow($rs)) { |
|
118 | + while ($row = $modx->db->getRow($rs)) { |
|
119 | 119 | ?> |
120 | 120 | <tr> |
121 | 121 | <td class="text-right"><?= $row['id'] ?></td> |