evolution-cms /
evolution
@@ -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; |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0; |
|
| 2 | +$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0; |
|
| 3 | 3 | |
| 4 | -if( ! function_exists('getTemplates')) { |
|
| 4 | +if (!function_exists('getTemplates')) { |
|
| 5 | 5 | /** |
| 6 | 6 | * @param array $presets |
| 7 | 7 | * @return string |
@@ -26,12 +26,12 @@ discard block |
||
| 26 | 26 | $i++; |
| 27 | 27 | } |
| 28 | 28 | if (0 < count($_)) { |
| 29 | - return '<h3>[%templates%]</h3>' . join("\n", $_); |
|
| 29 | + return '<h3>[%templates%]</h3>'.join("\n", $_); |
|
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | -if( ! function_exists('getTVs')) { |
|
| 34 | +if (!function_exists('getTVs')) { |
|
| 35 | 35 | /** |
| 36 | 36 | * @param array $presets |
| 37 | 37 | * @return string |
@@ -56,12 +56,12 @@ discard block |
||
| 56 | 56 | $i++; |
| 57 | 57 | } |
| 58 | 58 | if (0 < count($_)) { |
| 59 | - return '<h3>[%tvs%]</h3>' . join("\n", $_); |
|
| 59 | + return '<h3>[%tvs%]</h3>'.join("\n", $_); |
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | -if( ! function_exists('getChunks')) { |
|
| 64 | +if (!function_exists('getChunks')) { |
|
| 65 | 65 | /** |
| 66 | 66 | * display chunks |
| 67 | 67 | * |
@@ -87,12 +87,12 @@ discard block |
||
| 87 | 87 | $i++; |
| 88 | 88 | } |
| 89 | 89 | if (0 < count($_)) { |
| 90 | - return '<h3>[%chunks%]</h3>' . join("\n", $_); |
|
| 90 | + return '<h3>[%chunks%]</h3>'.join("\n", $_); |
|
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | -if( ! function_exists('getModules')) { |
|
| 95 | +if (!function_exists('getModules')) { |
|
| 96 | 96 | /** |
| 97 | 97 | * display modules |
| 98 | 98 | * |
@@ -118,12 +118,12 @@ discard block |
||
| 118 | 118 | $i++; |
| 119 | 119 | } |
| 120 | 120 | if (0 < count($_)) { |
| 121 | - return '<h3>[%modules%]</h3>' . join("\n", $_); |
|
| 121 | + return '<h3>[%modules%]</h3>'.join("\n", $_); |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | -if( ! function_exists('getPlugins')) { |
|
| 126 | +if (!function_exists('getPlugins')) { |
|
| 127 | 127 | /** |
| 128 | 128 | * display plugins |
| 129 | 129 | * |
@@ -153,12 +153,12 @@ discard block |
||
| 153 | 153 | $i++; |
| 154 | 154 | } |
| 155 | 155 | if (0 < count($_)) { |
| 156 | - return '<h3>[%plugins%]</h3>' . join("\n", $_); |
|
| 156 | + return '<h3>[%plugins%]</h3>'.join("\n", $_); |
|
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | -if( ! function_exists('getSnippets')) { |
|
| 161 | +if (!function_exists('getSnippets')) { |
|
| 162 | 162 | /** |
| 163 | 163 | * display snippets |
| 164 | 164 | * |
@@ -184,24 +184,24 @@ discard block |
||
| 184 | 184 | $i++; |
| 185 | 185 | } |
| 186 | 186 | if (0 < count($_)) { |
| 187 | - return '<h3>[%snippets%]</h3>' . join("\n", $_); |
|
| 187 | + return '<h3>[%snippets%]</h3>'.join("\n", $_); |
|
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | -switch($installMode){ |
|
| 192 | +switch ($installMode) { |
|
| 193 | 193 | case 0: |
| 194 | 194 | case 2: |
| 195 | 195 | $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci'; |
| 196 | 196 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
| 197 | 197 | $_POST['database_connection_charset'] = $database_charset; |
| 198 | - if(empty($_SESSION['databaseloginpassword'])) |
|
| 198 | + if (empty($_SESSION['databaseloginpassword'])) |
|
| 199 | 199 | $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword']; |
| 200 | - if(empty($_SESSION['databaseloginname'])) |
|
| 200 | + if (empty($_SESSION['databaseloginname'])) |
|
| 201 | 201 | $_SESSION['databaseloginname'] = $_POST['databaseloginname']; |
| 202 | 202 | break; |
| 203 | 203 | case 1: |
| 204 | - include $base_path . MGR_DIR . '/includes/config.inc.php'; |
|
| 204 | + include $base_path.MGR_DIR.'/includes/config.inc.php'; |
|
| 205 | 205 | if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) { |
| 206 | 206 | if (@ mysqli_query($conn, "USE {$dbase}")) { |
| 207 | 207 | if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) { |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | $ph['checked'] = isset ($_POST['installdata']) && $_POST['installdata'] == "1" ? 'checked' : ''; |
| 257 | 257 | |
| 258 | 258 | # load setup information file |
| 259 | -include($base_path . 'install/setup.info.php'); |
|
| 259 | +include($base_path.'install/setup.info.php'); |
|
| 260 | 260 | $ph['templates'] = getTemplates($moduleTemplates); |
| 261 | 261 | $ph['tvs'] = getTVs($moduleTVs); |
| 262 | 262 | $ph['chunks'] = getChunks($moduleChunks); |
@@ -266,6 +266,6 @@ discard block |
||
| 266 | 266 | |
| 267 | 267 | $ph['action'] = ($installMode == 1) ? 'mode' : 'connection'; |
| 268 | 268 | |
| 269 | -$tpl = file_get_contents($base_path . 'install/actions/tpl_options.html'); |
|
| 270 | -$content = parse($tpl,$ph); |
|
| 271 | -echo parse($content,$_lang,'[%','%]'); |
|
| 269 | +$tpl = file_get_contents($base_path.'install/actions/tpl_options.html'); |
|
| 270 | +$content = parse($tpl, $ph); |
|
| 271 | +echo parse($content, $_lang, '[%', '%]'); |
|
@@ -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 |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if (file_exists(dirname(__FILE__)."/../assets/cache/siteManager.php")) { |
| 3 | 3 | include_once(dirname(__FILE__)."/../assets/cache/siteManager.php"); |
| 4 | -}else{ |
|
| 4 | +} else { |
|
| 5 | 5 | define('MGR_DIR', 'manager'); |
| 6 | 6 | } |
| 7 | 7 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | echo "<p>{$_lang['setup_database']}</p>\n"; |
| 30 | 30 | |
| 31 | -$installMode= intval($_POST['installmode']); |
|
| 31 | +$installMode = intval($_POST['installmode']); |
|
| 32 | 32 | $installData = $_POST['installdata'] == "1" ? 1 : 0; |
| 33 | 33 | |
| 34 | 34 | //if ($installMode == 1) { |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
| 43 | 43 | $database_connection_charset = $_POST['database_connection_charset']; |
| 44 | 44 | $database_connection_method = $_POST['database_connection_method']; |
| 45 | -$dbase = "`" . $_POST['database_name'] . "`"; |
|
| 45 | +$dbase = "`".$_POST['database_name']."`"; |
|
| 46 | 46 | $table_prefix = $_POST['tableprefix']; |
| 47 | 47 | $adminname = $_POST['cmsadmin']; |
| 48 | 48 | $adminemail = $_POST['cmsadminemail']; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | // set session name variable |
| 55 | 55 | if (!isset ($site_sessionname)) { |
| 56 | - $site_sessionname = 'SN' . uniqid(''); |
|
| 56 | + $site_sessionname = 'SN'.uniqid(''); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | // get base path and url |
@@ -67,11 +67,11 @@ discard block |
||
| 67 | 67 | array_pop($a); |
| 68 | 68 | $pth = implode("install", $a); |
| 69 | 69 | unset ($a); |
| 70 | -$base_url = $url . (substr($url, -1) != "/" ? "/" : ""); |
|
| 71 | -$base_path = $pth . (substr($pth, -1) != "/" ? "/" : ""); |
|
| 70 | +$base_url = $url.(substr($url, -1) != "/" ? "/" : ""); |
|
| 71 | +$base_path = $pth.(substr($pth, -1) != "/" ? "/" : ""); |
|
| 72 | 72 | |
| 73 | 73 | // connect to the database |
| 74 | -echo "<p>". $_lang['setup_database_create_connection']; |
|
| 74 | +echo "<p>".$_lang['setup_database_create_connection']; |
|
| 75 | 75 | if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) { |
| 76 | 76 | echo '<span class="notok">'.$_lang["setup_database_create_connection_failed"]."</span></p><p>".$_lang['setup_database_create_connection_failed_note']."</p>"; |
| 77 | 77 | return; |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | // select database |
| 83 | -echo "<p>".$_lang['setup_database_selection']. str_replace("`", "", $dbase) . "`: "; |
|
| 83 | +echo "<p>".$_lang['setup_database_selection'].str_replace("`", "", $dbase)."`: "; |
|
| 84 | 84 | if (!mysqli_select_db($conn, str_replace("`", "", $dbase))) { |
| 85 | 85 | echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>"; |
| 86 | 86 | $create = true; |
@@ -92,9 +92,9 @@ discard block |
||
| 92 | 92 | |
| 93 | 93 | // try to create the database |
| 94 | 94 | if ($create) { |
| 95 | - echo "<p>".$_lang['setup_database_creation']. str_replace("`", "", $dbase) . "`: "; |
|
| 95 | + echo "<p>".$_lang['setup_database_creation'].str_replace("`", "", $dbase)."`: "; |
|
| 96 | 96 | // if(!@mysqli_create_db(str_replace("`","",$dbase), $conn)) { |
| 97 | - if (! mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) { |
|
| 97 | + if (!mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) { |
|
| 98 | 98 | echo '<span class="notok">'.$_lang['setup_database_creation_failed']."</span>".$_lang['setup_database_creation_failed_note']."</p>"; |
| 99 | 99 | $errors += 1; |
| 100 | 100 | ?> |
@@ -113,33 +113,33 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | // check table prefix |
| 115 | 115 | if ($installMode == 0) { |
| 116 | - echo "<p>" . $_lang['checking_table_prefix'] . $table_prefix . "`: "; |
|
| 117 | - if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) { |
|
| 118 | - echo '<span class="notok">' . $_lang['failed'] . "</span>" . $_lang['table_prefix_already_inuse'] . "</p>"; |
|
| 116 | + echo "<p>".$_lang['checking_table_prefix'].$table_prefix."`: "; |
|
| 117 | + if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) { |
|
| 118 | + echo '<span class="notok">'.$_lang['failed']."</span>".$_lang['table_prefix_already_inuse']."</p>"; |
|
| 119 | 119 | $errors += 1; |
| 120 | - echo "<p>" . $_lang['table_prefix_already_inuse_note'] . "</p>"; |
|
| 120 | + echo "<p>".$_lang['table_prefix_already_inuse_note']."</p>"; |
|
| 121 | 121 | return; |
| 122 | 122 | } else { |
| 123 | 123 | echo '<span class="ok">'.$_lang['ok']."</span></p>"; |
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | -if(!function_exists('parseProperties')) { |
|
| 127 | +if (!function_exists('parseProperties')) { |
|
| 128 | 128 | // parses a resource property string and returns the result as an array |
| 129 | 129 | // duplicate of method in documentParser class |
| 130 | - function parseProperties($propertyString) { |
|
| 131 | - $parameter= array (); |
|
| 130 | + function parseProperties($propertyString){ |
|
| 131 | + $parameter = array(); |
|
| 132 | 132 | if (!empty ($propertyString)) { |
| 133 | - $tmpParams= explode("&", $propertyString); |
|
| 134 | - for ($x= 0; $x < count($tmpParams); $x++) { |
|
| 133 | + $tmpParams = explode("&", $propertyString); |
|
| 134 | + for ($x = 0; $x < count($tmpParams); $x++) { |
|
| 135 | 135 | if (strpos($tmpParams[$x], '=', 0)) { |
| 136 | - $pTmp= explode("=", $tmpParams[$x]); |
|
| 137 | - $pvTmp= explode(";", trim($pTmp[1])); |
|
| 136 | + $pTmp = explode("=", $tmpParams[$x]); |
|
| 137 | + $pvTmp = explode(";", trim($pTmp[1])); |
|
| 138 | 138 | if ($pvTmp[1] == 'list' && $pvTmp[3] != "") |
| 139 | - $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default |
|
| 139 | + $parameter[trim($pTmp[0])] = $pvTmp[3]; //list default |
|
| 140 | 140 | else |
| 141 | 141 | if ($pvTmp[1] != 'list' && $pvTmp[2] != "") |
| 142 | - $parameter[trim($pTmp[0])]= $pvTmp[2]; |
|
| 142 | + $parameter[trim($pTmp[0])] = $pvTmp[2]; |
|
| 143 | 143 | } |
| 144 | 144 | } |
| 145 | 145 | } |
@@ -150,20 +150,20 @@ discard block |
||
| 150 | 150 | // check status of Inherit Parent Template plugin |
| 151 | 151 | $auto_template_logic = 'parent'; |
| 152 | 152 | if ($installMode != 0) { |
| 153 | - $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='Inherit Parent Template'"); |
|
| 153 | + $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`".$table_prefix."site_plugins` WHERE name='Inherit Parent Template'"); |
|
| 154 | 154 | $row = mysqli_fetch_row($rs); |
| 155 | - if(!$row) { |
|
| 155 | + if (!$row) { |
|
| 156 | 156 | // not installed |
| 157 | 157 | $auto_template_logic = 'system'; |
| 158 | 158 | } else { |
| 159 | - if($row[1] == 1) { |
|
| 159 | + if ($row[1] == 1) { |
|
| 160 | 160 | // installed but disabled |
| 161 | 161 | $auto_template_logic = 'system'; |
| 162 | 162 | } else { |
| 163 | 163 | // installed, enabled .. see how it's configured |
| 164 | 164 | $properties = parseProperties($row[0]); |
| 165 | - if(isset($properties['inheritTemplate'])) { |
|
| 166 | - if($properties['inheritTemplate'] == 'From First Sibling') { |
|
| 165 | + if (isset($properties['inheritTemplate'])) { |
|
| 166 | + if ($properties['inheritTemplate'] == 'From First Sibling') { |
|
| 167 | 167 | $auto_template_logic = 'sibling'; |
| 168 | 168 | } |
| 169 | 169 | } |
@@ -187,20 +187,20 @@ discard block |
||
| 187 | 187 | $sqlParser->connect(); |
| 188 | 188 | |
| 189 | 189 | // install/update database |
| 190 | -echo "<p>" . $_lang['setup_database_creating_tables']; |
|
| 190 | +echo "<p>".$_lang['setup_database_creating_tables']; |
|
| 191 | 191 | if ($moduleSQLBaseFile) { |
| 192 | 192 | $sqlParser->process($moduleSQLBaseFile); |
| 193 | 193 | // display database results |
| 194 | 194 | if ($sqlParser->installFailed == true) { |
| 195 | 195 | $errors += 1; |
| 196 | - echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>"; |
|
| 197 | - echo "<p>" . $_lang['setup_couldnt_install'] . "</p>"; |
|
| 198 | - echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />"; |
|
| 196 | + echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>"; |
|
| 197 | + echo "<p>".$_lang['setup_couldnt_install']."</p>"; |
|
| 198 | + echo "<p>".$_lang['installation_error_occured']."<br /><br />"; |
|
| 199 | 199 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 200 | - echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />"; |
|
| 200 | + echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />"; |
|
| 201 | 201 | } |
| 202 | 202 | echo "</p>"; |
| 203 | - echo "<p>" . $_lang['some_tables_not_updated'] . "</p>"; |
|
| 203 | + echo "<p>".$_lang['some_tables_not_updated']."</p>"; |
|
| 204 | 204 | return; |
| 205 | 205 | } else { |
| 206 | 206 | echo '<span class="ok">'.$_lang['ok']."</span></p>"; |
@@ -210,12 +210,12 @@ discard block |
||
| 210 | 210 | // custom or not |
| 211 | 211 | if (file_exists(dirname(__FILE__)."/../../assets/cache/siteManager.php")) { |
| 212 | 212 | $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");'; |
| 213 | -}else{ |
|
| 213 | +} else { |
|
| 214 | 214 | $mgrdir = 'define(\'MGR_DIR\', \'manager\');'; |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | // write the config.inc.php file if new installation |
| 218 | -echo "<p>" . $_lang['writing_config_file']; |
|
| 218 | +echo "<p>".$_lang['writing_config_file']; |
|
| 219 | 219 | |
| 220 | 220 | $confph = array(); |
| 221 | 221 | $confph['database_server'] = $database_server; |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | $chmodSuccess = @chmod($filename, 0404); |
| 248 | 248 | |
| 249 | 249 | if ($configFileFailed == true) { |
| 250 | - echo '<span class="notok">' . $_lang['failed'] . "</span></p>"; |
|
| 250 | + echo '<span class="notok">'.$_lang['failed']."</span></p>"; |
|
| 251 | 251 | $errors += 1; |
| 252 | 252 | ?> |
| 253 | 253 | <p><?php echo $_lang['cant_write_config_file']?><span class="mono"><?php echo MGR_DIR; ?>/includes/config.inc.php</span></p> |
@@ -264,35 +264,35 @@ discard block |
||
| 264 | 264 | // generate new site_id and set manager theme to default |
| 265 | 265 | if ($installMode == 0) { |
| 266 | 266 | $siteid = uniqid(''); |
| 267 | - mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')"); |
|
| 267 | + mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')"); |
|
| 268 | 268 | } else { |
| 269 | 269 | // update site_id if missing |
| 270 | - $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`" . $table_prefix . "system_settings` WHERE setting_name='site_id'"); |
|
| 270 | + $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`".$table_prefix."system_settings` WHERE setting_name='site_id'"); |
|
| 271 | 271 | if ($ds) { |
| 272 | 272 | $r = mysqli_fetch_assoc($ds); |
| 273 | 273 | $siteid = $r['setting_value']; |
| 274 | 274 | if ($siteid == '' || $siteid = 'MzGeQ2faT4Dw06+U49x3') { |
| 275 | 275 | $siteid = uniqid(''); |
| 276 | - mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')"); |
|
| 276 | + mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')"); |
|
| 277 | 277 | } |
| 278 | 278 | } |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | // Reset database for installation of demo-site |
| 282 | 282 | if ($installData && $moduleSQLDataFile && $moduleSQLResetFile) { |
| 283 | - echo "<p>" . $_lang['resetting_database']; |
|
| 283 | + echo "<p>".$_lang['resetting_database']; |
|
| 284 | 284 | $sqlParser->process($moduleSQLResetFile); |
| 285 | 285 | // display database results |
| 286 | 286 | if ($sqlParser->installFailed == true) { |
| 287 | 287 | $errors += 1; |
| 288 | - echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>"; |
|
| 289 | - echo "<p>" . $_lang['setup_couldnt_install'] . "</p>"; |
|
| 290 | - echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />"; |
|
| 288 | + echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>"; |
|
| 289 | + echo "<p>".$_lang['setup_couldnt_install']."</p>"; |
|
| 290 | + echo "<p>".$_lang['installation_error_occured']."<br /><br />"; |
|
| 291 | 291 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 292 | - echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />"; |
|
| 292 | + echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />"; |
|
| 293 | 293 | } |
| 294 | 294 | echo "</p>"; |
| 295 | - echo "<p>" . $_lang['some_tables_not_updated'] . "</p>"; |
|
| 295 | + echo "<p>".$_lang['some_tables_not_updated']."</p>"; |
|
| 296 | 296 | return; |
| 297 | 297 | } else { |
| 298 | 298 | echo '<span class="ok">'.$_lang['ok']."</span></p>"; |
@@ -301,11 +301,11 @@ discard block |
||
| 301 | 301 | |
| 302 | 302 | // Install Templates |
| 303 | 303 | if (isset ($_POST['template']) || $installData) { |
| 304 | - echo "<h3>" . $_lang['templates'] . ":</h3> "; |
|
| 304 | + echo "<h3>".$_lang['templates'].":</h3> "; |
|
| 305 | 305 | $selTemplates = $_POST['template']; |
| 306 | 306 | foreach ($moduleTemplates as $k=>$moduleTemplate) { |
| 307 | 307 | $installSample = in_array('sample', $moduleTemplate[6]) && $installData == 1; |
| 308 | - if($installSample || in_array($k, $selTemplates)) { |
|
| 308 | + if ($installSample || in_array($k, $selTemplates)) { |
|
| 309 | 309 | $name = mysqli_real_escape_string($conn, $moduleTemplate[0]); |
| 310 | 310 | $desc = mysqli_real_escape_string($conn, $moduleTemplate[1]); |
| 311 | 311 | $category = mysqli_real_escape_string($conn, $moduleTemplate[4]); |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | $filecontent = $moduleTemplate[3]; |
| 314 | 314 | $save_sql_id_as = $moduleTemplate[7]; // Nessecary for demo-site |
| 315 | 315 | if (!file_exists($filecontent)) { |
| 316 | - echo "<p> $name: <span class=\"notok\">" . $_lang['unable_install_template'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>"; |
|
| 316 | + echo "<p> $name: <span class=\"notok\">".$_lang['unable_install_template']." '$filecontent' ".$_lang['not_found'].".</span></p>"; |
|
| 317 | 317 | } else { |
| 318 | 318 | // Create the category if it does not already exist |
| 319 | 319 | $category_id = getCreateDbCategory($category, $sqlParser); |
@@ -323,31 +323,31 @@ discard block |
||
| 323 | 323 | $template = mysqli_real_escape_string($conn, $template); |
| 324 | 324 | |
| 325 | 325 | // See if the template already exists |
| 326 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'"); |
|
| 326 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name'"); |
|
| 327 | 327 | |
| 328 | 328 | if (mysqli_num_rows($rs)) { |
| 329 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked' WHERE templatename='$name' LIMIT 1;")) { |
|
| 329 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked' WHERE templatename='$name' LIMIT 1;")) { |
|
| 330 | 330 | $errors += 1; |
| 331 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 331 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 332 | 332 | return; |
| 333 | 333 | } |
| 334 | - if(!is_null($save_sql_id_as)) { |
|
| 334 | + if (!is_null($save_sql_id_as)) { |
|
| 335 | 335 | $sql_id = @mysqli_insert_id($sqlParser->conn); |
| 336 | - if(!$sql_id) { |
|
| 337 | - $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name' LIMIT 1;")); |
|
| 336 | + if (!$sql_id) { |
|
| 337 | + $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name' LIMIT 1;")); |
|
| 338 | 338 | $sql_id = $idQuery['id']; |
| 339 | 339 | } |
| 340 | 340 | $custom_placeholders[$save_sql_id_as] = $sql_id; |
| 341 | 341 | } |
| 342 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 342 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 343 | 343 | } else { |
| 344 | - if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) { |
|
| 344 | + if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) { |
|
| 345 | 345 | $errors += 1; |
| 346 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 346 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 347 | 347 | return; |
| 348 | 348 | } |
| 349 | - if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn); |
|
| 350 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 349 | + if (!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn); |
|
| 350 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 351 | 351 | } |
| 352 | 352 | } |
| 353 | 353 | } |
@@ -356,11 +356,11 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | // Install Template Variables |
| 358 | 358 | if (isset ($_POST['tv']) || $installData) { |
| 359 | - echo "<h3>" . $_lang['tvs'] . ":</h3> "; |
|
| 359 | + echo "<h3>".$_lang['tvs'].":</h3> "; |
|
| 360 | 360 | $selTVs = $_POST['tv']; |
| 361 | 361 | foreach ($moduleTVs as $k=>$moduleTV) { |
| 362 | 362 | $installSample = in_array('sample', $moduleTV[12]) && $installData == 1; |
| 363 | - if($installSample || in_array($k, $selTVs)) { |
|
| 363 | + if ($installSample || in_array($k, $selTVs)) { |
|
| 364 | 364 | $name = mysqli_real_escape_string($conn, $moduleTV[0]); |
| 365 | 365 | $caption = mysqli_real_escape_string($conn, $moduleTV[1]); |
| 366 | 366 | $desc = mysqli_real_escape_string($conn, $moduleTV[2]); |
@@ -378,25 +378,25 @@ discard block |
||
| 378 | 378 | // Create the category if it does not already exist |
| 379 | 379 | $category = getCreateDbCategory($category, $sqlParser); |
| 380 | 380 | |
| 381 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_tmplvars` WHERE name='$name'"); |
|
| 381 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name'"); |
|
| 382 | 382 | if (mysqli_num_rows($rs)) { |
| 383 | 383 | $insert = true; |
| 384 | - while($row = mysqli_fetch_assoc($rs)) { |
|
| 385 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) { |
|
| 386 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 384 | + while ($row = mysqli_fetch_assoc($rs)) { |
|
| 385 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) { |
|
| 386 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 387 | 387 | return; |
| 388 | 388 | } |
| 389 | 389 | $insert = false; |
| 390 | 390 | } |
| 391 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 391 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 392 | 392 | } else { |
| 393 | 393 | //$q = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',(SELECT (CASE COUNT(*) WHEN 0 THEN 0 ELSE `id` END) `id` FROM $dbase.`" . $table_prefix . "categories` WHERE `category` = '$category'),$locked,'$input_options','$output_widget','$output_widget_params','$input_default');"; |
| 394 | - $q = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');"; |
|
| 394 | + $q = "INSERT INTO $dbase.`".$table_prefix."site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');"; |
|
| 395 | 395 | if (!mysqli_query($sqlParser->conn, $q)) { |
| 396 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 396 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 397 | 397 | return; |
| 398 | 398 | } |
| 399 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 399 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 400 | 400 | } |
| 401 | 401 | |
| 402 | 402 | // add template assignments |
@@ -405,10 +405,10 @@ discard block |
||
| 405 | 405 | if (count($assignments) > 0) { |
| 406 | 406 | |
| 407 | 407 | // remove existing tv -> template assignments |
| 408 | - $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';"); |
|
| 408 | + $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';"); |
|
| 409 | 409 | $row = mysqli_fetch_assoc($ds); |
| 410 | 410 | $id = $row["id"]; |
| 411 | - mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_tmplvar_templates` WHERE tmplvarid = \'' . $id . '\''); |
|
| 411 | + mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_tmplvar_templates` WHERE tmplvarid = \''.$id.'\''); |
|
| 412 | 412 | |
| 413 | 413 | // add tv -> template assignments |
| 414 | 414 | foreach ($assignments as $assignment) { |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | if ($ds && $ts) { |
| 418 | 418 | $tRow = mysqli_fetch_assoc($ts); |
| 419 | 419 | $templateId = $tRow['id']; |
| 420 | - mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"); |
|
| 420 | + mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"); |
|
| 421 | 421 | } |
| 422 | 422 | } |
| 423 | 423 | } |
@@ -427,12 +427,12 @@ discard block |
||
| 427 | 427 | |
| 428 | 428 | // Install Chunks |
| 429 | 429 | if (isset ($_POST['chunk']) || $installData) { |
| 430 | - echo "<h3>" . $_lang['chunks'] . ":</h3> "; |
|
| 430 | + echo "<h3>".$_lang['chunks'].":</h3> "; |
|
| 431 | 431 | $selChunks = $_POST['chunk']; |
| 432 | 432 | foreach ($moduleChunks as $k=>$moduleChunk) { |
| 433 | 433 | $installSample = in_array('sample', $moduleChunk[5]) && $installData == 1; |
| 434 | 434 | $count_new_name = 0; |
| 435 | - if($installSample || in_array($k, $selChunks)) { |
|
| 435 | + if ($installSample || in_array($k, $selChunks)) { |
|
| 436 | 436 | |
| 437 | 437 | $name = mysqli_real_escape_string($conn, $moduleChunk[0]); |
| 438 | 438 | $desc = mysqli_real_escape_string($conn, $moduleChunk[1]); |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | $filecontent = $moduleChunk[2]; |
| 442 | 442 | |
| 443 | 443 | if (!file_exists($filecontent)) |
| 444 | - echo "<p> $name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>"; |
|
| 444 | + echo "<p> $name: <span class=\"notok\">".$_lang['unable_install_chunk']." '$filecontent' ".$_lang['not_found'].".</span></p>"; |
|
| 445 | 445 | else { |
| 446 | 446 | |
| 447 | 447 | // Create the category if it does not already exist |
@@ -449,31 +449,31 @@ discard block |
||
| 449 | 449 | |
| 450 | 450 | $chunk = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', file_get_contents($filecontent), 1); |
| 451 | 451 | $chunk = mysqli_real_escape_string($conn, $chunk); |
| 452 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$name'"); |
|
| 452 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$name'"); |
|
| 453 | 453 | $count_original_name = mysqli_num_rows($rs); |
| 454 | - if($overwrite == 'false') { |
|
| 455 | - $newname = $name . '-' . str_replace('.', '_', $modx_version); |
|
| 456 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$newname'"); |
|
| 454 | + if ($overwrite == 'false') { |
|
| 455 | + $newname = $name.'-'.str_replace('.', '_', $modx_version); |
|
| 456 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$newname'"); |
|
| 457 | 457 | $count_new_name = mysqli_num_rows($rs); |
| 458 | 458 | } |
| 459 | 459 | $update = $count_original_name > 0 && $overwrite == 'true'; |
| 460 | 460 | if ($update) { |
| 461 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 461 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 462 | 462 | $errors += 1; |
| 463 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 463 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 464 | 464 | return; |
| 465 | 465 | } |
| 466 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 467 | - } elseif($count_new_name == 0) { |
|
| 468 | - if($count_original_name > 0 && $overwrite == 'false') { |
|
| 466 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 467 | + } elseif ($count_new_name == 0) { |
|
| 468 | + if ($count_original_name > 0 && $overwrite == 'false') { |
|
| 469 | 469 | $name = $newname; |
| 470 | 470 | } |
| 471 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) { |
|
| 471 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) { |
|
| 472 | 472 | $errors += 1; |
| 473 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 473 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 474 | 474 | return; |
| 475 | 475 | } |
| 476 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 476 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 477 | 477 | } |
| 478 | 478 | } |
| 479 | 479 | } |
@@ -482,11 +482,11 @@ discard block |
||
| 482 | 482 | |
| 483 | 483 | // Install Modules |
| 484 | 484 | if (isset ($_POST['module']) || $installData) { |
| 485 | - echo "<h3>" . $_lang['modules'] . ":</h3> "; |
|
| 485 | + echo "<h3>".$_lang['modules'].":</h3> "; |
|
| 486 | 486 | $selModules = $_POST['module']; |
| 487 | 487 | foreach ($moduleModules as $k=>$moduleModule) { |
| 488 | 488 | $installSample = in_array('sample', $moduleModule[7]) && $installData == 1; |
| 489 | - if($installSample || in_array($k, $selModules)) { |
|
| 489 | + if ($installSample || in_array($k, $selModules)) { |
|
| 490 | 490 | $name = mysqli_real_escape_string($conn, $moduleModule[0]); |
| 491 | 491 | $desc = mysqli_real_escape_string($conn, $moduleModule[1]); |
| 492 | 492 | $filecontent = $moduleModule[2]; |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | $shared = mysqli_real_escape_string($conn, $moduleModule[5]); |
| 496 | 496 | $category = mysqli_real_escape_string($conn, $moduleModule[6]); |
| 497 | 497 | if (!file_exists($filecontent)) |
| 498 | - echo "<p> $name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>"; |
|
| 498 | + echo "<p> $name: <span class=\"notok\">".$_lang['unable_install_module']." '$filecontent' ".$_lang['not_found'].".</span></p>"; |
|
| 499 | 499 | else { |
| 500 | 500 | |
| 501 | 501 | // Create the category if it does not already exist |
@@ -504,22 +504,22 @@ discard block |
||
| 504 | 504 | $module = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2)); |
| 505 | 505 | // $module = removeDocblock($module, 'module'); // Modules have no fileBinding, keep docblock for info-tab |
| 506 | 506 | $module = mysqli_real_escape_string($conn, $module); |
| 507 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_modules` WHERE name='$name'"); |
|
| 507 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_modules` WHERE name='$name'"); |
|
| 508 | 508 | if (mysqli_num_rows($rs)) { |
| 509 | 509 | $row = mysqli_fetch_assoc($rs); |
| 510 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 511 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 512 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 510 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 511 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 512 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 513 | 513 | return; |
| 514 | 514 | } |
| 515 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 515 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 516 | 516 | } else { |
| 517 | 517 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 518 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) { |
|
| 519 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 518 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) { |
|
| 519 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 520 | 520 | return; |
| 521 | 521 | } |
| 522 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 522 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 523 | 523 | } |
| 524 | 524 | } |
| 525 | 525 | } |
@@ -528,11 +528,11 @@ discard block |
||
| 528 | 528 | |
| 529 | 529 | // Install Plugins |
| 530 | 530 | if (isset ($_POST['plugin']) || $installData) { |
| 531 | - echo "<h3>" . $_lang['plugins'] . ":</h3> "; |
|
| 531 | + echo "<h3>".$_lang['plugins'].":</h3> "; |
|
| 532 | 532 | $selPlugs = $_POST['plugin']; |
| 533 | 533 | foreach ($modulePlugins as $k=>$modulePlugin) { |
| 534 | 534 | $installSample = in_array('sample', $modulePlugin[8]) && $installData == 1; |
| 535 | - if($installSample || in_array($k, $selPlugs)) { |
|
| 535 | + if ($installSample || in_array($k, $selPlugs)) { |
|
| 536 | 536 | $name = mysqli_real_escape_string($conn, $modulePlugin[0]); |
| 537 | 537 | $desc = mysqli_real_escape_string($conn, $modulePlugin[1]); |
| 538 | 538 | $filecontent = $modulePlugin[2]; |
@@ -542,17 +542,17 @@ discard block |
||
| 542 | 542 | $category = mysqli_real_escape_string($conn, $modulePlugin[6]); |
| 543 | 543 | $leg_names = ''; |
| 544 | 544 | $disabled = $modulePlugin[9]; |
| 545 | - if(array_key_exists(7, $modulePlugin)) { |
|
| 545 | + if (array_key_exists(7, $modulePlugin)) { |
|
| 546 | 546 | // parse comma-separated legacy names and prepare them for sql IN clause |
| 547 | - $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'"; |
|
| 547 | + $leg_names = "'".implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7])))."'"; |
|
| 548 | 548 | } |
| 549 | 549 | if (!file_exists($filecontent)) |
| 550 | - echo "<p> $name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>"; |
|
| 550 | + echo "<p> $name: <span class=\"notok\">".$_lang['unable_install_plugin']." '$filecontent' ".$_lang['not_found'].".</span></p>"; |
|
| 551 | 551 | else { |
| 552 | 552 | |
| 553 | 553 | // disable legacy versions based on legacy_names provided |
| 554 | - if(!empty($leg_names)) { |
|
| 555 | - $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 554 | + if (!empty($leg_names)) { |
|
| 555 | + $update_query = "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 556 | 556 | $rs = mysqli_query($sqlParser->conn, $update_query); |
| 557 | 557 | } |
| 558 | 558 | |
@@ -562,50 +562,50 @@ discard block |
||
| 562 | 562 | $plugin = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2)); |
| 563 | 563 | $plugin = removeDocblock($plugin, 'plugin'); |
| 564 | 564 | $plugin = mysqli_real_escape_string($conn, $plugin); |
| 565 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='$name'"); |
|
| 565 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name'"); |
|
| 566 | 566 | if (mysqli_num_rows($rs)) { |
| 567 | 567 | $insert = true; |
| 568 | - while($row = mysqli_fetch_assoc($rs)) { |
|
| 569 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 570 | - if($row['description'] == $desc){ |
|
| 571 | - if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 572 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 568 | + while ($row = mysqli_fetch_assoc($rs)) { |
|
| 569 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 570 | + if ($row['description'] == $desc) { |
|
| 571 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 572 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 573 | 573 | return; |
| 574 | 574 | } |
| 575 | 575 | $insert = false; |
| 576 | 576 | } else { |
| 577 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 577 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 578 | 578 | echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
| 579 | 579 | return; |
| 580 | 580 | } |
| 581 | 581 | } |
| 582 | 582 | } |
| 583 | - if($insert === true) { |
|
| 584 | - $properties = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 585 | - if(!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) { |
|
| 583 | + if ($insert === true) { |
|
| 584 | + $properties = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 585 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) { |
|
| 586 | 586 | echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
| 587 | 587 | return; |
| 588 | 588 | } |
| 589 | 589 | } |
| 590 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 590 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 591 | 591 | } else { |
| 592 | 592 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 593 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) { |
|
| 594 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 593 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) { |
|
| 594 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 595 | 595 | return; |
| 596 | 596 | } |
| 597 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 597 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 598 | 598 | } |
| 599 | 599 | // add system events |
| 600 | 600 | if (count($events) > 0) { |
| 601 | - $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';"); |
|
| 601 | + $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';"); |
|
| 602 | 602 | if ($ds) { |
| 603 | 603 | $row = mysqli_fetch_assoc($ds); |
| 604 | 604 | $id = $row["id"]; |
| 605 | 605 | // remove existing events |
| 606 | - mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_plugin_events` WHERE pluginid = \'' . $id . '\''); |
|
| 606 | + mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_plugin_events` WHERE pluginid = \''.$id.'\''); |
|
| 607 | 607 | // add new events |
| 608 | - mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`" . $table_prefix . "system_eventnames` se WHERE name IN ('" . implode("','", $events) . "')"); |
|
| 608 | + mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`".$table_prefix."system_eventnames` se WHERE name IN ('".implode("','", $events)."')"); |
|
| 609 | 609 | } |
| 610 | 610 | } |
| 611 | 611 | } |
@@ -615,18 +615,18 @@ discard block |
||
| 615 | 615 | |
| 616 | 616 | // Install Snippets |
| 617 | 617 | if (isset ($_POST['snippet']) || $installData) { |
| 618 | - echo "<h3>" . $_lang['snippets'] . ":</h3> "; |
|
| 618 | + echo "<h3>".$_lang['snippets'].":</h3> "; |
|
| 619 | 619 | $selSnips = $_POST['snippet']; |
| 620 | 620 | foreach ($moduleSnippets as $k=>$moduleSnippet) { |
| 621 | 621 | $installSample = in_array('sample', $moduleSnippet[5]) && $installData == 1; |
| 622 | - if($installSample || in_array($k, $selSnips)) { |
|
| 622 | + if ($installSample || in_array($k, $selSnips)) { |
|
| 623 | 623 | $name = mysqli_real_escape_string($conn, $moduleSnippet[0]); |
| 624 | 624 | $desc = mysqli_real_escape_string($conn, $moduleSnippet[1]); |
| 625 | 625 | $filecontent = $moduleSnippet[2]; |
| 626 | 626 | $properties = $moduleSnippet[3]; |
| 627 | 627 | $category = mysqli_real_escape_string($conn, $moduleSnippet[4]); |
| 628 | 628 | if (!file_exists($filecontent)) |
| 629 | - echo "<p> $name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>"; |
|
| 629 | + echo "<p> $name: <span class=\"notok\">".$_lang['unable_install_snippet']." '$filecontent' ".$_lang['not_found'].".</span></p>"; |
|
| 630 | 630 | else { |
| 631 | 631 | |
| 632 | 632 | // Create the category if it does not already exist |
@@ -635,22 +635,22 @@ discard block |
||
| 635 | 635 | $snippet = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent))); |
| 636 | 636 | $snippet = removeDocblock($snippet, 'snippet'); |
| 637 | 637 | $snippet = mysqli_real_escape_string($conn, $snippet); |
| 638 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_snippets` WHERE name='$name'"); |
|
| 638 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_snippets` WHERE name='$name'"); |
|
| 639 | 639 | if (mysqli_num_rows($rs)) { |
| 640 | 640 | $row = mysqli_fetch_assoc($rs); |
| 641 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 642 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 643 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 641 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 642 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 643 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 644 | 644 | return; |
| 645 | 645 | } |
| 646 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 646 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 647 | 647 | } else { |
| 648 | 648 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 649 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
|
| 650 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 649 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
|
| 650 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 651 | 651 | return; |
| 652 | 652 | } |
| 653 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 653 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 654 | 654 | } |
| 655 | 655 | } |
| 656 | 656 | } |
@@ -659,24 +659,24 @@ discard block |
||
| 659 | 659 | |
| 660 | 660 | // Install demo-site |
| 661 | 661 | if ($installData && $moduleSQLDataFile) { |
| 662 | - echo "<p>" . $_lang['installing_demo_site']; |
|
| 662 | + echo "<p>".$_lang['installing_demo_site']; |
|
| 663 | 663 | $sqlParser->process($moduleSQLDataFile); |
| 664 | 664 | // display database results |
| 665 | 665 | if ($sqlParser->installFailed == true) { |
| 666 | 666 | $errors += 1; |
| 667 | - echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>"; |
|
| 668 | - echo "<p>" . $_lang['setup_couldnt_install'] . "</p>"; |
|
| 669 | - echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />"; |
|
| 667 | + echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>"; |
|
| 668 | + echo "<p>".$_lang['setup_couldnt_install']."</p>"; |
|
| 669 | + echo "<p>".$_lang['installation_error_occured']."<br /><br />"; |
|
| 670 | 670 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 671 | - echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />"; |
|
| 671 | + echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />"; |
|
| 672 | 672 | } |
| 673 | 673 | echo "</p>"; |
| 674 | - echo "<p>" . $_lang['some_tables_not_updated'] . "</p>"; |
|
| 674 | + echo "<p>".$_lang['some_tables_not_updated']."</p>"; |
|
| 675 | 675 | return; |
| 676 | 676 | } else { |
| 677 | 677 | $sql = sprintf("SELECT id FROM `%ssite_templates` WHERE templatename='EVO startup - Bootstrap'", $sqlParser->prefix); |
| 678 | 678 | $rs = mysqli_query($sqlParser->conn, $sql); |
| 679 | - if(mysqli_num_rows($rs)) { |
|
| 679 | + if (mysqli_num_rows($rs)) { |
|
| 680 | 680 | $row = mysqli_fetch_assoc($rs); |
| 681 | 681 | $sql = sprintf('UPDATE `%ssite_content` SET template=%s WHERE template=4', $sqlParser->prefix, $row['id']); |
| 682 | 682 | mysqli_query($sqlParser->conn, $sql); |
@@ -687,9 +687,9 @@ discard block |
||
| 687 | 687 | |
| 688 | 688 | // Install Dependencies |
| 689 | 689 | foreach ($moduleDependencies as $dependency) { |
| 690 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"'); |
|
| 690 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM '.$dbase.'`'.$sqlParser->prefix.'site_modules` WHERE name="'.$dependency['module'].'"'); |
|
| 691 | 691 | if (!$ds) { |
| 692 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 692 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 693 | 693 | return; |
| 694 | 694 | } else { |
| 695 | 695 | $row = mysqli_fetch_assoc($ds); |
@@ -697,37 +697,37 @@ discard block |
||
| 697 | 697 | $moduleGuid = $row["guid"]; |
| 698 | 698 | } |
| 699 | 699 | // get extra id |
| 700 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"'); |
|
| 700 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE '.$dependency['column'].'="'.$dependency['name'].'"'); |
|
| 701 | 701 | if (!$ds) { |
| 702 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 702 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 703 | 703 | return; |
| 704 | 704 | } else { |
| 705 | 705 | $row = mysqli_fetch_assoc($ds); |
| 706 | 706 | $extraId = $row["id"]; |
| 707 | 707 | } |
| 708 | 708 | // setup extra as module dependency |
| 709 | - $ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1'); |
|
| 709 | + $ds = mysqli_query($sqlParser->conn, 'SELECT module FROM '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type'].' LIMIT 1'); |
|
| 710 | 710 | if (!$ds) { |
| 711 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 711 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 712 | 712 | return; |
| 713 | 713 | } else { |
| 714 | 714 | if (mysqli_num_rows($ds) === 0) { |
| 715 | - mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')'); |
|
| 716 | - echo '<p> ' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_create'] . '</span></p>'; |
|
| 715 | + mysqli_query($sqlParser->conn, 'INSERT INTO '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` (module, resource, type) VALUES('.$moduleId.','.$extraId.','.$dependency['type'].')'); |
|
| 716 | + echo '<p> '.$dependency['module'].' Module: <span class="ok">'.$_lang['depedency_create'].'</span></p>'; |
|
| 717 | 717 | } else { |
| 718 | - mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']); |
|
| 719 | - echo '<p> ' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_update'] . '</span></p>'; |
|
| 718 | + mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` SET module = '.$moduleId.', resource = '.$extraId.', type = '.$dependency['type'].' WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type']); |
|
| 719 | + echo '<p> '.$dependency['module'].' Module: <span class="ok">'.$_lang['depedency_update'].'</span></p>'; |
|
| 720 | 720 | } |
| 721 | 721 | if ($dependency['type'] == 30 || $dependency['type'] == 40) { |
| 722 | 722 | // set extra guid for plugins and snippets |
| 723 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1'); |
|
| 723 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE id='.$extraId.' LIMIT 1'); |
|
| 724 | 724 | if (!$ds) { |
| 725 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 725 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 726 | 726 | return; |
| 727 | 727 | } else { |
| 728 | 728 | if (mysqli_num_rows($ds) != 0) { |
| 729 | - mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId); |
|
| 730 | - echo '<p> ' . $dependency['name'] . ': <span class="ok">' . $_lang['guid_set'] . '</span></p>'; |
|
| 729 | + mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` SET moduleguid = '.$moduleGuid.' WHERE id='.$extraId); |
|
| 730 | + echo '<p> '.$dependency['name'].': <span class="ok">'.$_lang['guid_set'].'</span></p>'; |
|
| 731 | 731 | } |
| 732 | 732 | } |
| 733 | 733 | } |
@@ -736,7 +736,7 @@ discard block |
||
| 736 | 736 | |
| 737 | 737 | // call back function |
| 738 | 738 | if ($callBackFnc != "") |
| 739 | - $callBackFnc ($sqlParser); |
|
| 739 | + $callBackFnc($sqlParser); |
|
| 740 | 740 | |
| 741 | 741 | // Setup the MODX API -- needed for the cache processor |
| 742 | 742 | define('MODX_API_MODE', true); |
@@ -771,20 +771,20 @@ discard block |
||
| 771 | 771 | } |
| 772 | 772 | |
| 773 | 773 | // setup completed! |
| 774 | -echo "<p><b>" . $_lang['installation_successful'] . "</b></p>"; |
|
| 775 | -echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>"; |
|
| 774 | +echo "<p><b>".$_lang['installation_successful']."</b></p>"; |
|
| 775 | +echo "<p>".$_lang['to_log_into_content_manager']."</p>"; |
|
| 776 | 776 | if ($installMode == 0) { |
| 777 | - echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />" . $_lang['installation_note'] . "</p>"; |
|
| 777 | + echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />".$_lang['installation_note']."</p>"; |
|
| 778 | 778 | } else { |
| 779 | - echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />" . $_lang['upgrade_note'] . "</p>"; |
|
| 779 | + echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />".$_lang['upgrade_note']."</p>"; |
|
| 780 | 780 | } |
| 781 | 781 | |
| 782 | 782 | // Property Update function |
| 783 | -function propUpdate($new,$old){ |
|
| 783 | +function propUpdate($new, $old){ |
|
| 784 | 784 | $newArr = parseProperties($new); |
| 785 | 785 | $oldArr = parseProperties($old); |
| 786 | - foreach ($oldArr as $k => $v){ |
|
| 787 | - if (isset($v['0']['options'])){ |
|
| 786 | + foreach ($oldArr as $k => $v) { |
|
| 787 | + if (isset($v['0']['options'])) { |
|
| 788 | 788 | $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options']; |
| 789 | 789 | } |
| 790 | 790 | } |
@@ -794,30 +794,30 @@ discard block |
||
| 794 | 794 | return $return; |
| 795 | 795 | } |
| 796 | 796 | |
| 797 | -function parseProperties($propertyString, $json=false) { |
|
| 798 | - $propertyString = str_replace('{}', '', $propertyString ); |
|
| 799 | - $propertyString = str_replace('} {', ',', $propertyString ); |
|
| 797 | +function parseProperties($propertyString, $json = false){ |
|
| 798 | + $propertyString = str_replace('{}', '', $propertyString); |
|
| 799 | + $propertyString = str_replace('} {', ',', $propertyString); |
|
| 800 | 800 | |
| 801 | - if(empty($propertyString)) return array(); |
|
| 802 | - if($propertyString=='{}' || $propertyString=='[]') return array(); |
|
| 801 | + if (empty($propertyString)) return array(); |
|
| 802 | + if ($propertyString == '{}' || $propertyString == '[]') return array(); |
|
| 803 | 803 | |
| 804 | 804 | $jsonFormat = isJson($propertyString, true); |
| 805 | 805 | $property = array(); |
| 806 | 806 | // old format |
| 807 | - if ( $jsonFormat === false) { |
|
| 808 | - $props= explode('&', $propertyString); |
|
| 807 | + if ($jsonFormat === false) { |
|
| 808 | + $props = explode('&', $propertyString); |
|
| 809 | 809 | foreach ($props as $prop) { |
| 810 | 810 | $prop = trim($prop); |
| 811 | - if($prop === '') { |
|
| 811 | + if ($prop === '') { |
|
| 812 | 812 | continue; |
| 813 | 813 | } |
| 814 | 814 | |
| 815 | 815 | $arr = explode(';', $prop); |
| 816 | - if( ! is_array($arr)) { |
|
| 816 | + if (!is_array($arr)) { |
|
| 817 | 817 | $arr = array(); |
| 818 | 818 | } |
| 819 | 819 | $key = explode('=', isset($arr[0]) ? $arr[0] : ''); |
| 820 | - if( ! is_array($key) || empty($key[0])) { |
|
| 820 | + if (!is_array($key) || empty($key[0])) { |
|
| 821 | 821 | continue; |
| 822 | 822 | } |
| 823 | 823 | |
@@ -841,7 +841,7 @@ discard block |
||
| 841 | 841 | |
| 842 | 842 | } |
| 843 | 843 | // new json-format |
| 844 | - } else if(!empty($jsonFormat)){ |
|
| 844 | + } else if (!empty($jsonFormat)) { |
|
| 845 | 845 | $property = $jsonFormat; |
| 846 | 846 | } |
| 847 | 847 | if ($json) { |
@@ -851,25 +851,25 @@ discard block |
||
| 851 | 851 | return $property; |
| 852 | 852 | } |
| 853 | 853 | |
| 854 | -function isJson($string, $returnData=false) { |
|
| 854 | +function isJson($string, $returnData = false){ |
|
| 855 | 855 | $data = json_decode($string, true); |
| 856 | 856 | return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false; |
| 857 | 857 | } |
| 858 | 858 | |
| 859 | -function getCreateDbCategory($category, $sqlParser) { |
|
| 859 | +function getCreateDbCategory($category, $sqlParser){ |
|
| 860 | 860 | $dbase = $sqlParser->dbname; |
| 861 | - $dbase = '`' . trim($dbase,'`') . '`'; |
|
| 861 | + $dbase = '`'.trim($dbase, '`').'`'; |
|
| 862 | 862 | $table_prefix = $sqlParser->prefix; |
| 863 | 863 | $category_id = 0; |
| 864 | - if(!empty($category)) { |
|
| 864 | + if (!empty($category)) { |
|
| 865 | 865 | $category = mysqli_real_escape_string($sqlParser->conn, $category); |
| 866 | 866 | $rs = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."categories` WHERE category = '".$category."'"); |
| 867 | - if(mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) { |
|
| 867 | + if (mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) { |
|
| 868 | 868 | $category_id = $row['id']; |
| 869 | 869 | } else { |
| 870 | 870 | $q = "INSERT INTO $dbase.`".$table_prefix."categories` (`category`) VALUES ('{$category}');"; |
| 871 | 871 | $rs = mysqli_query($sqlParser->conn, $q); |
| 872 | - if($rs) { |
|
| 872 | + if ($rs) { |
|
| 873 | 873 | $category_id = mysqli_insert_id($sqlParser->conn); |
| 874 | 874 | } |
| 875 | 875 | } |
@@ -878,12 +878,12 @@ discard block |
||
| 878 | 878 | } |
| 879 | 879 | |
| 880 | 880 | // Remove installer Docblock only from components using plugin FileSource / fileBinding |
| 881 | -function removeDocblock($code, $type) { |
|
| 881 | +function removeDocblock($code, $type){ |
|
| 882 | 882 | |
| 883 | 883 | $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1); |
| 884 | 884 | |
| 885 | 885 | // Procedure taken from plugin.filesource.php |
| 886 | - switch($type) { |
|
| 886 | + switch ($type) { |
|
| 887 | 887 | case 'snippet': |
| 888 | 888 | $elm_name = 'snippets'; |
| 889 | 889 | $include = 'return require'; |
@@ -899,7 +899,7 @@ discard block |
||
| 899 | 899 | default: |
| 900 | 900 | return $cleaned; |
| 901 | 901 | }; |
| 902 | - if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') |
|
| 902 | + if (substr(trim($cleaned), 0, $count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') |
|
| 903 | 903 | return $cleaned; |
| 904 | 904 | |
| 905 | 905 | // fileBinding not found - return code incl docblock |
@@ -1,33 +1,32 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | //:: EVO Installer Setup file |
| 3 | 3 | //::::::::::::::::::::::::::::::::::::::::: |
| 4 | -if (is_file($base_path . 'assets/cache/siteManager.php')) { |
|
| 5 | - include_once($base_path . 'assets/cache/siteManager.php'); |
|
| 4 | +if (is_file($base_path.'assets/cache/siteManager.php')) { |
|
| 5 | + include_once($base_path.'assets/cache/siteManager.php'); |
|
| 6 | 6 | } |
| 7 | -if(!defined('MGR_DIR')) define('MGR_DIR', 'manager'); |
|
| 7 | +if (!defined('MGR_DIR')) define('MGR_DIR', 'manager'); |
|
| 8 | 8 | |
| 9 | 9 | require_once('../'.MGR_DIR.'/includes/version.inc.php'); |
| 10 | 10 | |
| 11 | -$chunkPath = $base_path .'install/assets/chunks'; |
|
| 12 | -$snippetPath = $base_path .'install/assets/snippets'; |
|
| 13 | -$pluginPath = $base_path .'install/assets/plugins'; |
|
| 14 | -$modulePath = $base_path .'install/assets/modules'; |
|
| 15 | -$templatePath = $base_path .'install/assets/templates'; |
|
| 16 | -$tvPath = $base_path .'install/assets/tvs'; |
|
| 11 | +$chunkPath = $base_path.'install/assets/chunks'; |
|
| 12 | +$snippetPath = $base_path.'install/assets/snippets'; |
|
| 13 | +$pluginPath = $base_path.'install/assets/plugins'; |
|
| 14 | +$modulePath = $base_path.'install/assets/modules'; |
|
| 15 | +$templatePath = $base_path.'install/assets/templates'; |
|
| 16 | +$tvPath = $base_path.'install/assets/tvs'; |
|
| 17 | 17 | |
| 18 | 18 | // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category |
| 19 | 19 | $mt = &$moduleTemplates; |
| 20 | -if(is_dir($templatePath) && is_readable($templatePath)) { |
|
| 20 | +if (is_dir($templatePath) && is_readable($templatePath)) { |
|
| 21 | 21 | $d = dir($templatePath); |
| 22 | 22 | while (false !== ($tplfile = $d->read())) |
| 23 | 23 | { |
| 24 | - if(substr($tplfile, -4) != '.tpl') continue; |
|
| 24 | + if (substr($tplfile, -4) != '.tpl') continue; |
|
| 25 | 25 | $params = parse_docblock($templatePath, $tplfile); |
| 26 | - if(is_array($params) && (count($params)>0)) |
|
| 26 | + if (is_array($params) && (count($params) > 0)) |
|
| 27 | 27 | { |
| 28 | 28 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 29 | - $mt[] = array |
|
| 30 | - ( |
|
| 29 | + $mt[] = array( |
|
| 31 | 30 | $params['name'], |
| 32 | 31 | $description, |
| 33 | 32 | // Don't think this is gonna be used ... but adding it just in case 'type' |
@@ -45,12 +44,12 @@ discard block |
||
| 45 | 44 | |
| 46 | 45 | // setup Template Variable template files |
| 47 | 46 | $mtv = &$moduleTVs; |
| 48 | -if(is_dir($tvPath) && is_readable($tvPath)) { |
|
| 47 | +if (is_dir($tvPath) && is_readable($tvPath)) { |
|
| 49 | 48 | $d = dir($tvPath); |
| 50 | 49 | while (false !== ($tplfile = $d->read())) { |
| 51 | - if(substr($tplfile, -4) != '.tpl') continue; |
|
| 50 | + if (substr($tplfile, -4) != '.tpl') continue; |
|
| 52 | 51 | $params = parse_docblock($tvPath, $tplfile); |
| 53 | - if(is_array($params) && (count($params)>0)) { |
|
| 52 | + if (is_array($params) && (count($params) > 0)) { |
|
| 54 | 53 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 55 | 54 | $mtv[] = array( |
| 56 | 55 | $params['name'], |
@@ -62,9 +61,9 @@ discard block |
||
| 62 | 61 | $params['output_widget'], |
| 63 | 62 | $params['output_widget_params'], |
| 64 | 63 | "$templatePath/{$params['filename']}", /* not currently used */ |
| 65 | - $params['template_assignments']!="*"?$params['template_assignments']:implode(",",array_map(create_function('$v','return $v[0];'),$mt)), /* comma-separated list of template names */ |
|
| 64 | + $params['template_assignments'] != "*" ? $params['template_assignments'] : implode(",", array_map(create_function('$v', 'return $v[0];'), $mt)), /* comma-separated list of template names */ |
|
| 66 | 65 | $params['modx_category'], |
| 67 | - $params['lock_tv'], /* value should be 1 or 0 */ |
|
| 66 | + $params['lock_tv'], /* value should be 1 or 0 */ |
|
| 68 | 67 | array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false |
| 69 | 68 | ); |
| 70 | 69 | } |
@@ -74,14 +73,14 @@ discard block |
||
| 74 | 73 | |
| 75 | 74 | // setup chunks template files - array : name, description, type - 0:file or 1:content, file or content |
| 76 | 75 | $mc = &$moduleChunks; |
| 77 | -if(is_dir($chunkPath) && is_readable($chunkPath)) { |
|
| 76 | +if (is_dir($chunkPath) && is_readable($chunkPath)) { |
|
| 78 | 77 | $d = dir($chunkPath); |
| 79 | 78 | while (false !== ($tplfile = $d->read())) { |
| 80 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 79 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 81 | 80 | continue; |
| 82 | 81 | } |
| 83 | 82 | $params = parse_docblock($chunkPath, $tplfile); |
| 84 | - if(is_array($params) && count($params) > 0) { |
|
| 83 | + if (is_array($params) && count($params) > 0) { |
|
| 85 | 84 | $mc[] = array( |
| 86 | 85 | $params['name'], |
| 87 | 86 | $params['description'], |
@@ -97,14 +96,14 @@ discard block |
||
| 97 | 96 | |
| 98 | 97 | // setup snippets template files - array : name, description, type - 0:file or 1:content, file or content,properties |
| 99 | 98 | $ms = &$moduleSnippets; |
| 100 | -if(is_dir($snippetPath) && is_readable($snippetPath)) { |
|
| 99 | +if (is_dir($snippetPath) && is_readable($snippetPath)) { |
|
| 101 | 100 | $d = dir($snippetPath); |
| 102 | 101 | while (false !== ($tplfile = $d->read())) { |
| 103 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 102 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 104 | 103 | continue; |
| 105 | 104 | } |
| 106 | 105 | $params = parse_docblock($snippetPath, $tplfile); |
| 107 | - if(is_array($params) && count($params) > 0) { |
|
| 106 | + if (is_array($params) && count($params) > 0) { |
|
| 108 | 107 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 109 | 108 | $ms[] = array( |
| 110 | 109 | $params['name'], |
@@ -121,14 +120,14 @@ discard block |
||
| 121 | 120 | |
| 122 | 121 | // setup plugins template files - array : name, description, type - 0:file or 1:content, file or content,properties |
| 123 | 122 | $mp = &$modulePlugins; |
| 124 | -if(is_dir($pluginPath) && is_readable($pluginPath)) { |
|
| 123 | +if (is_dir($pluginPath) && is_readable($pluginPath)) { |
|
| 125 | 124 | $d = dir($pluginPath); |
| 126 | 125 | while (false !== ($tplfile = $d->read())) { |
| 127 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 126 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 128 | 127 | continue; |
| 129 | 128 | } |
| 130 | 129 | $params = parse_docblock($pluginPath, $tplfile); |
| 131 | - if(is_array($params) && count($params) > 0) { |
|
| 130 | + if (is_array($params) && count($params) > 0) { |
|
| 132 | 131 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 133 | 132 | $mp[] = array( |
| 134 | 133 | $params['name'], |
@@ -150,14 +149,14 @@ discard block |
||
| 150 | 149 | // setup modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid,enable_sharedparams |
| 151 | 150 | $mm = &$moduleModules; |
| 152 | 151 | $mdp = &$moduleDependencies; |
| 153 | -if(is_dir($modulePath) && is_readable($modulePath)) { |
|
| 152 | +if (is_dir($modulePath) && is_readable($modulePath)) { |
|
| 154 | 153 | $d = dir($modulePath); |
| 155 | 154 | while (false !== ($tplfile = $d->read())) { |
| 156 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 155 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 157 | 156 | continue; |
| 158 | 157 | } |
| 159 | 158 | $params = parse_docblock($modulePath, $tplfile); |
| 160 | - if(is_array($params) && count($params) > 0) { |
|
| 159 | + if (is_array($params) && count($params) > 0) { |
|
| 161 | 160 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 162 | 161 | $mm[] = array( |
| 163 | 162 | $params['name'], |
@@ -241,103 +240,103 @@ discard block |
||
| 241 | 240 | // setup callback function |
| 242 | 241 | $callBackFnc = "clean_up"; |
| 243 | 242 | |
| 244 | -function clean_up($sqlParser) { |
|
| 243 | +function clean_up($sqlParser){ |
|
| 245 | 244 | $ids = array(); |
| 246 | 245 | |
| 247 | 246 | // secure web documents - privateweb |
| 248 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1"); |
|
| 249 | - $sql = "SELECT DISTINCT sc.id |
|
| 247 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1"); |
|
| 248 | + $sql = "SELECT DISTINCT sc.id |
|
| 250 | 249 | FROM `".$sqlParser->prefix."site_content` sc |
| 251 | 250 | LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id |
| 252 | 251 | LEFT JOIN `".$sqlParser->prefix."webgroup_access` wga ON wga.documentgroup = dg.document_group |
| 253 | 252 | WHERE wga.id>0"; |
| 254 | - $ds = mysqli_query($sqlParser->conn,$sql); |
|
| 255 | - if(!$ds) { |
|
| 253 | + $ds = mysqli_query($sqlParser->conn, $sql); |
|
| 254 | + if (!$ds) { |
|
| 256 | 255 | echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn); |
| 257 | 256 | } |
| 258 | 257 | else { |
| 259 | - while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"]; |
|
| 260 | - if(count($ids)>0) { |
|
| 261 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")"); |
|
| 258 | + while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"]; |
|
| 259 | + if (count($ids) > 0) { |
|
| 260 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ", $ids).")"); |
|
| 262 | 261 | unset($ids); |
| 263 | 262 | } |
| 264 | 263 | } |
| 265 | 264 | |
| 266 | 265 | // secure manager documents privatemgr |
| 267 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1"); |
|
| 268 | - $sql = "SELECT DISTINCT sc.id |
|
| 266 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1"); |
|
| 267 | + $sql = "SELECT DISTINCT sc.id |
|
| 269 | 268 | FROM `".$sqlParser->prefix."site_content` sc |
| 270 | 269 | LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id |
| 271 | 270 | LEFT JOIN `".$sqlParser->prefix."membergroup_access` mga ON mga.documentgroup = dg.document_group |
| 272 | 271 | WHERE mga.id>0"; |
| 273 | - $ds = mysqli_query($sqlParser->conn,$sql); |
|
| 274 | - if(!$ds) { |
|
| 272 | + $ds = mysqli_query($sqlParser->conn, $sql); |
|
| 273 | + if (!$ds) { |
|
| 275 | 274 | echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn); |
| 276 | 275 | } |
| 277 | 276 | else { |
| 278 | - while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"]; |
|
| 279 | - if(count($ids)>0) { |
|
| 280 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")"); |
|
| 277 | + while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"]; |
|
| 278 | + if (count($ids) > 0) { |
|
| 279 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ", $ids).")"); |
|
| 281 | 280 | unset($ids); |
| 282 | 281 | } |
| 283 | 282 | } |
| 284 | 283 | } |
| 285 | 284 | |
| 286 | -function parse_docblock($element_dir, $filename) { |
|
| 285 | +function parse_docblock($element_dir, $filename){ |
|
| 287 | 286 | $params = array(); |
| 288 | - $fullpath = $element_dir . '/' . $filename; |
|
| 289 | - if(is_readable($fullpath)) { |
|
| 287 | + $fullpath = $element_dir.'/'.$filename; |
|
| 288 | + if (is_readable($fullpath)) { |
|
| 290 | 289 | $tpl = @fopen($fullpath, "r"); |
| 291 | - if($tpl) { |
|
| 290 | + if ($tpl) { |
|
| 292 | 291 | $params['filename'] = $filename; |
| 293 | 292 | $docblock_start_found = false; |
| 294 | 293 | $name_found = false; |
| 295 | 294 | $description_found = false; |
| 296 | 295 | |
| 297 | - while(!feof($tpl)) { |
|
| 296 | + while (!feof($tpl)) { |
|
| 298 | 297 | $line = fgets($tpl); |
| 299 | - if(!$docblock_start_found) { |
|
| 298 | + if (!$docblock_start_found) { |
|
| 300 | 299 | // find docblock start |
| 301 | - if(strpos($line, '/**') !== false) { |
|
| 300 | + if (strpos($line, '/**') !== false) { |
|
| 302 | 301 | $docblock_start_found = true; |
| 303 | 302 | } |
| 304 | 303 | continue; |
| 305 | - } elseif(!$name_found) { |
|
| 304 | + } elseif (!$name_found) { |
|
| 306 | 305 | // find name |
| 307 | 306 | $ma = null; |
| 308 | - if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 307 | + if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 309 | 308 | $params['name'] = trim($ma[1]); |
| 310 | 309 | $name_found = !empty($params['name']); |
| 311 | 310 | } |
| 312 | 311 | continue; |
| 313 | - } elseif(!$description_found) { |
|
| 312 | + } elseif (!$description_found) { |
|
| 314 | 313 | // find description |
| 315 | 314 | $ma = null; |
| 316 | - if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 315 | + if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 317 | 316 | $params['description'] = trim($ma[1]); |
| 318 | 317 | $description_found = !empty($params['description']); |
| 319 | 318 | } |
| 320 | 319 | continue; |
| 321 | 320 | } else { |
| 322 | 321 | $ma = null; |
| 323 | - if(preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) { |
|
| 322 | + if (preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) { |
|
| 324 | 323 | $param = trim($ma[1]); |
| 325 | 324 | $val = trim($ma[2]); |
| 326 | - if(!empty($param) && !empty($val)) { |
|
| 327 | - if($param == 'internal') { |
|
| 325 | + if (!empty($param) && !empty($val)) { |
|
| 326 | + if ($param == 'internal') { |
|
| 328 | 327 | $ma = null; |
| 329 | - if(preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) { |
|
| 328 | + if (preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) { |
|
| 330 | 329 | $param = trim($ma[1]); |
| 331 | 330 | $val = trim($ma[2]); |
| 332 | 331 | } |
| 333 | 332 | //if($val !== '0' && (empty($param) || empty($val))) { |
| 334 | - if(empty($param)) { |
|
| 333 | + if (empty($param)) { |
|
| 335 | 334 | continue; |
| 336 | 335 | } |
| 337 | 336 | } |
| 338 | 337 | $params[$param] = $val; |
| 339 | 338 | } |
| 340 | - } elseif(preg_match("/^\s*\*\/\s*$/", $line)) { |
|
| 339 | + } elseif (preg_match("/^\s*\*\/\s*$/", $line)) { |
|
| 341 | 340 | break; |
| 342 | 341 | } |
| 343 | 342 | } |
@@ -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); |
