evolution-cms /
evolution
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | ?> |
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | ?> |
@@ -130,7 +130,7 @@ |
||
| 130 | 130 | * duplicate of method in documentParser class |
| 131 | 131 | * |
| 132 | 132 | * @param string $propertyString |
| 133 | - * @return array |
|
| 133 | + * @return string |
|
| 134 | 134 | */ |
| 135 | 135 | function parseProperties($propertyString) { |
| 136 | 136 | $parameter= array (); |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | |
| 270 | 270 | |
| 271 | 271 | // make sure we can use the database |
| 272 | -if ($installMode > 0 && !mysqli_query($conn, "USE {$dbase}")) { |
|
| 272 | +if ($installMode > 0 && !mysqli_query($conn, "use {$dbase}")) { |
|
| 273 | 273 | $errors++; |
| 274 | 274 | echo $_lang['database_use_failed'].PHP_EOL; |
| 275 | 275 | } |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | $params['modx_category'], |
| 574 | 574 | $params['lock_template'], |
| 575 | 575 | array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false, |
| 576 | - isset($params['save_sql_id_as']) ? $params['save_sql_id_as'] : NULL // Nessecary to fix template-ID for demo-site |
|
| 576 | + isset($params['save_sql_id_as']) ? $params['save_sql_id_as'] : null // Nessecary to fix template-ID for demo-site |
|
| 577 | 577 | ); |
| 578 | 578 | } |
| 579 | 579 | } |
@@ -949,7 +949,7 @@ discard block |
||
| 949 | 949 | } |
| 950 | 950 | |
| 951 | 951 | // write $somecontent to our opened file. |
| 952 | -if (@ fwrite($handle, $configString) === FALSE) { |
|
| 952 | +if (@ fwrite($handle, $configString) === false) { |
|
| 953 | 953 | $configFileFailed = true; |
| 954 | 954 | } |
| 955 | 955 | @ fclose($handle); |
@@ -1041,7 +1041,7 @@ discard block |
||
| 1041 | 1041 | $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'"); |
| 1042 | 1042 | |
| 1043 | 1043 | if (mysqli_num_rows($rs)) { |
| 1044 | - 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;")) { |
|
| 1044 | + 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;")) { |
|
| 1045 | 1045 | $errors += 1; |
| 1046 | 1046 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1047 | 1047 | return; |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | if (mysqli_num_rows($rs)) { |
| 1099 | 1099 | $insert = true; |
| 1100 | 1100 | while($row = mysqli_fetch_assoc($rs)) { |
| 1101 | - 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']};")) { |
|
| 1101 | + 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']};")) { |
|
| 1102 | 1102 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1103 | 1103 | return; |
| 1104 | 1104 | } |
@@ -1174,7 +1174,7 @@ discard block |
||
| 1174 | 1174 | } |
| 1175 | 1175 | $update = $count_original_name > 0 && $overwrite == 'true'; |
| 1176 | 1176 | if ($update) { |
| 1177 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 1177 | + if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 1178 | 1178 | $errors += 1; |
| 1179 | 1179 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1180 | 1180 | return; |
@@ -1225,13 +1225,13 @@ discard block |
||
| 1225 | 1225 | if (mysqli_num_rows($rs)) { |
| 1226 | 1226 | $row = mysqli_fetch_assoc($rs); |
| 1227 | 1227 | $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
| 1228 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 1228 | + if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 1229 | 1229 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1230 | 1230 | return; |
| 1231 | 1231 | } |
| 1232 | 1232 | echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
| 1233 | 1233 | } else { |
| 1234 | - if ($properties != NULL ){ |
|
| 1234 | + if ($properties != null ){ |
|
| 1235 | 1235 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1236 | 1236 | } |
| 1237 | 1237 | 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);")) { |
@@ -1272,7 +1272,7 @@ discard block |
||
| 1272 | 1272 | |
| 1273 | 1273 | // disable legacy versions based on legacy_names provided |
| 1274 | 1274 | if(!empty($leg_names)) { |
| 1275 | - $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 1275 | + $update_query = "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 1276 | 1276 | $rs = mysqli_query($sqlParser->conn, $update_query); |
| 1277 | 1277 | } |
| 1278 | 1278 | |
@@ -1288,13 +1288,13 @@ discard block |
||
| 1288 | 1288 | while($row = mysqli_fetch_assoc($rs)) { |
| 1289 | 1289 | $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
| 1290 | 1290 | if($row['description'] == $desc){ |
| 1291 | - if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 1291 | + if (! mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 1292 | 1292 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1293 | 1293 | return; |
| 1294 | 1294 | } |
| 1295 | 1295 | $insert = false; |
| 1296 | 1296 | } else { |
| 1297 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 1297 | + if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 1298 | 1298 | echo mysqli_error($sqlParser->conn).PHP_EOL; |
| 1299 | 1299 | return; |
| 1300 | 1300 | } |
@@ -1309,7 +1309,7 @@ discard block |
||
| 1309 | 1309 | } |
| 1310 | 1310 | echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
| 1311 | 1311 | } else { |
| 1312 | - if ($properties != NULL ){ |
|
| 1312 | + if ($properties != null ){ |
|
| 1313 | 1313 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1314 | 1314 | } |
| 1315 | 1315 | 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);")) { |
@@ -1362,13 +1362,13 @@ discard block |
||
| 1362 | 1362 | if (mysqli_num_rows($rs)) { |
| 1363 | 1363 | $row = mysqli_fetch_assoc($rs); |
| 1364 | 1364 | $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
| 1365 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 1365 | + if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 1366 | 1366 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1367 | 1367 | return; |
| 1368 | 1368 | } |
| 1369 | 1369 | echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
| 1370 | 1370 | } else { |
| 1371 | - if ($properties != NULL ){ |
|
| 1371 | + if ($properties != null ){ |
|
| 1372 | 1372 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1373 | 1373 | } |
| 1374 | 1374 | if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
@@ -339,9 +339,9 @@ discard block |
||
| 339 | 339 | echo $_lang['failed'] . ' ' . $_lang['table_prefix_not_exist'] . PHP_EOL; |
| 340 | 340 | $errors++; |
| 341 | 341 | |
| 342 | - } else { |
|
| 342 | + } else { |
|
| 343 | 343 | echo $_lang['ok'] . PHP_EOL; |
| 344 | - } |
|
| 344 | + } |
|
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | // check mysql version |
@@ -1162,7 +1162,7 @@ discard block |
||
| 1162 | 1162 | $tRow = mysqli_fetch_assoc($ts); |
| 1163 | 1163 | $templateId = $tRow['id']; |
| 1164 | 1164 | mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"); |
| 1165 | - } |
|
| 1165 | + } |
|
| 1166 | 1166 | } |
| 1167 | 1167 | } |
| 1168 | 1168 | } |
@@ -1527,9 +1527,9 @@ discard block |
||
| 1527 | 1527 | echo PHP_EOL . $_lang['installation_successful'] . PHP_EOL . PHP_EOL; |
| 1528 | 1528 | //echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>"; |
| 1529 | 1529 | if ($installMode == 0) { |
| 1530 | - echo strip_tags($_lang['installation_note']) . PHP_EOL; |
|
| 1530 | + echo strip_tags($_lang['installation_note']) . PHP_EOL; |
|
| 1531 | 1531 | } else { |
| 1532 | - echo strip_tags($_lang['upgrade_note']) . PHP_EOL; |
|
| 1532 | + echo strip_tags($_lang['upgrade_note']) . PHP_EOL; |
|
| 1533 | 1533 | } |
| 1534 | 1534 | |
| 1535 | 1535 | |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | $args = array_slice($argv, 1); |
| 59 | 59 | |
| 60 | -if ( empty($args) ){ |
|
| 60 | +if ( empty($args) ) { |
|
| 61 | 61 | echo 'Install Evolution CMS'.PHP_EOL; |
| 62 | 62 | //$installYes = readline("Type 'y' to continue: "); |
| 63 | 63 | //if ($installYes != 'y') return; |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | $managerlanguage = readline('Мanager language:' . ' [en] '); |
| 77 | 77 | $installData = readline('Instal demo-site (y/n):' . ' [n] '); |
| 78 | 78 | |
| 79 | -}else{ |
|
| 79 | +} else { |
|
| 80 | 80 | |
| 81 | 81 | $cli_variables = []; |
| 82 | 82 | foreach ($args as $arg) { |
@@ -130,21 +130,24 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | ////////////////////////////////////////////////////////////////////////////////////// |
| 133 | -if( ! function_exists('f_owc')){ |
|
| 133 | +if( ! function_exists('f_owc')) { |
|
| 134 | 134 | /** |
| 135 | 135 | * @param $path |
| 136 | 136 | * @param $data |
| 137 | 137 | * @param null|int $mode |
| 138 | 138 | */ |
| 139 | - function f_owc($path, $data, $mode = null){ |
|
| 139 | + function f_owc($path, $data, $mode = null) |
|
| 140 | + { |
|
| 140 | 141 | try { |
| 141 | 142 | // make an attempt to create the file |
| 142 | 143 | $hnd = fopen($path, 'w'); |
| 143 | 144 | fwrite($hnd, $data); |
| 144 | 145 | fclose($hnd); |
| 145 | 146 | |
| 146 | - if(null !== $mode) chmod($path, $mode); |
|
| 147 | - }catch(Exception $e){ |
|
| 147 | + if(null !== $mode) { |
|
| 148 | + chmod($path, $mode); |
|
| 149 | + } |
|
| 150 | + } catch(Exception $e) { |
|
| 148 | 151 | // Nothing, this is NOT normal |
| 149 | 152 | unset($e); |
| 150 | 153 | } |
@@ -210,7 +213,7 @@ discard block |
||
| 210 | 213 | |
| 211 | 214 | // File Browser directories exists? |
| 212 | 215 | echo strip_tags($_lang['checking_if_images_exist']); |
| 213 | -switch(true){ |
|
| 216 | +switch(true) { |
|
| 214 | 217 | case !file_exists($path."../assets/images"): |
| 215 | 218 | case !file_exists($path."../assets/files"): |
| 216 | 219 | case !file_exists($path."../assets/backup"): |
@@ -225,7 +228,7 @@ discard block |
||
| 225 | 228 | |
| 226 | 229 | // File Browser directories writable? |
| 227 | 230 | echo strip_tags($_lang['checking_if_images_writable']); |
| 228 | -switch(true){ |
|
| 231 | +switch(true) { |
|
| 229 | 232 | case !is_writable($path."../assets/images"): |
| 230 | 233 | case !is_writable($path."../assets/files"): |
| 231 | 234 | case !is_writable($path."../assets/backup"): |
@@ -361,7 +364,7 @@ discard block |
||
| 361 | 364 | if ($conn) { |
| 362 | 365 | echo $_lang['checking_mysql_strict_mode']; |
| 363 | 366 | $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode"); |
| 364 | - if (mysqli_num_rows($mysqlmode) > 0){ |
|
| 367 | + if (mysqli_num_rows($mysqlmode) > 0) { |
|
| 365 | 368 | $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM); |
| 366 | 369 | //$modes = array("STRICT_TRANS_TABLES"); // for testing |
| 367 | 370 | // print_r($modes); |
@@ -397,9 +400,9 @@ discard block |
||
| 397 | 400 | if ($errors > 0) { |
| 398 | 401 | echo $_lang['setup_cannot_continue'] . ' '; |
| 399 | 402 | |
| 400 | - if($errors > 1){ |
|
| 403 | + if($errors > 1) { |
|
| 401 | 404 | echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural']; |
| 402 | - }else{ |
|
| 405 | + } else { |
|
| 403 | 406 | echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again']. PHP_EOL; |
| 404 | 407 | } |
| 405 | 408 | |
@@ -445,13 +448,15 @@ discard block |
||
| 445 | 448 | |
| 446 | 449 | // get base path and url |
| 447 | 450 | $a = explode("install", str_replace("\\", "/", dirname($_SERVER["PHP_SELF"]))); |
| 448 | -if (count($a) > 1) |
|
| 451 | +if (count($a) > 1) { |
|
| 449 | 452 | array_pop($a); |
| 453 | +} |
|
| 450 | 454 | $url = implode("install", $a); |
| 451 | 455 | reset($a); |
| 452 | 456 | $a = explode("install", str_replace("\\", "/", realpath(dirname(__FILE__)))); |
| 453 | -if (count($a) > 1) |
|
| 457 | +if (count($a) > 1) { |
|
| 454 | 458 | array_pop($a); |
| 459 | +} |
|
| 455 | 460 | $pth = implode("install", $a); |
| 456 | 461 | unset ($a); |
| 457 | 462 | $base_url = $url . (substr($url, -1) != "/" ? "/" : ""); |
@@ -472,7 +477,9 @@ discard block |
||
| 472 | 477 | echo $_lang['setup_database_selection_failed']." ".$_lang['setup_database_selection_failed_note'].PHP_EOL; |
| 473 | 478 | $create = true; |
| 474 | 479 | } else { |
| 475 | - if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset); |
|
| 480 | + if (function_exists('mysqli_set_charset')) { |
|
| 481 | + mysqli_set_charset($conn, $database_charset); |
|
| 482 | + } |
|
| 476 | 483 | mysqli_query($conn, "{$database_connection_method} {$database_connection_charset}"); |
| 477 | 484 | echo $_lang['ok'].PHP_EOL; |
| 478 | 485 | } |
@@ -518,7 +525,8 @@ discard block |
||
| 518 | 525 | * @param string $propertyString |
| 519 | 526 | * @return array |
| 520 | 527 | */ |
| 521 | - function parseProperties($propertyString) { |
|
| 528 | + function parseProperties($propertyString) |
|
| 529 | + { |
|
| 522 | 530 | $parameter= array (); |
| 523 | 531 | if (!empty ($propertyString)) { |
| 524 | 532 | $tmpParams= explode("&", $propertyString); |
@@ -527,11 +535,14 @@ discard block |
||
| 527 | 535 | if (strpos($tmpParams[$x], '=', 0)) { |
| 528 | 536 | $pTmp= explode("=", $tmpParams[$x]); |
| 529 | 537 | $pvTmp= explode(";", trim($pTmp[1])); |
| 530 | - if ($pvTmp[1] == 'list' && $pvTmp[3] != "") |
|
| 531 | - $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default |
|
| 538 | + if ($pvTmp[1] == 'list' && $pvTmp[3] != "") { |
|
| 539 | + $parameter[trim($pTmp[0])]= $pvTmp[3]; |
|
| 540 | + } |
|
| 541 | + //list default |
|
| 532 | 542 | else |
| 533 | - if ($pvTmp[1] != 'list' && $pvTmp[2] != "") |
|
| 534 | - $parameter[trim($pTmp[0])]= $pvTmp[2]; |
|
| 543 | + if ($pvTmp[1] != 'list' && $pvTmp[2] != "") { |
|
| 544 | + $parameter[trim($pTmp[0])]= $pvTmp[2]; |
|
| 545 | + } |
|
| 535 | 546 | } |
| 536 | 547 | } |
| 537 | 548 | } |
@@ -579,12 +590,12 @@ discard block |
||
| 579 | 590 | $mt = &$moduleTemplates; |
| 580 | 591 | if(is_dir($templatePath) && is_readable($templatePath)) { |
| 581 | 592 | $d = dir($templatePath); |
| 582 | - while (false !== ($tplfile = $d->read())) |
|
| 583 | - { |
|
| 584 | - if(substr($tplfile, -4) != '.tpl') continue; |
|
| 593 | + while (false !== ($tplfile = $d->read())) { |
|
| 594 | + if(substr($tplfile, -4) != '.tpl') { |
|
| 595 | + continue; |
|
| 596 | + } |
|
| 585 | 597 | $params = parse_docblock($templatePath, $tplfile); |
| 586 | - if(is_array($params) && (count($params)>0)) |
|
| 587 | - { |
|
| 598 | + if(is_array($params) && (count($params)>0)) { |
|
| 588 | 599 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 589 | 600 | $mt[] = array |
| 590 | 601 | ( |
@@ -608,7 +619,9 @@ discard block |
||
| 608 | 619 | if(is_dir($tvPath) && is_readable($tvPath)) { |
| 609 | 620 | $d = dir($tvPath); |
| 610 | 621 | while (false !== ($tplfile = $d->read())) { |
| 611 | - if(substr($tplfile, -4) != '.tpl') continue; |
|
| 622 | + if(substr($tplfile, -4) != '.tpl') { |
|
| 623 | + continue; |
|
| 624 | + } |
|
| 612 | 625 | $params = parse_docblock($tvPath, $tplfile); |
| 613 | 626 | if(is_array($params) && (count($params)>0)) { |
| 614 | 627 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
@@ -801,7 +814,8 @@ discard block |
||
| 801 | 814 | // setup callback function |
| 802 | 815 | $callBackFnc = "clean_up"; |
| 803 | 816 | |
| 804 | -function clean_up($sqlParser) { |
|
| 817 | +function clean_up($sqlParser) |
|
| 818 | +{ |
|
| 805 | 819 | $ids = array(); |
| 806 | 820 | |
| 807 | 821 | // secure web documents - privateweb |
@@ -814,9 +828,10 @@ discard block |
||
| 814 | 828 | $ds = mysqli_query($sqlParser->conn,$sql); |
| 815 | 829 | if(!$ds) { |
| 816 | 830 | echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn); |
| 817 | - } |
|
| 818 | - else { |
|
| 819 | - while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"]; |
|
| 831 | + } else { |
|
| 832 | + while($r = mysqli_fetch_assoc($ds)) { |
|
| 833 | + $ids[]=$r["id"]; |
|
| 834 | + } |
|
| 820 | 835 | if(count($ids)>0) { |
| 821 | 836 | mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")"); |
| 822 | 837 | unset($ids); |
@@ -833,9 +848,10 @@ discard block |
||
| 833 | 848 | $ds = mysqli_query($sqlParser->conn,$sql); |
| 834 | 849 | if(!$ds) { |
| 835 | 850 | echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn); |
| 836 | - } |
|
| 837 | - else { |
|
| 838 | - while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"]; |
|
| 851 | + } else { |
|
| 852 | + while($r = mysqli_fetch_assoc($ds)) { |
|
| 853 | + $ids[]=$r["id"]; |
|
| 854 | + } |
|
| 839 | 855 | if(count($ids)>0) { |
| 840 | 856 | mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")"); |
| 841 | 857 | unset($ids); |
@@ -843,7 +859,8 @@ discard block |
||
| 843 | 859 | } |
| 844 | 860 | } |
| 845 | 861 | |
| 846 | -function parse_docblock($element_dir, $filename) { |
|
| 862 | +function parse_docblock($element_dir, $filename) |
|
| 863 | +{ |
|
| 847 | 864 | $params = array(); |
| 848 | 865 | $fullpath = $element_dir . '/' . $filename; |
| 849 | 866 | if(is_readable($fullpath)) { |
@@ -944,7 +961,7 @@ discard block |
||
| 944 | 961 | // custom or not |
| 945 | 962 | if (file_exists($path."../assets/cache/siteManager.php")) { |
| 946 | 963 | $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");'; |
| 947 | -}else{ |
|
| 964 | +} else { |
|
| 948 | 965 | $mgrdir = 'define(\'MGR_DIR\', \'manager\');'; |
| 949 | 966 | } |
| 950 | 967 | |
@@ -1084,7 +1101,9 @@ discard block |
||
| 1084 | 1101 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1085 | 1102 | die(); |
| 1086 | 1103 | } |
| 1087 | - if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn); |
|
| 1104 | + if(!is_null($save_sql_id_as)) { |
|
| 1105 | + $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn); |
|
| 1106 | + } |
|
| 1088 | 1107 | echo " $name: " . $_lang['installed'] . PHP_EOL; |
| 1089 | 1108 | } |
| 1090 | 1109 | } |
@@ -1179,9 +1198,9 @@ discard block |
||
| 1179 | 1198 | $overwrite = mysqli_real_escape_string($conn, $moduleChunk[4]); |
| 1180 | 1199 | $filecontent = $moduleChunk[2]; |
| 1181 | 1200 | |
| 1182 | - if (!file_exists($filecontent)) |
|
| 1183 | - echo " $name: " . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1184 | - else { |
|
| 1201 | + if (!file_exists($filecontent)) { |
|
| 1202 | + echo " $name: " . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1203 | + } else { |
|
| 1185 | 1204 | |
| 1186 | 1205 | // Create the category if it does not already exist |
| 1187 | 1206 | $category_id = getCreateDbCategory($category, $sqlParser); |
@@ -1234,9 +1253,9 @@ discard block |
||
| 1234 | 1253 | $guid = mysqli_real_escape_string($conn, $moduleModule[4]); |
| 1235 | 1254 | $shared = mysqli_real_escape_string($conn, $moduleModule[5]); |
| 1236 | 1255 | $category = mysqli_real_escape_string($conn, $moduleModule[6]); |
| 1237 | - if (!file_exists($filecontent)) |
|
| 1238 | - echo " $name: " . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1239 | - else { |
|
| 1256 | + if (!file_exists($filecontent)) { |
|
| 1257 | + echo " $name: " . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1258 | + } else { |
|
| 1240 | 1259 | |
| 1241 | 1260 | // Create the category if it does not already exist |
| 1242 | 1261 | $category = getCreateDbCategory($category, $sqlParser); |
@@ -1254,7 +1273,7 @@ discard block |
||
| 1254 | 1273 | } |
| 1255 | 1274 | echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
| 1256 | 1275 | } else { |
| 1257 | - if ($properties != NULL ){ |
|
| 1276 | + if ($properties != NULL ) { |
|
| 1258 | 1277 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1259 | 1278 | } |
| 1260 | 1279 | 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);")) { |
@@ -1289,9 +1308,9 @@ discard block |
||
| 1289 | 1308 | // parse comma-separated legacy names and prepare them for sql IN clause |
| 1290 | 1309 | $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'"; |
| 1291 | 1310 | } |
| 1292 | - if (!file_exists($filecontent)) |
|
| 1293 | - echo " $name: " . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1294 | - else { |
|
| 1311 | + if (!file_exists($filecontent)) { |
|
| 1312 | + echo " $name: " . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1313 | + } else { |
|
| 1295 | 1314 | |
| 1296 | 1315 | // disable legacy versions based on legacy_names provided |
| 1297 | 1316 | if(!empty($leg_names)) { |
@@ -1310,7 +1329,7 @@ discard block |
||
| 1310 | 1329 | $insert = true; |
| 1311 | 1330 | while($row = mysqli_fetch_assoc($rs)) { |
| 1312 | 1331 | $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
| 1313 | - if($row['description'] == $desc){ |
|
| 1332 | + if($row['description'] == $desc) { |
|
| 1314 | 1333 | if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
| 1315 | 1334 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1316 | 1335 | return; |
@@ -1332,7 +1351,7 @@ discard block |
||
| 1332 | 1351 | } |
| 1333 | 1352 | echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
| 1334 | 1353 | } else { |
| 1335 | - if ($properties != NULL ){ |
|
| 1354 | + if ($properties != NULL ) { |
|
| 1336 | 1355 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1337 | 1356 | } |
| 1338 | 1357 | 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);")) { |
@@ -1371,9 +1390,9 @@ discard block |
||
| 1371 | 1390 | $filecontent = $moduleSnippet[2]; |
| 1372 | 1391 | $properties = $moduleSnippet[3]; |
| 1373 | 1392 | $category = mysqli_real_escape_string($conn, $moduleSnippet[4]); |
| 1374 | - if (!file_exists($filecontent)) |
|
| 1375 | - echo " $name: " . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1376 | - else { |
|
| 1393 | + if (!file_exists($filecontent)) { |
|
| 1394 | + echo " $name: " . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1395 | + } else { |
|
| 1377 | 1396 | |
| 1378 | 1397 | // Create the category if it does not already exist |
| 1379 | 1398 | $category = getCreateDbCategory($category, $sqlParser); |
@@ -1391,7 +1410,7 @@ discard block |
||
| 1391 | 1410 | } |
| 1392 | 1411 | echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
| 1393 | 1412 | } else { |
| 1394 | - if ($properties != NULL ){ |
|
| 1413 | + if ($properties != NULL ) { |
|
| 1395 | 1414 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1396 | 1415 | } |
| 1397 | 1416 | if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
@@ -1484,11 +1503,14 @@ discard block |
||
| 1484 | 1503 | } |
| 1485 | 1504 | |
| 1486 | 1505 | // call back function |
| 1487 | -if ($callBackFnc != "") |
|
| 1506 | +if ($callBackFnc != "") { |
|
| 1488 | 1507 | $callBackFnc ($sqlParser); |
| 1508 | +} |
|
| 1489 | 1509 | |
| 1490 | 1510 | // Setup the MODX API -- needed for the cache processor |
| 1491 | -if (!defined('MODX_MANAGER_PATH')) define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/'); |
|
| 1511 | +if (!defined('MODX_MANAGER_PATH')) { |
|
| 1512 | + define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/'); |
|
| 1513 | +} |
|
| 1492 | 1514 | $database_type = 'mysqli'; |
| 1493 | 1515 | // initiate a new document parser |
| 1494 | 1516 | include_once($path.'../'.MGR_DIR.'/includes/document.parser.class.inc.php'); |
@@ -1527,7 +1549,7 @@ discard block |
||
| 1527 | 1549 | } |
| 1528 | 1550 | |
| 1529 | 1551 | |
| 1530 | -if ( empty($args) ){ |
|
| 1552 | +if ( empty($args) ) { |
|
| 1531 | 1553 | echo PHP_EOL . 'Remove install folder?'.PHP_EOL; |
| 1532 | 1554 | $removeInstall = readline("Type 'y' or 'n' to continue: "); |
| 1533 | 1555 | } |
@@ -1543,11 +1565,12 @@ discard block |
||
| 1543 | 1565 | * @param string $old |
| 1544 | 1566 | * @return string |
| 1545 | 1567 | */ |
| 1546 | -function propUpdate($new,$old){ |
|
| 1568 | +function propUpdate($new,$old) |
|
| 1569 | +{ |
|
| 1547 | 1570 | $newArr = parseProperties($new); |
| 1548 | 1571 | $oldArr = parseProperties($old); |
| 1549 | - foreach ($oldArr as $k => $v){ |
|
| 1550 | - if (isset($v['0']['options'])){ |
|
| 1572 | + foreach ($oldArr as $k => $v) { |
|
| 1573 | + if (isset($v['0']['options'])) { |
|
| 1551 | 1574 | $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options']; |
| 1552 | 1575 | } |
| 1553 | 1576 | } |
@@ -1562,12 +1585,17 @@ discard block |
||
| 1562 | 1585 | * @param bool|mixed $json |
| 1563 | 1586 | * @return string |
| 1564 | 1587 | */ |
| 1565 | -function parseProperties($propertyString, $json=false) { |
|
| 1588 | +function parseProperties($propertyString, $json=false) |
|
| 1589 | +{ |
|
| 1566 | 1590 | $propertyString = str_replace('{}', '', $propertyString ); |
| 1567 | 1591 | $propertyString = str_replace('} {', ',', $propertyString ); |
| 1568 | 1592 | |
| 1569 | - if(empty($propertyString)) return array(); |
|
| 1570 | - if($propertyString=='{}' || $propertyString=='[]') return array(); |
|
| 1593 | + if(empty($propertyString)) { |
|
| 1594 | + return array(); |
|
| 1595 | + } |
|
| 1596 | + if($propertyString=='{}' || $propertyString=='[]') { |
|
| 1597 | + return array(); |
|
| 1598 | + } |
|
| 1571 | 1599 | |
| 1572 | 1600 | $jsonFormat = isJson($propertyString, true); |
| 1573 | 1601 | $property = array(); |
@@ -1609,7 +1637,7 @@ discard block |
||
| 1609 | 1637 | |
| 1610 | 1638 | } |
| 1611 | 1639 | // new json-format |
| 1612 | - } else if(!empty($jsonFormat)){ |
|
| 1640 | + } else if(!empty($jsonFormat)) { |
|
| 1613 | 1641 | $property = $jsonFormat; |
| 1614 | 1642 | } |
| 1615 | 1643 | if ($json) { |
@@ -1624,7 +1652,8 @@ discard block |
||
| 1624 | 1652 | * @param bool $returnData |
| 1625 | 1653 | * @return bool|mixed |
| 1626 | 1654 | */ |
| 1627 | -function isJson($string, $returnData=false) { |
|
| 1655 | +function isJson($string, $returnData=false) |
|
| 1656 | +{ |
|
| 1628 | 1657 | $data = json_decode($string, true); |
| 1629 | 1658 | return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false; |
| 1630 | 1659 | } |
@@ -1634,7 +1663,8 @@ discard block |
||
| 1634 | 1663 | * @param SqlParser $sqlParser |
| 1635 | 1664 | * @return int |
| 1636 | 1665 | */ |
| 1637 | -function getCreateDbCategory($category, $sqlParser) { |
|
| 1666 | +function getCreateDbCategory($category, $sqlParser) |
|
| 1667 | +{ |
|
| 1638 | 1668 | $dbase = $sqlParser->dbname; |
| 1639 | 1669 | $dbase = '`' . trim($dbase,'`') . '`'; |
| 1640 | 1670 | $table_prefix = $sqlParser->prefix; |
@@ -1662,7 +1692,8 @@ discard block |
||
| 1662 | 1692 | * @param string $type |
| 1663 | 1693 | * @return string |
| 1664 | 1694 | */ |
| 1665 | -function removeDocblock($code, $type) { |
|
| 1695 | +function removeDocblock($code, $type) |
|
| 1696 | +{ |
|
| 1666 | 1697 | |
| 1667 | 1698 | $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1); |
| 1668 | 1699 | |
@@ -1683,8 +1714,9 @@ discard block |
||
| 1683 | 1714 | default: |
| 1684 | 1715 | return $cleaned; |
| 1685 | 1716 | }; |
| 1686 | - if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') |
|
| 1687 | - return $cleaned; |
|
| 1717 | + if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') { |
|
| 1718 | + return $cleaned; |
|
| 1719 | + } |
|
| 1688 | 1720 | |
| 1689 | 1721 | // fileBinding not found - return code incl docblock |
| 1690 | 1722 | return $code; |
@@ -5,8 +5,8 @@ discard block |
||
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | 7 | $self = 'install/cli-install.php'; |
| 8 | -$path = dirname(__FILE__) . '/'; |
|
| 9 | -$base_path = str_replace($self,'',str_replace('\\','/', __FILE__)); |
|
| 8 | +$path = dirname(__FILE__).'/'; |
|
| 9 | +$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__)); |
|
| 10 | 10 | define('MODX_API_MODE', true); |
| 11 | 11 | define('MODX_BASE_PATH', $base_path); |
| 12 | 12 | define('MODX_SITE_URL', '/'); |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | if (is_file($base_path."assets/cache/siteManager.php")) { |
| 20 | 20 | include_once($base_path."assets/cache/siteManager.php"); |
| 21 | 21 | } |
| 22 | -if(!defined('MGR_DIR') && is_dir($base_path."manager")) { |
|
| 22 | +if (!defined('MGR_DIR') && is_dir($base_path."manager")) { |
|
| 23 | 23 | define('MGR_DIR', 'manager'); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -33,43 +33,43 @@ discard block |
||
| 33 | 33 | $moduleSQLDataFile = $path."setup.data.sql"; |
| 34 | 34 | $moduleSQLResetFile = $path."setup.data.reset.sql"; |
| 35 | 35 | |
| 36 | -$moduleChunks = array (); // chunks - array : name, description, type - 0:file or 1:content, file or content |
|
| 37 | -$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content |
|
| 38 | -$moduleSnippets = array (); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 39 | -$modulePlugins = array (); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid |
|
| 40 | -$moduleModules = array (); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid |
|
| 41 | -$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 42 | -$moduleTVs = array (); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 36 | +$moduleChunks = array(); // chunks - array : name, description, type - 0:file or 1:content, file or content |
|
| 37 | +$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content |
|
| 38 | +$moduleSnippets = array(); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 39 | +$modulePlugins = array(); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid |
|
| 40 | +$moduleModules = array(); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid |
|
| 41 | +$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 42 | +$moduleTVs = array(); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 43 | 43 | $moduleDependencies = array(); // module depedencies - array : module, table, column, type, name |
| 44 | -$errors= 0; |
|
| 44 | +$errors = 0; |
|
| 45 | 45 | |
| 46 | 46 | |
| 47 | -$installMode= 0; |
|
| 47 | +$installMode = 0; |
|
| 48 | 48 | $installData = 0; |
| 49 | 49 | $tableprefixauto = base_convert(rand(10, 20), 10, 36).substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), rand(0, 33), 3).'_'; |
| 50 | 50 | |
| 51 | 51 | $args = array_slice($argv, 1); |
| 52 | 52 | |
| 53 | -if ( empty($args) ){ |
|
| 53 | +if (empty($args)) { |
|
| 54 | 54 | echo 'Install Evolution CMS'.PHP_EOL; |
| 55 | 55 | //$installYes = readline("Type 'y' to continue: "); |
| 56 | 56 | //if ($installYes != 'y') return; |
| 57 | 57 | |
| 58 | 58 | //set param manual |
| 59 | - $databasehost = readline($_lang['connection_screen_database_host']. ' [localhost] '); |
|
| 60 | - $databaseloginname = readline($_lang['connection_screen_database_login']. ' '); |
|
| 61 | - $databaseloginpassword = readline($_lang['connection_screen_database_pass']. ' '); |
|
| 62 | - $database_name = readline($_lang['connection_screen_database_name']. ' '); |
|
| 63 | - $tableprefix = readline($_lang['connection_screen_table_prefix']. ' ['.$tableprefixauto.'] '); |
|
| 64 | - $database_connection_method = readline($_lang['connection_screen_connection_method']. ' [SET CHARACTER SET] '); |
|
| 65 | - $database_collation = readline($_lang['connection_screen_collation']. ' [utf8_general_ci] '); |
|
| 66 | - $cmsadmin = readline($_lang['connection_screen_default_admin_login']. ' [admin] '); |
|
| 67 | - $cmsadminemail = readline($_lang['connection_screen_default_admin_email']. ' '); |
|
| 68 | - $cmspassword = readline($_lang['connection_screen_default_admin_password']. ' '); |
|
| 69 | - $managerlanguage = readline('Мanager language:' . ' [en] '); |
|
| 70 | - $installData = readline('Instal demo-site (y/n):' . ' [n] '); |
|
| 59 | + $databasehost = readline($_lang['connection_screen_database_host'].' [localhost] '); |
|
| 60 | + $databaseloginname = readline($_lang['connection_screen_database_login'].' '); |
|
| 61 | + $databaseloginpassword = readline($_lang['connection_screen_database_pass'].' '); |
|
| 62 | + $database_name = readline($_lang['connection_screen_database_name'].' '); |
|
| 63 | + $tableprefix = readline($_lang['connection_screen_table_prefix'].' ['.$tableprefixauto.'] '); |
|
| 64 | + $database_connection_method = readline($_lang['connection_screen_connection_method'].' [SET CHARACTER SET] '); |
|
| 65 | + $database_collation = readline($_lang['connection_screen_collation'].' [utf8_general_ci] '); |
|
| 66 | + $cmsadmin = readline($_lang['connection_screen_default_admin_login'].' [admin] '); |
|
| 67 | + $cmsadminemail = readline($_lang['connection_screen_default_admin_email'].' '); |
|
| 68 | + $cmspassword = readline($_lang['connection_screen_default_admin_password'].' '); |
|
| 69 | + $managerlanguage = readline('Мanager language:'.' [en] '); |
|
| 70 | + $installData = readline('Instal demo-site (y/n):'.' [n] '); |
|
| 71 | 71 | |
| 72 | -}else{ |
|
| 72 | +} else { |
|
| 73 | 73 | |
| 74 | 74 | $cli_variables = []; |
| 75 | 75 | foreach ($args as $arg) { |
@@ -100,14 +100,14 @@ discard block |
||
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | |
| 103 | -if ($databasehost == '') { $databasehost= 'localhost'; } |
|
| 104 | -if ($tableprefix == ''){ $tableprefix = $tableprefixauto; } |
|
| 103 | +if ($databasehost == '') { $databasehost = 'localhost'; } |
|
| 104 | +if ($tableprefix == '') { $tableprefix = $tableprefixauto; } |
|
| 105 | 105 | if ($database_connection_method == '') { $database_connection_method = 'SET CHARACTER SET'; } |
| 106 | 106 | if ($database_collation == '') { $database_collation = 'utf8_general_ci'; } |
| 107 | -if ($cmsadmin == ''){ $cmsadmin = 'admin'; } |
|
| 107 | +if ($cmsadmin == '') { $cmsadmin = 'admin'; } |
|
| 108 | 108 | if ($managerlanguage == '') { $managerlanguage = 'en'; } |
| 109 | -if ($installData == 'y') { $installData = 1;} |
|
| 110 | -if ($mode == 'upgrade') { $installMode = 1;} |
|
| 109 | +if ($installData == 'y') { $installData = 1; } |
|
| 110 | +if ($mode == 'upgrade') { $installMode = 1; } |
|
| 111 | 111 | |
| 112 | 112 | //добавить обработку языка |
| 113 | 113 | |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | ////////////////////////////////////////////////////////////////////////////////////// |
| 126 | -if( ! function_exists('f_owc')){ |
|
| 126 | +if (!function_exists('f_owc')) { |
|
| 127 | 127 | /** |
| 128 | 128 | * @param $path |
| 129 | 129 | * @param $data |
@@ -136,8 +136,8 @@ discard block |
||
| 136 | 136 | fwrite($hnd, $data); |
| 137 | 137 | fclose($hnd); |
| 138 | 138 | |
| 139 | - if(null !== $mode) chmod($path, $mode); |
|
| 140 | - }catch(Exception $e){ |
|
| 139 | + if (null !== $mode) chmod($path, $mode); |
|
| 140 | + } catch (Exception $e) { |
|
| 141 | 141 | // Nothing, this is NOT normal |
| 142 | 142 | unset($e); |
| 143 | 143 | } |
@@ -147,24 +147,24 @@ discard block |
||
| 147 | 147 | // check PHP version |
| 148 | 148 | define('PHP_MIN_VERSION', '5.4.0'); |
| 149 | 149 | $phpMinVersion = PHP_MIN_VERSION; // Maybe not necessary. For backward compatibility |
| 150 | -echo PHP_EOL . $_lang['checking_php_version']; |
|
| 150 | +echo PHP_EOL.$_lang['checking_php_version']; |
|
| 151 | 151 | // -1 if left is less, 0 if equal, +1 if left is higher |
| 152 | 152 | if (version_compare(phpversion(), PHP_MIN_VERSION) < 0) { |
| 153 | 153 | $errors++; |
| 154 | - $tmp = $_lang['you_running_php'] . phpversion() . str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]); |
|
| 155 | - echo $_lang['failed'] . ' ' . $tmp . PHP_EOL; |
|
| 154 | + $tmp = $_lang['you_running_php'].phpversion().str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]); |
|
| 155 | + echo $_lang['failed'].' '.$tmp.PHP_EOL; |
|
| 156 | 156 | } else { |
| 157 | - echo $_lang['ok'] . PHP_EOL; |
|
| 157 | + echo $_lang['ok'].PHP_EOL; |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | // check directories |
| 161 | 161 | // cache exists? |
| 162 | 162 | echo strip_tags($_lang['checking_if_cache_exist']); |
| 163 | 163 | if (!file_exists($path."../assets/cache") || !file_exists($path."../assets/cache/rss")) { |
| 164 | - echo $_lang['failed'] . PHP_EOL; |
|
| 164 | + echo $_lang['failed'].PHP_EOL; |
|
| 165 | 165 | $errors++; |
| 166 | 166 | } else { |
| 167 | - echo $_lang['ok'] . PHP_EOL; |
|
| 167 | + echo $_lang['ok'].PHP_EOL; |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | |
@@ -172,82 +172,82 @@ discard block |
||
| 172 | 172 | echo strip_tags($_lang['checking_if_cache_writable']); |
| 173 | 173 | if (!is_writable($path."../assets/cache")) { |
| 174 | 174 | $errors++; |
| 175 | - echo $_lang['failed'] . PHP_EOL; |
|
| 175 | + echo $_lang['failed'].PHP_EOL; |
|
| 176 | 176 | } else { |
| 177 | - echo $_lang['ok'] . PHP_EOL; |
|
| 177 | + echo $_lang['ok'].PHP_EOL; |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | |
| 181 | 181 | // cache files writable? |
| 182 | 182 | echo strip_tags($_lang['checking_if_cache_file_writable']); |
| 183 | 183 | $tmp = $path."../assets/cache/siteCache.idx.php"; |
| 184 | -if ( ! file_exists($tmp)) { |
|
| 184 | +if (!file_exists($tmp)) { |
|
| 185 | 185 | f_owc($tmp, "<?php //EVO site cache file ?>"); |
| 186 | 186 | } |
| 187 | -if ( ! is_writable($tmp)) { |
|
| 187 | +if (!is_writable($tmp)) { |
|
| 188 | 188 | $errors++; |
| 189 | - echo $_lang['failed'] . PHP_EOL; |
|
| 189 | + echo $_lang['failed'].PHP_EOL; |
|
| 190 | 190 | } else { |
| 191 | - echo $_lang['ok'] . PHP_EOL; |
|
| 191 | + echo $_lang['ok'].PHP_EOL; |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | |
| 195 | 195 | echo strip_tags($_lang['checking_if_cache_file2_writable']); |
| 196 | -if ( ! is_writable($path."../assets/cache/sitePublishing.idx.php")) { |
|
| 196 | +if (!is_writable($path."../assets/cache/sitePublishing.idx.php")) { |
|
| 197 | 197 | $errors++; |
| 198 | - echo $_lang['failed'] . PHP_EOL; |
|
| 198 | + echo $_lang['failed'].PHP_EOL; |
|
| 199 | 199 | } else { |
| 200 | - echo $_lang['ok'] . PHP_EOL; |
|
| 200 | + echo $_lang['ok'].PHP_EOL; |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | |
| 204 | 204 | // File Browser directories exists? |
| 205 | 205 | echo strip_tags($_lang['checking_if_images_exist']); |
| 206 | -switch(true){ |
|
| 206 | +switch (true) { |
|
| 207 | 207 | case !file_exists($path."../assets/images"): |
| 208 | 208 | case !file_exists($path."../assets/files"): |
| 209 | 209 | case !file_exists($path."../assets/backup"): |
| 210 | 210 | //case !file_exists("../assets/.thumbs"): |
| 211 | 211 | $errors++; |
| 212 | - echo $_lang['failed'] . PHP_EOL; |
|
| 212 | + echo $_lang['failed'].PHP_EOL; |
|
| 213 | 213 | break; |
| 214 | 214 | default: |
| 215 | - echo $_lang['ok'] . PHP_EOL; |
|
| 215 | + echo $_lang['ok'].PHP_EOL; |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | |
| 219 | 219 | // File Browser directories writable? |
| 220 | 220 | echo strip_tags($_lang['checking_if_images_writable']); |
| 221 | -switch(true){ |
|
| 221 | +switch (true) { |
|
| 222 | 222 | case !is_writable($path."../assets/images"): |
| 223 | 223 | case !is_writable($path."../assets/files"): |
| 224 | 224 | case !is_writable($path."../assets/backup"): |
| 225 | 225 | //case !is_writable("../assets/.thumbs"): |
| 226 | 226 | $errors++; |
| 227 | - echo $_lang['failed'] . PHP_EOL; |
|
| 227 | + echo $_lang['failed'].PHP_EOL; |
|
| 228 | 228 | break; |
| 229 | 229 | default: |
| 230 | - echo $_lang['ok'] . PHP_EOL; |
|
| 230 | + echo $_lang['ok'].PHP_EOL; |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | |
| 234 | 234 | // export exists? |
| 235 | 235 | echo strip_tags($_lang['checking_if_export_exists']); |
| 236 | 236 | if (!file_exists($path."../assets/export")) { |
| 237 | - echo $_lang['failed'] . PHP_EOL; |
|
| 237 | + echo $_lang['failed'].PHP_EOL; |
|
| 238 | 238 | $errors++; |
| 239 | 239 | } else { |
| 240 | - echo $_lang['ok'] . PHP_EOL; |
|
| 240 | + echo $_lang['ok'].PHP_EOL; |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | |
| 244 | 244 | // export writable? |
| 245 | 245 | echo strip_tags($_lang['checking_if_export_writable']); |
| 246 | 246 | if (!is_writable($path."../assets/export")) { |
| 247 | - echo $_lang['failed'] . PHP_EOL; |
|
| 247 | + echo $_lang['failed'].PHP_EOL; |
|
| 248 | 248 | $errors++; |
| 249 | 249 | } else { |
| 250 | - echo $_lang['ok'] . PHP_EOL; |
|
| 250 | + echo $_lang['ok'].PHP_EOL; |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | |
@@ -262,9 +262,9 @@ discard block |
||
| 262 | 262 | $isWriteable = is_writable($tmp); |
| 263 | 263 | if (!$isWriteable) { |
| 264 | 264 | $errors++; |
| 265 | - echo $_lang['failed'] . PHP_EOL; |
|
| 265 | + echo $_lang['failed'].PHP_EOL; |
|
| 266 | 266 | } else { |
| 267 | - echo $_lang['ok'] . PHP_EOL; |
|
| 267 | + echo $_lang['ok'].PHP_EOL; |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_') - 1); |
| 281 | 281 | $database_connection_charset = $database_collation; |
| 282 | 282 | $database_connection_method = $database_connection_method; |
| 283 | - $dbase = '`' . $database_name . '`'; |
|
| 283 | + $dbase = '`'.$database_name.'`'; |
|
| 284 | 284 | $table_prefix = $tableprefix; |
| 285 | 285 | } |
| 286 | 286 | echo $_lang['creating_database_connection']; |
@@ -320,33 +320,33 @@ discard block |
||
| 320 | 320 | |
| 321 | 321 | // check table prefix |
| 322 | 322 | if ($conn && $installMode == 0) { |
| 323 | - echo $_lang['checking_table_prefix'] . $table_prefix . '`: '; |
|
| 324 | - if ($rs= mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) { |
|
| 325 | - echo $_lang['failed'] . ' ' . $_lang['table_prefix_already_inuse_note'] . PHP_EOL; |
|
| 323 | + echo $_lang['checking_table_prefix'].$table_prefix.'`: '; |
|
| 324 | + if ($rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) { |
|
| 325 | + echo $_lang['failed'].' '.$_lang['table_prefix_already_inuse_note'].PHP_EOL; |
|
| 326 | 326 | $errors++; |
| 327 | 327 | |
| 328 | 328 | } else { |
| 329 | - echo $_lang['ok'] . PHP_EOL; |
|
| 329 | + echo $_lang['ok'].PHP_EOL; |
|
| 330 | 330 | } |
| 331 | 331 | } elseif ($conn && $installMode == 2) { |
| 332 | - echo $_lang['checking_table_prefix'] . $table_prefix . '`: '; |
|
| 333 | - if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) { |
|
| 334 | - echo $_lang['failed'] . ' ' . $_lang['table_prefix_not_exist'] . PHP_EOL; |
|
| 332 | + echo $_lang['checking_table_prefix'].$table_prefix.'`: '; |
|
| 333 | + if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) { |
|
| 334 | + echo $_lang['failed'].' '.$_lang['table_prefix_not_exist'].PHP_EOL; |
|
| 335 | 335 | $errors++; |
| 336 | 336 | |
| 337 | 337 | } else { |
| 338 | - echo $_lang['ok'] . PHP_EOL; |
|
| 338 | + echo $_lang['ok'].PHP_EOL; |
|
| 339 | 339 | } |
| 340 | 340 | } |
| 341 | 341 | |
| 342 | 342 | // check mysql version |
| 343 | 343 | if ($conn) { |
| 344 | 344 | echo $_lang['checking_mysql_version']; |
| 345 | - if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) { |
|
| 346 | - echo $_lang['warning'] . ' ' . $_lang['mysql_5051'] . PHP_EOL; |
|
| 347 | - echo $_lang['mysql_5051_warning'] . PHP_EOL; |
|
| 345 | + if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) { |
|
| 346 | + echo $_lang['warning'].' '.$_lang['mysql_5051'].PHP_EOL; |
|
| 347 | + echo $_lang['mysql_5051_warning'].PHP_EOL; |
|
| 348 | 348 | } else { |
| 349 | - echo $_lang['ok'] . ' ' . $_lang['mysql_version_is'] . mysqli_get_server_info($conn) . PHP_EOL; |
|
| 349 | + echo $_lang['ok'].' '.$_lang['mysql_version_is'].mysqli_get_server_info($conn).PHP_EOL; |
|
| 350 | 350 | } |
| 351 | 351 | } |
| 352 | 352 | |
@@ -354,20 +354,20 @@ discard block |
||
| 354 | 354 | if ($conn) { |
| 355 | 355 | echo $_lang['checking_mysql_strict_mode']; |
| 356 | 356 | $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode"); |
| 357 | - if (mysqli_num_rows($mysqlmode) > 0){ |
|
| 357 | + if (mysqli_num_rows($mysqlmode) > 0) { |
|
| 358 | 358 | $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM); |
| 359 | 359 | //$modes = array("STRICT_TRANS_TABLES"); // for testing |
| 360 | 360 | // print_r($modes); |
| 361 | 361 | foreach ($modes as $mode) { |
| 362 | 362 | if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) { |
| 363 | - echo $_lang['warning'] . ' ' . $_lang['strict_mode'] . PHP_EOL; |
|
| 364 | - echo $_lang['strict_mode_error'] . PHP_EOL; |
|
| 363 | + echo $_lang['warning'].' '.$_lang['strict_mode'].PHP_EOL; |
|
| 364 | + echo $_lang['strict_mode_error'].PHP_EOL; |
|
| 365 | 365 | } else { |
| 366 | - echo $_lang['ok'] . PHP_EOL; |
|
| 366 | + echo $_lang['ok'].PHP_EOL; |
|
| 367 | 367 | } |
| 368 | 368 | } |
| 369 | 369 | } else { |
| 370 | - echo $_lang['ok'] . PHP_EOL; |
|
| 370 | + echo $_lang['ok'].PHP_EOL; |
|
| 371 | 371 | } |
| 372 | 372 | } |
| 373 | 373 | // Version and strict mode check end |
@@ -383,17 +383,17 @@ discard block |
||
| 383 | 383 | f_owc($path."../assets/cache/installProc.inc.php", '<?php $installStartTime = '.time().'; ?>'); |
| 384 | 384 | } |
| 385 | 385 | |
| 386 | -if($installMode > 0 && $_POST['installdata'] == "1") { |
|
| 387 | - echo $_lang['sample_web_site'] . ': ' . $_lang['sample_web_site_note'] . PHP_EOL; |
|
| 386 | +if ($installMode > 0 && $_POST['installdata'] == "1") { |
|
| 387 | + echo $_lang['sample_web_site'].': '.$_lang['sample_web_site_note'].PHP_EOL; |
|
| 388 | 388 | } |
| 389 | 389 | |
| 390 | 390 | if ($errors > 0) { |
| 391 | - echo $_lang['setup_cannot_continue'] . ' '; |
|
| 391 | + echo $_lang['setup_cannot_continue'].' '; |
|
| 392 | 392 | |
| 393 | - if($errors > 1){ |
|
| 394 | - echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural']; |
|
| 395 | - }else{ |
|
| 396 | - echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again']. PHP_EOL; |
|
| 393 | + if ($errors > 1) { |
|
| 394 | + echo $errors." ".$_lang['errors'].$_lang['please_correct_errors'].$_lang['and_try_again_plural']; |
|
| 395 | + } else { |
|
| 396 | + echo $_lang['error'].$_lang['please_correct_error'].$_lang['and_try_again'].PHP_EOL; |
|
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | die(); |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
| 423 | 423 | $database_connection_charset = $database_charset; |
| 424 | 424 | $database_connection_method = $database_connection_method; |
| 425 | - $dbase = "`" .$database_name. "`"; |
|
| 425 | + $dbase = "`".$database_name."`"; |
|
| 426 | 426 | $table_prefix = $tableprefix; |
| 427 | 427 | $adminname = $cmsadmin; |
| 428 | 428 | $adminemail = $cmsadminemail; |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | |
| 434 | 434 | // set session name variable |
| 435 | 435 | if (!isset ($site_sessionname)) { |
| 436 | - $site_sessionname = 'SN' . uniqid(''); |
|
| 436 | + $site_sessionname = 'SN'.uniqid(''); |
|
| 437 | 437 | } |
| 438 | 438 | |
| 439 | 439 | // get base path and url |
@@ -447,8 +447,8 @@ discard block |
||
| 447 | 447 | array_pop($a); |
| 448 | 448 | $pth = implode("install", $a); |
| 449 | 449 | unset ($a); |
| 450 | -$base_url = $url . (substr($url, -1) != "/" ? "/" : ""); |
|
| 451 | -$base_path = $pth . (substr($pth, -1) != "/" ? "/" : ""); |
|
| 450 | +$base_url = $url.(substr($url, -1) != "/" ? "/" : ""); |
|
| 451 | +$base_path = $pth.(substr($pth, -1) != "/" ? "/" : ""); |
|
| 452 | 452 | |
| 453 | 453 | // connect to the database |
| 454 | 454 | echo $_lang['setup_database_create_connection'].': '; |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | } |
| 461 | 461 | |
| 462 | 462 | // select database |
| 463 | -echo $_lang['setup_database_selection']. str_replace("`", "", $dbase) . "`: "; |
|
| 463 | +echo $_lang['setup_database_selection'].str_replace("`", "", $dbase)."`: "; |
|
| 464 | 464 | if (!mysqli_select_db($conn, str_replace("`", "", $dbase))) { |
| 465 | 465 | echo $_lang['setup_database_selection_failed']." ".$_lang['setup_database_selection_failed_note'].PHP_EOL; |
| 466 | 466 | $create = true; |
@@ -472,16 +472,16 @@ discard block |
||
| 472 | 472 | |
| 473 | 473 | // try to create the database |
| 474 | 474 | if ($create) { |
| 475 | - echo $_lang['setup_database_creation']. str_replace("`", "", $dbase) . "`: "; |
|
| 475 | + echo $_lang['setup_database_creation'].str_replace("`", "", $dbase)."`: "; |
|
| 476 | 476 | // if(!@mysqli_create_db(str_replace("`","",$dbase), $conn)) { |
| 477 | - if (! mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) { |
|
| 477 | + if (!mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) { |
|
| 478 | 478 | echo $_lang['setup_database_creation_failed']." ".$_lang['setup_database_creation_failed_note'].PHP_EOL; |
| 479 | 479 | $errors += 1; |
| 480 | 480 | |
| 481 | - echo 'database charset: ' . $database_charset . PHP_EOL; |
|
| 482 | - echo 'database collation: ' . $database_collation . PHP_EOL; |
|
| 481 | + echo 'database charset: '.$database_charset.PHP_EOL; |
|
| 482 | + echo 'database collation: '.$database_collation.PHP_EOL; |
|
| 483 | 483 | |
| 484 | - echo $_lang['setup_database_creation_failed_note2'] . PHP_EOL; |
|
| 484 | + echo $_lang['setup_database_creation_failed_note2'].PHP_EOL; |
|
| 485 | 485 | |
| 486 | 486 | die(); |
| 487 | 487 | |
@@ -492,18 +492,18 @@ discard block |
||
| 492 | 492 | |
| 493 | 493 | // check table prefix |
| 494 | 494 | if ($installMode == 0) { |
| 495 | - echo $_lang['checking_table_prefix'] . $table_prefix . "`: "; |
|
| 496 | - if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) { |
|
| 497 | - echo $_lang['failed'] . " " . $_lang['table_prefix_already_inuse'] . PHP_EOL; |
|
| 495 | + echo $_lang['checking_table_prefix'].$table_prefix."`: "; |
|
| 496 | + if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) { |
|
| 497 | + echo $_lang['failed']." ".$_lang['table_prefix_already_inuse'].PHP_EOL; |
|
| 498 | 498 | $errors += 1; |
| 499 | - echo $_lang['table_prefix_already_inuse_note'] . PHP_EOL; |
|
| 499 | + echo $_lang['table_prefix_already_inuse_note'].PHP_EOL; |
|
| 500 | 500 | return; |
| 501 | 501 | } else { |
| 502 | 502 | echo $_lang['ok'].PHP_EOL; |
| 503 | 503 | } |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | -if(!function_exists('parseProperties')) { |
|
| 506 | +if (!function_exists('parseProperties')) { |
|
| 507 | 507 | /** |
| 508 | 508 | * parses a resource property string and returns the result as an array |
| 509 | 509 | * duplicate of method in documentParser class |
@@ -511,20 +511,20 @@ discard block |
||
| 511 | 511 | * @param string $propertyString |
| 512 | 512 | * @return array |
| 513 | 513 | */ |
| 514 | - function parseProperties($propertyString) { |
|
| 515 | - $parameter= array (); |
|
| 514 | + function parseProperties($propertyString){ |
|
| 515 | + $parameter = array(); |
|
| 516 | 516 | if (!empty ($propertyString)) { |
| 517 | - $tmpParams= explode("&", $propertyString); |
|
| 517 | + $tmpParams = explode("&", $propertyString); |
|
| 518 | 518 | $countParams = count($tmpParams); |
| 519 | - for ($x= 0; $x < $countParams; $x++) { |
|
| 519 | + for ($x = 0; $x < $countParams; $x++) { |
|
| 520 | 520 | if (strpos($tmpParams[$x], '=', 0)) { |
| 521 | - $pTmp= explode("=", $tmpParams[$x]); |
|
| 522 | - $pvTmp= explode(";", trim($pTmp[1])); |
|
| 521 | + $pTmp = explode("=", $tmpParams[$x]); |
|
| 522 | + $pvTmp = explode(";", trim($pTmp[1])); |
|
| 523 | 523 | if ($pvTmp[1] == 'list' && $pvTmp[3] != "") |
| 524 | - $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default |
|
| 524 | + $parameter[trim($pTmp[0])] = $pvTmp[3]; //list default |
|
| 525 | 525 | else |
| 526 | 526 | if ($pvTmp[1] != 'list' && $pvTmp[2] != "") |
| 527 | - $parameter[trim($pTmp[0])]= $pvTmp[2]; |
|
| 527 | + $parameter[trim($pTmp[0])] = $pvTmp[2]; |
|
| 528 | 528 | } |
| 529 | 529 | } |
| 530 | 530 | } |
@@ -535,20 +535,20 @@ discard block |
||
| 535 | 535 | // check status of Inherit Parent Template plugin |
| 536 | 536 | $auto_template_logic = 'parent'; |
| 537 | 537 | if ($installMode != 0) { |
| 538 | - $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='Inherit Parent Template'"); |
|
| 538 | + $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`".$table_prefix."site_plugins` WHERE name='Inherit Parent Template'"); |
|
| 539 | 539 | $row = mysqli_fetch_row($rs); |
| 540 | - if(!$row) { |
|
| 540 | + if (!$row) { |
|
| 541 | 541 | // not installed |
| 542 | 542 | $auto_template_logic = 'system'; |
| 543 | 543 | } else { |
| 544 | - if($row[1] == 1) { |
|
| 544 | + if ($row[1] == 1) { |
|
| 545 | 545 | // installed but disabled |
| 546 | 546 | $auto_template_logic = 'system'; |
| 547 | 547 | } else { |
| 548 | 548 | // installed, enabled .. see how it's configured |
| 549 | 549 | $properties = parseProperties($row[0]); |
| 550 | - if(isset($properties['inheritTemplate'])) { |
|
| 551 | - if($properties['inheritTemplate'] == 'From First Sibling') { |
|
| 550 | + if (isset($properties['inheritTemplate'])) { |
|
| 551 | + if ($properties['inheritTemplate'] == 'From First Sibling') { |
|
| 552 | 552 | $auto_template_logic = 'sibling'; |
| 553 | 553 | } |
| 554 | 554 | } |
@@ -570,17 +570,16 @@ discard block |
||
| 570 | 570 | |
| 571 | 571 | // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category |
| 572 | 572 | $mt = &$moduleTemplates; |
| 573 | -if(is_dir($templatePath) && is_readable($templatePath)) { |
|
| 573 | +if (is_dir($templatePath) && is_readable($templatePath)) { |
|
| 574 | 574 | $d = dir($templatePath); |
| 575 | 575 | while (false !== ($tplfile = $d->read())) |
| 576 | 576 | { |
| 577 | - if(substr($tplfile, -4) != '.tpl') continue; |
|
| 577 | + if (substr($tplfile, -4) != '.tpl') continue; |
|
| 578 | 578 | $params = parse_docblock($templatePath, $tplfile); |
| 579 | - if(is_array($params) && (count($params)>0)) |
|
| 579 | + if (is_array($params) && (count($params) > 0)) |
|
| 580 | 580 | { |
| 581 | 581 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 582 | - $mt[] = array |
|
| 583 | - ( |
|
| 582 | + $mt[] = array( |
|
| 584 | 583 | $params['name'], |
| 585 | 584 | $description, |
| 586 | 585 | // Don't think this is gonna be used ... but adding it just in case 'type' |
@@ -598,12 +597,12 @@ discard block |
||
| 598 | 597 | |
| 599 | 598 | // setup Template Variable template files |
| 600 | 599 | $mtv = &$moduleTVs; |
| 601 | -if(is_dir($tvPath) && is_readable($tvPath)) { |
|
| 600 | +if (is_dir($tvPath) && is_readable($tvPath)) { |
|
| 602 | 601 | $d = dir($tvPath); |
| 603 | 602 | while (false !== ($tplfile = $d->read())) { |
| 604 | - if(substr($tplfile, -4) != '.tpl') continue; |
|
| 603 | + if (substr($tplfile, -4) != '.tpl') continue; |
|
| 605 | 604 | $params = parse_docblock($tvPath, $tplfile); |
| 606 | - if(is_array($params) && (count($params)>0)) { |
|
| 605 | + if (is_array($params) && (count($params) > 0)) { |
|
| 607 | 606 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 608 | 607 | $mtv[] = array( |
| 609 | 608 | $params['name'], |
@@ -615,9 +614,9 @@ discard block |
||
| 615 | 614 | $params['output_widget'], |
| 616 | 615 | $params['output_widget_params'], |
| 617 | 616 | "$templatePath/{$params['filename']}", /* not currently used */ |
| 618 | - $params['template_assignments']!="*"?$params['template_assignments']:implode(",",array_map(create_function('$v','return $v[0];'),$mt)), /* comma-separated list of template names */ |
|
| 617 | + $params['template_assignments'] != "*" ? $params['template_assignments'] : implode(",", array_map(create_function('$v', 'return $v[0];'), $mt)), /* comma-separated list of template names */ |
|
| 619 | 618 | $params['modx_category'], |
| 620 | - $params['lock_tv'], /* value should be 1 or 0 */ |
|
| 619 | + $params['lock_tv'], /* value should be 1 or 0 */ |
|
| 621 | 620 | array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false |
| 622 | 621 | ); |
| 623 | 622 | } |
@@ -627,14 +626,14 @@ discard block |
||
| 627 | 626 | |
| 628 | 627 | // setup chunks template files - array : name, description, type - 0:file or 1:content, file or content |
| 629 | 628 | $mc = &$moduleChunks; |
| 630 | -if(is_dir($chunkPath) && is_readable($chunkPath)) { |
|
| 629 | +if (is_dir($chunkPath) && is_readable($chunkPath)) { |
|
| 631 | 630 | $d = dir($chunkPath); |
| 632 | 631 | while (false !== ($tplfile = $d->read())) { |
| 633 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 632 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 634 | 633 | continue; |
| 635 | 634 | } |
| 636 | 635 | $params = parse_docblock($chunkPath, $tplfile); |
| 637 | - if(is_array($params) && count($params) > 0) { |
|
| 636 | + if (is_array($params) && count($params) > 0) { |
|
| 638 | 637 | $mc[] = array( |
| 639 | 638 | $params['name'], |
| 640 | 639 | $params['description'], |
@@ -650,14 +649,14 @@ discard block |
||
| 650 | 649 | |
| 651 | 650 | // setup snippets template files - array : name, description, type - 0:file or 1:content, file or content,properties |
| 652 | 651 | $ms = &$moduleSnippets; |
| 653 | -if(is_dir($snippetPath) && is_readable($snippetPath)) { |
|
| 652 | +if (is_dir($snippetPath) && is_readable($snippetPath)) { |
|
| 654 | 653 | $d = dir($snippetPath); |
| 655 | 654 | while (false !== ($tplfile = $d->read())) { |
| 656 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 655 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 657 | 656 | continue; |
| 658 | 657 | } |
| 659 | 658 | $params = parse_docblock($snippetPath, $tplfile); |
| 660 | - if(is_array($params) && count($params) > 0) { |
|
| 659 | + if (is_array($params) && count($params) > 0) { |
|
| 661 | 660 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 662 | 661 | $ms[] = array( |
| 663 | 662 | $params['name'], |
@@ -674,14 +673,14 @@ discard block |
||
| 674 | 673 | |
| 675 | 674 | // setup plugins template files - array : name, description, type - 0:file or 1:content, file or content,properties |
| 676 | 675 | $mp = &$modulePlugins; |
| 677 | -if(is_dir($pluginPath) && is_readable($pluginPath)) { |
|
| 676 | +if (is_dir($pluginPath) && is_readable($pluginPath)) { |
|
| 678 | 677 | $d = dir($pluginPath); |
| 679 | 678 | while (false !== ($tplfile = $d->read())) { |
| 680 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 679 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 681 | 680 | continue; |
| 682 | 681 | } |
| 683 | 682 | $params = parse_docblock($pluginPath, $tplfile); |
| 684 | - if(is_array($params) && count($params) > 0) { |
|
| 683 | + if (is_array($params) && count($params) > 0) { |
|
| 685 | 684 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 686 | 685 | $mp[] = array( |
| 687 | 686 | $params['name'], |
@@ -693,7 +692,7 @@ discard block |
||
| 693 | 692 | $params['modx_category'], |
| 694 | 693 | $params['legacy_names'], |
| 695 | 694 | array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false, |
| 696 | - (int)$params['disabled'] |
|
| 695 | + (int) $params['disabled'] |
|
| 697 | 696 | ); |
| 698 | 697 | } |
| 699 | 698 | } |
@@ -703,14 +702,14 @@ discard block |
||
| 703 | 702 | // setup modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid,enable_sharedparams |
| 704 | 703 | $mm = &$moduleModules; |
| 705 | 704 | $mdp = &$moduleDependencies; |
| 706 | -if(is_dir($modulePath) && is_readable($modulePath)) { |
|
| 705 | +if (is_dir($modulePath) && is_readable($modulePath)) { |
|
| 707 | 706 | $d = dir($modulePath); |
| 708 | 707 | while (false !== ($tplfile = $d->read())) { |
| 709 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 708 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 710 | 709 | continue; |
| 711 | 710 | } |
| 712 | 711 | $params = parse_docblock($modulePath, $tplfile); |
| 713 | - if(is_array($params) && count($params) > 0) { |
|
| 712 | + if (is_array($params) && count($params) > 0) { |
|
| 714 | 713 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 715 | 714 | $mm[] = array( |
| 716 | 715 | $params['name'], |
@@ -718,12 +717,12 @@ discard block |
||
| 718 | 717 | "$modulePath/{$params['filename']}", |
| 719 | 718 | $params['properties'], |
| 720 | 719 | $params['guid'], |
| 721 | - (int)$params['shareparams'], |
|
| 720 | + (int) $params['shareparams'], |
|
| 722 | 721 | $params['modx_category'], |
| 723 | 722 | array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false |
| 724 | 723 | ); |
| 725 | 724 | } |
| 726 | - if ((int)$params['shareparams'] || !empty($params['dependencies'])) { |
|
| 725 | + if ((int) $params['shareparams'] || !empty($params['dependencies'])) { |
|
| 727 | 726 | $dependencies = explode(',', $params['dependencies']); |
| 728 | 727 | foreach ($dependencies as $dependency) { |
| 729 | 728 | $dependency = explode(':', $dependency); |
@@ -794,103 +793,103 @@ discard block |
||
| 794 | 793 | // setup callback function |
| 795 | 794 | $callBackFnc = "clean_up"; |
| 796 | 795 | |
| 797 | -function clean_up($sqlParser) { |
|
| 796 | +function clean_up($sqlParser){ |
|
| 798 | 797 | $ids = array(); |
| 799 | 798 | |
| 800 | 799 | // secure web documents - privateweb |
| 801 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1"); |
|
| 802 | - $sql = "SELECT DISTINCT sc.id |
|
| 800 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1"); |
|
| 801 | + $sql = "SELECT DISTINCT sc.id |
|
| 803 | 802 | FROM `".$sqlParser->prefix."site_content` sc |
| 804 | 803 | LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id |
| 805 | 804 | LEFT JOIN `".$sqlParser->prefix."webgroup_access` wga ON wga.documentgroup = dg.document_group |
| 806 | 805 | WHERE wga.id>0"; |
| 807 | - $ds = mysqli_query($sqlParser->conn,$sql); |
|
| 808 | - if(!$ds) { |
|
| 806 | + $ds = mysqli_query($sqlParser->conn, $sql); |
|
| 807 | + if (!$ds) { |
|
| 809 | 808 | echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn); |
| 810 | 809 | } |
| 811 | 810 | else { |
| 812 | - while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"]; |
|
| 813 | - if(count($ids)>0) { |
|
| 814 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")"); |
|
| 811 | + while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"]; |
|
| 812 | + if (count($ids) > 0) { |
|
| 813 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ", $ids).")"); |
|
| 815 | 814 | unset($ids); |
| 816 | 815 | } |
| 817 | 816 | } |
| 818 | 817 | |
| 819 | 818 | // secure manager documents privatemgr |
| 820 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1"); |
|
| 821 | - $sql = "SELECT DISTINCT sc.id |
|
| 819 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1"); |
|
| 820 | + $sql = "SELECT DISTINCT sc.id |
|
| 822 | 821 | FROM `".$sqlParser->prefix."site_content` sc |
| 823 | 822 | LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id |
| 824 | 823 | LEFT JOIN `".$sqlParser->prefix."membergroup_access` mga ON mga.documentgroup = dg.document_group |
| 825 | 824 | WHERE mga.id>0"; |
| 826 | - $ds = mysqli_query($sqlParser->conn,$sql); |
|
| 827 | - if(!$ds) { |
|
| 825 | + $ds = mysqli_query($sqlParser->conn, $sql); |
|
| 826 | + if (!$ds) { |
|
| 828 | 827 | echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn); |
| 829 | 828 | } |
| 830 | 829 | else { |
| 831 | - while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"]; |
|
| 832 | - if(count($ids)>0) { |
|
| 833 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")"); |
|
| 830 | + while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"]; |
|
| 831 | + if (count($ids) > 0) { |
|
| 832 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ", $ids).")"); |
|
| 834 | 833 | unset($ids); |
| 835 | 834 | } |
| 836 | 835 | } |
| 837 | 836 | } |
| 838 | 837 | |
| 839 | -function parse_docblock($element_dir, $filename) { |
|
| 838 | +function parse_docblock($element_dir, $filename){ |
|
| 840 | 839 | $params = array(); |
| 841 | - $fullpath = $element_dir . '/' . $filename; |
|
| 842 | - if(is_readable($fullpath)) { |
|
| 840 | + $fullpath = $element_dir.'/'.$filename; |
|
| 841 | + if (is_readable($fullpath)) { |
|
| 843 | 842 | $tpl = @fopen($fullpath, "r"); |
| 844 | - if($tpl) { |
|
| 843 | + if ($tpl) { |
|
| 845 | 844 | $params['filename'] = $filename; |
| 846 | 845 | $docblock_start_found = false; |
| 847 | 846 | $name_found = false; |
| 848 | 847 | $description_found = false; |
| 849 | 848 | |
| 850 | - while(!feof($tpl)) { |
|
| 849 | + while (!feof($tpl)) { |
|
| 851 | 850 | $line = fgets($tpl); |
| 852 | - if(!$docblock_start_found) { |
|
| 851 | + if (!$docblock_start_found) { |
|
| 853 | 852 | // find docblock start |
| 854 | - if(strpos($line, '/**') !== false) { |
|
| 853 | + if (strpos($line, '/**') !== false) { |
|
| 855 | 854 | $docblock_start_found = true; |
| 856 | 855 | } |
| 857 | 856 | continue; |
| 858 | - } elseif(!$name_found) { |
|
| 857 | + } elseif (!$name_found) { |
|
| 859 | 858 | // find name |
| 860 | 859 | $ma = null; |
| 861 | - if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 860 | + if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 862 | 861 | $params['name'] = trim($ma[1]); |
| 863 | 862 | $name_found = !empty($params['name']); |
| 864 | 863 | } |
| 865 | 864 | continue; |
| 866 | - } elseif(!$description_found) { |
|
| 865 | + } elseif (!$description_found) { |
|
| 867 | 866 | // find description |
| 868 | 867 | $ma = null; |
| 869 | - if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 868 | + if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 870 | 869 | $params['description'] = trim($ma[1]); |
| 871 | 870 | $description_found = !empty($params['description']); |
| 872 | 871 | } |
| 873 | 872 | continue; |
| 874 | 873 | } else { |
| 875 | 874 | $ma = null; |
| 876 | - if(preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) { |
|
| 875 | + if (preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) { |
|
| 877 | 876 | $param = trim($ma[1]); |
| 878 | 877 | $val = trim($ma[2]); |
| 879 | - if(!empty($param) && !empty($val)) { |
|
| 880 | - if($param == 'internal') { |
|
| 878 | + if (!empty($param) && !empty($val)) { |
|
| 879 | + if ($param == 'internal') { |
|
| 881 | 880 | $ma = null; |
| 882 | - if(preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) { |
|
| 881 | + if (preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) { |
|
| 883 | 882 | $param = trim($ma[1]); |
| 884 | 883 | $val = trim($ma[2]); |
| 885 | 884 | } |
| 886 | 885 | //if($val !== '0' && (empty($param) || empty($val))) { |
| 887 | - if(empty($param)) { |
|
| 886 | + if (empty($param)) { |
|
| 888 | 887 | continue; |
| 889 | 888 | } |
| 890 | 889 | } |
| 891 | 890 | $params[$param] = $val; |
| 892 | 891 | } |
| 893 | - } elseif(preg_match("/^\s*\*\/\s*$/", $line)) { |
|
| 892 | + } elseif (preg_match("/^\s*\*\/\s*$/", $line)) { |
|
| 894 | 893 | break; |
| 895 | 894 | } |
| 896 | 895 | } |
@@ -921,13 +920,13 @@ discard block |
||
| 921 | 920 | // display database results |
| 922 | 921 | if ($sqlParser->installFailed == true) { |
| 923 | 922 | $errors += 1; |
| 924 | - echo $_lang['database_alerts'] . PHP_EOL; |
|
| 925 | - echo $_lang['setup_couldnt_install'] . PHP_EOL; |
|
| 926 | - echo $_lang['installation_error_occured'] . PHP_EOL; |
|
| 923 | + echo $_lang['database_alerts'].PHP_EOL; |
|
| 924 | + echo $_lang['setup_couldnt_install'].PHP_EOL; |
|
| 925 | + echo $_lang['installation_error_occured'].PHP_EOL; |
|
| 927 | 926 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 928 | - echo $sqlParser->mysqlErrors[$i]["error"] . " " . $_lang['during_execution_of_sql'] . " " . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . PHP_EOL; |
|
| 927 | + echo $sqlParser->mysqlErrors[$i]["error"]." ".$_lang['during_execution_of_sql']." ".strip_tags($sqlParser->mysqlErrors[$i]["sql"]).PHP_EOL; |
|
| 929 | 928 | } |
| 930 | - echo $_lang['some_tables_not_updated'] . PHP_EOL; |
|
| 929 | + echo $_lang['some_tables_not_updated'].PHP_EOL; |
|
| 931 | 930 | die(); |
| 932 | 931 | } else { |
| 933 | 932 | echo $_lang['ok'].PHP_EOL; |
@@ -937,7 +936,7 @@ discard block |
||
| 937 | 936 | // custom or not |
| 938 | 937 | if (file_exists($path."../assets/cache/siteManager.php")) { |
| 939 | 938 | $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");'; |
| 940 | -}else{ |
|
| 939 | +} else { |
|
| 941 | 940 | $mgrdir = 'define(\'MGR_DIR\', \'manager\');'; |
| 942 | 941 | } |
| 943 | 942 | |
@@ -974,16 +973,16 @@ discard block |
||
| 974 | 973 | $chmodSuccess = @chmod($filename, 0404); |
| 975 | 974 | |
| 976 | 975 | if ($configFileFailed == true) { |
| 977 | - echo $_lang['failed'] . PHP_EOL; |
|
| 976 | + echo $_lang['failed'].PHP_EOL; |
|
| 978 | 977 | $errors += 1; |
| 979 | 978 | |
| 980 | - echo $_lang['cant_write_config_file'] . ' ' . MGR_DIR .'/includes/config.inc.php' .PHP_EOL; |
|
| 979 | + echo $_lang['cant_write_config_file'].' '.MGR_DIR.'/includes/config.inc.php'.PHP_EOL; |
|
| 981 | 980 | echo ' '.PHP_EOL; |
| 982 | 981 | echo ' '.PHP_EOL; |
| 983 | 982 | echo $configString; |
| 984 | 983 | echo ' '.PHP_EOL; |
| 985 | 984 | echo ' '.PHP_EOL; |
| 986 | - echo $_lang['cant_write_config_file_note'] . PHP_EOL; |
|
| 985 | + echo $_lang['cant_write_config_file_note'].PHP_EOL; |
|
| 987 | 986 | die(); |
| 988 | 987 | |
| 989 | 988 | } else { |
@@ -993,16 +992,16 @@ discard block |
||
| 993 | 992 | // generate new site_id and set manager theme to default |
| 994 | 993 | if ($installMode == 0) { |
| 995 | 994 | $siteid = uniqid(''); |
| 996 | - mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')"); |
|
| 995 | + mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')"); |
|
| 997 | 996 | } else { |
| 998 | 997 | // update site_id if missing |
| 999 | - $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`" . $table_prefix . "system_settings` WHERE setting_name='site_id'"); |
|
| 998 | + $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`".$table_prefix."system_settings` WHERE setting_name='site_id'"); |
|
| 1000 | 999 | if ($ds) { |
| 1001 | 1000 | $r = mysqli_fetch_assoc($ds); |
| 1002 | 1001 | $siteid = $r['setting_value']; |
| 1003 | 1002 | if ($siteid == '' || $siteid = 'MzGeQ2faT4Dw06+U49x3') { |
| 1004 | 1003 | $siteid = uniqid(''); |
| 1005 | - mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')"); |
|
| 1004 | + mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')"); |
|
| 1006 | 1005 | } |
| 1007 | 1006 | } |
| 1008 | 1007 | } |
@@ -1014,29 +1013,29 @@ discard block |
||
| 1014 | 1013 | // display database results |
| 1015 | 1014 | if ($sqlParser->installFailed == true) { |
| 1016 | 1015 | $errors += 1; |
| 1017 | - echo $_lang['database_alerts'] . PHP_EOL; |
|
| 1018 | - echo $_lang['setup_couldnt_install'] . PHP_EOL; |
|
| 1019 | - echo $_lang['installation_error_occured'] . PHP_EOL . PHP_EOL; |
|
| 1016 | + echo $_lang['database_alerts'].PHP_EOL; |
|
| 1017 | + echo $_lang['setup_couldnt_install'].PHP_EOL; |
|
| 1018 | + echo $_lang['installation_error_occured'].PHP_EOL.PHP_EOL; |
|
| 1020 | 1019 | /* |
| 1021 | 1020 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 1022 | 1021 | echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />"; |
| 1023 | 1022 | } |
| 1024 | 1023 | echo "</p>";*/ |
| 1025 | - echo $_lang['some_tables_not_updated'] . PHP_EOL; |
|
| 1024 | + echo $_lang['some_tables_not_updated'].PHP_EOL; |
|
| 1026 | 1025 | die(); |
| 1027 | 1026 | } else { |
| 1028 | - echo $_lang['ok'] . PHP_EOL; |
|
| 1027 | + echo $_lang['ok'].PHP_EOL; |
|
| 1029 | 1028 | } |
| 1030 | 1029 | } |
| 1031 | 1030 | |
| 1032 | 1031 | // Install Templates |
| 1033 | 1032 | $moduleTemplate = $mt; |
| 1034 | 1033 | if (!empty($moduleTemplate) || $installData) { |
| 1035 | - echo PHP_EOL . $_lang['templates'] . ":" . PHP_EOL; |
|
| 1034 | + echo PHP_EOL.$_lang['templates'].":".PHP_EOL; |
|
| 1036 | 1035 | //$selTemplates = $_POST['template']; |
| 1037 | 1036 | foreach ($moduleTemplates as $k=>$moduleTemplate) { |
| 1038 | 1037 | $installSample = in_array('sample', $moduleTemplate[6]) && $installData == 1; |
| 1039 | - if($installSample || is_array($moduleTemplate)) { |
|
| 1038 | + if ($installSample || is_array($moduleTemplate)) { |
|
| 1040 | 1039 | $name = mysqli_real_escape_string($conn, $moduleTemplate[0]); |
| 1041 | 1040 | $desc = mysqli_real_escape_string($conn, $moduleTemplate[1]); |
| 1042 | 1041 | $category = mysqli_real_escape_string($conn, $moduleTemplate[4]); |
@@ -1044,7 +1043,7 @@ discard block |
||
| 1044 | 1043 | $filecontent = $moduleTemplate[3]; |
| 1045 | 1044 | $save_sql_id_as = $moduleTemplate[7]; // Nessecary for demo-site |
| 1046 | 1045 | if (!file_exists($filecontent)) { |
| 1047 | - echo " $name: " . $_lang['unable_install_template'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1046 | + echo " $name: ".$_lang['unable_install_template']." '$filecontent' ".$_lang['not_found'].PHP_EOL; |
|
| 1048 | 1047 | } else { |
| 1049 | 1048 | // Create the category if it does not already exist |
| 1050 | 1049 | $category_id = getCreateDbCategory($category, $sqlParser); |
@@ -1054,31 +1053,31 @@ discard block |
||
| 1054 | 1053 | $template = mysqli_real_escape_string($conn, $template); |
| 1055 | 1054 | |
| 1056 | 1055 | // See if the template already exists |
| 1057 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'"); |
|
| 1056 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name'"); |
|
| 1058 | 1057 | |
| 1059 | 1058 | if (mysqli_num_rows($rs)) { |
| 1060 | - 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;")) { |
|
| 1059 | + 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;")) { |
|
| 1061 | 1060 | $errors += 1; |
| 1062 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1061 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1063 | 1062 | return; |
| 1064 | 1063 | } |
| 1065 | - if(!is_null($save_sql_id_as)) { |
|
| 1064 | + if (!is_null($save_sql_id_as)) { |
|
| 1066 | 1065 | $sql_id = @mysqli_insert_id($sqlParser->conn); |
| 1067 | - if(!$sql_id) { |
|
| 1068 | - $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name' LIMIT 1;")); |
|
| 1066 | + if (!$sql_id) { |
|
| 1067 | + $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name' LIMIT 1;")); |
|
| 1069 | 1068 | $sql_id = $idQuery['id']; |
| 1070 | 1069 | } |
| 1071 | 1070 | $custom_placeholders[$save_sql_id_as] = $sql_id; |
| 1072 | 1071 | } |
| 1073 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1072 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1074 | 1073 | } else { |
| 1075 | - if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) { |
|
| 1074 | + if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) { |
|
| 1076 | 1075 | $errors += 1; |
| 1077 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1076 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1078 | 1077 | die(); |
| 1079 | 1078 | } |
| 1080 | - if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn); |
|
| 1081 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1079 | + if (!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn); |
|
| 1080 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1082 | 1081 | } |
| 1083 | 1082 | } |
| 1084 | 1083 | } |
@@ -1088,11 +1087,11 @@ discard block |
||
| 1088 | 1087 | // Install Template Variables |
| 1089 | 1088 | $moduleTVs = $mtv; |
| 1090 | 1089 | if (is_array($moduleTVs) || $installData) { |
| 1091 | - echo PHP_EOL . $_lang['tvs'].': '.PHP_EOL; |
|
| 1090 | + echo PHP_EOL.$_lang['tvs'].': '.PHP_EOL; |
|
| 1092 | 1091 | //$selTVs = $_POST['tv']; |
| 1093 | 1092 | foreach ($moduleTVs as $k=>$moduleTV) { |
| 1094 | 1093 | $installSample = in_array('sample', $moduleTV[12]) && $installData == 1; |
| 1095 | - if($installSample || is_array($moduleTVs)) { |
|
| 1094 | + if ($installSample || is_array($moduleTVs)) { |
|
| 1096 | 1095 | $name = mysqli_real_escape_string($conn, $moduleTV[0]); |
| 1097 | 1096 | $caption = mysqli_real_escape_string($conn, $moduleTV[1]); |
| 1098 | 1097 | $desc = mysqli_real_escape_string($conn, $moduleTV[2]); |
@@ -1110,24 +1109,24 @@ discard block |
||
| 1110 | 1109 | // Create the category if it does not already exist |
| 1111 | 1110 | $category = getCreateDbCategory($category, $sqlParser); |
| 1112 | 1111 | |
| 1113 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_tmplvars` WHERE name='$name'"); |
|
| 1112 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name'"); |
|
| 1114 | 1113 | if (mysqli_num_rows($rs)) { |
| 1115 | 1114 | $insert = true; |
| 1116 | - while($row = mysqli_fetch_assoc($rs)) { |
|
| 1117 | - 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']};")) { |
|
| 1118 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1115 | + while ($row = mysqli_fetch_assoc($rs)) { |
|
| 1116 | + 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']};")) { |
|
| 1117 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1119 | 1118 | return; |
| 1120 | 1119 | } |
| 1121 | 1120 | $insert = false; |
| 1122 | 1121 | } |
| 1123 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1122 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1124 | 1123 | } else { |
| 1125 | - $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');"; |
|
| 1124 | + $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');"; |
|
| 1126 | 1125 | if (!mysqli_query($sqlParser->conn, $q)) { |
| 1127 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1126 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1128 | 1127 | return; |
| 1129 | 1128 | } |
| 1130 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1129 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1131 | 1130 | } |
| 1132 | 1131 | |
| 1133 | 1132 | // add template assignments |
@@ -1136,10 +1135,10 @@ discard block |
||
| 1136 | 1135 | if (count($assignments) > 0) { |
| 1137 | 1136 | |
| 1138 | 1137 | // remove existing tv -> template assignments |
| 1139 | - $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';"); |
|
| 1138 | + $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';"); |
|
| 1140 | 1139 | $row = mysqli_fetch_assoc($ds); |
| 1141 | 1140 | $id = $row["id"]; |
| 1142 | - mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_tmplvar_templates` WHERE tmplvarid = \'' . $id . '\''); |
|
| 1141 | + mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_tmplvar_templates` WHERE tmplvarid = \''.$id.'\''); |
|
| 1143 | 1142 | |
| 1144 | 1143 | // add tv -> template assignments |
| 1145 | 1144 | foreach ($assignments as $assignment) { |
@@ -1148,7 +1147,7 @@ discard block |
||
| 1148 | 1147 | if ($ds && $ts) { |
| 1149 | 1148 | $tRow = mysqli_fetch_assoc($ts); |
| 1150 | 1149 | $templateId = $tRow['id']; |
| 1151 | - mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"); |
|
| 1150 | + mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"); |
|
| 1152 | 1151 | } |
| 1153 | 1152 | } |
| 1154 | 1153 | } |
@@ -1159,12 +1158,12 @@ discard block |
||
| 1159 | 1158 | |
| 1160 | 1159 | $moduleChunks = $mc; |
| 1161 | 1160 | // Install Chunks |
| 1162 | -if (is_array ($moduleChunks) || $installData) { |
|
| 1163 | - echo PHP_EOL . $_lang['chunks'] . ": " . PHP_EOL; |
|
| 1161 | +if (is_array($moduleChunks) || $installData) { |
|
| 1162 | + echo PHP_EOL.$_lang['chunks'].": ".PHP_EOL; |
|
| 1164 | 1163 | foreach ($moduleChunks as $k=>$moduleChunk) { |
| 1165 | 1164 | $installSample = in_array('sample', $moduleChunk[5]) && $installData == 1; |
| 1166 | 1165 | $count_new_name = 0; |
| 1167 | - if($installSample || is_array ($moduleChunks)) { |
|
| 1166 | + if ($installSample || is_array($moduleChunks)) { |
|
| 1168 | 1167 | |
| 1169 | 1168 | $name = mysqli_real_escape_string($conn, $moduleChunk[0]); |
| 1170 | 1169 | $desc = mysqli_real_escape_string($conn, $moduleChunk[1]); |
@@ -1173,7 +1172,7 @@ discard block |
||
| 1173 | 1172 | $filecontent = $moduleChunk[2]; |
| 1174 | 1173 | |
| 1175 | 1174 | if (!file_exists($filecontent)) |
| 1176 | - echo " $name: " . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1175 | + echo " $name: ".$_lang['unable_install_chunk']." '$filecontent' ".$_lang['not_found'].PHP_EOL; |
|
| 1177 | 1176 | else { |
| 1178 | 1177 | |
| 1179 | 1178 | // Create the category if it does not already exist |
@@ -1181,31 +1180,31 @@ discard block |
||
| 1181 | 1180 | |
| 1182 | 1181 | $chunk = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', file_get_contents($filecontent), 1); |
| 1183 | 1182 | $chunk = mysqli_real_escape_string($conn, $chunk); |
| 1184 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$name'"); |
|
| 1183 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$name'"); |
|
| 1185 | 1184 | $count_original_name = mysqli_num_rows($rs); |
| 1186 | - if($overwrite == 'false') { |
|
| 1187 | - $newname = $name . '-' . str_replace('.', '_', $modx_version); |
|
| 1188 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$newname'"); |
|
| 1185 | + if ($overwrite == 'false') { |
|
| 1186 | + $newname = $name.'-'.str_replace('.', '_', $modx_version); |
|
| 1187 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$newname'"); |
|
| 1189 | 1188 | $count_new_name = mysqli_num_rows($rs); |
| 1190 | 1189 | } |
| 1191 | 1190 | $update = $count_original_name > 0 && $overwrite == 'true'; |
| 1192 | 1191 | if ($update) { |
| 1193 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 1192 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 1194 | 1193 | $errors += 1; |
| 1195 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1194 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1196 | 1195 | return; |
| 1197 | 1196 | } |
| 1198 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1199 | - } elseif($count_new_name == 0) { |
|
| 1200 | - if($count_original_name > 0 && $overwrite == 'false') { |
|
| 1197 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1198 | + } elseif ($count_new_name == 0) { |
|
| 1199 | + if ($count_original_name > 0 && $overwrite == 'false') { |
|
| 1201 | 1200 | $name = $newname; |
| 1202 | 1201 | } |
| 1203 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) { |
|
| 1202 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) { |
|
| 1204 | 1203 | $errors += 1; |
| 1205 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1204 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1206 | 1205 | return; |
| 1207 | 1206 | } |
| 1208 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1207 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1209 | 1208 | } |
| 1210 | 1209 | } |
| 1211 | 1210 | } |
@@ -1215,11 +1214,11 @@ discard block |
||
| 1215 | 1214 | // Install Modules |
| 1216 | 1215 | $moduleModules = $mm; |
| 1217 | 1216 | if (is_array($moduleModules) || $installData) { |
| 1218 | - echo PHP_EOL . $_lang['modules'] . ":" . PHP_EOL; |
|
| 1217 | + echo PHP_EOL.$_lang['modules'].":".PHP_EOL; |
|
| 1219 | 1218 | //$selModules = $_POST['module']; |
| 1220 | 1219 | foreach ($moduleModules as $k=>$moduleModule) { |
| 1221 | 1220 | $installSample = in_array('sample', $moduleModule[7]) && $installData == 1; |
| 1222 | - if($installSample || is_array($moduleModules)) { |
|
| 1221 | + if ($installSample || is_array($moduleModules)) { |
|
| 1223 | 1222 | $name = mysqli_real_escape_string($conn, $moduleModule[0]); |
| 1224 | 1223 | $desc = mysqli_real_escape_string($conn, $moduleModule[1]); |
| 1225 | 1224 | $filecontent = $moduleModule[2]; |
@@ -1228,7 +1227,7 @@ discard block |
||
| 1228 | 1227 | $shared = mysqli_real_escape_string($conn, $moduleModule[5]); |
| 1229 | 1228 | $category = mysqli_real_escape_string($conn, $moduleModule[6]); |
| 1230 | 1229 | if (!file_exists($filecontent)) |
| 1231 | - echo " $name: " . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1230 | + echo " $name: ".$_lang['unable_install_module']." '$filecontent' ".$_lang['not_found'].PHP_EOL; |
|
| 1232 | 1231 | else { |
| 1233 | 1232 | |
| 1234 | 1233 | // Create the category if it does not already exist |
@@ -1237,24 +1236,24 @@ discard block |
||
| 1237 | 1236 | $module = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2)); |
| 1238 | 1237 | // $module = removeDocblock($module, 'module'); // Modules have no fileBinding, keep docblock for info-tab |
| 1239 | 1238 | $module = mysqli_real_escape_string($conn, $module); |
| 1240 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_modules` WHERE name='$name'"); |
|
| 1239 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_modules` WHERE name='$name'"); |
|
| 1241 | 1240 | if (mysqli_num_rows($rs)) { |
| 1242 | 1241 | $row = mysqli_fetch_assoc($rs); |
| 1243 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 1244 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 1245 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1242 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 1243 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 1244 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1246 | 1245 | return; |
| 1247 | 1246 | } |
| 1248 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1247 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1249 | 1248 | } else { |
| 1250 | - if ($properties != NULL ){ |
|
| 1249 | + if ($properties != NULL) { |
|
| 1251 | 1250 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1252 | 1251 | } |
| 1253 | - 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);")) { |
|
| 1254 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 1252 | + 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);")) { |
|
| 1253 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 1255 | 1254 | return; |
| 1256 | 1255 | } |
| 1257 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1256 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1258 | 1257 | } |
| 1259 | 1258 | } |
| 1260 | 1259 | } |
@@ -1264,11 +1263,11 @@ discard block |
||
| 1264 | 1263 | // Install Plugins |
| 1265 | 1264 | $modulePlugins = $mp; |
| 1266 | 1265 | if (is_array($modulePlugins) || $installData) { |
| 1267 | - echo PHP_EOL . $_lang['plugins'] . ":" . PHP_EOL; |
|
| 1266 | + echo PHP_EOL.$_lang['plugins'].":".PHP_EOL; |
|
| 1268 | 1267 | $selPlugs = $_POST['plugin']; |
| 1269 | 1268 | foreach ($modulePlugins as $k=>$modulePlugin) { |
| 1270 | 1269 | //$installSample = in_array('sample', $modulePlugin[8]) && $installData == 1; |
| 1271 | - if($installSample || is_array($modulePlugins)) { |
|
| 1270 | + if ($installSample || is_array($modulePlugins)) { |
|
| 1272 | 1271 | $name = mysqli_real_escape_string($conn, $modulePlugin[0]); |
| 1273 | 1272 | $desc = mysqli_real_escape_string($conn, $modulePlugin[1]); |
| 1274 | 1273 | $filecontent = $modulePlugin[2]; |
@@ -1278,17 +1277,17 @@ discard block |
||
| 1278 | 1277 | $category = mysqli_real_escape_string($conn, $modulePlugin[6]); |
| 1279 | 1278 | $leg_names = ''; |
| 1280 | 1279 | $disabled = $modulePlugin[9]; |
| 1281 | - if(array_key_exists(7, $modulePlugin)) { |
|
| 1280 | + if (array_key_exists(7, $modulePlugin)) { |
|
| 1282 | 1281 | // parse comma-separated legacy names and prepare them for sql IN clause |
| 1283 | - $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'"; |
|
| 1282 | + $leg_names = "'".implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7])))."'"; |
|
| 1284 | 1283 | } |
| 1285 | 1284 | if (!file_exists($filecontent)) |
| 1286 | - echo " $name: " . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1285 | + echo " $name: ".$_lang['unable_install_plugin']." '$filecontent' ".$_lang['not_found'].PHP_EOL; |
|
| 1287 | 1286 | else { |
| 1288 | 1287 | |
| 1289 | 1288 | // disable legacy versions based on legacy_names provided |
| 1290 | - if(!empty($leg_names)) { |
|
| 1291 | - $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 1289 | + if (!empty($leg_names)) { |
|
| 1290 | + $update_query = "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 1292 | 1291 | $rs = mysqli_query($sqlParser->conn, $update_query); |
| 1293 | 1292 | } |
| 1294 | 1293 | |
@@ -1298,52 +1297,52 @@ discard block |
||
| 1298 | 1297 | $plugin = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2)); |
| 1299 | 1298 | $plugin = removeDocblock($plugin, 'plugin'); |
| 1300 | 1299 | $plugin = mysqli_real_escape_string($conn, $plugin); |
| 1301 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='$name'"); |
|
| 1300 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name'"); |
|
| 1302 | 1301 | if (mysqli_num_rows($rs)) { |
| 1303 | 1302 | $insert = true; |
| 1304 | - while($row = mysqli_fetch_assoc($rs)) { |
|
| 1305 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 1306 | - if($row['description'] == $desc){ |
|
| 1307 | - if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 1308 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1303 | + while ($row = mysqli_fetch_assoc($rs)) { |
|
| 1304 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 1305 | + if ($row['description'] == $desc) { |
|
| 1306 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 1307 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1309 | 1308 | return; |
| 1310 | 1309 | } |
| 1311 | 1310 | $insert = false; |
| 1312 | 1311 | } else { |
| 1313 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 1312 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 1314 | 1313 | echo mysqli_error($sqlParser->conn).PHP_EOL; |
| 1315 | 1314 | return; |
| 1316 | 1315 | } |
| 1317 | 1316 | } |
| 1318 | 1317 | } |
| 1319 | - if($insert === true) { |
|
| 1320 | - $properties = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 1321 | - 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);")) { |
|
| 1318 | + if ($insert === true) { |
|
| 1319 | + $properties = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 1320 | + 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);")) { |
|
| 1322 | 1321 | echo mysqli_error($sqlParser->conn).PHP_EOL; |
| 1323 | 1322 | return; |
| 1324 | 1323 | } |
| 1325 | 1324 | } |
| 1326 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1325 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1327 | 1326 | } else { |
| 1328 | - if ($properties != NULL ){ |
|
| 1327 | + if ($properties != NULL) { |
|
| 1329 | 1328 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1330 | 1329 | } |
| 1331 | - 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);")) { |
|
| 1332 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1330 | + 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);")) { |
|
| 1331 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1333 | 1332 | return; |
| 1334 | 1333 | } |
| 1335 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1334 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1336 | 1335 | } |
| 1337 | 1336 | // add system events |
| 1338 | 1337 | if (count($events) > 0) { |
| 1339 | - $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';"); |
|
| 1338 | + $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';"); |
|
| 1340 | 1339 | if ($ds) { |
| 1341 | 1340 | $row = mysqli_fetch_assoc($ds); |
| 1342 | 1341 | $id = $row["id"]; |
| 1343 | 1342 | // remove existing events |
| 1344 | - mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_plugin_events` WHERE pluginid = \'' . $id . '\''); |
|
| 1343 | + mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_plugin_events` WHERE pluginid = \''.$id.'\''); |
|
| 1345 | 1344 | // add new events |
| 1346 | - 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) . "')"); |
|
| 1345 | + 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)."')"); |
|
| 1347 | 1346 | } |
| 1348 | 1347 | } |
| 1349 | 1348 | } |
@@ -1354,18 +1353,18 @@ discard block |
||
| 1354 | 1353 | // Install Snippets |
| 1355 | 1354 | $moduleSnippet = $ms; |
| 1356 | 1355 | if (is_array($moduleSnippet) || $installData) { |
| 1357 | - echo PHP_EOL . $_lang['snippets'] . ":" . PHP_EOL; |
|
| 1356 | + echo PHP_EOL.$_lang['snippets'].":".PHP_EOL; |
|
| 1358 | 1357 | //$selSnips = $_POST['snippet']; |
| 1359 | 1358 | foreach ($moduleSnippets as $k=>$moduleSnippet) { |
| 1360 | 1359 | $installSample = in_array('sample', $moduleSnippet[5]) && $installData == 1; |
| 1361 | - if($installSample || is_array($moduleSnippet)) { |
|
| 1360 | + if ($installSample || is_array($moduleSnippet)) { |
|
| 1362 | 1361 | $name = mysqli_real_escape_string($conn, $moduleSnippet[0]); |
| 1363 | 1362 | $desc = mysqli_real_escape_string($conn, $moduleSnippet[1]); |
| 1364 | 1363 | $filecontent = $moduleSnippet[2]; |
| 1365 | 1364 | $properties = $moduleSnippet[3]; |
| 1366 | 1365 | $category = mysqli_real_escape_string($conn, $moduleSnippet[4]); |
| 1367 | 1366 | if (!file_exists($filecontent)) |
| 1368 | - echo " $name: " . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1367 | + echo " $name: ".$_lang['unable_install_snippet']." '$filecontent' ".$_lang['not_found'].PHP_EOL; |
|
| 1369 | 1368 | else { |
| 1370 | 1369 | |
| 1371 | 1370 | // Create the category if it does not already exist |
@@ -1374,24 +1373,24 @@ discard block |
||
| 1374 | 1373 | $snippet = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent))); |
| 1375 | 1374 | $snippet = removeDocblock($snippet, 'snippet'); |
| 1376 | 1375 | $snippet = mysqli_real_escape_string($conn, $snippet); |
| 1377 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_snippets` WHERE name='$name'"); |
|
| 1376 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_snippets` WHERE name='$name'"); |
|
| 1378 | 1377 | if (mysqli_num_rows($rs)) { |
| 1379 | 1378 | $row = mysqli_fetch_assoc($rs); |
| 1380 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 1381 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 1382 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1379 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 1380 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 1381 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1383 | 1382 | return; |
| 1384 | 1383 | } |
| 1385 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1384 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1386 | 1385 | } else { |
| 1387 | - if ($properties != NULL ){ |
|
| 1386 | + if ($properties != NULL) { |
|
| 1388 | 1387 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1389 | 1388 | } |
| 1390 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
|
| 1391 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1389 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
|
| 1390 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1392 | 1391 | return; |
| 1393 | 1392 | } |
| 1394 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1393 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1395 | 1394 | } |
| 1396 | 1395 | } |
| 1397 | 1396 | } |
@@ -1400,24 +1399,24 @@ discard block |
||
| 1400 | 1399 | |
| 1401 | 1400 | // Install demo-site |
| 1402 | 1401 | if ($installData && $moduleSQLDataFile) { |
| 1403 | - echo PHP_EOL . $_lang['installing_demo_site']; |
|
| 1402 | + echo PHP_EOL.$_lang['installing_demo_site']; |
|
| 1404 | 1403 | $sqlParser->process($moduleSQLDataFile); |
| 1405 | 1404 | // display database results |
| 1406 | 1405 | if ($sqlParser->installFailed == true) { |
| 1407 | 1406 | $errors += 1; |
| 1408 | - echo $_lang['database_alerts'] . PHP_EOL; |
|
| 1409 | - echo $_lang['setup_couldnt_install'] . PHP_EOL; |
|
| 1410 | - echo $_lang['installation_error_occured'] . PHP_EOL . PHP_EOL; |
|
| 1407 | + echo $_lang['database_alerts'].PHP_EOL; |
|
| 1408 | + echo $_lang['setup_couldnt_install'].PHP_EOL; |
|
| 1409 | + echo $_lang['installation_error_occured'].PHP_EOL.PHP_EOL; |
|
| 1411 | 1410 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 1412 | - echo $sqlParser->mysqlErrors[$i]["error"] . " " . $_lang['during_execution_of_sql'] . " " . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . PHP_EOL; |
|
| 1411 | + echo $sqlParser->mysqlErrors[$i]["error"]." ".$_lang['during_execution_of_sql']." ".strip_tags($sqlParser->mysqlErrors[$i]["sql"]).PHP_EOL; |
|
| 1413 | 1412 | } |
| 1414 | 1413 | |
| 1415 | - echo $_lang['some_tables_not_updated'] . PHP_EOL; |
|
| 1414 | + echo $_lang['some_tables_not_updated'].PHP_EOL; |
|
| 1416 | 1415 | return; |
| 1417 | 1416 | } else { |
| 1418 | 1417 | $sql = sprintf("SELECT id FROM `%ssite_templates` WHERE templatename='EVO startup - Bootstrap'", $sqlParser->prefix); |
| 1419 | 1418 | $rs = mysqli_query($sqlParser->conn, $sql); |
| 1420 | - if(mysqli_num_rows($rs)) { |
|
| 1419 | + if (mysqli_num_rows($rs)) { |
|
| 1421 | 1420 | $row = mysqli_fetch_assoc($rs); |
| 1422 | 1421 | $sql = sprintf('UPDATE `%ssite_content` SET template=%s WHERE template=4', $sqlParser->prefix, $row['id']); |
| 1423 | 1422 | mysqli_query($sqlParser->conn, $sql); |
@@ -1429,9 +1428,9 @@ discard block |
||
| 1429 | 1428 | // Install Dependencies |
| 1430 | 1429 | $moduleDependencies = $mdp; |
| 1431 | 1430 | foreach ($moduleDependencies as $dependency) { |
| 1432 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"'); |
|
| 1431 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM '.$dbase.'`'.$sqlParser->prefix.'site_modules` WHERE name="'.$dependency['module'].'"'); |
|
| 1433 | 1432 | if (!$ds) { |
| 1434 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1433 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1435 | 1434 | return; |
| 1436 | 1435 | } else { |
| 1437 | 1436 | $row = mysqli_fetch_assoc($ds); |
@@ -1439,37 +1438,37 @@ discard block |
||
| 1439 | 1438 | $moduleGuid = $row["guid"]; |
| 1440 | 1439 | } |
| 1441 | 1440 | // get extra id |
| 1442 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"'); |
|
| 1441 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE '.$dependency['column'].'="'.$dependency['name'].'"'); |
|
| 1443 | 1442 | if (!$ds) { |
| 1444 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1443 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1445 | 1444 | return; |
| 1446 | 1445 | } else { |
| 1447 | 1446 | $row = mysqli_fetch_assoc($ds); |
| 1448 | 1447 | $extraId = $row["id"]; |
| 1449 | 1448 | } |
| 1450 | 1449 | // setup extra as module dependency |
| 1451 | - $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'); |
|
| 1450 | + $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'); |
|
| 1452 | 1451 | if (!$ds) { |
| 1453 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1452 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1454 | 1453 | return; |
| 1455 | 1454 | } else { |
| 1456 | 1455 | if (mysqli_num_rows($ds) === 0) { |
| 1457 | - mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')'); |
|
| 1458 | - echo $dependency['module'] . ' Module: ' . $_lang['depedency_create'] . PHP_EOL; |
|
| 1456 | + mysqli_query($sqlParser->conn, 'INSERT INTO '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` (module, resource, type) VALUES('.$moduleId.','.$extraId.','.$dependency['type'].')'); |
|
| 1457 | + echo $dependency['module'].' Module: '.$_lang['depedency_create'].PHP_EOL; |
|
| 1459 | 1458 | } else { |
| 1460 | - 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']); |
|
| 1461 | - echo $dependency['module'] . ' Module: ' . $_lang['depedency_update'] . PHP_EOL; |
|
| 1459 | + 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']); |
|
| 1460 | + echo $dependency['module'].' Module: '.$_lang['depedency_update'].PHP_EOL; |
|
| 1462 | 1461 | } |
| 1463 | 1462 | if ($dependency['type'] == 30 || $dependency['type'] == 40) { |
| 1464 | 1463 | // set extra guid for plugins and snippets |
| 1465 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1'); |
|
| 1464 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE id='.$extraId.' LIMIT 1'); |
|
| 1466 | 1465 | if (!$ds) { |
| 1467 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1466 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1468 | 1467 | return; |
| 1469 | 1468 | } else { |
| 1470 | 1469 | if (mysqli_num_rows($ds) != 0) { |
| 1471 | - mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId); |
|
| 1472 | - echo $dependency['name'] . ': ' . $_lang['guid_set'] . PHP_EOL; |
|
| 1470 | + mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` SET moduleguid = '.$moduleGuid.' WHERE id='.$extraId); |
|
| 1471 | + echo $dependency['name'].': '.$_lang['guid_set'].PHP_EOL; |
|
| 1473 | 1472 | } |
| 1474 | 1473 | } |
| 1475 | 1474 | } |
@@ -1478,7 +1477,7 @@ discard block |
||
| 1478 | 1477 | |
| 1479 | 1478 | // call back function |
| 1480 | 1479 | if ($callBackFnc != "") |
| 1481 | - $callBackFnc ($sqlParser); |
|
| 1480 | + $callBackFnc($sqlParser); |
|
| 1482 | 1481 | |
| 1483 | 1482 | // Setup the MODX API -- needed for the cache processor |
| 1484 | 1483 | if (!defined('MODX_MANAGER_PATH')) define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/'); |
@@ -1511,17 +1510,17 @@ discard block |
||
| 1511 | 1510 | } |
| 1512 | 1511 | |
| 1513 | 1512 | // setup completed! |
| 1514 | -echo PHP_EOL . $_lang['installation_successful'] . PHP_EOL . PHP_EOL; |
|
| 1513 | +echo PHP_EOL.$_lang['installation_successful'].PHP_EOL.PHP_EOL; |
|
| 1515 | 1514 | //echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>"; |
| 1516 | 1515 | if ($installMode == 0) { |
| 1517 | - echo strip_tags($_lang['installation_note']) . PHP_EOL; |
|
| 1516 | + echo strip_tags($_lang['installation_note']).PHP_EOL; |
|
| 1518 | 1517 | } else { |
| 1519 | - echo strip_tags($_lang['upgrade_note']) . PHP_EOL; |
|
| 1518 | + echo strip_tags($_lang['upgrade_note']).PHP_EOL; |
|
| 1520 | 1519 | } |
| 1521 | 1520 | |
| 1522 | 1521 | |
| 1523 | -if ( empty($args) ){ |
|
| 1524 | - echo PHP_EOL . 'Remove install folder?'.PHP_EOL; |
|
| 1522 | +if (empty($args)) { |
|
| 1523 | + echo PHP_EOL.'Remove install folder?'.PHP_EOL; |
|
| 1525 | 1524 | $removeInstall = readline("Type 'y' or 'n' to continue: "); |
| 1526 | 1525 | } |
| 1527 | 1526 | //remove installFolder |
@@ -1529,7 +1528,7 @@ discard block |
||
| 1529 | 1528 | removeFolder($path); |
| 1530 | 1529 | removeFolder($base_path.'.tx'); |
| 1531 | 1530 | unlink($base_path.'README.md'); |
| 1532 | - echo 'Install folder deleted!'. PHP_EOL . PHP_EOL; |
|
| 1531 | + echo 'Install folder deleted!'.PHP_EOL.PHP_EOL; |
|
| 1533 | 1532 | } |
| 1534 | 1533 | |
| 1535 | 1534 | /** |
@@ -1568,11 +1567,11 @@ discard block |
||
| 1568 | 1567 | * @param string $old |
| 1569 | 1568 | * @return string |
| 1570 | 1569 | */ |
| 1571 | -function propUpdate($new,$old){ |
|
| 1570 | +function propUpdate($new, $old){ |
|
| 1572 | 1571 | $newArr = parseProperties($new); |
| 1573 | 1572 | $oldArr = parseProperties($old); |
| 1574 | - foreach ($oldArr as $k => $v){ |
|
| 1575 | - if (isset($v['0']['options'])){ |
|
| 1573 | + foreach ($oldArr as $k => $v) { |
|
| 1574 | + if (isset($v['0']['options'])) { |
|
| 1576 | 1575 | $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options']; |
| 1577 | 1576 | } |
| 1578 | 1577 | } |
@@ -1587,30 +1586,30 @@ discard block |
||
| 1587 | 1586 | * @param bool|mixed $json |
| 1588 | 1587 | * @return string |
| 1589 | 1588 | */ |
| 1590 | -function parseProperties($propertyString, $json=false) { |
|
| 1591 | - $propertyString = str_replace('{}', '', $propertyString ); |
|
| 1592 | - $propertyString = str_replace('} {', ',', $propertyString ); |
|
| 1589 | +function parseProperties($propertyString, $json = false){ |
|
| 1590 | + $propertyString = str_replace('{}', '', $propertyString); |
|
| 1591 | + $propertyString = str_replace('} {', ',', $propertyString); |
|
| 1593 | 1592 | |
| 1594 | - if(empty($propertyString)) return array(); |
|
| 1595 | - if($propertyString=='{}' || $propertyString=='[]') return array(); |
|
| 1593 | + if (empty($propertyString)) return array(); |
|
| 1594 | + if ($propertyString == '{}' || $propertyString == '[]') return array(); |
|
| 1596 | 1595 | |
| 1597 | 1596 | $jsonFormat = isJson($propertyString, true); |
| 1598 | 1597 | $property = array(); |
| 1599 | 1598 | // old format |
| 1600 | - if ( $jsonFormat === false) { |
|
| 1601 | - $props= explode('&', $propertyString); |
|
| 1599 | + if ($jsonFormat === false) { |
|
| 1600 | + $props = explode('&', $propertyString); |
|
| 1602 | 1601 | foreach ($props as $prop) { |
| 1603 | 1602 | $prop = trim($prop); |
| 1604 | - if($prop === '') { |
|
| 1603 | + if ($prop === '') { |
|
| 1605 | 1604 | continue; |
| 1606 | 1605 | } |
| 1607 | 1606 | |
| 1608 | 1607 | $arr = explode(';', $prop); |
| 1609 | - if( ! is_array($arr)) { |
|
| 1608 | + if (!is_array($arr)) { |
|
| 1610 | 1609 | $arr = array(); |
| 1611 | 1610 | } |
| 1612 | 1611 | $key = explode('=', isset($arr[0]) ? $arr[0] : ''); |
| 1613 | - if( ! is_array($key) || empty($key[0])) { |
|
| 1612 | + if (!is_array($key) || empty($key[0])) { |
|
| 1614 | 1613 | continue; |
| 1615 | 1614 | } |
| 1616 | 1615 | |
@@ -1634,7 +1633,7 @@ discard block |
||
| 1634 | 1633 | |
| 1635 | 1634 | } |
| 1636 | 1635 | // new json-format |
| 1637 | - } else if(!empty($jsonFormat)){ |
|
| 1636 | + } else if (!empty($jsonFormat)) { |
|
| 1638 | 1637 | $property = $jsonFormat; |
| 1639 | 1638 | } |
| 1640 | 1639 | if ($json) { |
@@ -1649,7 +1648,7 @@ discard block |
||
| 1649 | 1648 | * @param bool $returnData |
| 1650 | 1649 | * @return bool|mixed |
| 1651 | 1650 | */ |
| 1652 | -function isJson($string, $returnData=false) { |
|
| 1651 | +function isJson($string, $returnData = false){ |
|
| 1653 | 1652 | $data = json_decode($string, true); |
| 1654 | 1653 | return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false; |
| 1655 | 1654 | } |
@@ -1659,20 +1658,20 @@ discard block |
||
| 1659 | 1658 | * @param SqlParser $sqlParser |
| 1660 | 1659 | * @return int |
| 1661 | 1660 | */ |
| 1662 | -function getCreateDbCategory($category, $sqlParser) { |
|
| 1661 | +function getCreateDbCategory($category, $sqlParser){ |
|
| 1663 | 1662 | $dbase = $sqlParser->dbname; |
| 1664 | - $dbase = '`' . trim($dbase,'`') . '`'; |
|
| 1663 | + $dbase = '`'.trim($dbase, '`').'`'; |
|
| 1665 | 1664 | $table_prefix = $sqlParser->prefix; |
| 1666 | 1665 | $category_id = 0; |
| 1667 | - if(!empty($category)) { |
|
| 1666 | + if (!empty($category)) { |
|
| 1668 | 1667 | $category = mysqli_real_escape_string($sqlParser->conn, $category); |
| 1669 | 1668 | $rs = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."categories` WHERE category = '".$category."'"); |
| 1670 | - if(mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) { |
|
| 1669 | + if (mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) { |
|
| 1671 | 1670 | $category_id = $row['id']; |
| 1672 | 1671 | } else { |
| 1673 | 1672 | $q = "INSERT INTO $dbase.`".$table_prefix."categories` (`category`) VALUES ('{$category}');"; |
| 1674 | 1673 | $rs = mysqli_query($sqlParser->conn, $q); |
| 1675 | - if($rs) { |
|
| 1674 | + if ($rs) { |
|
| 1676 | 1675 | $category_id = mysqli_insert_id($sqlParser->conn); |
| 1677 | 1676 | } |
| 1678 | 1677 | } |
@@ -1687,12 +1686,12 @@ discard block |
||
| 1687 | 1686 | * @param string $type |
| 1688 | 1687 | * @return string |
| 1689 | 1688 | */ |
| 1690 | -function removeDocblock($code, $type) { |
|
| 1689 | +function removeDocblock($code, $type){ |
|
| 1691 | 1690 | |
| 1692 | 1691 | $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1); |
| 1693 | 1692 | |
| 1694 | 1693 | // Procedure taken from plugin.filesource.php |
| 1695 | - switch($type) { |
|
| 1694 | + switch ($type) { |
|
| 1696 | 1695 | case 'snippet': |
| 1697 | 1696 | $elm_name = 'snippets'; |
| 1698 | 1697 | $include = 'return require'; |
@@ -1708,7 +1707,7 @@ discard block |
||
| 1708 | 1707 | default: |
| 1709 | 1708 | return $cleaned; |
| 1710 | 1709 | }; |
| 1711 | - if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') |
|
| 1710 | + if (substr(trim($cleaned), 0, $count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') |
|
| 1712 | 1711 | return $cleaned; |
| 1713 | 1712 | |
| 1714 | 1713 | // fileBinding not found - return code incl docblock |
@@ -105,7 +105,8 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | - private function getUserIP() { |
|
| 108 | + private function getUserIP() |
|
| 109 | + { |
|
| 109 | 110 | if( array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER) && !empty($_SERVER['HTTP_X_FORWARDED_FOR']) ) { |
| 110 | 111 | if (strpos($_SERVER['HTTP_X_FORWARDED_FOR'], ',')>0) { |
| 111 | 112 | $addr = explode(",",$_SERVER['HTTP_X_FORWARDED_FOR']); |
@@ -113,8 +114,7 @@ discard block |
||
| 113 | 114 | } else { |
| 114 | 115 | return $_SERVER['HTTP_X_FORWARDED_FOR']; |
| 115 | 116 | } |
| 116 | - } |
|
| 117 | - else { |
|
| 117 | + } else { |
|
| 118 | 118 | return $_SERVER['REMOTE_ADDR']; |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -36,16 +36,16 @@ discard block |
||
| 36 | 36 | $action = "", |
| 37 | 37 | $itemid = "", |
| 38 | 38 | $itemname = "" |
| 39 | - ) { |
|
| 39 | + ){ |
|
| 40 | 40 | $modx = evolutionCMS(); |
| 41 | 41 | $this->entry['msg'] = $msg; // writes testmessage to the object |
| 42 | - $this->entry['action'] = empty($action) ? $modx->manager->action : $action; // writes the action to the object |
|
| 42 | + $this->entry['action'] = empty($action) ? $modx->manager->action : $action; // writes the action to the object |
|
| 43 | 43 | |
| 44 | 44 | // User Credentials |
| 45 | 45 | $this->entry['internalKey'] = $internalKey == "" ? $modx->getLoginUserID() : $internalKey; |
| 46 | 46 | $this->entry['username'] = $username == "" ? $modx->getLoginUserName() : $username; |
| 47 | 47 | |
| 48 | - $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int)$_REQUEST['id'] : $itemid; // writes the id to the object |
|
| 48 | + $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int) $_REQUEST['id'] : $itemid; // writes the id to the object |
|
| 49 | 49 | if ($this->entry['itemId'] == 0) { |
| 50 | 50 | $this->entry['itemId'] = "-"; |
| 51 | 51 | } // to stop items having id 0 |
@@ -96,20 +96,20 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | $insert_id = $modx->db->insert($fields, $tbl_manager_log); |
| 98 | 98 | if (!$insert_id) { |
| 99 | - $modx->messageQuit("Logging error: couldn't save log to table! Error code: " . $modx->db->getLastError()); |
|
| 99 | + $modx->messageQuit("Logging error: couldn't save log to table! Error code: ".$modx->db->getLastError()); |
|
| 100 | 100 | } else { |
| 101 | - $limit = (isset($modx->config['manager_log_limit'])) ? (int)$modx->config['manager_log_limit'] : 3000; |
|
| 102 | - $trim = (isset($modx->config['manager_log_trim'])) ? (int)$modx->config['manager_log_trim'] : 100; |
|
| 101 | + $limit = (isset($modx->config['manager_log_limit'])) ? (int) $modx->config['manager_log_limit'] : 3000; |
|
| 102 | + $trim = (isset($modx->config['manager_log_trim'])) ? (int) $modx->config['manager_log_trim'] : 100; |
|
| 103 | 103 | if (($insert_id % $trim) === 0) { |
| 104 | 104 | $modx->rotate_log('manager_log', $limit, $trim); |
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - private function getUserIP() { |
|
| 110 | - if( array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER) && !empty($_SERVER['HTTP_X_FORWARDED_FOR']) ) { |
|
| 111 | - if (strpos($_SERVER['HTTP_X_FORWARDED_FOR'], ',')>0) { |
|
| 112 | - $addr = explode(",",$_SERVER['HTTP_X_FORWARDED_FOR']); |
|
| 109 | + private function getUserIP(){ |
|
| 110 | + if (array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER) && !empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { |
|
| 111 | + if (strpos($_SERVER['HTTP_X_FORWARDED_FOR'], ',') > 0) { |
|
| 112 | + $addr = explode(",", $_SERVER['HTTP_X_FORWARDED_FOR']); |
|
| 113 | 113 | return trim($addr[0]); |
| 114 | 114 | } else { |
| 115 | 115 | return $_SERVER['HTTP_X_FORWARDED_FOR']; |
@@ -20,37 +20,37 @@ discard block |
||
| 20 | 20 | $body_class = ''; |
| 21 | 21 | $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');
|
| 22 | 22 | if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
|
| 23 | - $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']]; |
|
| 23 | + $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']]; |
|
| 24 | 24 | } elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
|
| 25 | - $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']]; |
|
| 25 | + $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']]; |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | -$css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime; |
|
| 28 | +$css = 'media/style/'.$modx->config['manager_theme'].'/style.css?v='.$lastInstallTime; |
|
| 29 | 29 | |
| 30 | 30 | if ($modx->config['manager_theme'] == 'default') {
|
| 31 | - if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') |
|
| 32 | - && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
|
|
| 33 | - require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php'; |
|
| 31 | + if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css') |
|
| 32 | + && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {
|
|
| 33 | + require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php'; |
|
| 34 | 34 | $minifier = new Formatter\CSSMinify(); |
| 35 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css'); |
|
| 36 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css'); |
|
| 37 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css'); |
|
| 38 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css'); |
|
| 39 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css'); |
|
| 40 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css'); |
|
| 41 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css'); |
|
| 42 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css'); |
|
| 43 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css'); |
|
| 44 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css'); |
|
| 45 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css'); |
|
| 35 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css'); |
|
| 36 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css'); |
|
| 37 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css'); |
|
| 38 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css'); |
|
| 39 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css'); |
|
| 40 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css'); |
|
| 41 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css'); |
|
| 42 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css'); |
|
| 43 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css'); |
|
| 44 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css'); |
|
| 45 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css'); |
|
| 46 | 46 | $css = $minifier->minify(); |
| 47 | 47 | file_put_contents( |
| 48 | - MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', |
|
| 48 | + MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css', |
|
| 49 | 49 | $css |
| 50 | 50 | ); |
| 51 | 51 | } |
| 52 | - if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
|
|
| 53 | - $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime; |
|
| 52 | + if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
|
|
| 53 | + $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | <meta http-equiv="X-UA-Compatible" content="IE=edge"/> |
| 66 | 66 | <link rel="stylesheet" type="text/css" href="<?= $css ?>"/> |
| 67 | 67 | <script type="text/javascript" src="media/script/tabpane.js"></script> |
| 68 | - <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>
|
|
| 68 | + <?= sprintf('<script type="text/javascript" src="%s"></script>'."\n", $modx->config['mgr_jquery_path']) ?>
|
|
| 69 | 69 | <?php if ($modx->config['show_picker'] != "0") { ?>
|
| 70 | 70 | <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js" |
| 71 | 71 | type="text/javascript"></script> |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | <?php } ?> |
| 79 | 79 | |
| 80 | 80 | <!-- OnManagerMainFrameHeaderHTMLBlock --> |
| 81 | - <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?> |
|
| 81 | + <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?> |
|
| 82 | 82 | |
| 83 | 83 | <script type="text/javascript"> |
| 84 | 84 | if (!evo) {
|
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | <script> |
| 108 | 108 | <?php |
| 109 | 109 | if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
|
| 110 | - echo 'doRefresh(' . $_REQUEST['r'] . ");\n";
|
|
| 110 | + echo 'doRefresh('.$_REQUEST['r'].");\n";
|
|
| 111 | 111 | } |
| 112 | 112 | ?> |
| 113 | 113 | </script> |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />
|
| 4 | 4 | Please use the EVO Content Manager instead of accessing this file directly."); |
| 5 | 5 | } |
@@ -10,26 +10,26 @@ discard block |
||
| 10 | 10 | $modx_textdir = isset($modx_textdir) ? $modx_textdir : null; |
| 11 | 11 | $onManagerMainFrameHeaderHTMLBlock = is_array($evtOut) ? implode("\n", $evtOut) : '';
|
| 12 | 12 | $textdir = $modx_textdir === 'rtl' ? 'rtl' : 'ltr'; |
| 13 | -if (!isset($modx->config['mgr_jquery_path'])) {
|
|
| 13 | +if (!isset($modx->config['mgr_jquery_path'])) { |
|
| 14 | 14 | $modx->config['mgr_jquery_path'] = 'media/script/jquery/jquery.min.js'; |
| 15 | 15 | } |
| 16 | -if (!isset($modx->config['mgr_date_picker_path'])) {
|
|
| 16 | +if (!isset($modx->config['mgr_date_picker_path'])) { |
|
| 17 | 17 | $modx->config['mgr_date_picker_path'] = 'media/script/air-datepicker/datepicker.inc.php'; |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | $body_class = ''; |
| 21 | 21 | $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');
|
| 22 | -if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
|
|
| 22 | +if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) { |
|
| 23 | 23 | $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']]; |
| 24 | -} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
|
|
| 24 | +} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) { |
|
| 25 | 25 | $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']]; |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | $css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime; |
| 29 | 29 | |
| 30 | -if ($modx->config['manager_theme'] == 'default') {
|
|
| 30 | +if ($modx->config['manager_theme'] == 'default') { |
|
| 31 | 31 | if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') |
| 32 | - && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
|
|
| 32 | + && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) { |
|
| 33 | 33 | require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php'; |
| 34 | 34 | $minifier = new Formatter\CSSMinify(); |
| 35 | 35 | $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css'); |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $css |
| 50 | 50 | ); |
| 51 | 51 | } |
| 52 | - if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
|
|
| 52 | + if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) { |
|
| 53 | 53 | $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime; |
| 54 | 54 | } |
| 55 | 55 | } |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | <script src="media/script/main.js"></script> |
| 107 | 107 | <script> |
| 108 | 108 | <?php |
| 109 | - if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
|
|
| 109 | + if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) { |
|
| 110 | 110 | echo 'doRefresh(' . $_REQUEST['r'] . ");\n";
|
| 111 | 111 | } |
| 112 | 112 | ?> |
@@ -1,13 +1,13 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
| 3 | - die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
|
|
| 3 | + die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
|
|
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes |
| 7 | 7 | |
| 8 | 8 | if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
|
| 9 | - // seems to be a new install - send the user to the configuration page |
|
| 10 | - exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
|
|
| 9 | + // seems to be a new install - send the user to the configuration page |
|
| 10 | + exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
|
|
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | // set placeholders |
@@ -17,92 +17,92 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | // setup message info |
| 19 | 19 | if($modx->hasPermission('messages')) {
|
| 20 | - include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php'); |
|
| 21 | - $_SESSION['nrtotalmessages'] = $nrtotalmessages; |
|
| 22 | - $_SESSION['nrnewmessages'] = $nrnewmessages; |
|
| 23 | - |
|
| 24 | - $msg = array(); |
|
| 25 | - $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
|
|
| 26 | - $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : ''; |
|
| 27 | - $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold"> <a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
|
|
| 28 | - $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0'; |
|
| 29 | - $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages); |
|
| 30 | - $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
|
|
| 31 | - $ph['MessageInfo'] = implode("\n", $msg);
|
|
| 20 | + include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php'); |
|
| 21 | + $_SESSION['nrtotalmessages'] = $nrtotalmessages; |
|
| 22 | + $_SESSION['nrnewmessages'] = $nrnewmessages; |
|
| 23 | + |
|
| 24 | + $msg = array(); |
|
| 25 | + $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
|
|
| 26 | + $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : ''; |
|
| 27 | + $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold"> <a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
|
|
| 28 | + $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0'; |
|
| 29 | + $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages); |
|
| 30 | + $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
|
|
| 31 | + $ph['MessageInfo'] = implode("\n", $msg);
|
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | // setup icons |
| 35 | 35 | if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
|
| 36 | - $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]'; |
|
| 37 | - $ph['SecurityIcon'] = wrapIcon($icon, 75); |
|
| 36 | + $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]'; |
|
| 37 | + $ph['SecurityIcon'] = wrapIcon($icon, 75); |
|
| 38 | 38 | } |
| 39 | 39 | if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
|
| 40 | - $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]'; |
|
| 41 | - $ph['WebUserIcon'] = wrapIcon($icon, 99); |
|
| 40 | + $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]'; |
|
| 41 | + $ph['WebUserIcon'] = wrapIcon($icon, 99); |
|
| 42 | 42 | } |
| 43 | 43 | if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
|
| 44 | - $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]'; |
|
| 45 | - $ph['ModulesIcon'] = wrapIcon($icon, 106); |
|
| 44 | + $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]'; |
|
| 45 | + $ph['ModulesIcon'] = wrapIcon($icon, 106); |
|
| 46 | 46 | } |
| 47 | 47 | if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
|
| 48 | - $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]'; |
|
| 49 | - $ph['ResourcesIcon'] = wrapIcon($icon, 76); |
|
| 48 | + $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]'; |
|
| 49 | + $ph['ResourcesIcon'] = wrapIcon($icon, 76); |
|
| 50 | 50 | } |
| 51 | 51 | if($modx->hasPermission('bk_manager')) {
|
| 52 | - $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]'; |
|
| 53 | - $ph['BackupIcon'] = wrapIcon($icon, 93); |
|
| 52 | + $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]'; |
|
| 53 | + $ph['BackupIcon'] = wrapIcon($icon, 93); |
|
| 54 | 54 | } |
| 55 | 55 | if($modx->hasPermission('help')) {
|
| 56 | - $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]'; |
|
| 57 | - $ph['HelpIcon'] = wrapIcon($icon, 9); |
|
| 56 | + $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]'; |
|
| 57 | + $ph['HelpIcon'] = wrapIcon($icon, 9); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | if($modx->hasPermission('new_document')) {
|
| 61 | - $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]'; |
|
| 62 | - $ph['ResourceIcon'] = wrapIcon($icon, 4); |
|
| 63 | - $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]'; |
|
| 64 | - $ph['WeblinkIcon'] = wrapIcon($icon, 72); |
|
| 61 | + $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]'; |
|
| 62 | + $ph['ResourceIcon'] = wrapIcon($icon, 4); |
|
| 63 | + $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]'; |
|
| 64 | + $ph['WeblinkIcon'] = wrapIcon($icon, 72); |
|
| 65 | 65 | } |
| 66 | 66 | if($modx->hasPermission('assets_images')) {
|
| 67 | - $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]'; |
|
| 68 | - $ph['ImagesIcon'] = wrapIcon($icon, 72); |
|
| 67 | + $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]'; |
|
| 68 | + $ph['ImagesIcon'] = wrapIcon($icon, 72); |
|
| 69 | 69 | } |
| 70 | 70 | if($modx->hasPermission('assets_files')) {
|
| 71 | - $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]'; |
|
| 72 | - $ph['FilesIcon'] = wrapIcon($icon, 72); |
|
| 71 | + $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]'; |
|
| 72 | + $ph['FilesIcon'] = wrapIcon($icon, 72); |
|
| 73 | 73 | } |
| 74 | 74 | if($modx->hasPermission('change_password')) {
|
| 75 | - $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]'; |
|
| 76 | - $ph['PasswordIcon'] = wrapIcon($icon, 28); |
|
| 75 | + $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]'; |
|
| 76 | + $ph['PasswordIcon'] = wrapIcon($icon, 28); |
|
| 77 | 77 | } |
| 78 | 78 | $icon = '<i class="[&icons_logout_large&]"></i>[%logout%]'; |
| 79 | 79 | $ph['LogoutIcon'] = wrapIcon($icon, 8); |
| 80 | 80 | |
| 81 | 81 | // do some config checks |
| 82 | 82 | if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
|
| 83 | - include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php'); |
|
| 84 | - if($config_check_results != $_lang['configcheck_ok']) {
|
|
| 85 | - $ph['config_check_results'] = $config_check_results; |
|
| 86 | - $ph['config_display'] = 'block'; |
|
| 87 | - } else {
|
|
| 88 | - $ph['config_display'] = 'none'; |
|
| 89 | - } |
|
| 83 | + include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php'); |
|
| 84 | + if($config_check_results != $_lang['configcheck_ok']) {
|
|
| 85 | + $ph['config_check_results'] = $config_check_results; |
|
| 86 | + $ph['config_display'] = 'block'; |
|
| 87 | + } else {
|
|
| 88 | + $ph['config_display'] = 'none'; |
|
| 89 | + } |
|
| 90 | 90 | } else {
|
| 91 | - $ph['config_display'] = 'none'; |
|
| 91 | + $ph['config_display'] = 'none'; |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // Check logout-reminder |
| 95 | 95 | if(isset($_SESSION['show_logout_reminder'])) {
|
| 96 | - switch($_SESSION['show_logout_reminder']['type']) {
|
|
| 97 | - case 'logout_reminder': |
|
| 98 | - $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly'); |
|
| 99 | - $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
|
|
| 100 | - break; |
|
| 101 | - } |
|
| 102 | - $ph['show_logout_reminder'] = 'block'; |
|
| 103 | - unset($_SESSION['show_logout_reminder']); |
|
| 96 | + switch($_SESSION['show_logout_reminder']['type']) {
|
|
| 97 | + case 'logout_reminder': |
|
| 98 | + $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly'); |
|
| 99 | + $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
|
|
| 100 | + break; |
|
| 101 | + } |
|
| 102 | + $ph['show_logout_reminder'] = 'block'; |
|
| 103 | + unset($_SESSION['show_logout_reminder']); |
|
| 104 | 104 | } else {
|
| 105 | - $ph['show_logout_reminder'] = 'none'; |
|
| 105 | + $ph['show_logout_reminder'] = 'none'; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | // Check multiple sessions |
@@ -150,11 +150,11 @@ discard block |
||
| 150 | 150 | $nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>'; |
| 151 | 151 | |
| 152 | 152 | $ph['UserInfo'] = $modx->parseText($tpl, array( |
| 153 | - 'username' => $modx->getLoginUserName(), |
|
| 154 | - 'role' => $_SESSION['mgrPermissions']['name'], |
|
| 155 | - 'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time), |
|
| 156 | - 'logincount' => $_SESSION['mgrLogincount'] + 1, |
|
| 157 | - 'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages) |
|
| 153 | + 'username' => $modx->getLoginUserName(), |
|
| 154 | + 'role' => $_SESSION['mgrPermissions']['name'], |
|
| 155 | + 'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time), |
|
| 156 | + 'logincount' => $_SESSION['mgrLogincount'] + 1, |
|
| 157 | + 'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages) |
|
| 158 | 158 | )); |
| 159 | 159 | |
| 160 | 160 | $from = array(); |
@@ -163,13 +163,13 @@ discard block |
||
| 163 | 163 | $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
|
| 164 | 164 | |
| 165 | 165 | if($modx->db->getRecordCount($rs) < 1) {
|
| 166 | - $html = '<p>[%no_active_users_found%]</p>'; |
|
| 166 | + $html = '<p>[%no_active_users_found%]</p>'; |
|
| 167 | 167 | } else {
|
| 168 | - include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php'); |
|
| 169 | - $now = $_SERVER['REQUEST_TIME'] + $server_offset_time; |
|
| 170 | - $ph['now'] = strftime('%H:%M:%S', $now);
|
|
| 171 | - $timetocheck = ($now - (60 * 20)); //+$server_offset_time; |
|
| 172 | - $html = ' |
|
| 168 | + include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php'); |
|
| 169 | + $now = $_SERVER['REQUEST_TIME'] + $server_offset_time; |
|
| 170 | + $ph['now'] = strftime('%H:%M:%S', $now);
|
|
| 171 | + $timetocheck = ($now - (60 * 20)); //+$server_offset_time; |
|
| 172 | + $html = ' |
|
| 173 | 173 | <div class="card-body"> |
| 174 | 174 | [%onlineusers_message%] |
| 175 | 175 | <b>[+now+]</b>): |
@@ -187,33 +187,33 @@ discard block |
||
| 187 | 187 | </thead> |
| 188 | 188 | <tbody>'; |
| 189 | 189 | |
| 190 | - $userList = array(); |
|
| 191 | - $userCount = array(); |
|
| 192 | - // Create userlist with session-count first before output |
|
| 193 | - while($activeusers = $modx->db->getRow($rs)) {
|
|
| 194 | - $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1; |
|
| 195 | - |
|
| 196 | - $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : ''; |
|
| 197 | - $webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" /> ' : ''; |
|
| 198 | - $ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip']; |
|
| 199 | - $currentaction = getAction($activeusers['action'], $activeusers['id']); |
|
| 200 | - $userList[] = array( |
|
| 201 | - $idle, |
|
| 202 | - '', |
|
| 203 | - $activeusers['username'], |
|
| 204 | - $webicon, |
|
| 205 | - abs($activeusers['internalKey']), |
|
| 206 | - $ip, |
|
| 207 | - strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),
|
|
| 208 | - $currentaction |
|
| 209 | - ); |
|
| 210 | - } |
|
| 211 | - foreach($userList as $params) {
|
|
| 212 | - $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : ''; |
|
| 213 | - $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
|
|
| 214 | - } |
|
| 215 | - |
|
| 216 | - $html .= ' |
|
| 190 | + $userList = array(); |
|
| 191 | + $userCount = array(); |
|
| 192 | + // Create userlist with session-count first before output |
|
| 193 | + while($activeusers = $modx->db->getRow($rs)) {
|
|
| 194 | + $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1; |
|
| 195 | + |
|
| 196 | + $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : ''; |
|
| 197 | + $webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" /> ' : ''; |
|
| 198 | + $ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip']; |
|
| 199 | + $currentaction = getAction($activeusers['action'], $activeusers['id']); |
|
| 200 | + $userList[] = array( |
|
| 201 | + $idle, |
|
| 202 | + '', |
|
| 203 | + $activeusers['username'], |
|
| 204 | + $webicon, |
|
| 205 | + abs($activeusers['internalKey']), |
|
| 206 | + $ip, |
|
| 207 | + strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),
|
|
| 208 | + $currentaction |
|
| 209 | + ); |
|
| 210 | + } |
|
| 211 | + foreach($userList as $params) {
|
|
| 212 | + $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : ''; |
|
| 213 | + $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
|
|
| 214 | + } |
|
| 215 | + |
|
| 216 | + $html .= ' |
|
| 217 | 217 | </tbody> |
| 218 | 218 | </table> |
| 219 | 219 | </div> |
@@ -254,17 +254,17 @@ discard block |
||
| 254 | 254 | // invoke event OnManagerWelcomePrerender |
| 255 | 255 | $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
|
| 256 | 256 | if(is_array($evtOut)) {
|
| 257 | - $output = implode('', $evtOut);
|
|
| 258 | - $ph['OnManagerWelcomePrerender'] = $output; |
|
| 257 | + $output = implode('', $evtOut);
|
|
| 258 | + $ph['OnManagerWelcomePrerender'] = $output; |
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | $widgets['welcome'] = array( |
| 262 | - 'menuindex' => '10', |
|
| 263 | - 'id' => 'welcome', |
|
| 264 | - 'cols' => 'col-lg-6', |
|
| 265 | - 'icon' => 'fa-home', |
|
| 266 | - 'title' => '[%welcome_title%]', |
|
| 267 | - 'body' => ' |
|
| 262 | + 'menuindex' => '10', |
|
| 263 | + 'id' => 'welcome', |
|
| 264 | + 'cols' => 'col-lg-6', |
|
| 265 | + 'icon' => 'fa-home', |
|
| 266 | + 'title' => '[%welcome_title%]', |
|
| 267 | + 'body' => ' |
|
| 268 | 268 | <div class="wm_buttons card-body"> |
| 269 | 269 | <!--@IF:[[#hasPermission?key=new_document]]--> |
| 270 | 270 | <span class="wm_button"> |
@@ -338,25 +338,25 @@ discard block |
||
| 338 | 338 | </table> |
| 339 | 339 | </div> |
| 340 | 340 | ', |
| 341 | - 'hide'=>'0' |
|
| 341 | + 'hide'=>'0' |
|
| 342 | 342 | ); |
| 343 | 343 | $widgets['onlineinfo'] = array( |
| 344 | - 'menuindex' => '20', |
|
| 345 | - 'id' => 'onlineinfo', |
|
| 346 | - 'cols' => 'col-lg-6', |
|
| 347 | - 'icon' => 'fa-user', |
|
| 348 | - 'title' => '[%onlineusers_title%]', |
|
| 349 | - 'body' => '<div class="userstable">[+OnlineInfo+]</div>', |
|
| 350 | - 'hide'=>'0' |
|
| 344 | + 'menuindex' => '20', |
|
| 345 | + 'id' => 'onlineinfo', |
|
| 346 | + 'cols' => 'col-lg-6', |
|
| 347 | + 'icon' => 'fa-user', |
|
| 348 | + 'title' => '[%onlineusers_title%]', |
|
| 349 | + 'body' => '<div class="userstable">[+OnlineInfo+]</div>', |
|
| 350 | + 'hide'=>'0' |
|
| 351 | 351 | ); |
| 352 | 352 | $widgets['recentinfo'] = array( |
| 353 | - 'menuindex' => '30', |
|
| 354 | - 'id' => 'modxrecent_widget', |
|
| 355 | - 'cols' => 'col-sm-12', |
|
| 356 | - 'icon' => 'fa-pencil-square-o', |
|
| 357 | - 'title' => '[%activity_title%]', |
|
| 358 | - 'body' => '<div class="widget-stage">[+RecentInfo+]</div>', |
|
| 359 | - 'hide'=>'0' |
|
| 353 | + 'menuindex' => '30', |
|
| 354 | + 'id' => 'modxrecent_widget', |
|
| 355 | + 'cols' => 'col-sm-12', |
|
| 356 | + 'icon' => 'fa-pencil-square-o', |
|
| 357 | + 'title' => '[%activity_title%]', |
|
| 358 | + 'body' => '<div class="widget-stage">[+RecentInfo+]</div>', |
|
| 359 | + 'hide'=>'0' |
|
| 360 | 360 | ); |
| 361 | 361 | if ($modx->config['rss_url_news']) {
|
| 362 | 362 | $widgets['news'] = array( |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | // invoke OnManagerWelcomeHome event |
| 385 | 385 | $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
|
| 386 | 386 | if(is_array($sitewidgets)) {
|
| 387 | - $newwidgets = array(); |
|
| 387 | + $newwidgets = array(); |
|
| 388 | 388 | foreach($sitewidgets as $widget){
|
| 389 | 389 | $newwidgets = array_merge($newwidgets, unserialize($widget)); |
| 390 | 390 | } |
@@ -392,21 +392,21 @@ discard block |
||
| 392 | 392 | } |
| 393 | 393 | |
| 394 | 394 | usort($widgets, function ($a, $b) {
|
| 395 | - return $a['menuindex'] - $b['menuindex']; |
|
| 395 | + return $a['menuindex'] - $b['menuindex']; |
|
| 396 | 396 | }); |
| 397 | 397 | |
| 398 | 398 | $tpl = getTplWidget(); |
| 399 | 399 | $output = ''; |
| 400 | 400 | foreach($widgets as $widget) {
|
| 401 | - if ($widget['hide'] != '1'){
|
|
| 402 | - $output .= $modx->parseText($tpl, $widget); |
|
| 403 | - } |
|
| 401 | + if ($widget['hide'] != '1'){
|
|
| 402 | + $output .= $modx->parseText($tpl, $widget); |
|
| 403 | + } |
|
| 404 | 404 | } |
| 405 | 405 | $ph['widgets'] = $output; |
| 406 | 406 | |
| 407 | 407 | // load template |
| 408 | 408 | if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
|
| 409 | - $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'; |
|
| 409 | + $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'; |
|
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | $target = $modx->config['manager_welcome_tpl']; |
@@ -414,27 +414,27 @@ discard block |
||
| 414 | 414 | $target = $modx->mergeSettingsContent($target); |
| 415 | 415 | |
| 416 | 416 | if(substr($target, 0, 1) === '@') {
|
| 417 | - if(substr($target, 0, 6) === '@CHUNK') {
|
|
| 418 | - $content = $modx->getChunk(trim(substr($target, 7))); |
|
| 419 | - } elseif(substr($target, 0, 5) === '@FILE') {
|
|
| 420 | - $content = file_get_contents(trim(substr($target, 6))); |
|
| 421 | - } else {
|
|
| 422 | - $content = ''; |
|
| 423 | - } |
|
| 417 | + if(substr($target, 0, 6) === '@CHUNK') {
|
|
| 418 | + $content = $modx->getChunk(trim(substr($target, 7))); |
|
| 419 | + } elseif(substr($target, 0, 5) === '@FILE') {
|
|
| 420 | + $content = file_get_contents(trim(substr($target, 6))); |
|
| 421 | + } else {
|
|
| 422 | + $content = ''; |
|
| 423 | + } |
|
| 424 | 424 | } else {
|
| 425 | - $chunk = $modx->getChunk($target); |
|
| 426 | - if($chunk !== false && !empty($chunk)) {
|
|
| 427 | - $content = $chunk; |
|
| 428 | - } elseif(is_file(MODX_BASE_PATH . $target)) {
|
|
| 429 | - $content = file_get_contents(MODX_BASE_PATH . $target); |
|
| 430 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
|
|
| 431 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl'); |
|
| 432 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible |
|
| 433 | - {
|
|
| 434 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html'); |
|
| 435 | - } else {
|
|
| 436 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'); |
|
| 437 | - } |
|
| 425 | + $chunk = $modx->getChunk($target); |
|
| 426 | + if($chunk !== false && !empty($chunk)) {
|
|
| 427 | + $content = $chunk; |
|
| 428 | + } elseif(is_file(MODX_BASE_PATH . $target)) {
|
|
| 429 | + $content = file_get_contents(MODX_BASE_PATH . $target); |
|
| 430 | + } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
|
|
| 431 | + $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl'); |
|
| 432 | + } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible |
|
| 433 | + {
|
|
| 434 | + $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html'); |
|
| 435 | + } else {
|
|
| 436 | + $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'); |
|
| 437 | + } |
|
| 438 | 438 | } |
| 439 | 439 | |
| 440 | 440 | // merge placeholders |
@@ -442,8 +442,8 @@ discard block |
||
| 442 | 442 | $content = $modx->mergeSettingsContent($content); |
| 443 | 443 | $content = $modx->parseText($content, $ph); |
| 444 | 444 | if(strpos($content, '[+') !== false) {
|
| 445 | - $modx->toPlaceholders($ph); |
|
| 446 | - $content = $modx->mergePlaceholderContent($content); |
|
| 445 | + $modx->toPlaceholders($ph); |
|
| 446 | + $content = $modx->mergePlaceholderContent($content); |
|
| 447 | 447 | } |
| 448 | 448 | $content = $modx->parseDocumentSource($content); |
| 449 | 449 | $content = $modx->parseText($content, $_lang, '[%', '%]'); |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | $content = $modx->cleanUpMODXTags($content); //cleanup |
| 452 | 452 | |
| 453 | 453 | if($js = $modx->getRegisteredClientScripts()) {
|
| 454 | - $content .= $js; |
|
| 454 | + $content .= $js; |
|
| 455 | 455 | } |
| 456 | 456 | |
| 457 | 457 | echo $content; |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | // <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a> |
| 462 | 462 | //</span> |
| 463 | 463 | function getTplWidget() { // recent document info
|
| 464 | - return ' |
|
| 464 | + return ' |
|
| 465 | 465 | <div class="[+cols+]" id="[+id+]"> |
| 466 | 466 | <div class="card"[+cardAttr+]> |
| 467 | 467 | <div class="card-header"[+headAttr+]> <i class="fa [+icon+]"></i> [+title+] </div> |
@@ -472,11 +472,11 @@ discard block |
||
| 472 | 472 | } |
| 473 | 473 | |
| 474 | 474 | function getRecentInfo() { // recent document info
|
| 475 | - $modx = evolutionCMS(); |
|
| 475 | + $modx = evolutionCMS(); |
|
| 476 | 476 | |
| 477 | - $modx->addSnippet('recentInfoList', 'getRecentInfoList');
|
|
| 477 | + $modx->addSnippet('recentInfoList', 'getRecentInfoList');
|
|
| 478 | 478 | |
| 479 | - $html = ' |
|
| 479 | + $html = ' |
|
| 480 | 480 | <div class="table-responsive"> |
| 481 | 481 | <table class="table data"> |
| 482 | 482 | <thead> |
@@ -494,96 +494,96 @@ discard block |
||
| 494 | 494 | </table> |
| 495 | 495 | </div> |
| 496 | 496 | '; |
| 497 | - return $html; |
|
| 497 | + return $html; |
|
| 498 | 498 | } |
| 499 | 499 | |
| 500 | 500 | function getRecentInfoList() {
|
| 501 | - $modx = evolutionCMS(); |
|
| 502 | - |
|
| 503 | - $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);
|
|
| 504 | - |
|
| 505 | - if($modx->db->getRecordCount($rs) < 1) {
|
|
| 506 | - return '<tr><td>[%no_activity_message%]</td></tr>'; |
|
| 507 | - } |
|
| 508 | - |
|
| 509 | - $tpl = getRecentInfoRowTpl(); |
|
| 510 | - |
|
| 511 | - $btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> '; |
|
| 512 | - $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> '; |
|
| 513 | - |
|
| 514 | - $output = array(); |
|
| 515 | - while($ph = $modx->db->getRow($rs)) {
|
|
| 516 | - $docid = $ph['id']; |
|
| 517 | - $_ = $modx->getUserInfo($ph['editedby']); |
|
| 518 | - $ph['username'] = $_['username']; |
|
| 519 | - |
|
| 520 | - if($ph['deleted'] == 1) {
|
|
| 521 | - $ph['status'] = 'deleted text-danger'; |
|
| 522 | - } elseif($ph['published'] == 0) {
|
|
| 523 | - $ph['status'] = 'unpublished font-italic text-muted'; |
|
| 524 | - } else {
|
|
| 525 | - $ph['status'] = 'published'; |
|
| 526 | - } |
|
| 527 | - |
|
| 528 | - if($modx->hasPermission('edit_document')) {
|
|
| 529 | - $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);
|
|
| 530 | - } else {
|
|
| 531 | - $ph['edit_btn'] = ''; |
|
| 532 | - } |
|
| 533 | - |
|
| 534 | - $preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : ''; |
|
| 535 | - $ph['preview_btn'] = str_replace(array( |
|
| 536 | - '[+id+]', |
|
| 537 | - '[+preview_disabled+]' |
|
| 538 | - ), array( |
|
| 539 | - $docid, |
|
| 540 | - $preview_disabled |
|
| 541 | - ), $btntpl['preview_btn']); |
|
| 542 | - |
|
| 543 | - if($modx->hasPermission('delete_document')) {
|
|
| 544 | - if($ph['deleted'] == 0) {
|
|
| 545 | - $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> '; |
|
| 546 | - } else {
|
|
| 547 | - $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> '; |
|
| 548 | - } |
|
| 549 | - $ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);
|
|
| 550 | - } else {
|
|
| 551 | - $ph['delete_btn'] = ''; |
|
| 552 | - } |
|
| 553 | - |
|
| 554 | - if($ph['deleted'] == 1 && $ph['published'] == 0) {
|
|
| 555 | - $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> '; |
|
| 556 | - } elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
|
|
| 557 | - $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> '; |
|
| 558 | - } elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
|
|
| 559 | - $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> '; |
|
| 560 | - } else {
|
|
| 561 | - $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> '; |
|
| 562 | - } |
|
| 563 | - $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);
|
|
| 564 | - |
|
| 565 | - $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');
|
|
| 566 | - |
|
| 567 | - if($ph['longtitle'] == '') {
|
|
| 568 | - $ph['longtitle'] = '(<i>[%not_set%]</i>)'; |
|
| 569 | - } |
|
| 570 | - if($ph['description'] == '') {
|
|
| 571 | - $ph['description'] = '(<i>[%not_set%]</i>)'; |
|
| 572 | - } |
|
| 573 | - if($ph['introtext'] == '') {
|
|
| 574 | - $ph['introtext'] = '(<i>[%not_set%]</i>)'; |
|
| 575 | - } |
|
| 576 | - if($ph['alias'] == '') {
|
|
| 577 | - $ph['alias'] = '(<i>[%not_set%]</i>)'; |
|
| 578 | - } |
|
| 579 | - |
|
| 580 | - $output[] = $modx->parseText($tpl, $ph); |
|
| 581 | - } |
|
| 582 | - return implode("\n", $output);
|
|
| 501 | + $modx = evolutionCMS(); |
|
| 502 | + |
|
| 503 | + $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);
|
|
| 504 | + |
|
| 505 | + if($modx->db->getRecordCount($rs) < 1) {
|
|
| 506 | + return '<tr><td>[%no_activity_message%]</td></tr>'; |
|
| 507 | + } |
|
| 508 | + |
|
| 509 | + $tpl = getRecentInfoRowTpl(); |
|
| 510 | + |
|
| 511 | + $btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> '; |
|
| 512 | + $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> '; |
|
| 513 | + |
|
| 514 | + $output = array(); |
|
| 515 | + while($ph = $modx->db->getRow($rs)) {
|
|
| 516 | + $docid = $ph['id']; |
|
| 517 | + $_ = $modx->getUserInfo($ph['editedby']); |
|
| 518 | + $ph['username'] = $_['username']; |
|
| 519 | + |
|
| 520 | + if($ph['deleted'] == 1) {
|
|
| 521 | + $ph['status'] = 'deleted text-danger'; |
|
| 522 | + } elseif($ph['published'] == 0) {
|
|
| 523 | + $ph['status'] = 'unpublished font-italic text-muted'; |
|
| 524 | + } else {
|
|
| 525 | + $ph['status'] = 'published'; |
|
| 526 | + } |
|
| 527 | + |
|
| 528 | + if($modx->hasPermission('edit_document')) {
|
|
| 529 | + $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);
|
|
| 530 | + } else {
|
|
| 531 | + $ph['edit_btn'] = ''; |
|
| 532 | + } |
|
| 533 | + |
|
| 534 | + $preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : ''; |
|
| 535 | + $ph['preview_btn'] = str_replace(array( |
|
| 536 | + '[+id+]', |
|
| 537 | + '[+preview_disabled+]' |
|
| 538 | + ), array( |
|
| 539 | + $docid, |
|
| 540 | + $preview_disabled |
|
| 541 | + ), $btntpl['preview_btn']); |
|
| 542 | + |
|
| 543 | + if($modx->hasPermission('delete_document')) {
|
|
| 544 | + if($ph['deleted'] == 0) {
|
|
| 545 | + $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> '; |
|
| 546 | + } else {
|
|
| 547 | + $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> '; |
|
| 548 | + } |
|
| 549 | + $ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);
|
|
| 550 | + } else {
|
|
| 551 | + $ph['delete_btn'] = ''; |
|
| 552 | + } |
|
| 553 | + |
|
| 554 | + if($ph['deleted'] == 1 && $ph['published'] == 0) {
|
|
| 555 | + $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> '; |
|
| 556 | + } elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
|
|
| 557 | + $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> '; |
|
| 558 | + } elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
|
|
| 559 | + $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> '; |
|
| 560 | + } else {
|
|
| 561 | + $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> '; |
|
| 562 | + } |
|
| 563 | + $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);
|
|
| 564 | + |
|
| 565 | + $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');
|
|
| 566 | + |
|
| 567 | + if($ph['longtitle'] == '') {
|
|
| 568 | + $ph['longtitle'] = '(<i>[%not_set%]</i>)'; |
|
| 569 | + } |
|
| 570 | + if($ph['description'] == '') {
|
|
| 571 | + $ph['description'] = '(<i>[%not_set%]</i>)'; |
|
| 572 | + } |
|
| 573 | + if($ph['introtext'] == '') {
|
|
| 574 | + $ph['introtext'] = '(<i>[%not_set%]</i>)'; |
|
| 575 | + } |
|
| 576 | + if($ph['alias'] == '') {
|
|
| 577 | + $ph['alias'] = '(<i>[%not_set%]</i>)'; |
|
| 578 | + } |
|
| 579 | + |
|
| 580 | + $output[] = $modx->parseText($tpl, $ph); |
|
| 581 | + } |
|
| 582 | + return implode("\n", $output);
|
|
| 583 | 583 | } |
| 584 | 584 | |
| 585 | 585 | function getRecentInfoRowTpl() {
|
| 586 | - $tpl = ' |
|
| 586 | + $tpl = ' |
|
| 587 | 587 | <tr> |
| 588 | 588 | <td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td> |
| 589 | 589 | <td data-toggle="collapse" data-target=".collapse[+id+]"><a class="[+status+]" title="[%edit_resource%]" href="index.php?a=3&id=[+id+]" target="main">[+pagetitle+]</a></td> |
@@ -607,16 +607,16 @@ discard block |
||
| 607 | 607 | </div> |
| 608 | 608 | </td> |
| 609 | 609 | </tr>'; |
| 610 | - return $tpl; |
|
| 610 | + return $tpl; |
|
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | // setup icons |
| 614 | 614 | function wrapIcon($i, $action) {
|
| 615 | - return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);
|
|
| 615 | + return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);
|
|
| 616 | 616 | } |
| 617 | 617 | |
| 618 | 618 | function getStartUpScript() {
|
| 619 | - $script = ' |
|
| 619 | + $script = ' |
|
| 620 | 620 | <script type="text/javascript"> |
| 621 | 621 | function hideConfigCheckWarning(key) {
|
| 622 | 622 | var xhr = new XMLHttpRequest(); |
@@ -640,5 +640,5 @@ discard block |
||
| 640 | 640 | })(jQuery); |
| 641 | 641 | </script> |
| 642 | 642 | '; |
| 643 | - return $script; |
|
| 643 | + return $script; |
|
| 644 | 644 | } |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 3 | 3 | die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
|
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes |
| 7 | 7 | |
| 8 | -if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
|
|
| 8 | +if ($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
|
|
| 9 | 9 | // seems to be a new install - send the user to the configuration page |
| 10 | 10 | exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
|
| 11 | 11 | } |
@@ -16,62 +16,62 @@ discard block |
||
| 16 | 16 | $_SESSION['nrnewmessages'] = 0; |
| 17 | 17 | |
| 18 | 18 | // setup message info |
| 19 | -if($modx->hasPermission('messages')) {
|
|
| 20 | - include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php'); |
|
| 19 | +if ($modx->hasPermission('messages')) {
|
|
| 20 | + include_once(MODX_MANAGER_PATH.'includes/messageCount.inc.php'); |
|
| 21 | 21 | $_SESSION['nrtotalmessages'] = $nrtotalmessages; |
| 22 | 22 | $_SESSION['nrnewmessages'] = $nrnewmessages; |
| 23 | 23 | |
| 24 | 24 | $msg = array(); |
| 25 | 25 | $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
|
| 26 | - $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : ''; |
|
| 26 | + $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">'.$_SESSION['nrnewmessages'].'</span>)' : ''; |
|
| 27 | 27 | $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold"> <a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
|
| 28 | - $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0'; |
|
| 28 | + $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">'.$_SESSION['nrnewmessages'].'</span>' : '0'; |
|
| 29 | 29 | $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages); |
| 30 | 30 | $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
|
| 31 | 31 | $ph['MessageInfo'] = implode("\n", $msg);
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | // setup icons |
| 35 | -if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
|
|
| 35 | +if ($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
|
|
| 36 | 36 | $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]'; |
| 37 | 37 | $ph['SecurityIcon'] = wrapIcon($icon, 75); |
| 38 | 38 | } |
| 39 | -if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
|
|
| 39 | +if ($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
|
|
| 40 | 40 | $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]'; |
| 41 | 41 | $ph['WebUserIcon'] = wrapIcon($icon, 99); |
| 42 | 42 | } |
| 43 | -if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
|
|
| 43 | +if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
|
|
| 44 | 44 | $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]'; |
| 45 | 45 | $ph['ModulesIcon'] = wrapIcon($icon, 106); |
| 46 | 46 | } |
| 47 | -if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
|
|
| 47 | +if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
|
|
| 48 | 48 | $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]'; |
| 49 | 49 | $ph['ResourcesIcon'] = wrapIcon($icon, 76); |
| 50 | 50 | } |
| 51 | -if($modx->hasPermission('bk_manager')) {
|
|
| 51 | +if ($modx->hasPermission('bk_manager')) {
|
|
| 52 | 52 | $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]'; |
| 53 | 53 | $ph['BackupIcon'] = wrapIcon($icon, 93); |
| 54 | 54 | } |
| 55 | -if($modx->hasPermission('help')) {
|
|
| 55 | +if ($modx->hasPermission('help')) {
|
|
| 56 | 56 | $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]'; |
| 57 | 57 | $ph['HelpIcon'] = wrapIcon($icon, 9); |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | -if($modx->hasPermission('new_document')) {
|
|
| 60 | +if ($modx->hasPermission('new_document')) {
|
|
| 61 | 61 | $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]'; |
| 62 | 62 | $ph['ResourceIcon'] = wrapIcon($icon, 4); |
| 63 | 63 | $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]'; |
| 64 | 64 | $ph['WeblinkIcon'] = wrapIcon($icon, 72); |
| 65 | 65 | } |
| 66 | -if($modx->hasPermission('assets_images')) {
|
|
| 66 | +if ($modx->hasPermission('assets_images')) {
|
|
| 67 | 67 | $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]'; |
| 68 | 68 | $ph['ImagesIcon'] = wrapIcon($icon, 72); |
| 69 | 69 | } |
| 70 | -if($modx->hasPermission('assets_files')) {
|
|
| 70 | +if ($modx->hasPermission('assets_files')) {
|
|
| 71 | 71 | $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]'; |
| 72 | 72 | $ph['FilesIcon'] = wrapIcon($icon, 72); |
| 73 | 73 | } |
| 74 | -if($modx->hasPermission('change_password')) {
|
|
| 74 | +if ($modx->hasPermission('change_password')) {
|
|
| 75 | 75 | $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]'; |
| 76 | 76 | $ph['PasswordIcon'] = wrapIcon($icon, 28); |
| 77 | 77 | } |
@@ -79,9 +79,9 @@ discard block |
||
| 79 | 79 | $ph['LogoutIcon'] = wrapIcon($icon, 8); |
| 80 | 80 | |
| 81 | 81 | // do some config checks |
| 82 | -if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
|
|
| 83 | - include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php'); |
|
| 84 | - if($config_check_results != $_lang['configcheck_ok']) {
|
|
| 82 | +if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
|
|
| 83 | + include_once(MODX_MANAGER_PATH.'includes/config_check.inc.php'); |
|
| 84 | + if ($config_check_results != $_lang['configcheck_ok']) {
|
|
| 85 | 85 | $ph['config_check_results'] = $config_check_results; |
| 86 | 86 | $ph['config_display'] = 'block'; |
| 87 | 87 | } else {
|
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // Check logout-reminder |
| 95 | -if(isset($_SESSION['show_logout_reminder'])) {
|
|
| 96 | - switch($_SESSION['show_logout_reminder']['type']) {
|
|
| 95 | +if (isset($_SESSION['show_logout_reminder'])) {
|
|
| 96 | + switch ($_SESSION['show_logout_reminder']['type']) {
|
|
| 97 | 97 | case 'logout_reminder': |
| 98 | 98 | $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly'); |
| 99 | 99 | $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
|
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | </tr> |
| 148 | 148 | </table>'; |
| 149 | 149 | |
| 150 | -$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>'; |
|
| 150 | +$nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>'; |
|
| 151 | 151 | |
| 152 | 152 | $ph['UserInfo'] = $modx->parseText($tpl, array( |
| 153 | 153 | 'username' => $modx->getLoginUserName(), |
@@ -162,10 +162,10 @@ discard block |
||
| 162 | 162 | $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'"; |
| 163 | 163 | $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
|
| 164 | 164 | |
| 165 | -if($modx->db->getRecordCount($rs) < 1) {
|
|
| 165 | +if ($modx->db->getRecordCount($rs) < 1) {
|
|
| 166 | 166 | $html = '<p>[%no_active_users_found%]</p>'; |
| 167 | 167 | } else {
|
| 168 | - include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php'); |
|
| 168 | + include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php'); |
|
| 169 | 169 | $now = $_SERVER['REQUEST_TIME'] + $server_offset_time; |
| 170 | 170 | $ph['now'] = strftime('%H:%M:%S', $now);
|
| 171 | 171 | $timetocheck = ($now - (60 * 20)); //+$server_offset_time; |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $userList = array(); |
| 191 | 191 | $userCount = array(); |
| 192 | 192 | // Create userlist with session-count first before output |
| 193 | - while($activeusers = $modx->db->getRow($rs)) {
|
|
| 193 | + while ($activeusers = $modx->db->getRow($rs)) {
|
|
| 194 | 194 | $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1; |
| 195 | 195 | |
| 196 | 196 | $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : ''; |
@@ -208,9 +208,9 @@ discard block |
||
| 208 | 208 | $currentaction |
| 209 | 209 | ); |
| 210 | 210 | } |
| 211 | - foreach($userList as $params) {
|
|
| 211 | + foreach ($userList as $params) {
|
|
| 212 | 212 | $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : ''; |
| 213 | - $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
|
|
| 213 | + $html .= "\n\t\t".vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
|
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | $html .= ' |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | $ph['OnlineInfo'] = $html; |
| 223 | 223 | |
| 224 | 224 | // include rss feeds for important forum topics |
| 225 | -include_once(MODX_MANAGER_PATH . 'includes/rss.inc.php'); |
|
| 225 | +include_once(MODX_MANAGER_PATH.'includes/rss.inc.php'); |
|
| 226 | 226 | $ph['modx_security_notices_content'] = $feedData['modx_security_notices_content']; |
| 227 | 227 | $ph['modx_news_content'] = $feedData['modx_news_content']; |
| 228 | 228 | |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | |
| 254 | 254 | // invoke event OnManagerWelcomePrerender |
| 255 | 255 | $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
|
| 256 | -if(is_array($evtOut)) {
|
|
| 256 | +if (is_array($evtOut)) {
|
|
| 257 | 257 | $output = implode('', $evtOut);
|
| 258 | 258 | $ph['OnManagerWelcomePrerender'] = $output; |
| 259 | 259 | } |
@@ -383,57 +383,57 @@ discard block |
||
| 383 | 383 | |
| 384 | 384 | // invoke OnManagerWelcomeHome event |
| 385 | 385 | $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
|
| 386 | -if(is_array($sitewidgets)) {
|
|
| 386 | +if (is_array($sitewidgets)) {
|
|
| 387 | 387 | $newwidgets = array(); |
| 388 | - foreach($sitewidgets as $widget){
|
|
| 388 | + foreach ($sitewidgets as $widget) {
|
|
| 389 | 389 | $newwidgets = array_merge($newwidgets, unserialize($widget)); |
| 390 | 390 | } |
| 391 | 391 | $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets; |
| 392 | 392 | } |
| 393 | 393 | |
| 394 | -usort($widgets, function ($a, $b) {
|
|
| 394 | +usort($widgets, function($a, $b){
|
|
| 395 | 395 | return $a['menuindex'] - $b['menuindex']; |
| 396 | 396 | }); |
| 397 | 397 | |
| 398 | 398 | $tpl = getTplWidget(); |
| 399 | 399 | $output = ''; |
| 400 | -foreach($widgets as $widget) {
|
|
| 401 | - if ($widget['hide'] != '1'){
|
|
| 400 | +foreach ($widgets as $widget) {
|
|
| 401 | + if ($widget['hide'] != '1') {
|
|
| 402 | 402 | $output .= $modx->parseText($tpl, $widget); |
| 403 | 403 | } |
| 404 | 404 | } |
| 405 | 405 | $ph['widgets'] = $output; |
| 406 | 406 | |
| 407 | 407 | // load template |
| 408 | -if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
|
|
| 409 | - $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'; |
|
| 408 | +if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
|
|
| 409 | + $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH.'media/style/common/welcome.tpl'; |
|
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | $target = $modx->config['manager_welcome_tpl']; |
| 413 | 413 | $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
|
| 414 | 414 | $target = $modx->mergeSettingsContent($target); |
| 415 | 415 | |
| 416 | -if(substr($target, 0, 1) === '@') {
|
|
| 417 | - if(substr($target, 0, 6) === '@CHUNK') {
|
|
| 416 | +if (substr($target, 0, 1) === '@') {
|
|
| 417 | + if (substr($target, 0, 6) === '@CHUNK') {
|
|
| 418 | 418 | $content = $modx->getChunk(trim(substr($target, 7))); |
| 419 | - } elseif(substr($target, 0, 5) === '@FILE') {
|
|
| 419 | + } elseif (substr($target, 0, 5) === '@FILE') {
|
|
| 420 | 420 | $content = file_get_contents(trim(substr($target, 6))); |
| 421 | 421 | } else {
|
| 422 | 422 | $content = ''; |
| 423 | 423 | } |
| 424 | 424 | } else {
|
| 425 | 425 | $chunk = $modx->getChunk($target); |
| 426 | - if($chunk !== false && !empty($chunk)) {
|
|
| 426 | + if ($chunk !== false && !empty($chunk)) {
|
|
| 427 | 427 | $content = $chunk; |
| 428 | - } elseif(is_file(MODX_BASE_PATH . $target)) {
|
|
| 429 | - $content = file_get_contents(MODX_BASE_PATH . $target); |
|
| 430 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
|
|
| 431 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl'); |
|
| 432 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible |
|
| 428 | + } elseif (is_file(MODX_BASE_PATH.$target)) {
|
|
| 429 | + $content = file_get_contents(MODX_BASE_PATH.$target); |
|
| 430 | + } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl')) {
|
|
| 431 | + $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl'); |
|
| 432 | + } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html')) // ClipperCMS compatible |
|
| 433 | 433 | {
|
| 434 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html'); |
|
| 434 | + $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html'); |
|
| 435 | 435 | } else {
|
| 436 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'); |
|
| 436 | + $content = file_get_contents(MODX_MANAGER_PATH.'media/style/common/welcome.tpl'); |
|
| 437 | 437 | } |
| 438 | 438 | } |
| 439 | 439 | |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | $content = $modx->mergeConditionalTagsContent($content); |
| 442 | 442 | $content = $modx->mergeSettingsContent($content); |
| 443 | 443 | $content = $modx->parseText($content, $ph); |
| 444 | -if(strpos($content, '[+') !== false) {
|
|
| 444 | +if (strpos($content, '[+') !== false) {
|
|
| 445 | 445 | $modx->toPlaceholders($ph); |
| 446 | 446 | $content = $modx->mergePlaceholderContent($content); |
| 447 | 447 | } |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | $content = $modx->parseText($content, $_style, '[&', '&]'); |
| 451 | 451 | $content = $modx->cleanUpMODXTags($content); //cleanup |
| 452 | 452 | |
| 453 | -if($js = $modx->getRegisteredClientScripts()) {
|
|
| 453 | +if ($js = $modx->getRegisteredClientScripts()) {
|
|
| 454 | 454 | $content .= $js; |
| 455 | 455 | } |
| 456 | 456 | |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | // <a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a> |
| 461 | 461 | // <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a> |
| 462 | 462 | //</span> |
| 463 | -function getTplWidget() { // recent document info
|
|
| 463 | +function getTplWidget(){ // recent document info
|
|
| 464 | 464 | return ' |
| 465 | 465 | <div class="[+cols+]" id="[+id+]"> |
| 466 | 466 | <div class="card"[+cardAttr+]> |
@@ -471,7 +471,7 @@ discard block |
||
| 471 | 471 | '; |
| 472 | 472 | } |
| 473 | 473 | |
| 474 | -function getRecentInfo() { // recent document info
|
|
| 474 | +function getRecentInfo(){ // recent document info
|
|
| 475 | 475 | $modx = evolutionCMS(); |
| 476 | 476 | |
| 477 | 477 | $modx->addSnippet('recentInfoList', 'getRecentInfoList');
|
@@ -497,12 +497,12 @@ discard block |
||
| 497 | 497 | return $html; |
| 498 | 498 | } |
| 499 | 499 | |
| 500 | -function getRecentInfoList() {
|
|
| 500 | +function getRecentInfoList(){
|
|
| 501 | 501 | $modx = evolutionCMS(); |
| 502 | 502 | |
| 503 | 503 | $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);
|
| 504 | 504 | |
| 505 | - if($modx->db->getRecordCount($rs) < 1) {
|
|
| 505 | + if ($modx->db->getRecordCount($rs) < 1) {
|
|
| 506 | 506 | return '<tr><td>[%no_activity_message%]</td></tr>'; |
| 507 | 507 | } |
| 508 | 508 | |
@@ -512,20 +512,20 @@ discard block |
||
| 512 | 512 | $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> '; |
| 513 | 513 | |
| 514 | 514 | $output = array(); |
| 515 | - while($ph = $modx->db->getRow($rs)) {
|
|
| 515 | + while ($ph = $modx->db->getRow($rs)) {
|
|
| 516 | 516 | $docid = $ph['id']; |
| 517 | 517 | $_ = $modx->getUserInfo($ph['editedby']); |
| 518 | 518 | $ph['username'] = $_['username']; |
| 519 | 519 | |
| 520 | - if($ph['deleted'] == 1) {
|
|
| 520 | + if ($ph['deleted'] == 1) {
|
|
| 521 | 521 | $ph['status'] = 'deleted text-danger'; |
| 522 | - } elseif($ph['published'] == 0) {
|
|
| 522 | + } elseif ($ph['published'] == 0) {
|
|
| 523 | 523 | $ph['status'] = 'unpublished font-italic text-muted'; |
| 524 | 524 | } else {
|
| 525 | 525 | $ph['status'] = 'published'; |
| 526 | 526 | } |
| 527 | 527 | |
| 528 | - if($modx->hasPermission('edit_document')) {
|
|
| 528 | + if ($modx->hasPermission('edit_document')) {
|
|
| 529 | 529 | $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);
|
| 530 | 530 | } else {
|
| 531 | 531 | $ph['edit_btn'] = ''; |
@@ -540,8 +540,8 @@ discard block |
||
| 540 | 540 | $preview_disabled |
| 541 | 541 | ), $btntpl['preview_btn']); |
| 542 | 542 | |
| 543 | - if($modx->hasPermission('delete_document')) {
|
|
| 544 | - if($ph['deleted'] == 0) {
|
|
| 543 | + if ($modx->hasPermission('delete_document')) {
|
|
| 544 | + if ($ph['deleted'] == 0) {
|
|
| 545 | 545 | $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> '; |
| 546 | 546 | } else {
|
| 547 | 547 | $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> '; |
@@ -551,11 +551,11 @@ discard block |
||
| 551 | 551 | $ph['delete_btn'] = ''; |
| 552 | 552 | } |
| 553 | 553 | |
| 554 | - if($ph['deleted'] == 1 && $ph['published'] == 0) {
|
|
| 554 | + if ($ph['deleted'] == 1 && $ph['published'] == 0) {
|
|
| 555 | 555 | $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> '; |
| 556 | - } elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
|
|
| 556 | + } elseif ($ph['deleted'] == 1 && $ph['published'] == 1) {
|
|
| 557 | 557 | $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> '; |
| 558 | - } elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
|
|
| 558 | + } elseif ($ph['deleted'] == 0 && $ph['published'] == 0) {
|
|
| 559 | 559 | $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> '; |
| 560 | 560 | } else {
|
| 561 | 561 | $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> '; |
@@ -564,16 +564,16 @@ discard block |
||
| 564 | 564 | |
| 565 | 565 | $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');
|
| 566 | 566 | |
| 567 | - if($ph['longtitle'] == '') {
|
|
| 567 | + if ($ph['longtitle'] == '') {
|
|
| 568 | 568 | $ph['longtitle'] = '(<i>[%not_set%]</i>)'; |
| 569 | 569 | } |
| 570 | - if($ph['description'] == '') {
|
|
| 570 | + if ($ph['description'] == '') {
|
|
| 571 | 571 | $ph['description'] = '(<i>[%not_set%]</i>)'; |
| 572 | 572 | } |
| 573 | - if($ph['introtext'] == '') {
|
|
| 573 | + if ($ph['introtext'] == '') {
|
|
| 574 | 574 | $ph['introtext'] = '(<i>[%not_set%]</i>)'; |
| 575 | 575 | } |
| 576 | - if($ph['alias'] == '') {
|
|
| 576 | + if ($ph['alias'] == '') {
|
|
| 577 | 577 | $ph['alias'] = '(<i>[%not_set%]</i>)'; |
| 578 | 578 | } |
| 579 | 579 | |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | return implode("\n", $output);
|
| 583 | 583 | } |
| 584 | 584 | |
| 585 | -function getRecentInfoRowTpl() {
|
|
| 585 | +function getRecentInfoRowTpl(){
|
|
| 586 | 586 | $tpl = ' |
| 587 | 587 | <tr> |
| 588 | 588 | <td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td> |
@@ -611,11 +611,11 @@ discard block |
||
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | // setup icons |
| 614 | -function wrapIcon($i, $action) {
|
|
| 614 | +function wrapIcon($i, $action){
|
|
| 615 | 615 | return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);
|
| 616 | 616 | } |
| 617 | 617 | |
| 618 | -function getStartUpScript() {
|
|
| 618 | +function getStartUpScript(){
|
|
| 619 | 619 | $script = ' |
| 620 | 620 | <script type="text/javascript"> |
| 621 | 621 | function hideConfigCheckWarning(key) {
|
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
|
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes |
| 7 | 7 | |
| 8 | -if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
|
|
| 8 | +if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) { |
|
| 9 | 9 | // seems to be a new install - send the user to the configuration page |
| 10 | 10 | exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
|
| 11 | 11 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | $_SESSION['nrnewmessages'] = 0; |
| 17 | 17 | |
| 18 | 18 | // setup message info |
| 19 | -if($modx->hasPermission('messages')) {
|
|
| 19 | +if($modx->hasPermission('messages')) { |
|
| 20 | 20 | include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php'); |
| 21 | 21 | $_SESSION['nrtotalmessages'] = $nrtotalmessages; |
| 22 | 22 | $_SESSION['nrnewmessages'] = $nrnewmessages; |
@@ -32,46 +32,46 @@ discard block |
||
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | // setup icons |
| 35 | -if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
|
|
| 35 | +if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) { |
|
| 36 | 36 | $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]'; |
| 37 | 37 | $ph['SecurityIcon'] = wrapIcon($icon, 75); |
| 38 | 38 | } |
| 39 | -if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
|
|
| 39 | +if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) { |
|
| 40 | 40 | $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]'; |
| 41 | 41 | $ph['WebUserIcon'] = wrapIcon($icon, 99); |
| 42 | 42 | } |
| 43 | -if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
|
|
| 43 | +if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) { |
|
| 44 | 44 | $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]'; |
| 45 | 45 | $ph['ModulesIcon'] = wrapIcon($icon, 106); |
| 46 | 46 | } |
| 47 | -if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
|
|
| 47 | +if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) { |
|
| 48 | 48 | $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]'; |
| 49 | 49 | $ph['ResourcesIcon'] = wrapIcon($icon, 76); |
| 50 | 50 | } |
| 51 | -if($modx->hasPermission('bk_manager')) {
|
|
| 51 | +if($modx->hasPermission('bk_manager')) { |
|
| 52 | 52 | $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]'; |
| 53 | 53 | $ph['BackupIcon'] = wrapIcon($icon, 93); |
| 54 | 54 | } |
| 55 | -if($modx->hasPermission('help')) {
|
|
| 55 | +if($modx->hasPermission('help')) { |
|
| 56 | 56 | $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]'; |
| 57 | 57 | $ph['HelpIcon'] = wrapIcon($icon, 9); |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | -if($modx->hasPermission('new_document')) {
|
|
| 60 | +if($modx->hasPermission('new_document')) { |
|
| 61 | 61 | $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]'; |
| 62 | 62 | $ph['ResourceIcon'] = wrapIcon($icon, 4); |
| 63 | 63 | $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]'; |
| 64 | 64 | $ph['WeblinkIcon'] = wrapIcon($icon, 72); |
| 65 | 65 | } |
| 66 | -if($modx->hasPermission('assets_images')) {
|
|
| 66 | +if($modx->hasPermission('assets_images')) { |
|
| 67 | 67 | $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]'; |
| 68 | 68 | $ph['ImagesIcon'] = wrapIcon($icon, 72); |
| 69 | 69 | } |
| 70 | -if($modx->hasPermission('assets_files')) {
|
|
| 70 | +if($modx->hasPermission('assets_files')) { |
|
| 71 | 71 | $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]'; |
| 72 | 72 | $ph['FilesIcon'] = wrapIcon($icon, 72); |
| 73 | 73 | } |
| 74 | -if($modx->hasPermission('change_password')) {
|
|
| 74 | +if($modx->hasPermission('change_password')) { |
|
| 75 | 75 | $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]'; |
| 76 | 76 | $ph['PasswordIcon'] = wrapIcon($icon, 28); |
| 77 | 77 | } |
@@ -79,21 +79,21 @@ discard block |
||
| 79 | 79 | $ph['LogoutIcon'] = wrapIcon($icon, 8); |
| 80 | 80 | |
| 81 | 81 | // do some config checks |
| 82 | -if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
|
|
| 82 | +if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) { |
|
| 83 | 83 | include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php'); |
| 84 | - if($config_check_results != $_lang['configcheck_ok']) {
|
|
| 84 | + if($config_check_results != $_lang['configcheck_ok']) { |
|
| 85 | 85 | $ph['config_check_results'] = $config_check_results; |
| 86 | 86 | $ph['config_display'] = 'block'; |
| 87 | - } else {
|
|
| 87 | + } else { |
|
| 88 | 88 | $ph['config_display'] = 'none'; |
| 89 | 89 | } |
| 90 | -} else {
|
|
| 90 | +} else { |
|
| 91 | 91 | $ph['config_display'] = 'none'; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // Check logout-reminder |
| 95 | -if(isset($_SESSION['show_logout_reminder'])) {
|
|
| 96 | - switch($_SESSION['show_logout_reminder']['type']) {
|
|
| 95 | +if(isset($_SESSION['show_logout_reminder'])) { |
|
| 96 | + switch($_SESSION['show_logout_reminder']['type']) { |
|
| 97 | 97 | case 'logout_reminder': |
| 98 | 98 | $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly'); |
| 99 | 99 | $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
|
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | } |
| 102 | 102 | $ph['show_logout_reminder'] = 'block'; |
| 103 | 103 | unset($_SESSION['show_logout_reminder']); |
| 104 | -} else {
|
|
| 104 | +} else { |
|
| 105 | 105 | $ph['show_logout_reminder'] = 'none'; |
| 106 | 106 | } |
| 107 | 107 | |
@@ -162,9 +162,9 @@ discard block |
||
| 162 | 162 | $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'"; |
| 163 | 163 | $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
|
| 164 | 164 | |
| 165 | -if($modx->db->getRecordCount($rs) < 1) {
|
|
| 165 | +if($modx->db->getRecordCount($rs) < 1) { |
|
| 166 | 166 | $html = '<p>[%no_active_users_found%]</p>'; |
| 167 | -} else {
|
|
| 167 | +} else { |
|
| 168 | 168 | include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php'); |
| 169 | 169 | $now = $_SERVER['REQUEST_TIME'] + $server_offset_time; |
| 170 | 170 | $ph['now'] = strftime('%H:%M:%S', $now);
|
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $userList = array(); |
| 191 | 191 | $userCount = array(); |
| 192 | 192 | // Create userlist with session-count first before output |
| 193 | - while($activeusers = $modx->db->getRow($rs)) {
|
|
| 193 | + while($activeusers = $modx->db->getRow($rs)) { |
|
| 194 | 194 | $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1; |
| 195 | 195 | |
| 196 | 196 | $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : ''; |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | $currentaction |
| 209 | 209 | ); |
| 210 | 210 | } |
| 211 | - foreach($userList as $params) {
|
|
| 211 | + foreach($userList as $params) { |
|
| 212 | 212 | $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : ''; |
| 213 | 213 | $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
|
| 214 | 214 | } |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | |
| 254 | 254 | // invoke event OnManagerWelcomePrerender |
| 255 | 255 | $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
|
| 256 | -if(is_array($evtOut)) {
|
|
| 256 | +if(is_array($evtOut)) { |
|
| 257 | 257 | $output = implode('', $evtOut);
|
| 258 | 258 | $ph['OnManagerWelcomePrerender'] = $output; |
| 259 | 259 | } |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | 'body' => '<div class="widget-stage">[+RecentInfo+]</div>', |
| 359 | 359 | 'hide'=>'0' |
| 360 | 360 | ); |
| 361 | -if ($modx->config['rss_url_news']) {
|
|
| 361 | +if ($modx->config['rss_url_news']) { |
|
| 362 | 362 | $widgets['news'] = array( |
| 363 | 363 | 'menuindex' => '40', |
| 364 | 364 | 'id' => 'news', |
@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | 'hide'=>'0' |
| 370 | 370 | ); |
| 371 | 371 | } |
| 372 | -if ($modx->config['rss_url_security']) {
|
|
| 372 | +if ($modx->config['rss_url_security']) { |
|
| 373 | 373 | $widgets['security'] = array( |
| 374 | 374 | 'menuindex' => '50', |
| 375 | 375 | 'id' => 'security', |
@@ -383,29 +383,29 @@ discard block |
||
| 383 | 383 | |
| 384 | 384 | // invoke OnManagerWelcomeHome event |
| 385 | 385 | $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
|
| 386 | -if(is_array($sitewidgets)) {
|
|
| 386 | +if(is_array($sitewidgets)) { |
|
| 387 | 387 | $newwidgets = array(); |
| 388 | - foreach($sitewidgets as $widget){
|
|
| 388 | + foreach($sitewidgets as $widget) { |
|
| 389 | 389 | $newwidgets = array_merge($newwidgets, unserialize($widget)); |
| 390 | 390 | } |
| 391 | 391 | $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets; |
| 392 | 392 | } |
| 393 | 393 | |
| 394 | -usort($widgets, function ($a, $b) {
|
|
| 394 | +usort($widgets, function ($a, $b){ |
|
| 395 | 395 | return $a['menuindex'] - $b['menuindex']; |
| 396 | 396 | }); |
| 397 | 397 | |
| 398 | 398 | $tpl = getTplWidget(); |
| 399 | 399 | $output = ''; |
| 400 | -foreach($widgets as $widget) {
|
|
| 401 | - if ($widget['hide'] != '1'){
|
|
| 400 | +foreach($widgets as $widget) { |
|
| 401 | + if ($widget['hide'] != '1') { |
|
| 402 | 402 | $output .= $modx->parseText($tpl, $widget); |
| 403 | 403 | } |
| 404 | 404 | } |
| 405 | 405 | $ph['widgets'] = $output; |
| 406 | 406 | |
| 407 | 407 | // load template |
| 408 | -if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
|
|
| 408 | +if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) { |
|
| 409 | 409 | $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'; |
| 410 | 410 | } |
| 411 | 411 | |
@@ -413,26 +413,28 @@ discard block |
||
| 413 | 413 | $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
|
| 414 | 414 | $target = $modx->mergeSettingsContent($target); |
| 415 | 415 | |
| 416 | -if(substr($target, 0, 1) === '@') {
|
|
| 417 | - if(substr($target, 0, 6) === '@CHUNK') {
|
|
| 416 | +if(substr($target, 0, 1) === '@') { |
|
| 417 | + if(substr($target, 0, 6) === '@CHUNK') { |
|
| 418 | 418 | $content = $modx->getChunk(trim(substr($target, 7))); |
| 419 | - } elseif(substr($target, 0, 5) === '@FILE') {
|
|
| 419 | + } elseif(substr($target, 0, 5) === '@FILE') { |
|
| 420 | 420 | $content = file_get_contents(trim(substr($target, 6))); |
| 421 | - } else {
|
|
| 421 | + } else { |
|
| 422 | 422 | $content = ''; |
| 423 | 423 | } |
| 424 | -} else {
|
|
| 424 | +} else { |
|
| 425 | 425 | $chunk = $modx->getChunk($target); |
| 426 | - if($chunk !== false && !empty($chunk)) {
|
|
| 426 | + if($chunk !== false && !empty($chunk)) { |
|
| 427 | 427 | $content = $chunk; |
| 428 | - } elseif(is_file(MODX_BASE_PATH . $target)) {
|
|
| 428 | + } elseif(is_file(MODX_BASE_PATH . $target)) { |
|
| 429 | 429 | $content = file_get_contents(MODX_BASE_PATH . $target); |
| 430 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
|
|
| 430 | + } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) { |
|
| 431 | 431 | $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl'); |
| 432 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible |
|
| 432 | + } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) { |
|
| 433 | + // ClipperCMS compatible |
|
| 433 | 434 | {
|
| 434 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html'); |
|
| 435 | - } else {
|
|
| 435 | + $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html'); |
|
| 436 | + } |
|
| 437 | + } else { |
|
| 436 | 438 | $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'); |
| 437 | 439 | } |
| 438 | 440 | } |
@@ -441,7 +443,7 @@ discard block |
||
| 441 | 443 | $content = $modx->mergeConditionalTagsContent($content); |
| 442 | 444 | $content = $modx->mergeSettingsContent($content); |
| 443 | 445 | $content = $modx->parseText($content, $ph); |
| 444 | -if(strpos($content, '[+') !== false) {
|
|
| 446 | +if(strpos($content, '[+') !== false) { |
|
| 445 | 447 | $modx->toPlaceholders($ph); |
| 446 | 448 | $content = $modx->mergePlaceholderContent($content); |
| 447 | 449 | } |
@@ -450,7 +452,7 @@ discard block |
||
| 450 | 452 | $content = $modx->parseText($content, $_style, '[&', '&]'); |
| 451 | 453 | $content = $modx->cleanUpMODXTags($content); //cleanup |
| 452 | 454 | |
| 453 | -if($js = $modx->getRegisteredClientScripts()) {
|
|
| 455 | +if($js = $modx->getRegisteredClientScripts()) { |
|
| 454 | 456 | $content .= $js; |
| 455 | 457 | } |
| 456 | 458 | |
@@ -460,7 +462,9 @@ discard block |
||
| 460 | 462 | // <a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a> |
| 461 | 463 | // <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a> |
| 462 | 464 | //</span> |
| 463 | -function getTplWidget() { // recent document info
|
|
| 465 | +function getTplWidget() |
|
| 466 | +{ |
|
| 467 | +// recent document info |
|
| 464 | 468 | return ' |
| 465 | 469 | <div class="[+cols+]" id="[+id+]"> |
| 466 | 470 | <div class="card"[+cardAttr+]> |
@@ -471,7 +475,9 @@ discard block |
||
| 471 | 475 | '; |
| 472 | 476 | } |
| 473 | 477 | |
| 474 | -function getRecentInfo() { // recent document info
|
|
| 478 | +function getRecentInfo() |
|
| 479 | +{ |
|
| 480 | +// recent document info |
|
| 475 | 481 | $modx = evolutionCMS(); |
| 476 | 482 | |
| 477 | 483 | $modx->addSnippet('recentInfoList', 'getRecentInfoList');
|
@@ -497,12 +503,13 @@ discard block |
||
| 497 | 503 | return $html; |
| 498 | 504 | } |
| 499 | 505 | |
| 500 | -function getRecentInfoList() {
|
|
| 506 | +function getRecentInfoList() |
|
| 507 | +{ |
|
| 501 | 508 | $modx = evolutionCMS(); |
| 502 | 509 | |
| 503 | 510 | $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);
|
| 504 | 511 | |
| 505 | - if($modx->db->getRecordCount($rs) < 1) {
|
|
| 512 | + if($modx->db->getRecordCount($rs) < 1) { |
|
| 506 | 513 | return '<tr><td>[%no_activity_message%]</td></tr>'; |
| 507 | 514 | } |
| 508 | 515 | |
@@ -512,22 +519,22 @@ discard block |
||
| 512 | 519 | $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> '; |
| 513 | 520 | |
| 514 | 521 | $output = array(); |
| 515 | - while($ph = $modx->db->getRow($rs)) {
|
|
| 522 | + while($ph = $modx->db->getRow($rs)) { |
|
| 516 | 523 | $docid = $ph['id']; |
| 517 | 524 | $_ = $modx->getUserInfo($ph['editedby']); |
| 518 | 525 | $ph['username'] = $_['username']; |
| 519 | 526 | |
| 520 | - if($ph['deleted'] == 1) {
|
|
| 527 | + if($ph['deleted'] == 1) { |
|
| 521 | 528 | $ph['status'] = 'deleted text-danger'; |
| 522 | - } elseif($ph['published'] == 0) {
|
|
| 529 | + } elseif($ph['published'] == 0) { |
|
| 523 | 530 | $ph['status'] = 'unpublished font-italic text-muted'; |
| 524 | - } else {
|
|
| 531 | + } else { |
|
| 525 | 532 | $ph['status'] = 'published'; |
| 526 | 533 | } |
| 527 | 534 | |
| 528 | - if($modx->hasPermission('edit_document')) {
|
|
| 535 | + if($modx->hasPermission('edit_document')) { |
|
| 529 | 536 | $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);
|
| 530 | - } else {
|
|
| 537 | + } else { |
|
| 531 | 538 | $ph['edit_btn'] = ''; |
| 532 | 539 | } |
| 533 | 540 | |
@@ -540,40 +547,40 @@ discard block |
||
| 540 | 547 | $preview_disabled |
| 541 | 548 | ), $btntpl['preview_btn']); |
| 542 | 549 | |
| 543 | - if($modx->hasPermission('delete_document')) {
|
|
| 544 | - if($ph['deleted'] == 0) {
|
|
| 550 | + if($modx->hasPermission('delete_document')) { |
|
| 551 | + if($ph['deleted'] == 0) { |
|
| 545 | 552 | $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> '; |
| 546 | - } else {
|
|
| 553 | + } else { |
|
| 547 | 554 | $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> '; |
| 548 | 555 | } |
| 549 | 556 | $ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);
|
| 550 | - } else {
|
|
| 557 | + } else { |
|
| 551 | 558 | $ph['delete_btn'] = ''; |
| 552 | 559 | } |
| 553 | 560 | |
| 554 | - if($ph['deleted'] == 1 && $ph['published'] == 0) {
|
|
| 561 | + if($ph['deleted'] == 1 && $ph['published'] == 0) { |
|
| 555 | 562 | $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> '; |
| 556 | - } elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
|
|
| 563 | + } elseif($ph['deleted'] == 1 && $ph['published'] == 1) { |
|
| 557 | 564 | $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> '; |
| 558 | - } elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
|
|
| 565 | + } elseif($ph['deleted'] == 0 && $ph['published'] == 0) { |
|
| 559 | 566 | $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> '; |
| 560 | - } else {
|
|
| 567 | + } else { |
|
| 561 | 568 | $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> '; |
| 562 | 569 | } |
| 563 | 570 | $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);
|
| 564 | 571 | |
| 565 | 572 | $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');
|
| 566 | 573 | |
| 567 | - if($ph['longtitle'] == '') {
|
|
| 574 | + if($ph['longtitle'] == '') { |
|
| 568 | 575 | $ph['longtitle'] = '(<i>[%not_set%]</i>)'; |
| 569 | 576 | } |
| 570 | - if($ph['description'] == '') {
|
|
| 577 | + if($ph['description'] == '') { |
|
| 571 | 578 | $ph['description'] = '(<i>[%not_set%]</i>)'; |
| 572 | 579 | } |
| 573 | - if($ph['introtext'] == '') {
|
|
| 580 | + if($ph['introtext'] == '') { |
|
| 574 | 581 | $ph['introtext'] = '(<i>[%not_set%]</i>)'; |
| 575 | 582 | } |
| 576 | - if($ph['alias'] == '') {
|
|
| 583 | + if($ph['alias'] == '') { |
|
| 577 | 584 | $ph['alias'] = '(<i>[%not_set%]</i>)'; |
| 578 | 585 | } |
| 579 | 586 | |
@@ -582,7 +589,8 @@ discard block |
||
| 582 | 589 | return implode("\n", $output);
|
| 583 | 590 | } |
| 584 | 591 | |
| 585 | -function getRecentInfoRowTpl() {
|
|
| 592 | +function getRecentInfoRowTpl() |
|
| 593 | +{ |
|
| 586 | 594 | $tpl = ' |
| 587 | 595 | <tr> |
| 588 | 596 | <td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td> |
@@ -611,11 +619,13 @@ discard block |
||
| 611 | 619 | } |
| 612 | 620 | |
| 613 | 621 | // setup icons |
| 614 | -function wrapIcon($i, $action) {
|
|
| 622 | +function wrapIcon($i, $action) |
|
| 623 | +{ |
|
| 615 | 624 | return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);
|
| 616 | 625 | } |
| 617 | 626 | |
| 618 | -function getStartUpScript() {
|
|
| 627 | +function getStartUpScript() |
|
| 628 | +{ |
|
| 619 | 629 | $script = ' |
| 620 | 630 | <script type="text/javascript"> |
| 621 | 631 | function hideConfigCheckWarning(key) {
|
@@ -113,7 +113,7 @@ |
||
| 113 | 113 | <?php |
| 114 | 114 | // invoke OnMiscSettingsRender event |
| 115 | 115 | $evtOut = $modx->invokeEvent('OnFileManagerSettingsRender');
|
| 116 | - if(is_array($evtOut)) echo implode("",$evtOut);
|
|
| 116 | + if (is_array($evtOut)) echo implode("", $evtOut);
|
|
| 117 | 117 | ?> |
| 118 | 118 | </td> |
| 119 | 119 | </tr> |
@@ -113,7 +113,9 @@ |
||
| 113 | 113 | <?php |
| 114 | 114 | // invoke OnMiscSettingsRender event |
| 115 | 115 | $evtOut = $modx->invokeEvent('OnFileManagerSettingsRender');
|
| 116 | - if(is_array($evtOut)) echo implode("",$evtOut);
|
|
| 116 | + if(is_array($evtOut)) { |
|
| 117 | + echo implode("",$evtOut); |
|
| 118 | + } |
|
| 117 | 119 | ?> |
| 118 | 120 | </td> |
| 119 | 121 | </tr> |
