evolution-cms /
evolution
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | } |
| 22 | 22 | elseif(is_writable($htaccess)) |
| 23 | 23 | { |
| 24 | - $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_); |
|
| 24 | + $_ = preg_replace('@RewriteBase.+@',"rewritebase {$dir}", $_); |
|
| 25 | 25 | if(!@file_put_contents($htaccess,$_)) |
| 26 | 26 | { |
| 27 | 27 | $warnings[] = $_lang["settings_friendlyurls_alert2"]; |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | elseif($modx->config['base_url']!=='/') |
| 38 | 38 | { |
| 39 | 39 | $_ = file_get_contents($htaccess); |
| 40 | - $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_); |
|
| 40 | + $_ = preg_replace('@RewriteBase.+@',"rewritebase {$dir}", $_); |
|
| 41 | 41 | if(!@file_put_contents($htaccess,$_)) |
| 42 | 42 | { |
| 43 | 43 | $warnings[] = $_lang["settings_friendlyurls_alert2"]; |
@@ -239,7 +239,7 @@ |
||
| 239 | 239 | if(version_compare(PHP_VERSION, '5.2', '<')) { |
| 240 | 240 | setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure); |
| 241 | 241 | } else { |
| 242 | - setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true); |
|
| 242 | + setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, null, $secure, true); |
|
| 243 | 243 | } |
| 244 | 244 | } else { |
| 245 | 245 | $_SESSION['modx.mgr.session.cookie.lifetime'] = 0; |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | <head> |
| 5 | 5 | <title>KCFinder: / |
| 6 | 6 | <?php echo $this->session['dir'] ?></title> |
| 7 | - <?php INCLUDE "tpl/tpl_css.php" ?> |
|
| 8 | - <?php INCLUDE "tpl/tpl_javascript.php" ?> |
|
| 7 | + <?php include "tpl/tpl_css.php" ?> |
|
| 8 | + <?php include "tpl/tpl_javascript.php" ?> |
|
| 9 | 9 | </head> |
| 10 | 10 | |
| 11 | 11 | <body> |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | ? $ignored |
| 26 | 26 | : ($ignored ? array($ignored) : array()); |
| 27 | 27 | |
| 28 | - if ($this->zip->open($file, ZIPARCHIVE::CREATE) !== TRUE) |
|
| 28 | + if ($this->zip->open($file, ZIPARCHIVE::CREATE) !== true) |
|
| 29 | 29 | throw new Exception("cannot open <$file>\n"); |
| 30 | 30 | |
| 31 | 31 | $folder = rtrim($folder, '/'); |
@@ -88,7 +88,7 @@ |
||
| 88 | 88 | } |
| 89 | 89 | </script> |
| 90 | 90 | |
| 91 | -JS; |
|
| 91 | +js; |
|
| 92 | 92 | $modx->regClientScript($script); |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -288,11 +288,11 @@ |
||
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | // Send the Username |
| 291 | - $this->sendString("USER $username" . static::LE); |
|
| 291 | + $this->sendString("user $username" . static::LE); |
|
| 292 | 292 | $pop3_response = $this->getResponse(); |
| 293 | 293 | if ($this->checkResponse($pop3_response)) { |
| 294 | 294 | // Send the Password |
| 295 | - $this->sendString("PASS $password" . static::LE); |
|
| 295 | + $this->sendString("pass $password" . static::LE); |
|
| 296 | 296 | $pop3_response = $this->getResponse(); |
| 297 | 297 | if ($this->checkResponse($pop3_response)) { |
| 298 | 298 | return true; |
@@ -888,7 +888,7 @@ discard block |
||
| 888 | 888 | protected function sendCommand($command, $commandstring, $expect) |
| 889 | 889 | { |
| 890 | 890 | if (!$this->connected()) { |
| 891 | - $this->setError("Called $command without being connected"); |
|
| 891 | + $this->setError("called $command without being connected"); |
|
| 892 | 892 | |
| 893 | 893 | return false; |
| 894 | 894 | } |
@@ -970,7 +970,7 @@ discard block |
||
| 970 | 970 | */ |
| 971 | 971 | public function verify($name) |
| 972 | 972 | { |
| 973 | - return $this->sendCommand('VRFY', "VRFY $name", [250, 251]); |
|
| 973 | + return $this->sendCommand('VRFY', "vrfy $name", [250, 251]); |
|
| 974 | 974 | } |
| 975 | 975 | |
| 976 | 976 | /** |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | |
| 317 | 317 | |
| 318 | 318 | // make sure we can use the database |
| 319 | -if ($installMode > 0 && !mysqli_query($conn, "USE {$dbase}")) { |
|
| 319 | +if ($installMode > 0 && !mysqli_query($conn, "use {$dbase}")) { |
|
| 320 | 320 | $errors++; |
| 321 | 321 | echo $_lang['database_use_failed'] . PHP_EOL; |
| 322 | 322 | } |
@@ -1117,7 +1117,7 @@ discard block |
||
| 1117 | 1117 | |
| 1118 | 1118 | if (mysqli_num_rows($rs)) { |
| 1119 | 1119 | if (!mysqli_query($sqlParser->conn, |
| 1120 | - "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked' WHERE templatename='$name' LIMIT 1;")) { |
|
| 1120 | + "update $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked' WHERE templatename='$name' LIMIT 1;")) { |
|
| 1121 | 1121 | $errors += 1; |
| 1122 | 1122 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1123 | 1123 | |
@@ -1181,7 +1181,7 @@ discard block |
||
| 1181 | 1181 | $insert = true; |
| 1182 | 1182 | while ($row = mysqli_fetch_assoc($rs)) { |
| 1183 | 1183 | if (!mysqli_query($sqlParser->conn, |
| 1184 | - "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']};")) { |
|
| 1184 | + "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']};")) { |
|
| 1185 | 1185 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1186 | 1186 | |
| 1187 | 1187 | return; |
@@ -1266,7 +1266,7 @@ discard block |
||
| 1266 | 1266 | $update = $count_original_name > 0 && $overwrite == 'true'; |
| 1267 | 1267 | if ($update) { |
| 1268 | 1268 | if (!mysqli_query($sqlParser->conn, |
| 1269 | - "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 1269 | + "update $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 1270 | 1270 | $errors += 1; |
| 1271 | 1271 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1272 | 1272 | |
@@ -1322,7 +1322,7 @@ discard block |
||
| 1322 | 1322 | $row = mysqli_fetch_assoc($rs); |
| 1323 | 1323 | $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
| 1324 | 1324 | if (!mysqli_query($sqlParser->conn, |
| 1325 | - "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 1325 | + "update $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 1326 | 1326 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1327 | 1327 | |
| 1328 | 1328 | return; |
@@ -1373,7 +1373,7 @@ discard block |
||
| 1373 | 1373 | |
| 1374 | 1374 | // disable legacy versions based on legacy_names provided |
| 1375 | 1375 | if (!empty($leg_names)) { |
| 1376 | - $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 1376 | + $update_query = "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 1377 | 1377 | $rs = mysqli_query($sqlParser->conn, $update_query); |
| 1378 | 1378 | } |
| 1379 | 1379 | |
@@ -1391,7 +1391,7 @@ discard block |
||
| 1391 | 1391 | $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
| 1392 | 1392 | if ($row['description'] == $desc) { |
| 1393 | 1393 | if (!mysqli_query($sqlParser->conn, |
| 1394 | - "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 1394 | + "update $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 1395 | 1395 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1396 | 1396 | |
| 1397 | 1397 | return; |
@@ -1399,7 +1399,7 @@ discard block |
||
| 1399 | 1399 | $insert = false; |
| 1400 | 1400 | } else { |
| 1401 | 1401 | if (!mysqli_query($sqlParser->conn, |
| 1402 | - "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 1402 | + "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 1403 | 1403 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1404 | 1404 | |
| 1405 | 1405 | return; |
@@ -1478,7 +1478,7 @@ discard block |
||
| 1478 | 1478 | $row = mysqli_fetch_assoc($rs); |
| 1479 | 1479 | $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
| 1480 | 1480 | if (!mysqli_query($sqlParser->conn, |
| 1481 | - "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 1481 | + "update $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 1482 | 1482 | echo mysqli_error($sqlParser->conn) . PHP_EOL; |
| 1483 | 1483 | |
| 1484 | 1484 | return; |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | case 1: |
| 16 | 16 | include $base_path . MGR_DIR . '/includes/config.inc.php'; |
| 17 | 17 | if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) { |
| 18 | - if (@ mysqli_query($conn, "USE {$dbase}")) { |
|
| 18 | + if (@ mysqli_query($conn, "use {$dbase}")) { |
|
| 19 | 19 | if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) { |
| 20 | 20 | $rs = mysqli_query($conn, "show session variables like 'collation_server'"); |
| 21 | 21 | } |
