Skip to content

Commit 611a990

Browse files
Dmi3yyDmi3yy
committed
Merge branch 'develop'
2 parents 750e6b3 + fec233d commit 611a990

5 files changed

Lines changed: 65 additions & 20 deletions

File tree

‎assets/docs/changelog.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,30 @@
11
This file shows the changes in recent releases of Evolution CMS. The most current release is usually the
22
development release, and is only shown to give an idea of what's currently in the pipeline.
33

4+
Evolution CMS 1.4.2 (Mar 23, 2018)
5+
* [GitHub:#6a33e6f2b] - now you can use argv like this: php cli-install.php --database_server=localhost --database=db --database_user=dbuser --database_password=dbpass --table_prefix=evo_ --cmsadmin=admin --cmsadminemail=dmi3yy@gmail.com --cmspassword=123456 --language=ru --mode=new --installData=n --removeInstall=y (dmi3yy)
6+
* [GitHub:#d8e7ec072] - run install file (dmi3yy)
7+
* [GitHub:#1baf289d6] - Install Evo from console: (https://monosnap.com/file/Tj21cmlMhZXNJdRXfKBLAvTlJcElkJ) (dmi3yy)
8+
* [GitHub:#52c27d0d6] - fix for use html tags in name (dmi3yy)
9+
* [GitHub:#6324989c9] - [F] #577 Fix "undefined index"-notice (Deesen)
10+
* [GitHub:#8389d3c15] - [C] #577 TinyMCE4 code clean-up (Deesen)
11+
* [GitHub:#4c9b26d56] - fix (document.parser.class.inc.php) sendStrictURI (Ruslan)
12+
* [GitHub:#27c63435a] - modernize default theme (Serg)
13+
* [GitHub:#b42174b85] - Globat Tabs by Default On (dmi3yy)
14+
* [GitHub:#4f8323b13] - add .tpl for create file from filemanager (dmi3yy)
15+
* [GitHub:#2ad9bb7e3] - correct getTpl (Serg)
16+
* [GitHub:#e5718a08a] - add composer.json (dmi3yy)
17+
* [GitHub:#14155ff84] - fix lang error (dmi3yy)
18+
* [GitHub:#628eabf86] - update DocLister and FormLister (dmi3yy)
19+
* [GitHub:#c1ea7c3e0] - fix escapeshellarg disabled for security reason (dmi3yy)
20+
* [GitHub:#f55cff2b8] - Update english.inc.php (Mr B)
21+
* [GitHub:#151206e87] - Update mainmenu.php (Mr B)
22+
* [GitHub:#4ae239de6] - fix #559 Zend OPcache API is restricted by "restrict_api" configuration directive (Pathologic)
23+
* [GitHub:#ddcdcdbc0] - fix #563 Error when upgrading to 'phpmailer sender property' commit(Pathologic)
24+
* [GitHub:#e3ce8aaf9] - phpmailer sender property (Pathologic)
25+
* [GitHub:#ce2fc8313] - fix only variables can be passed by reference (Pathologic)
26+
* [GitHub:#271d809b0] - log only public properties of MODxMailer (Pathologic)
27+
428

529
Evolution CMS 1.4.1 (Mar 02, 2018)
630
* [GitHub:#3a9224b03] - revert [I] save_content.processor.php Initialize full cache only when alias, parent, and published are changed (dmi3yy)

‎composer.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131
"require": {
3232
"php": ">=5.6"
3333
},
34-
"scripts": {
35-
"post-create-project-cmd": [
36-
"@php install/cli-install.php"
37-
]
38-
},
3934
"minimum-stability": "dev",
4035
"prefer-stable": true
4136
}

‎install/cli-install.php‎

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,8 @@
44
* php cli-install.php --database_server=localhost --database=db --database_user=dbuser --database_password=dbpass --table_prefix=evo_ --cmsadmin=admin --cmsadminemail=dmi3yy@gmail.com --cmspassword=123456 --language=ru --mode=new --installData=n --removeInstall=y
55
*/
66

7+
$self = 'install/cli-install.php';
78
$path = dirname(__FILE__) . '/';
8-
9-
/*
10-
$autoloader = realpath(__DIR__.'/../vendor/autoload.php');
11-
if (file_exists($autoloader) && is_readable($autoloader)) {
12-
include_once($autoloader);
13-
}*/
14-
15-
$self = 'install/index.php';
169
$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
1710
define('MODX_API_MODE', true);
1811
define('MODX_BASE_PATH', $base_path);
@@ -23,15 +16,15 @@
2316
// set error reporting
2417
error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
2518

26-
if (is_file($path."../assets/cache/siteManager.php")) {
27-
include_once($path."../assets/cache/siteManager.php");
19+
if (is_file($base_path."assets/cache/siteManager.php")) {
20+
include_once($base_path."assets/cache/siteManager.php");
2821
}
29-
if(!defined('MGR_DIR') && is_dir($path."../manager")) {
22+
if(!defined('MGR_DIR') && is_dir($base_path."manager")) {
3023
define('MGR_DIR', 'manager');
3124
}
3225

3326
require_once($path."lang.php");
34-
require_once($path.'../'.MGR_DIR.'/includes/version.inc.php');
27+
require_once($base_path.MGR_DIR.'/includes/version.inc.php');
3528

3629
$moduleName = "EVO";
3730
$moduleVersion = $modx_branch.' '.$modx_version;
@@ -962,10 +955,10 @@ function parse_docblock($element_dir, $filename) {
962955
$confph['lastInstallTime'] = time();
963956
$confph['site_sessionname'] = $site_sessionname;
964957

965-
$configString = file_get_contents('config.inc.tpl');
958+
$configString = file_get_contents($path.'config.inc.tpl');
966959
$configString = parse($configString, $confph);
967960

968-
$filename = $path.'../'.MGR_DIR.'/includes/config.inc.php';
961+
$filename = $base_path.MGR_DIR.'/includes/config.inc.php';
969962
$configFileFailed = false;
970963
if (@ !$handle = fopen($filename, 'w')) {
971964
$configFileFailed = true;
@@ -1533,9 +1526,41 @@ function parse_docblock($element_dir, $filename) {
15331526
}
15341527
//remove installFolder
15351528
if ($removeInstall == 'y') {
1529+
removeFolder($path);
1530+
removeFolder($base_path.'.tx');
1531+
unlink($base_path.'README.md');
15361532
echo 'Install folder deleted!'. PHP_EOL . PHP_EOL;
15371533
}
15381534

1535+
/**
1536+
* RemoveFolder
1537+
*
1538+
* @param string $path
1539+
* @return string
1540+
*/
1541+
function removeFolder($path)
1542+
{
1543+
$dir = realpath($path);
1544+
if (!is_dir($dir)) {
1545+
return;
1546+
}
1547+
1548+
$it = new RecursiveDirectoryIterator($dir);
1549+
$files = new RecursiveIteratorIterator($it,
1550+
RecursiveIteratorIterator::CHILD_FIRST);
1551+
foreach ($files as $file) {
1552+
if ($file->getFilename() === "." || $file->getFilename() === "..") {
1553+
continue;
1554+
}
1555+
if ($file->isDir()) {
1556+
rmdir($file->getRealPath());
1557+
} else {
1558+
unlink($file->getRealPath());
1559+
}
1560+
}
1561+
rmdir($dir);
1562+
}
1563+
15391564
/**
15401565
* Property Update function
15411566
*

‎manager/includes/document.parser.class.inc.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2499,6 +2499,7 @@ public function sendStrictURI()
24992499
$requestedURL = "{$scheme}://{$http_host}" . '/' . $q; //LANG
25002500

25012501
$site_url = $this->config['site_url'];
2502+
$url_query_string = explode('?', $_SERVER['REQUEST_URI'])[1];
25022503

25032504
if ($this->documentIdentifier == $this->config['site_start']) {
25042505
if ($requestedURL != $this->config['site_url']) {

‎manager/includes/version.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22
$modx_version = '1.4.2'; // Current version number
3-
$modx_release_date = 'Mar 22, 2018'; // Date of release
3+
$modx_release_date = 'Mar 23, 2018'; // Date of release
44
$modx_branch = 'Evolution'; // Codebase name
55
$modx_full_appname = "{$modx_branch} {$modx_version} ({$modx_release_date})";

0 commit comments

Comments
 (0)