Skip to content
This repository was archived by the owner on Mar 8, 2021. It is now read-only.

Commit c79c717

Browse files
authored
Merge pull request #1409 from modxcms/develop
Develop
2 parents b6ed91e + 118427e commit c79c717

File tree

588 files changed

+28149
-22664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

588 files changed

+28149
-22664
lines changed

.gitignore

+63-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,74 @@
1-
# ignore any files beginning with .
2-
#\.*
1+
# assets
2+
/assets/.thumbs/*
3+
!/assets/.thumbs/index.html
4+
!/assets/.thumbs/.htaccess
5+
6+
/assets/backup/*
7+
!/assets/backup/index.html
8+
!/assets/backup/.htaccess
39

4-
# and any files in the cache directory
510
/assets/cache/*
11+
!/assets/cache/.htaccess
12+
!/assets/cache/index.html
13+
!/assets/cache/siteManager.php
14+
!/assets/cache/sitePublishing.idx.php
15+
!/assets/cache/images/index.html
16+
!/assets/cache/rss/index.html
17+
!/assets/cache/updater/index.html
18+
19+
/assets/docs/*
20+
!/assets/docs/.htaccess
21+
!/assets/docs/changelog.txt
22+
!/assets/docs/index.html
23+
!/assets/docs/license.txt
24+
25+
/assets/export/*
26+
!/assets/export/index.html
27+
!/assets/export/.htaccess
28+
29+
/assets/files/*
30+
!/assets/files/index.html
31+
!/assets/files/.htaccess
32+
33+
/assets/images/*
34+
!/assets/images/index.html
35+
!/assets/images/evo-logo.png
36+
!/assets/images/.htaccess
637

7-
# and the config file
38+
/assets/import/*
39+
!/assets/import/index.html
40+
!/assets/import/.htaccess
41+
42+
/assets/site/*
43+
!/assets/site/index.html
44+
!/assets/site/.htaccess
45+
46+
# Manager
847
/manager/includes/config.inc.php
948

10-
# Windows and Mac
49+
# Composer
50+
/composer.phar
51+
/vendor/*
52+
!/vendor/.htaccess
53+
!/vendor/index.html
54+
55+
# IDE Helper
56+
modx_evolution.IDEhelper.php
57+
_ide_helper.php
58+
.phpstorm.meta.php
59+
60+
#node.JS
61+
/node_modules
62+
npm-debug.log
63+
64+
# System
65+
ftpsync.settings
1166
Thumbs.db
1267
Desktop.ini
1368
.DS_Store
69+
.idea
70+
.vagrant
71+
.rocketeer
1472

1573
# except do not ignore .gitignore
1674
!.gitignore

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Evolution CMS
22

3-
![PHP version](https://img.shields.io/badge/PHP->=v5.6-green.svg?php=5.6) [![GitHub release](https://img.shields.io/github/release/evolution-cms/evolution.svg)](https://github.com/evolution-cms/evolution/)
3+
[![CMS Evolution](https://img.shields.io/badge/CMS-Evolution-brightgreen.svg)](https://github.com/evolution-cms/evolution) [![GitHub release](https://img.shields.io/github/release/evolution-cms/evolution.svg)](https://github.com/evolution-cms/evolution/releases) ![PHP version](https://img.shields.io/badge/PHP->=v5.6-green.svg?php=5.6) [![Issues](https://img.shields.io/github/issues-closed-raw/evolution-cms/evolution.svg?maxAge=2592000)](https://github.com/evolution-cms/evolution/issues) [![Code quality](https://img.shields.io/scrutinizer/g/evolution-cms/evolution.svg?maxAge=2592000&b=develop)](https://scrutinizer-ci.com/g/evolution-cms/evolution/?branch=develop) [![Documentation](https://img.shields.io/badge/Documentation-processed-orange.svg)](https://github.com/evolution-cms/docs/)
44

55
Evolution CMS requires **PHP >= 5.6**
66

assets/.thumbs/.htaccess

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
IndexIgnore */*
2+
<Files *.php>
3+
Order Deny,Allow
4+
Deny from all
5+
</Files>
File renamed without changes.

assets/docs/.htaccess

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@ IndexIgnore */*
22
<Files "changelog.txt">
33
Order Allow,Deny
44
Deny from all
5-
</Files>
5+
</Files>
6+
<Files *.php>
7+
Order Deny,Allow
8+
Deny from all
9+
</Files>

assets/docs/changelog.txt

+116
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,122 @@
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 [email protected] --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+
28+
29+
Evolution CMS 1.4.1 (Mar 02, 2018)
30+
* [GitHub:#3a9224b03] - revert [I] save_content.processor.php Initialize full cache only when alias, parent, and published are changed (dmi3yy)
31+
* [GitHub:#dae083a26] - Update FormLister (dmi3yy)
32+
* [GitHub:#367a6507e] - update DocLister (dmi3yy)
33+
* [GitHub:#ef6dfb889] - fix #548 (Pathologic)
34+
* [GitHub:#8770f4f99] - function method (Agel_Nash)
35+
* [GitHub:#16e54b2fe] - deleting an unused variables and functions (64j)
36+
* [GitHub:#db08547fa] - fix #539 (Agel_Nash)
37+
* [GitHub:#1f24ed117] - cli (Agel_Nash)
38+
* [GitHub:#76c89acab] - phpDoc (Agel_Nash)
39+
* [GitHub:#8c93023a7] - Исправлено добавление фигурных скобок в пустые параметры плагина (media_kot)
40+
* [GitHub:#bb183dd25] - fix #102 (Pathologic)
41+
* [GitHub:#22618e102] - single entry point (Pathologic)
42+
* [GitHub:#14e98f967] - join() => implode() (Agel_Nash)
43+
* [GitHub:#ef6566b2d] - intval() => (int) (Agel_Nash)
44+
* [GitHub:#c1a3d3a31] - refactor (Agel_Nash)
45+
* [GitHub:#19f4fe321] - public method (Agel_Nash)
46+
* [GitHub:#8b8bce9d8] - Duplicate function name manager/processors/save_template.processor.php (Agel_Nash)
47+
* [GitHub:#573aa5683] - It seems like $categories defined by $cm->getCategories() (Agel_Nash)
48+
* [GitHub:#fdc0ee465] - New random method for $table_prefix (Vitaliy Rudnyh)
49+
* [GitHub:#1ce79fbf4] - Step 1 + fix conflicts (Agel_Nash)
50+
* [GitHub:#31d870fdb] - Change version and date (Vitaliy Rudnyh)
51+
* [GitHub:#438eacc6b] - Add php-doc (Vitaliy Rudnyh)
52+
* [GitHub:#8583aae71] - formatting psr-2 (Vitaliy Rudnyh)
53+
* [GitHub:#697b1e3e8] - Check exists mysqi extension (Vitaliy Rudnyh)
54+
* [GitHub:#638334d94] - Fix install error on PHP 7.2 (Vitaliy Rudnyh)
55+
* [GitHub:#663a1fdb4] - Commented "plugin locks" / lock-file (Deesen)
56+
* [GitHub:#00fbcc2fc] - [F] #523 If config.inc.php exists, change chmod to 0666 (Deesen)
57+
* [GitHub:#0f6f45a85] - - Fix classname Imagic and Gmagic - Refactor (Agel_Nash)
58+
* [GitHub:#ae66352b5] - Step 2 (Agel_Nash)
59+
* [GitHub:#de7245b0a] - Fix Imagick class name (Agel_Nash)
60+
* [GitHub:#0d0d9ae28] - Fix Gmagic class name (Agel_Nash)
61+
* [GitHub:#af9476613] - refactor array_change_key_case function (Agel_Nash)
62+
* [GitHub:#426b74903] - Fix IN_MANAGER_MODE (Agel_Nash)
63+
* [GitHub:#8d4595dc7] - Step 1 (Agel_Nash)
64+
* [GitHub:#a1b09fad5] - fix install (Pathologic)
65+
* [GitHub:#1581c4c75] - Fix readme (Agel_Nash)
66+
* [GitHub:#8061c2891] - Update badges (Agel_Nash)
67+
* [GitHub:#63117c3b0] - sqlParser for PHP5 (Agel_Nash)
68+
* [GitHub:#095021f7d] - Remove closing tag ```?>``` in files (Agel_Nash)
69+
* [GitHub:#d98fbcb3e] - random table prefix (Agel_Nash)
70+
* [GitHub:#868b6aaa7] - Code style (Agel_Nash)
71+
* [GitHub:#932ceff2f] - Update .gitignore and .htaccess files (Agel_Nash)
72+
* [GitHub:#923a1c674] - [F] #481 Fix export of Static-HTML with FURLs enabled (Deesen)
73+
* [GitHub:#fcd59ef78] - fix #397 (Pathologic)
74+
* [GitHub:#1ce8cb620] - fix #484 (64j)
75+
* [GitHub:#a22a4ddb3] - fix #396 (Pathologic)
76+
* [GitHub:#5c176a09a] - fix #484 need permission for editing templates or chunks or snippets or plugins (64j)
77+
* [GitHub:#3738d46a5] - fix #484 need permission for editing documents (64j)
78+
* [GitHub:#65d13ad82] - fix error session "nrtotalmessages" for role editor (64j)
79+
* [GitHub:#654b69146] - fix russian lang extrascheck (Serg)
80+
* [GitHub:#93d503295] - single entry point (Pathologic)
81+
* [GitHub:#93e702991] - fixed something (Pathologic)
82+
* [GitHub:#52dd369e1] - single entry point (Pathologic)
83+
* [GitHub:#7e06c92bf] - fix Store module unparsed placeholders (Pathologic)
84+
* [GitHub:#b530747af] - moved page icon to style.php (Nicola)
85+
* [GitHub:#1db4e4baf] - page icon - mutate password (Nicola)
86+
* [GitHub:#83318077b] - icon_help (Nicola)
87+
* [GitHub:#6ac0a5c24] - fix broken OnWUsrFormRender event (Pathologic)
88+
* [GitHub:#47b459a0e] - update SystemEvent (Pathologic)
89+
* [GitHub:#c7873b6b0] - Update plugin.updater.php (Mr B)
90+
* [GitHub:#81df65a80] - [MODxMailer] log only public properties (Pathologic)
91+
* [GitHub:#a4081217d] - Update modxmailer.class.inc.php (Pathologic)
92+
* [GitHub:#c9ca177af] - fix #493 (Pathologic)
93+
* [GitHub:#bb4152705] - fix #475 (64j)
94+
* [GitHub:#2f0685fe2] - [F] fix for moving content to another tab (Mr B)
95+
* [GitHub:#b010fe286] - fix #42 (Pathologic)
96+
* [GitHub:#d902a2ce6] - fix #258 (Pathologic)
97+
* [GitHub:#20ff0eb2e] - fix #258 (Pathologic)
98+
* [GitHub:#7b63c4293] - Update style.css (Mr B)
99+
* [GitHub:#a91dc393d] - [I] Add right menu section ids (Mr B)
100+
* [GitHub:#28a085634] - [I] QM+ Remove space from Edit Resource text (Mr B)
101+
* [GitHub:#b34a39c60] - [F] Quick Manager+ ID text fix (Mr B)
102+
* [GitHub:#4aa572f2f] - [I] #483 Provide [+base_path+] and [+base_url+] (Deesen)
103+
* [GitHub:#8a6338966] - [F] #477 Cache plugin-properties using parseProperties() (Deesen)
104+
* [GitHub:#26def6fef] - fix #478 (Pathologic)
105+
* [GitHub:#6a754cc4b] - Fix tree buttons JS (Piotr Matysiak)
106+
* [GitHub:#2987cfff4] - fix and improvements (Outdated Extras Check) (Nicola)
107+
* [GitHub:#cd946c440] - ability to use extended DocumentParser class (Pathologic)
108+
* [GitHub:#83b776239] - [F] Fix Information tab logo path (Mr B)
109+
* [GitHub:#2902c56b2] - [I] Allow default-placeholders like [+which_browser+] in theme-values - $this-set('browserPath', '[+site_manager_url+]media/browser/[+which_browser+]/...') (Deesen)
110+
* [GitHub:#c49d50d2d] - [F] #442 New inlite-theme is only compatible with inline-mode - backend falls back to modern-theme (Deesen)
111+
* [GitHub:#f29ec8638] - [I] Extras/Store - New feature "Install by file-upload" - accepts ZIP-files from https://github.com/extras-evolution/ (Deesen)
112+
* [GitHub:#633908ec0] - Replaced "MODX Content Manager" by "EVO Content Manager" (Deesen)
113+
* [GitHub:#5aeb2a3f7] - Updated project-description (MODX to EVO) (Deesen)
114+
* [GitHub:#cfea32cab] - Update mm_hidefields.php (Mr B)
115+
* [GitHub:#6df0e1c33] - Update jquery.ddMM.js (Mr B)
116+
* [GitHub:#6609e8c51] - [I] Updated TinyMCE4 to v4.7.4 (from v4.6.3) - added param "mobile" to theme.base - added param "Skin-Theme" to settings - fixed/improved theme/skin settings and labels (Deesen)
117+
* [GitHub:#6cff1adc0] - fix #463 (Pathologic)
118+
119+
4120
Evolution CMS 1.4.0 (Jan 25, 2018)
5121
* [GitHub:#b1fffc26] - fix for php 7.2 (dmi3yy)
6122
* [GitHub:#da5b0533] - [F] Moving which_editor with resource content for MM (Mr B)

assets/export/.htaccess

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
IndexIgnore */*
2+
<Files *.php>
3+
Order Deny,Allow
4+
Deny from all
5+
</Files>

assets/files/.htaccess

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
IndexIgnore */*
2+
<Files *.php>
3+
Order Deny,Allow
4+
Deny from all
5+
</Files>

assets/images/.htaccess

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
IndexIgnore */*
2+
<Files *.php>
3+
Order Deny,Allow
4+
Deny from all
5+
</Files>

assets/import/.htaccess

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
IndexIgnore */*
2+
<Files *.php>
3+
Order Deny,Allow
4+
Deny from all
5+
</Files>

assets/js/euiuploader/lang/de.js

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
_euiuLang = [];
2+
_euiuLang['upload'] = 'Upload';
3+
_euiuLang['file'] = 'Datei';
4+
_euiuLang['size'] = 'Größe';
5+
_euiuLang['progress'] = 'Fortschritt';
6+
_euiuLang['files_upload'] = 'Dateien hochladen';
7+
_euiuLang['cancel'] = 'Abbrechen';
8+
_euiuLang['close'] = 'Schließen';
9+
_euiuLang['uploaded'] = 'Hochgeladen';
10+
_euiuLang['server_error'] = 'Server-Fehler: ';
11+
_euiuLang['parse_error'] = 'Fehler bei der Verarbeitung';
12+
_euiuUploadResult = [];
13+
_euiuUploadResult['upload_failed_1'] = 'Datei ist größer als upload_max_filesize';
14+
_euiuUploadResult['upload_failed_2'] = 'Datei ist größer als erlaubt';
15+
_euiuUploadResult['upload_failed_3'] = 'Die Datei wurde nur teilweise hochgeladen';
16+
_euiuUploadResult['upload_failed_4'] = 'Es wurde keine Datei hochgeladen';
17+
_euiuUploadResult['upload_failed_6'] = 'Es ist kein temporärer Ordner vorhanden';
18+
_euiuUploadResult['upload_failed_7'] = 'Fehler beim Schreiben der Datei auf die Festplatte';
19+
_euiuUploadResult['upload_failed_8'] = 'Eine PHP-Erweiterung hat den Datei-Upload gestoppt';
20+
_euiuUploadResult['unable_to_process_file'] = 'Fehler bei der Verarbeitung der hochgeladenen Datei';
21+
_euiuUploadResult['unable_to_move'] = 'Fehler beim Speichern der Datei';
22+
_euiuUploadResult['forbidden_file'] = 'Upload der Datei unzulässig';
23+
_euiuUploadResult['unable_to_create_folder'] = 'Fehler beim Erstellen des Upload-Ordners';

assets/js/euiuploader/lang/nl.js

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
_euiuLang = [];
2+
_euiuLang['upload'] = 'Uploaden';
3+
_euiuLang['file'] = 'Bestand';
4+
_euiuLang['size'] = 'Afmeting';
5+
_euiuLang['progress'] = 'Voortgang';
6+
_euiuLang['files_upload'] = 'Bestanden uploaden';
7+
_euiuLang['cancel'] = 'Annuleer';
8+
_euiuLang['close'] = 'Sluit';
9+
_euiuLang['uploaded'] = 'Geupload';
10+
_euiuLang['server_error'] = 'Server error: ';
11+
_euiuLang['parse_error'] = 'Serverrespons mislukt';
12+
_euiuUploadResult = [];
13+
_euiuUploadResult['upload_failed_1'] = 'Bestandsgrootte is groter dan upload_max_filesize';
14+
_euiuUploadResult['upload_failed_2'] = 'Bestandsgrootte is groter dan toegestaan';
15+
_euiuUploadResult['upload_failed_3'] = 'Het geuploade bestand is slechts gedeeltelijk geupload';
16+
_euiuUploadResult['upload_failed_4'] = 'Er is geen bestand geupload';
17+
_euiuUploadResult['upload_failed_6'] = 'Een tijdelijke map ontbreekt';
18+
_euiuUploadResult['upload_failed_7'] = 'Bestand uploaden mislukt';
19+
_euiuUploadResult['upload_failed_8'] = 'Een PHP-extensie heeft de upload van bestanden gestopt';
20+
_euiuUploadResult['unable_to_process_file'] = 'Het bestand uploaden is mislukt';
21+
_euiuUploadResult['unable_to_move'] = 'Kan het bestand niet opslaan';
22+
_euiuUploadResult['forbidden_file'] = 'Bestand is niet toegestaan om te uploaden';
23+
_euiuUploadResult['unable_to_create_folder'] = 'Kan uploadmap niet aanmaken';

assets/lib/APIHelpers.class.php

100755100644
+15-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2-
// extension_loaded('mbstring') ???
2+
33
/**
44
* Class APIhelpers
55
*/
66
class APIhelpers
77
{
8+
89
/**
910
* Преобразует первый символ в нижний регистр
1011
* @param $str
@@ -13,8 +14,12 @@ class APIhelpers
1314
*/
1415
public static function mb_lcfirst($str, $encoding = 'UTF-8')
1516
{
16-
return mb_strtolower(mb_substr($str, 0, 1, $encoding), $encoding) . mb_substr($str, 1, mb_strlen($str),
17-
$encoding);
17+
return mb_strtolower(mb_substr($str, 0, 1, $encoding), $encoding) . mb_substr(
18+
$str,
19+
1,
20+
mb_strlen($str),
21+
$encoding
22+
);
1823
}
1924

2025
/**
@@ -26,8 +31,12 @@ public static function mb_lcfirst($str, $encoding = 'UTF-8')
2631
public static function mb_ucfirst($str, $encoding = 'UTF-8')
2732
{
2833
$str = mb_ereg_replace('^[\ ]+', '', $str);
29-
$str = mb_strtoupper(mb_substr($str, 0, 1, $encoding), $encoding) . mb_substr($str, 1, mb_strlen($str),
30-
$encoding);
34+
$str = mb_strtoupper(mb_substr($str, 0, 1, $encoding), $encoding) . mb_substr(
35+
$str,
36+
1,
37+
mb_strlen($str),
38+
$encoding
39+
);
3140

3241
return $str;
3342
}
@@ -65,7 +74,7 @@ public static function mb_trim_word($html, $len, $encoding = 'UTF-8')
6574
* @param Closure $validate null функция дополнительной валидации значения (должна возвращать true или false)
6675
* @return mixed
6776
*/
68-
public static function getkey($data, $key, $default = null)
77+
public static function getkey($data, $key, $default = null, $validate = null)
6978
{
7079
$out = $default;
7180
if (is_array($data) && (is_int($key) || is_string($key)) && $key !== '' && array_key_exists($key, $data)) {

assets/lib/Formatter/HtmlFormatter.php

100755100644
+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
class HtmlFormatter
88
{
9+
910
/**
1011
* @param string $string
1112
* @param bool $decode

0 commit comments

Comments
 (0)