evolution-cms /
evolution
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | /** |
| 102 | 102 | * @param string $mode |
| 103 | 103 | * @param string $modifiers |
| 104 | - * @return bool|string |
|
| 104 | + * @return false|string |
|
| 105 | 105 | */ |
| 106 | 106 | public function _getDelim($mode, $modifiers) |
| 107 | 107 | { |
@@ -151,6 +151,13 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | + /** |
|
| 155 | + * @param string $mode |
|
| 156 | + * @param false|string $delim |
|
| 157 | + * @param string $modifiers |
|
| 158 | + * |
|
| 159 | + * @return string |
|
| 160 | + */ |
|
| 154 | 161 | public function _getRemainModifiers($mode, $delim, $modifiers) |
| 155 | 162 | { |
| 156 | 163 | if ($delim) { |
@@ -187,6 +194,9 @@ discard block |
||
| 187 | 194 | return substr($string, strpos($string, $delim) + $len); |
| 188 | 195 | } |
| 189 | 196 | |
| 197 | + /** |
|
| 198 | + * @param string $modifiers |
|
| 199 | + */ |
|
| 190 | 200 | public function splitEachModifiers($modifiers) |
| 191 | 201 | { |
| 192 | 202 | $modx = evolutionCMS(); |
@@ -259,6 +269,10 @@ discard block |
||
| 259 | 269 | return $result; |
| 260 | 270 | } |
| 261 | 271 | |
| 272 | + /** |
|
| 273 | + * @param string $key |
|
| 274 | + * @param string $value |
|
| 275 | + */ |
|
| 262 | 276 | public function parsePhx($key, $value, $modifiers) |
| 263 | 277 | { |
| 264 | 278 | $modx = evolutionCMS(); |
@@ -340,6 +354,10 @@ discard block |
||
| 340 | 354 | } |
| 341 | 355 | } |
| 342 | 356 | |
| 357 | + /** |
|
| 358 | + * @param string $cmd |
|
| 359 | + * @param string $opt |
|
| 360 | + */ |
|
| 343 | 361 | public function getValueFromPreset($key, $value, $cmd, $opt) |
| 344 | 362 | { |
| 345 | 363 | $modx = evolutionCMS(); |
@@ -1285,6 +1303,9 @@ discard block |
||
| 1285 | 1303 | return $value; |
| 1286 | 1304 | } |
| 1287 | 1305 | |
| 1306 | + /** |
|
| 1307 | + * @param string $cmd |
|
| 1308 | + */ |
|
| 1288 | 1309 | public function includeMdfFile($cmd) |
| 1289 | 1310 | { |
| 1290 | 1311 | $modx = evolutionCMS(); |
@@ -1477,6 +1498,10 @@ discard block |
||
| 1477 | 1498 | } |
| 1478 | 1499 | |
| 1479 | 1500 | // Sets a placeholder variable which can only be access by Modifiers |
| 1501 | + |
|
| 1502 | + /** |
|
| 1503 | + * @param string $value |
|
| 1504 | + */ |
|
| 1480 | 1505 | public function setModifiersVariable($key, $value) |
| 1481 | 1506 | { |
| 1482 | 1507 | if ($key != 'phx' && $key != 'dummy') { |
@@ -199,7 +199,8 @@ discard block |
||
| 199 | 199 | $c = substr($modifiers, 0, 1); |
| 200 | 200 | $modifiers = substr($modifiers, 1); |
| 201 | 201 | |
| 202 | - if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>= |
|
| 202 | + if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { |
|
| 203 | +// :=, :!=, :<=, :>=, :!<=, :!>= |
|
| 203 | 204 | $c = substr($modifiers, strlen($match[1]), 1); |
| 204 | 205 | $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]"; |
| 205 | 206 | if ($c === '(') { |
@@ -215,7 +216,8 @@ discard block |
||
| 215 | 216 | $result[] = array('cmd' => trim($match[1]), 'opt' => $opt, 'debuginfo' => $debuginfo); |
| 216 | 217 | $cmd = ''; |
| 217 | 218 | } elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers, |
| 218 | - $match)) { // :+3, :-3, :*3 ... |
|
| 219 | + $match)) { |
|
| 220 | +// :+3, :-3, :*3 ... |
|
| 219 | 221 | $modifiers = substr($modifiers, strlen($match[0])); |
| 220 | 222 | $result[] = array('cmd' => 'math', 'opt' => '%s' . $c . $match[0]); |
| 221 | 223 | $cmd = ''; |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | $this->srcValue = $value; |
| 84 | 84 | $modifiers = trim($modifiers); |
| 85 | - $modifiers = ':' . trim($modifiers, ':'); |
|
| 85 | + $modifiers = ':'.trim($modifiers, ':'); |
|
| 86 | 86 | $modifiers = str_replace(array("\r\n", "\r"), "\n", $modifiers); |
| 87 | 87 | $modifiers = $this->splitEachModifiers($modifiers); |
| 88 | 88 | |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | { |
| 130 | 130 | if ($delim) { |
| 131 | 131 | if ($mode == '(') { |
| 132 | - return substr($modifiers, 1, strpos($modifiers, $delim . ')') - 1); |
|
| 132 | + return substr($modifiers, 1, strpos($modifiers, $delim.')') - 1); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | return substr($modifiers, 1, strpos($modifiers, $delim, 1) - 1); |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | { |
| 156 | 156 | if ($delim) { |
| 157 | 157 | if ($mode == '(') { |
| 158 | - return $this->_fetchContent($modifiers, $delim . ')'); |
|
| 158 | + return $this->_fetchContent($modifiers, $delim.')'); |
|
| 159 | 159 | } else { |
| 160 | 160 | $modifiers = trim($modifiers); |
| 161 | 161 | $modifiers = substr($modifiers, 1); |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | } elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers, |
| 218 | 218 | $match)) { // :+3, :-3, :*3 ... |
| 219 | 219 | $modifiers = substr($modifiers, strlen($match[0])); |
| 220 | - $result[] = array('cmd' => 'math', 'opt' => '%s' . $c . $match[0]); |
|
| 220 | + $result[] = array('cmd' => 'math', 'opt' => '%s'.$c.$match[0]); |
|
| 221 | 221 | $cmd = ''; |
| 222 | 222 | } elseif ($c === '(' || $c === '=') { |
| 223 | 223 | $modifiers = $m1 = trim($modifiers); |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | } |
| 333 | 333 | |
| 334 | 334 | $_ = explode(',', |
| 335 | - $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary'); |
|
| 335 | + $this->condModifiers.',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary'); |
|
| 336 | 336 | if (in_array($cmd, $_)) { |
| 337 | 337 | return false; |
| 338 | 338 | } else { |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | case 'eq': |
| 366 | 366 | case 'is': |
| 367 | 367 | case 'equals': |
| 368 | - $this->condition[] = (int)($value == $opt); |
|
| 368 | + $this->condition[] = (int) ($value == $opt); |
|
| 369 | 369 | break; |
| 370 | 370 | case 'neq': |
| 371 | 371 | case 'ne': |
@@ -373,59 +373,59 @@ discard block |
||
| 373 | 373 | case 'isnot': |
| 374 | 374 | case 'isnt': |
| 375 | 375 | case 'not': |
| 376 | - $this->condition[] = (int)($value != $opt); |
|
| 376 | + $this->condition[] = (int) ($value != $opt); |
|
| 377 | 377 | break; |
| 378 | 378 | case '%': |
| 379 | - $this->condition[] = (int)($value % $opt == 0); |
|
| 379 | + $this->condition[] = (int) ($value % $opt == 0); |
|
| 380 | 380 | break; |
| 381 | 381 | case 'isempty': |
| 382 | - $this->condition[] = (int)(empty($value)); |
|
| 382 | + $this->condition[] = (int) (empty($value)); |
|
| 383 | 383 | break; |
| 384 | 384 | case 'isntempty': |
| 385 | 385 | case 'isnotempty': |
| 386 | - $this->condition[] = (int)(!empty($value)); |
|
| 386 | + $this->condition[] = (int) (!empty($value)); |
|
| 387 | 387 | break; |
| 388 | 388 | case '>=': |
| 389 | 389 | case 'gte': |
| 390 | 390 | case 'eg': |
| 391 | 391 | case 'isgte': |
| 392 | - $this->condition[] = (int)($value >= $opt); |
|
| 392 | + $this->condition[] = (int) ($value >= $opt); |
|
| 393 | 393 | break; |
| 394 | 394 | case '<=': |
| 395 | 395 | case 'lte': |
| 396 | 396 | case 'el': |
| 397 | 397 | case 'islte': |
| 398 | - $this->condition[] = (int)($value <= $opt); |
|
| 398 | + $this->condition[] = (int) ($value <= $opt); |
|
| 399 | 399 | break; |
| 400 | 400 | case '>': |
| 401 | 401 | case 'gt': |
| 402 | 402 | case 'greaterthan': |
| 403 | 403 | case 'isgreaterthan': |
| 404 | 404 | case 'isgt': |
| 405 | - $this->condition[] = (int)($value > $opt); |
|
| 405 | + $this->condition[] = (int) ($value > $opt); |
|
| 406 | 406 | break; |
| 407 | 407 | case '<': |
| 408 | 408 | case 'lt': |
| 409 | 409 | case 'lowerthan': |
| 410 | 410 | case 'islowerthan': |
| 411 | 411 | case 'islt': |
| 412 | - $this->condition[] = (int)($value < $opt); |
|
| 412 | + $this->condition[] = (int) ($value < $opt); |
|
| 413 | 413 | break; |
| 414 | 414 | case 'find': |
| 415 | - $this->condition[] = (int)(strpos($value, $opt) !== false); |
|
| 415 | + $this->condition[] = (int) (strpos($value, $opt) !== false); |
|
| 416 | 416 | break; |
| 417 | 417 | case 'inarray': |
| 418 | 418 | case 'in_array': |
| 419 | 419 | case 'in': |
| 420 | 420 | $opt = explode(',', $opt); |
| 421 | - $this->condition[] = (int)(in_array($value, $opt) !== false); |
|
| 421 | + $this->condition[] = (int) (in_array($value, $opt) !== false); |
|
| 422 | 422 | break; |
| 423 | 423 | case 'wildcard_match': |
| 424 | 424 | case 'wcard_match': |
| 425 | 425 | case 'wildcard': |
| 426 | 426 | case 'wcard': |
| 427 | 427 | case 'fnmatch': |
| 428 | - $this->condition[] = (int)(fnmatch($opt, $value) !== false); |
|
| 428 | + $this->condition[] = (int) (fnmatch($opt, $value) !== false); |
|
| 429 | 429 | break; |
| 430 | 430 | case 'is_file': |
| 431 | 431 | case 'is_dir': |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | if (strpos($path, $modx->config['base_path']) === false) { |
| 444 | 444 | $path = ltrim($path, '/'); |
| 445 | 445 | } |
| 446 | - $this->condition[] = (int)($cmd($path) !== false); |
|
| 446 | + $this->condition[] = (int) ($cmd($path) !== false); |
|
| 447 | 447 | break; |
| 448 | 448 | case 'is_image': |
| 449 | 449 | if (!$opt) { |
@@ -456,13 +456,13 @@ discard block |
||
| 456 | 456 | break; |
| 457 | 457 | } |
| 458 | 458 | $_ = getimagesize($path); |
| 459 | - $this->condition[] = (int)($_[0]); |
|
| 459 | + $this->condition[] = (int) ($_[0]); |
|
| 460 | 460 | break; |
| 461 | 461 | case 'regex': |
| 462 | 462 | case 'preg': |
| 463 | 463 | case 'preg_match': |
| 464 | 464 | case 'isinrole': |
| 465 | - $this->condition[] = (int)(preg_match($opt, $value)); |
|
| 465 | + $this->condition[] = (int) (preg_match($opt, $value)); |
|
| 466 | 466 | break; |
| 467 | 467 | case 'ir': |
| 468 | 468 | case 'memberof': |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | case 'show': |
| 480 | 480 | case 'this': |
| 481 | 481 | $conditional = implode(' ', $this->condition); |
| 482 | - $isvalid = (int)(eval("return ({$conditional});")); |
|
| 482 | + $isvalid = (int) (eval("return ({$conditional});")); |
|
| 483 | 483 | if ($isvalid) { |
| 484 | 484 | return $this->srcValue; |
| 485 | 485 | } |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | return null; |
| 488 | 488 | case 'then': |
| 489 | 489 | $conditional = implode(' ', $this->condition); |
| 490 | - $isvalid = (int)eval("return ({$conditional});"); |
|
| 490 | + $isvalid = (int) eval("return ({$conditional});"); |
|
| 491 | 491 | if ($isvalid) { |
| 492 | 492 | return $opt; |
| 493 | 493 | } |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | return null; |
| 496 | 496 | case 'else': |
| 497 | 497 | $conditional = implode(' ', $this->condition); |
| 498 | - $isvalid = (int)eval("return ({$conditional});"); |
|
| 498 | + $isvalid = (int) eval("return ({$conditional});"); |
|
| 499 | 499 | if (!$isvalid) { |
| 500 | 500 | return $opt; |
| 501 | 501 | } |
@@ -654,7 +654,7 @@ discard block |
||
| 654 | 654 | return $this->strpos($value, $opt); |
| 655 | 655 | case 'wordwrap': |
| 656 | 656 | // default: 70 |
| 657 | - $wrapat = (int)$opt > 0 ? (int)$opt : 70; |
|
| 657 | + $wrapat = (int) $opt > 0 ? (int) $opt : 70; |
|
| 658 | 658 | if (version_compare(PHP_VERSION, '5.3.0') >= 0) { |
| 659 | 659 | return $this->includeMdfFile('wordwrap'); |
| 660 | 660 | } else { |
@@ -686,7 +686,7 @@ discard block |
||
| 686 | 686 | if (strpos($opt, ',') !== false) { |
| 687 | 687 | list($b, $e) = explode(',', $opt, 2); |
| 688 | 688 | |
| 689 | - return $this->substr($value, $b, (int)$e); |
|
| 689 | + return $this->substr($value, $b, (int) $e); |
|
| 690 | 690 | } else { |
| 691 | 691 | return $this->substr($value, $opt); |
| 692 | 692 | } |
@@ -705,9 +705,9 @@ discard block |
||
| 705 | 705 | $str = ''; |
| 706 | 706 | } |
| 707 | 707 | if (preg_match('/^[1-9][0-9]*$/', $len)) { |
| 708 | - return $this->substr($value, 0, $len) . $str; |
|
| 708 | + return $this->substr($value, 0, $len).$str; |
|
| 709 | 709 | } elseif (preg_match('/^\-[1-9][0-9]*$/', $len)) { |
| 710 | - return $str . $this->substr($value, $len); |
|
| 710 | + return $str.$this->substr($value, $len); |
|
| 711 | 711 | } |
| 712 | 712 | break; |
| 713 | 713 | case 'summary': |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | case 'concatenate': |
| 773 | 773 | case '.': |
| 774 | 774 | if ($value !== '') { |
| 775 | - return $value . $opt; |
|
| 775 | + return $value.$opt; |
|
| 776 | 776 | } |
| 777 | 777 | break; |
| 778 | 778 | case 'sprintf': |
@@ -790,7 +790,7 @@ discard block |
||
| 790 | 790 | case 'money_format': |
| 791 | 791 | setlocale(LC_MONETARY, setlocale(LC_TIME, 0)); |
| 792 | 792 | if ($value !== '') { |
| 793 | - return money_format($opt, (double)$value); |
|
| 793 | + return money_format($opt, (double) $value); |
|
| 794 | 794 | } |
| 795 | 795 | break; |
| 796 | 796 | case 'tobool': |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | return strtotime($value); |
| 866 | 866 | ##### mathematical function |
| 867 | 867 | case 'toint': |
| 868 | - return (int)$value; |
|
| 868 | + return (int) $value; |
|
| 869 | 869 | case 'tofloat': |
| 870 | 870 | return floatval($value); |
| 871 | 871 | case 'round': |
@@ -883,7 +883,7 @@ discard block |
||
| 883 | 883 | return $cmd($value); |
| 884 | 884 | case 'math': |
| 885 | 885 | case 'calc': |
| 886 | - $value = (int)$value; |
|
| 886 | + $value = (int) $value; |
|
| 887 | 887 | if (empty($value)) { |
| 888 | 888 | $value = '0'; |
| 889 | 889 | } |
@@ -1026,7 +1026,7 @@ discard block |
||
| 1026 | 1026 | $where = implode(' AND ', $where); |
| 1027 | 1027 | $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where); |
| 1028 | 1028 | $result = array(); |
| 1029 | - foreach ((array)$children as $child) { |
|
| 1029 | + foreach ((array) $children as $child) { |
|
| 1030 | 1030 | $result[] = $child['id']; |
| 1031 | 1031 | } |
| 1032 | 1032 | |
@@ -1130,7 +1130,7 @@ discard block |
||
| 1130 | 1130 | $opt .= '/'; |
| 1131 | 1131 | } |
| 1132 | 1132 | |
| 1133 | - $filename = MODX_BASE_PATH . $opt . $filename; |
|
| 1133 | + $filename = MODX_BASE_PATH.$opt.$filename; |
|
| 1134 | 1134 | |
| 1135 | 1135 | if (is_file($filename)) { |
| 1136 | 1136 | clearstatcache(); |
@@ -1291,7 +1291,7 @@ discard block |
||
| 1291 | 1291 | $value = $this->value; |
| 1292 | 1292 | $opt = $this->opt; |
| 1293 | 1293 | |
| 1294 | - return include(MODX_MANAGER_PATH . "includes/extenders/modifiers/mdf_{$cmd}.inc.php"); |
|
| 1294 | + return include(MODX_MANAGER_PATH."includes/extenders/modifiers/mdf_{$cmd}.inc.php"); |
|
| 1295 | 1295 | } |
| 1296 | 1296 | |
| 1297 | 1297 | public function getValueFromElement($key, $value, $cmd, $opt) |
@@ -1307,13 +1307,13 @@ discard block |
||
| 1307 | 1307 | $row = $modx->getDatabase()->getRow($result); |
| 1308 | 1308 | $php = $row['snippet']; |
| 1309 | 1309 | } elseif ($total == 0) { |
| 1310 | - $assets_path = MODX_BASE_PATH . 'assets/'; |
|
| 1311 | - if (is_file($assets_path . "modifiers/mdf_{$cmd}.inc.php")) { |
|
| 1312 | - $modifiers_path = $assets_path . "modifiers/mdf_{$cmd}.inc.php"; |
|
| 1313 | - } elseif (is_file($assets_path . "plugins/phx/modifiers/{$cmd}.phx.php")) { |
|
| 1314 | - $modifiers_path = $assets_path . "plugins/phx/modifiers/{$cmd}.phx.php"; |
|
| 1315 | - } elseif (is_file(MODX_MANAGER_PATH . "includes/extenders/modifiers/mdf_{$cmd}.inc.php")) { |
|
| 1316 | - $modifiers_path = MODX_MANAGER_PATH . "includes/extenders/modifiers/mdf_{$cmd}.inc.php"; |
|
| 1310 | + $assets_path = MODX_BASE_PATH.'assets/'; |
|
| 1311 | + if (is_file($assets_path."modifiers/mdf_{$cmd}.inc.php")) { |
|
| 1312 | + $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php"; |
|
| 1313 | + } elseif (is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php")) { |
|
| 1314 | + $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php"; |
|
| 1315 | + } elseif (is_file(MODX_MANAGER_PATH."includes/extenders/modifiers/mdf_{$cmd}.inc.php")) { |
|
| 1316 | + $modifiers_path = MODX_MANAGER_PATH."includes/extenders/modifiers/mdf_{$cmd}.inc.php"; |
|
| 1317 | 1317 | } else { |
| 1318 | 1318 | $modifiers_path = false; |
| 1319 | 1319 | } |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | $php = substr($php, 0, -2); |
| 1332 | 1332 | } |
| 1333 | 1333 | if ($this->elmName !== '') { |
| 1334 | - $modx->snippetCache[$this->elmName . 'Props'] = ''; |
|
| 1334 | + $modx->snippetCache[$this->elmName.'Props'] = ''; |
|
| 1335 | 1335 | } |
| 1336 | 1336 | } else { |
| 1337 | 1337 | $php = false; |
@@ -1368,7 +1368,7 @@ discard block |
||
| 1368 | 1368 | $custom = eval($php); |
| 1369 | 1369 | $msg = ob_get_contents(); |
| 1370 | 1370 | if ($value === $this->bt) { |
| 1371 | - $value = $msg . $custom; |
|
| 1371 | + $value = $msg.$custom; |
|
| 1372 | 1372 | } |
| 1373 | 1373 | ob_end_clean(); |
| 1374 | 1374 | } elseif ($html !== false && isset($value) && $value !== '') { |
@@ -1542,7 +1542,7 @@ discard block |
||
| 1542 | 1542 | public function ucfirst($str) |
| 1543 | 1543 | { |
| 1544 | 1544 | if (function_exists('mb_strtoupper')) { |
| 1545 | - return mb_strtoupper($this->substr($str, 0, 1)) . $this->substr($str, 1, $this->strlen($str)); |
|
| 1545 | + return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str)); |
|
| 1546 | 1546 | } |
| 1547 | 1547 | |
| 1548 | 1548 | return ucfirst($str); |
@@ -1551,7 +1551,7 @@ discard block |
||
| 1551 | 1551 | public function lcfirst($str) |
| 1552 | 1552 | { |
| 1553 | 1553 | if (function_exists('mb_strtolower')) { |
| 1554 | - return mb_strtolower($this->substr($str, 0, 1)) . $this->substr($str, 1, $this->strlen($str)); |
|
| 1554 | + return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str)); |
|
| 1555 | 1555 | } |
| 1556 | 1556 | |
| 1557 | 1557 | return lcfirst($str); |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if (file_exists(dirname(dirname(dirname(__DIR__))) . "/assets/cache/siteManager.php")) { |
|
| 3 | - include_once(dirname(dirname(dirname(__DIR__))) . "/assets/cache/siteManager.php"); |
|
| 2 | +if (file_exists(dirname(dirname(dirname(__DIR__)))."/assets/cache/siteManager.php")) { |
|
| 3 | + include_once(dirname(dirname(dirname(__DIR__)))."/assets/cache/siteManager.php"); |
|
| 4 | 4 | } else { |
| 5 | 5 | define('MGR_DIR', 'manager'); |
| 6 | 6 | } |
@@ -25,8 +25,8 @@ discard block |
||
| 25 | 25 | // set timout limit |
| 26 | 26 | @ set_time_limit(120); // used @ to prevent warning when using safe mode? |
| 27 | 27 | |
| 28 | -$installMode = (int)$_POST['installmode']; |
|
| 29 | -$installData = (int)!empty($_POST['installdata']); |
|
| 28 | +$installMode = (int) $_POST['installmode']; |
|
| 29 | +$installData = (int) !empty($_POST['installdata']); |
|
| 30 | 30 | |
| 31 | 31 | // get db info from post |
| 32 | 32 | $database_server = $_POST['databasehost']; |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
| 37 | 37 | $database_connection_charset = $_POST['database_connection_charset']; |
| 38 | 38 | $database_connection_method = $_POST['database_connection_method']; |
| 39 | -$dbase = "`" . $_POST['database_name'] . "`"; |
|
| 39 | +$dbase = "`".$_POST['database_name']."`"; |
|
| 40 | 40 | $table_prefix = $_POST['tableprefix']; |
| 41 | 41 | $adminname = $_POST['cmsadmin']; |
| 42 | 42 | $adminemail = $_POST['cmsadminemail']; |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | // set session name variable |
| 48 | 48 | if (!isset ($site_sessionname)) { |
| 49 | - $site_sessionname = 'SN' . uniqid(''); |
|
| 49 | + $site_sessionname = 'SN'.uniqid(''); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | // get base path and url |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | $pth = implode('install', $a); |
| 64 | 64 | unset ($a); |
| 65 | -$base_url = $url . (substr($url, -1) != '/' ? '/' : ''); |
|
| 66 | -$base_path = $pth . (substr($pth, -1) != '/' ? '/' : ''); |
|
| 65 | +$base_url = $url.(substr($url, -1) != '/' ? '/' : ''); |
|
| 66 | +$base_path = $pth.(substr($pth, -1) != '/' ? '/' : ''); |
|
| 67 | 67 | |
| 68 | 68 | // connect to the database |
| 69 | 69 | $conn = @mysqli_connect($database_server, $database_user, $database_password); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | if ($installLevel === 1) { |
| 93 | 93 | // check table prefix |
| 94 | 94 | if ($installMode === 0) { |
| 95 | - $query = "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`"; |
|
| 95 | + $query = "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`"; |
|
| 96 | 96 | if (@mysqli_query($conn, $query)) { |
| 97 | 97 | $errors += 1; |
| 98 | 98 | } else { |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | // check status of Inherit Parent Template plugin |
| 108 | 108 | $auto_template_logic = 'parent'; |
| 109 | 109 | if ($installMode !== 0) { |
| 110 | - $query = "SELECT properties, disabled FROM " . $dbase . ".`" . $table_prefix . "site_plugins` WHERE name='Inherit Parent Template'"; |
|
| 110 | + $query = "SELECT properties, disabled FROM ".$dbase.".`".$table_prefix."site_plugins` WHERE name='Inherit Parent Template'"; |
|
| 111 | 111 | $rs = mysqli_query($conn, $query); |
| 112 | 112 | $row = mysqli_fetch_row($rs); |
| 113 | 113 | if (!$row) { |
@@ -130,8 +130,8 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | // open db connection |
| 133 | - include dirname(__DIR__) . '/processor/result.php'; |
|
| 134 | - include_once dirname(__DIR__) . '/sqlParser.class.php'; |
|
| 133 | + include dirname(__DIR__).'/processor/result.php'; |
|
| 134 | + include_once dirname(__DIR__).'/sqlParser.class.php'; |
|
| 135 | 135 | $sqlParser = new SqlParser( |
| 136 | 136 | $database_server, |
| 137 | 137 | $database_user, |
@@ -177,10 +177,10 @@ discard block |
||
| 177 | 177 | $confph['lastInstallTime'] = time(); |
| 178 | 178 | $confph['site_sessionname'] = $site_sessionname; |
| 179 | 179 | |
| 180 | - $configString = file_get_contents(dirname(dirname(__DIR__)) . '/stubs/config.tpl'); |
|
| 180 | + $configString = file_get_contents(dirname(dirname(__DIR__)).'/stubs/config.tpl'); |
|
| 181 | 181 | $configString = parse($configString, $confph); |
| 182 | 182 | |
| 183 | - $filename = dirname(dirname(dirname(__DIR__))) . '/' . MGR_DIR . '/includes/config.inc.php'; |
|
| 183 | + $filename = dirname(dirname(dirname(__DIR__))).'/'.MGR_DIR.'/includes/config.inc.php'; |
|
| 184 | 184 | $configFileFailed = false; |
| 185 | 185 | if (@ !$handle = fopen($filename, 'w')) { |
| 186 | 186 | $configFileFailed = true; |
@@ -208,13 +208,13 @@ discard block |
||
| 208 | 208 | $siteid = uniqid(''); |
| 209 | 209 | mysqli_query( |
| 210 | 210 | $sqlParser->conn, |
| 211 | - "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')" |
|
| 211 | + "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')" |
|
| 212 | 212 | ); |
| 213 | 213 | } else { |
| 214 | 214 | // update site_id if missing |
| 215 | 215 | $ds = mysqli_query( |
| 216 | 216 | $sqlParser->conn, |
| 217 | - "SELECT setting_name,setting_value FROM $dbase.`" . $table_prefix . "system_settings` WHERE setting_name='site_id'" |
|
| 217 | + "SELECT setting_name,setting_value FROM $dbase.`".$table_prefix."system_settings` WHERE setting_name='site_id'" |
|
| 218 | 218 | ); |
| 219 | 219 | if ($ds) { |
| 220 | 220 | $r = mysqli_fetch_assoc($ds); |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | $siteid = uniqid(''); |
| 224 | 224 | mysqli_query( |
| 225 | 225 | $sqlParser->conn, |
| 226 | - "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')" |
|
| 226 | + "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')" |
|
| 227 | 227 | ); |
| 228 | 228 | } |
| 229 | 229 | } |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | if ($installLevel === 5 && (isset ($_POST['template']) || $installData)) { |
| 250 | 250 | $selTemplates = $_POST['template']; |
| 251 | 251 | foreach ($moduleTemplates as $k => $moduleTemplate) { |
| 252 | - if (! is_array($moduleTemplate)) { |
|
| 252 | + if (!is_array($moduleTemplate)) { |
|
| 253 | 253 | continue; |
| 254 | 254 | } |
| 255 | 255 | $installDataLevel['templates'][$moduleTemplate[0]] = array( |
@@ -287,12 +287,12 @@ discard block |
||
| 287 | 287 | $template = mysqli_real_escape_string($conn, $template); |
| 288 | 288 | |
| 289 | 289 | // See if the template already exists |
| 290 | - $query = "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'"; |
|
| 290 | + $query = "SELECT * FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name'"; |
|
| 291 | 291 | $rs = mysqli_query($sqlParser->conn, $query); |
| 292 | 292 | |
| 293 | 293 | if (mysqli_num_rows($rs)) { |
| 294 | 294 | $installDataLevel['templates'][$moduleTemplate[0]]['type'] = 'update'; |
| 295 | - $query = "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked' WHERE templatename='$name' LIMIT 1;"; |
|
| 295 | + $query = "UPDATE $dbase.`".$table_prefix."site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked' WHERE templatename='$name' LIMIT 1;"; |
|
| 296 | 296 | if (!mysqli_query($sqlParser->conn, $query)) { |
| 297 | 297 | $errors += 1; |
| 298 | 298 | $installDataLevel['templates'][$moduleTemplate[0]]['error'] = array( |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | if (!is_null($save_sql_id_as)) { |
| 306 | 306 | $sql_id = @mysqli_insert_id($sqlParser->conn); |
| 307 | 307 | if (!$sql_id) { |
| 308 | - $query = "SELECT id FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name' LIMIT 1;"; |
|
| 308 | + $query = "SELECT id FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name' LIMIT 1;"; |
|
| 309 | 309 | $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, $query)); |
| 310 | 310 | $sql_id = $idQuery['id']; |
| 311 | 311 | } |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | } |
| 314 | 314 | } else { |
| 315 | 315 | $installDataLevel['templates'][$moduleTemplate[0]]['type'] = 'create'; |
| 316 | - $query = "INSERT INTO $dbase.`" . $table_prefix . "site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');"; |
|
| 316 | + $query = "INSERT INTO $dbase.`".$table_prefix."site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');"; |
|
| 317 | 317 | if (!@mysqli_query($sqlParser->conn, $query)) { |
| 318 | 318 | $errors += 1; |
| 319 | 319 | $installDataLevel['templates'][$moduleTemplate[0]]['error'] = array( |
@@ -378,12 +378,12 @@ discard block |
||
| 378 | 378 | // Create the category if it does not already exist |
| 379 | 379 | $category = getCreateDbCategory($category, $sqlParser); |
| 380 | 380 | |
| 381 | - $query = "SELECT * FROM $dbase.`" . $table_prefix . "site_tmplvars` WHERE name='$name'"; |
|
| 382 | - $rs = mysqli_query($sqlParser->conn,$query); |
|
| 381 | + $query = "SELECT * FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name'"; |
|
| 382 | + $rs = mysqli_query($sqlParser->conn, $query); |
|
| 383 | 383 | if (mysqli_num_rows($rs)) { |
| 384 | 384 | $installDataLevel['tvs'][$moduleTV[0]]['type'] = 'update'; |
| 385 | 385 | while ($row = mysqli_fetch_assoc($rs)) { |
| 386 | - $query = "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 | + $query = "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']};"; |
|
| 387 | 387 | if (!mysqli_query($sqlParser->conn, $query)) { |
| 388 | 388 | $installDataLevel['tvs'][$moduleTV[0]]['error'] = array( |
| 389 | 389 | 'type' => 'sql', |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | } |
| 397 | 397 | } else { |
| 398 | 398 | $installDataLevel['tvs'][$moduleTV[0]]['type'] = 'create'; |
| 399 | - $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');"; |
|
| 399 | + $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');"; |
|
| 400 | 400 | if (!mysqli_query($sqlParser->conn, $q)) { |
| 401 | 401 | $installDataLevel['tvs'][$moduleTV[0]]['error'] = array( |
| 402 | 402 | 'type' => 'sql', |
@@ -413,23 +413,23 @@ discard block |
||
| 413 | 413 | if (count($assignments) > 0) { |
| 414 | 414 | |
| 415 | 415 | // remove existing tv -> template assignments |
| 416 | - $query = "SELECT id FROM $dbase.`" . $table_prefix . "site_tmplvars` WHERE name='$name' AND description='$desc';"; |
|
| 416 | + $query = "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';"; |
|
| 417 | 417 | $ds = mysqli_query($sqlParser->conn, $query); |
| 418 | 418 | $row = mysqli_fetch_assoc($ds); |
| 419 | 419 | $id = $row["id"]; |
| 420 | - $query = 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_tmplvar_templates` WHERE tmplvarid = \'' . $id . '\''; |
|
| 420 | + $query = 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_tmplvar_templates` WHERE tmplvarid = \''.$id.'\''; |
|
| 421 | 421 | mysqli_query($sqlParser->conn, $query); |
| 422 | 422 | |
| 423 | 423 | // add tv -> template assignments |
| 424 | 424 | foreach ($assignments as $assignment) { |
| 425 | 425 | $template = mysqli_real_escape_string($conn, $assignment); |
| 426 | - $query = "SELECT id FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$template';"; |
|
| 426 | + $query = "SELECT id FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$template';"; |
|
| 427 | 427 | $ts = mysqli_query($sqlParser->conn, $query); |
| 428 | 428 | if ($ds && $ts) { |
| 429 | 429 | $tRow = mysqli_fetch_assoc($ts); |
| 430 | 430 | $templateId = $tRow['id']; |
| 431 | - $query = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"; |
|
| 432 | - mysqli_query($sqlParser->conn,$query); |
|
| 431 | + $query = "INSERT INTO $dbase.`".$table_prefix."site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"; |
|
| 432 | + mysqli_query($sqlParser->conn, $query); |
|
| 433 | 433 | } |
| 434 | 434 | } |
| 435 | 435 | } |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | if ($installLevel === 5 && $errorData === false && (isset ($_POST['chunk']) || $installData)) { |
| 442 | 442 | $selChunks = $_POST['chunk']; |
| 443 | 443 | foreach ($moduleChunks as $k => $moduleChunk) { |
| 444 | - if (! is_array($moduleChunk)) { |
|
| 444 | + if (!is_array($moduleChunk)) { |
|
| 445 | 445 | continue; |
| 446 | 446 | } |
| 447 | 447 | $installDataLevel['chunks'][$moduleChunk[0]] = array( |
@@ -479,14 +479,14 @@ discard block |
||
| 479 | 479 | $chunk = mysqli_real_escape_string($conn, $chunk); |
| 480 | 480 | $rs = mysqli_query( |
| 481 | 481 | $sqlParser->conn, |
| 482 | - "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$name'" |
|
| 482 | + "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$name'" |
|
| 483 | 483 | ); |
| 484 | 484 | $count_original_name = mysqli_num_rows($rs); |
| 485 | 485 | if ($overwrite == 'false') { |
| 486 | - $newname = $name . '-' . str_replace('.', '_', $modx_version); |
|
| 486 | + $newname = $name.'-'.str_replace('.', '_', $modx_version); |
|
| 487 | 487 | $rs = mysqli_query( |
| 488 | 488 | $sqlParser->conn, |
| 489 | - "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$newname'" |
|
| 489 | + "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$newname'" |
|
| 490 | 490 | ); |
| 491 | 491 | $count_new_name = mysqli_num_rows($rs); |
| 492 | 492 | } |
@@ -494,7 +494,7 @@ discard block |
||
| 494 | 494 | if ($update) { |
| 495 | 495 | $installDataLevel['chunks'][$moduleChunk[0]]['type'] = 'update'; |
| 496 | 496 | if (!mysqli_query($sqlParser->conn, |
| 497 | - "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 497 | + "UPDATE $dbase.`".$table_prefix."site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 498 | 498 | $errors += 1; |
| 499 | 499 | $installDataLevel['chunks'][$moduleChunk[0]]['error'] = array( |
| 500 | 500 | 'type' => 'sql', |
@@ -511,7 +511,7 @@ discard block |
||
| 511 | 511 | } else { |
| 512 | 512 | $installDataLevel['chunks'][$moduleChunk[0]]['type'] = 'create'; |
| 513 | 513 | } |
| 514 | - $query = "INSERT INTO $dbase.`" . $table_prefix . "site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);"; |
|
| 514 | + $query = "INSERT INTO $dbase.`".$table_prefix."site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);"; |
|
| 515 | 515 | if (!mysqli_query($sqlParser->conn, $query)) { |
| 516 | 516 | $errors += 1; |
| 517 | 517 | $installDataLevel['chunks'][$moduleChunk[0]]['error'] = array( |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | if ($installLevel === 5 && $errorData === false && (isset ($_POST['module']) || $installData)) { |
| 535 | 535 | $selModules = $_POST['module']; |
| 536 | 536 | foreach ($moduleModules as $k => $moduleModule) { |
| 537 | - if (! is_array($moduleModule)) { |
|
| 537 | + if (!is_array($moduleModule)) { |
|
| 538 | 538 | continue; |
| 539 | 539 | } |
| 540 | 540 | $installDataLevel['modules'][$moduleModule[0]] = array( |
@@ -573,13 +573,13 @@ discard block |
||
| 573 | 573 | // $module = removeDocblock($module, 'module'); // Modules have no fileBinding, keep docblock for info-tab |
| 574 | 574 | $module = mysqli_real_escape_string($conn, $module); |
| 575 | 575 | $rs = mysqli_query($sqlParser->conn, |
| 576 | - "SELECT * FROM $dbase.`" . $table_prefix . "site_modules` WHERE name='$name'"); |
|
| 576 | + "SELECT * FROM $dbase.`".$table_prefix."site_modules` WHERE name='$name'"); |
|
| 577 | 577 | if (mysqli_num_rows($rs)) { |
| 578 | 578 | $installDataLevel['modules'][$moduleModule[0]]['type'] = 'update'; |
| 579 | 579 | $row = mysqli_fetch_assoc($rs); |
| 580 | 580 | $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
| 581 | 581 | if (!mysqli_query($sqlParser->conn, |
| 582 | - "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 582 | + "UPDATE $dbase.`".$table_prefix."site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 583 | 583 | $installDataLevel['modules'][$moduleModule[0]]['error'] = array( |
| 584 | 584 | 'type' => 'sql', |
| 585 | 585 | 'content' => mysqli_error($sqlParser->conn) |
@@ -591,7 +591,7 @@ discard block |
||
| 591 | 591 | $installDataLevel['modules'][$moduleModule[0]]['type'] = 'create'; |
| 592 | 592 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 593 | 593 | if (!mysqli_query($sqlParser->conn, |
| 594 | - "INSERT INTO $dbase.`" . $table_prefix . "site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) { |
|
| 594 | + "INSERT INTO $dbase.`".$table_prefix."site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) { |
|
| 595 | 595 | $installDataLevel['modules'][$moduleModule[0]]['error'] = array( |
| 596 | 596 | 'type' => 'sql', |
| 597 | 597 | 'content' => mysqli_error($sqlParser->conn) |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | if ($installLevel === 5 && $errorData === false && (isset ($_POST['plugin']) || $installData)) { |
| 612 | 612 | $selPlugs = $_POST['plugin']; |
| 613 | 613 | foreach ($modulePlugins as $k => $modulePlugin) { |
| 614 | - if (! is_array($modulePlugin)) { |
|
| 614 | + if (!is_array($modulePlugin)) { |
|
| 615 | 615 | continue; |
| 616 | 616 | } |
| 617 | 617 | $installDataLevel['plugins'][$modulePlugin[0]] = array( |
@@ -645,12 +645,12 @@ discard block |
||
| 645 | 645 | $disabled = $modulePlugin[9]; |
| 646 | 646 | if (array_key_exists(7, $modulePlugin)) { |
| 647 | 647 | // parse comma-separated legacy names and prepare them for sql IN clause |
| 648 | - $leg_names = "'" . implode( |
|
| 648 | + $leg_names = "'".implode( |
|
| 649 | 649 | "','", |
| 650 | 650 | preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7])) |
| 651 | - ) . "'"; |
|
| 651 | + )."'"; |
|
| 652 | 652 | } |
| 653 | - if (! file_exists($filecontent)) { |
|
| 653 | + if (!file_exists($filecontent)) { |
|
| 654 | 654 | $installDataLevel['plugins'][$modulePlugin[0]]['error'] = array( |
| 655 | 655 | 'type' => 'file_not_found' |
| 656 | 656 | ); |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | |
| 659 | 659 | // disable legacy versions based on legacy_names provided |
| 660 | 660 | if (!empty($leg_names)) { |
| 661 | - $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 661 | + $update_query = "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 662 | 662 | $rs = mysqli_query($sqlParser->conn, $update_query); |
| 663 | 663 | } |
| 664 | 664 | |
@@ -668,7 +668,7 @@ discard block |
||
| 668 | 668 | $plugin = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2)); |
| 669 | 669 | $plugin = removeDocblock($plugin, 'plugin'); |
| 670 | 670 | $plugin = mysqli_real_escape_string($conn, $plugin); |
| 671 | - $query = "SELECT * FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='$name'"; |
|
| 671 | + $query = "SELECT * FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name'"; |
|
| 672 | 672 | $rs = mysqli_query($sqlParser->conn, $query); |
| 673 | 673 | if (mysqli_num_rows($rs)) { |
| 674 | 674 | $installDataLevel['plugins'][$modulePlugin[0]]['type'] = 'update'; |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | while ($row = mysqli_fetch_assoc($rs)) { |
| 677 | 677 | $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
| 678 | 678 | if ($row['description'] == $desc) { |
| 679 | - $query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};"; |
|
| 679 | + $query = "UPDATE $dbase.`".$table_prefix."site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};"; |
|
| 680 | 680 | if (!mysqli_query($sqlParser->conn, $query)) { |
| 681 | 681 | $installDataLevel['plugins'][$modulePlugin[0]]['error'] = array( |
| 682 | 682 | 'type' => 'sql', |
@@ -687,7 +687,7 @@ discard block |
||
| 687 | 687 | } |
| 688 | 688 | $insert = false; |
| 689 | 689 | } else { |
| 690 | - $query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};"; |
|
| 690 | + $query = "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE id={$row['id']};"; |
|
| 691 | 691 | if (!mysqli_query($sqlParser->conn, $query)) { |
| 692 | 692 | $installDataLevel['plugins'][$modulePlugin[0]]['error'] = array( |
| 693 | 693 | 'type' => 'sql', |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | } |
| 701 | 701 | if ($insert === true) { |
| 702 | 702 | $properties = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
| 703 | - $query = "INSERT INTO $dbase.`" . $table_prefix . "site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);"; |
|
| 703 | + $query = "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);"; |
|
| 704 | 704 | if (!mysqli_query($sqlParser->conn, $query)) { |
| 705 | 705 | $installDataLevel['plugins'][$modulePlugin[0]]['error'] = array( |
| 706 | 706 | 'type' => 'sql', |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | } else { |
| 714 | 714 | $installDataLevel['plugins'][$modulePlugin[0]]['type'] = 'create'; |
| 715 | 715 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 716 | - $query = "INSERT INTO $dbase.`" . $table_prefix . "site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);"; |
|
| 716 | + $query = "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);"; |
|
| 717 | 717 | if (!mysqli_query($sqlParser->conn, $query)) { |
| 718 | 718 | $installDataLevel['plugins'][$modulePlugin[0]]['error'] = array( |
| 719 | 719 | 'type' => 'sql', |
@@ -725,17 +725,17 @@ discard block |
||
| 725 | 725 | } |
| 726 | 726 | // add system events |
| 727 | 727 | if (count($events) > 0) { |
| 728 | - $query = "SELECT id FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='$name' AND description='$desc';"; |
|
| 728 | + $query = "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';"; |
|
| 729 | 729 | $ds = mysqli_query($sqlParser->conn, $query); |
| 730 | 730 | if ($ds) { |
| 731 | 731 | $row = mysqli_fetch_assoc($ds); |
| 732 | 732 | $id = $row["id"]; |
| 733 | 733 | // remove existing events |
| 734 | - $query = 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_plugin_events` WHERE pluginid = \'' . $id . '\''; |
|
| 734 | + $query = 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_plugin_events` WHERE pluginid = \''.$id.'\''; |
|
| 735 | 735 | mysqli_query($sqlParser->conn, $query); |
| 736 | 736 | // add new events |
| 737 | - $query = "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) . "')"; |
|
| 738 | - mysqli_query($sqlParser->conn,$query); |
|
| 737 | + $query = "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)."')"; |
|
| 738 | + mysqli_query($sqlParser->conn, $query); |
|
| 739 | 739 | } |
| 740 | 740 | } |
| 741 | 741 | } |
@@ -749,7 +749,7 @@ discard block |
||
| 749 | 749 | if ($installLevel === 5 && $errorData === false && (isset ($_POST['snippet']) || $installData)) { |
| 750 | 750 | $selSnips = $_POST['snippet']; |
| 751 | 751 | foreach ($moduleSnippets as $k => $moduleSnippet) { |
| 752 | - if (! is_array($moduleSnippet)) { |
|
| 752 | + if (!is_array($moduleSnippet)) { |
|
| 753 | 753 | continue; |
| 754 | 754 | } |
| 755 | 755 | $installDataLevel['snippets'][$moduleSnippet[0]] = array( |
@@ -784,13 +784,13 @@ discard block |
||
| 784 | 784 | $snippet = removeDocblock($snippet, 'snippet'); |
| 785 | 785 | $snippet = mysqli_real_escape_string($conn, $snippet); |
| 786 | 786 | $rs = mysqli_query($sqlParser->conn, |
| 787 | - "SELECT * FROM $dbase.`" . $table_prefix . "site_snippets` WHERE name='$name'"); |
|
| 787 | + "SELECT * FROM $dbase.`".$table_prefix."site_snippets` WHERE name='$name'"); |
|
| 788 | 788 | if (mysqli_num_rows($rs)) { |
| 789 | 789 | $installDataLevel['snippets'][$moduleSnippet[0]]['type'] = 'update'; |
| 790 | 790 | $row = mysqli_fetch_assoc($rs); |
| 791 | 791 | $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
| 792 | 792 | if (!mysqli_query($sqlParser->conn, |
| 793 | - "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 793 | + "UPDATE $dbase.`".$table_prefix."site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 794 | 794 | $installDataLevel['snippets'][$moduleSnippet[0]]['error'] = array( |
| 795 | 795 | 'type' => 'sql', |
| 796 | 796 | 'content' => mysqli_error($sqlParser->conn) |
@@ -802,7 +802,7 @@ discard block |
||
| 802 | 802 | $installDataLevel['snippets'][$moduleSnippet[0]]['type'] = 'create'; |
| 803 | 803 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 804 | 804 | if (!mysqli_query($sqlParser->conn, |
| 805 | - "INSERT INTO $dbase.`" . $table_prefix . "site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
|
| 805 | + "INSERT INTO $dbase.`".$table_prefix."site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
|
| 806 | 806 | $installDataLevel['snippets'][$moduleSnippet[0]]['error'] = array( |
| 807 | 807 | 'type' => 'sql', |
| 808 | 808 | 'content' => mysqli_error($sqlParser->conn) |
@@ -869,7 +869,7 @@ discard block |
||
| 869 | 869 | 'content' => '' //dependency name or error message |
| 870 | 870 | )*/ |
| 871 | 871 | ); |
| 872 | - $query = 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"'; |
|
| 872 | + $query = 'SELECT id, guid FROM '.$dbase.'`'.$sqlParser->prefix.'site_modules` WHERE name="'.$dependency['module'].'"'; |
|
| 873 | 873 | $ds = mysqli_query($sqlParser->conn, $query); |
| 874 | 874 | if (!$ds) { |
| 875 | 875 | $installDependencyLevel[$dependency['module']]['error'] = array( |
@@ -884,7 +884,7 @@ discard block |
||
| 884 | 884 | $moduleGuid = $row["guid"]; |
| 885 | 885 | } |
| 886 | 886 | // get extra id |
| 887 | - $query = 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"'; |
|
| 887 | + $query = 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE '.$dependency['column'].'="'.$dependency['name'].'"'; |
|
| 888 | 888 | $ds = mysqli_query($sqlParser->conn, $query); |
| 889 | 889 | if (!$ds) { |
| 890 | 890 | $installDependencyLevel[$dependency['module']]['error'] = array( |
@@ -898,7 +898,7 @@ discard block |
||
| 898 | 898 | $extraId = $row["id"]; |
| 899 | 899 | } |
| 900 | 900 | // setup extra as module dependency |
| 901 | - $query = 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1'; |
|
| 901 | + $query = 'SELECT module FROM '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type'].' LIMIT 1'; |
|
| 902 | 902 | $ds = mysqli_query($sqlParser->conn, $query); |
| 903 | 903 | if (!$ds) { |
| 904 | 904 | $installDependencyLevel[$dependency['module']]['error'] = array( |
@@ -909,17 +909,17 @@ discard block |
||
| 909 | 909 | break; |
| 910 | 910 | } else { |
| 911 | 911 | if (mysqli_num_rows($ds) === 0) { |
| 912 | - $query = 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')'; |
|
| 912 | + $query = 'INSERT INTO '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` (module, resource, type) VALUES('.$moduleId.','.$extraId.','.$dependency['type'].')'; |
|
| 913 | 913 | mysqli_query($sqlParser->conn, $query); |
| 914 | 914 | $installDependencyLevel[$dependency['module']]['type'] = 'create'; |
| 915 | 915 | } else { |
| 916 | - $query = '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']; |
|
| 916 | + $query = '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']; |
|
| 917 | 917 | mysqli_query($sqlParser->conn, $query); |
| 918 | 918 | $installDependencyLevel[$dependency['module']]['type'] = 'update'; |
| 919 | 919 | } |
| 920 | 920 | if ($dependency['type'] == 30 || $dependency['type'] == 40) { |
| 921 | 921 | // set extra guid for plugins and snippets |
| 922 | - $query = 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1'; |
|
| 922 | + $query = 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE id='.$extraId.' LIMIT 1'; |
|
| 923 | 923 | $ds = mysqli_query($sqlParser->conn, $query); |
| 924 | 924 | if (!$ds) { |
| 925 | 925 | $installDependencyLevel[$dependency['module']]['extra'] = array( |
@@ -930,8 +930,8 @@ discard block |
||
| 930 | 930 | break; |
| 931 | 931 | } else { |
| 932 | 932 | if (mysqli_num_rows($ds) != 0) { |
| 933 | - $query = 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId; |
|
| 934 | - $ds= mysqli_query($sqlParser->conn, $query); |
|
| 933 | + $query = 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` SET moduleguid = '.$moduleGuid.' WHERE id='.$extraId; |
|
| 934 | + $ds = mysqli_query($sqlParser->conn, $query); |
|
| 935 | 935 | $installDependencyLevel[$dependency['module']]['extra'] = array( |
| 936 | 936 | 'type' => 'done', |
| 937 | 937 | 'content' => $dependency['name'] |
@@ -953,28 +953,28 @@ discard block |
||
| 953 | 953 | } |
| 954 | 954 | |
| 955 | 955 | // Setup the MODX API -- needed for the cache processor |
| 956 | - if (file_exists(dirname(dirname(dirname(__DIR__))) . '/' . MGR_DIR . '/includes/config_mutator.php')) { |
|
| 957 | - require_once dirname(dirname(dirname(__DIR__))) . '/' . MGR_DIR . '/includes/config_mutator.php'; |
|
| 956 | + if (file_exists(dirname(dirname(dirname(__DIR__))).'/'.MGR_DIR.'/includes/config_mutator.php')) { |
|
| 957 | + require_once dirname(dirname(dirname(__DIR__))).'/'.MGR_DIR.'/includes/config_mutator.php'; |
|
| 958 | 958 | } |
| 959 | 959 | define('MODX_API_MODE', true); |
| 960 | 960 | if (!defined('MODX_BASE_PATH')) { |
| 961 | 961 | define('MODX_BASE_PATH', $base_path); |
| 962 | 962 | } |
| 963 | 963 | if (!defined('MODX_MANAGER_PATH')) { |
| 964 | - define('MODX_MANAGER_PATH', $base_path . MGR_DIR . '/'); |
|
| 964 | + define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/'); |
|
| 965 | 965 | } |
| 966 | 966 | $database_type = 'mysqli'; |
| 967 | 967 | // initiate a new document parser |
| 968 | 968 | if (!defined('EVO_BOOTSTRAP_FILE')) { |
| 969 | 969 | define('EVO_BOOTSTRAP_FILE', |
| 970 | - dirname(dirname(dirname(__DIR__))) . '/' . MGR_DIR . '/includes/bootstrap.php'); |
|
| 971 | - require_once dirname(dirname(dirname(__DIR__))) . '/' . MGR_DIR . '/includes/bootstrap.php'; |
|
| 970 | + dirname(dirname(dirname(__DIR__))).'/'.MGR_DIR.'/includes/bootstrap.php'); |
|
| 971 | + require_once dirname(dirname(dirname(__DIR__))).'/'.MGR_DIR.'/includes/bootstrap.php'; |
|
| 972 | 972 | } |
| 973 | 973 | |
| 974 | - if (! defined('EVO_SERVICES_FILE')) { |
|
| 975 | - define('EVO_SERVICES_FILE', dirname(dirname(dirname(__DIR__))) . '/' . MGR_DIR . '/includes/services.php'); |
|
| 974 | + if (!defined('EVO_SERVICES_FILE')) { |
|
| 975 | + define('EVO_SERVICES_FILE', dirname(dirname(dirname(__DIR__))).'/'.MGR_DIR.'/includes/services.php'); |
|
| 976 | 976 | } |
| 977 | - if (! defined('MODX_CLASS')) { |
|
| 977 | + if (!defined('MODX_CLASS')) { |
|
| 978 | 978 | define('MODX_CLASS', '\EvolutionCMS\Core'); |
| 979 | 979 | } |
| 980 | 980 | |
@@ -982,25 +982,25 @@ discard block |
||
| 982 | 982 | $modx->getDatabase()->connect(); |
| 983 | 983 | // always empty cache after install |
| 984 | 984 | $sync = new EvolutionCMS\Cache(); |
| 985 | - $sync->setCachepath(dirname(dirname(dirname(__DIR__))) . '/assets/cache/'); |
|
| 985 | + $sync->setCachepath(dirname(dirname(dirname(__DIR__))).'/assets/cache/'); |
|
| 986 | 986 | $sync->setReport(false); |
| 987 | 987 | $sync->emptyCache(); // first empty the cache |
| 988 | 988 | |
| 989 | 989 | // try to chmod the cache go-rwx (for suexeced php) |
| 990 | - @chmod(dirname(dirname(dirname(__DIR__))) . '/assets/cache/siteCache.idx.php', 0600); |
|
| 991 | - @chmod(dirname(dirname(dirname(__DIR__))) . '/assets/cache/sitePublishing.idx.php', 0600); |
|
| 990 | + @chmod(dirname(dirname(dirname(__DIR__))).'/assets/cache/siteCache.idx.php', 0600); |
|
| 991 | + @chmod(dirname(dirname(dirname(__DIR__))).'/assets/cache/sitePublishing.idx.php', 0600); |
|
| 992 | 992 | |
| 993 | 993 | // remove any locks on the manager functions so initial manager login is not blocked |
| 994 | - mysqli_query($conn, "TRUNCATE TABLE `" . $table_prefix . "active_users`"); |
|
| 994 | + mysqli_query($conn, "TRUNCATE TABLE `".$table_prefix."active_users`"); |
|
| 995 | 995 | |
| 996 | 996 | // close db connection |
| 997 | 997 | $sqlParser->close(); |
| 998 | 998 | |
| 999 | 999 | // andrazk 20070416 - release manager access |
| 1000 | - if (file_exists(dirname(dirname(dirname(__DIR__))) . '/assets/cache/installProc.inc.php')) { |
|
| 1001 | - @chmod(dirname(dirname(dirname(__DIR__))) . '/assets/cache/installProc.inc.php', 0755); |
|
| 1002 | - unlink(dirname(dirname(dirname(__DIR__))) . '/assets/cache/installProc.inc.php'); |
|
| 1000 | + if (file_exists(dirname(dirname(dirname(__DIR__))).'/assets/cache/installProc.inc.php')) { |
|
| 1001 | + @chmod(dirname(dirname(dirname(__DIR__))).'/assets/cache/installProc.inc.php', 0755); |
|
| 1002 | + unlink(dirname(dirname(dirname(__DIR__))).'/assets/cache/installProc.inc.php'); |
|
| 1003 | 1003 | } |
| 1004 | 1004 | } |
| 1005 | 1005 | } |
| 1006 | -include_once dirname(__DIR__) . '/template/actions/install.php'; |
|
| 1006 | +include_once dirname(__DIR__).'/template/actions/install.php'; |
|
