modxcms · Dmi3yy · Mar 23, 2018 · Jul 10, 2017 · Jan 7, 2018 · Jan 25, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,16 +1,74 @@
-# ignore any files beginning with .
-#\.*
+# assets
+/assets/.thumbs/*
+!/assets/.thumbs/index.html
+!/assets/.thumbs/.htaccess
+
+/assets/backup/*
+!/assets/backup/index.html
+!/assets/backup/.htaccess
 
-# and any files in the cache directory
 /assets/cache/*
+!/assets/cache/.htaccess
+!/assets/cache/index.html
+!/assets/cache/siteManager.php
+!/assets/cache/sitePublishing.idx.php
+!/assets/cache/images/index.html
+!/assets/cache/rss/index.html
+!/assets/cache/updater/index.html
+
+/assets/docs/*
+!/assets/docs/.htaccess
+!/assets/docs/changelog.txt
+!/assets/docs/index.html
+!/assets/docs/license.txt
+
+/assets/export/*
+!/assets/export/index.html
+!/assets/export/.htaccess
+
+/assets/files/*
+!/assets/files/index.html
+!/assets/files/.htaccess
+
+/assets/images/*
+!/assets/images/index.html
+!/assets/images/evo-logo.png
+!/assets/images/.htaccess
 
-# and the config file
+/assets/import/*
+!/assets/import/index.html
+!/assets/import/.htaccess
+
+/assets/site/*
+!/assets/site/index.html
+!/assets/site/.htaccess
+
+# Manager
 /manager/includes/config.inc.php
 
-# Windows and Mac
+# Composer
+/composer.phar
+/vendor/*
+!/vendor/.htaccess
+!/vendor/index.html
+
+# IDE Helper
+modx_evolution.IDEhelper.php
+_ide_helper.php
+.phpstorm.meta.php
+
+#node.JS
+/node_modules
+npm-debug.log
+
+# System
+ftpsync.settings
 Thumbs.db
 Desktop.ini
 .DS_Store
+.idea
+.vagrant
+.rocketeer
 
 # except do not ignore .gitignore
 !.gitignore
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Evolution CMS
 
-![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/)
+[![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/)
 
 Evolution CMS requires **PHP >= 5.6**
 

diff --git a/assets/.thumbs/.htaccess b/assets/.thumbs/.htaccess
@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/cache/updater/.htaccess → assets/backup/.htaccess b/assets/cache/updater/.htaccess → assets/backup/.htaccess
diff --git a/assets/docs/.htaccess b/assets/docs/.htaccess
@@ -2,4 +2,8 @@ IndexIgnore */*
 <Files "changelog.txt">
     Order Allow,Deny
     Deny from all
-</Files>
+</Files>
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/docs/changelog.txt b/assets/docs/changelog.txt
@@ -1,6 +1,122 @@
 This file shows the changes in recent releases of Evolution CMS. The most current release is usually the
 development release, and is only shown to give an idea of what's currently in the pipeline.
 
+Evolution CMS 1.4.2 (Mar 23, 2018)
+* [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)
+* [GitHub:#d8e7ec072] - run install file (dmi3yy)
+* [GitHub:#1baf289d6] - Install Evo from console: (https://monosnap.com/file/Tj21cmlMhZXNJdRXfKBLAvTlJcElkJ) (dmi3yy)
+* [GitHub:#52c27d0d6] - fix for use html tags in name (dmi3yy)
+* [GitHub:#6324989c9] - [F] #577 Fix "undefined index"-notice (Deesen)
+* [GitHub:#8389d3c15] - [C] #577 TinyMCE4 code clean-up (Deesen)
+* [GitHub:#4c9b26d56] - fix (document.parser.class.inc.php) sendStrictURI (Ruslan)
+* [GitHub:#27c63435a] - modernize default theme (Serg)
+* [GitHub:#b42174b85] - Globat Tabs by Default On (dmi3yy)
+* [GitHub:#4f8323b13] - add .tpl  for create file from filemanager (dmi3yy)
+* [GitHub:#2ad9bb7e3] - correct getTpl (Serg)
+* [GitHub:#e5718a08a] - add composer.json (dmi3yy)
+* [GitHub:#14155ff84] - fix lang error (dmi3yy)
+* [GitHub:#628eabf86] - update DocLister and FormLister (dmi3yy)
+* [GitHub:#c1ea7c3e0] - fix escapeshellarg disabled for security reason (dmi3yy)
+* [GitHub:#f55cff2b8] - Update english.inc.php (Mr B)
+* [GitHub:#151206e87] - Update mainmenu.php (Mr B)
+* [GitHub:#4ae239de6] - fix #559 Zend OPcache API is restricted by "restrict_api" configuration directive (Pathologic)
+* [GitHub:#ddcdcdbc0] - fix #563 Error when upgrading to 'phpmailer sender property' commit(Pathologic)
+* [GitHub:#e3ce8aaf9] - phpmailer sender property (Pathologic)
+* [GitHub:#ce2fc8313] - fix only variables can be passed by reference (Pathologic)
+* [GitHub:#271d809b0] - log only public properties of MODxMailer (Pathologic)
+
+
+Evolution CMS 1.4.1 (Mar 02, 2018)
+* [GitHub:#3a9224b03] - revert [I] save_content.processor.php Initialize full cache only when alias, parent, and published are changed (dmi3yy)
+* [GitHub:#dae083a26] - Update FormLister (dmi3yy)
+* [GitHub:#367a6507e] - update DocLister (dmi3yy)
+* [GitHub:#ef6dfb889] - fix #548 (Pathologic)
+* [GitHub:#8770f4f99] - function method (Agel_Nash)
+* [GitHub:#16e54b2fe] - deleting an unused variables and functions (64j)
+* [GitHub:#db08547fa] - fix #539 (Agel_Nash)
+* [GitHub:#1f24ed117] - cli (Agel_Nash)
+* [GitHub:#76c89acab] - phpDoc (Agel_Nash)
+* [GitHub:#8c93023a7] - Исправлено добавление фигурных скобок в пустые параметры плагина (media_kot)
+* [GitHub:#bb183dd25] - fix #102 (Pathologic)
+* [GitHub:#22618e102] - single entry point (Pathologic)
+* [GitHub:#14e98f967] - join() => implode() (Agel_Nash)
+* [GitHub:#ef6566b2d] - intval() => (int) (Agel_Nash)
+* [GitHub:#c1a3d3a31] - refactor (Agel_Nash)
+* [GitHub:#19f4fe321] - public method (Agel_Nash)
+* [GitHub:#8b8bce9d8] - Duplicate function name manager/processors/save_template.processor.php (Agel_Nash)
+* [GitHub:#573aa5683] - It seems like $categories defined by $cm->getCategories() (Agel_Nash)
+* [GitHub:#fdc0ee465] - New random method for $table_prefix (Vitaliy Rudnyh)
+* [GitHub:#1ce79fbf4] - Step 1 + fix conflicts (Agel_Nash)
+* [GitHub:#31d870fdb] - Change version and date (Vitaliy Rudnyh)
+* [GitHub:#438eacc6b] - Add php-doc (Vitaliy Rudnyh)
+* [GitHub:#8583aae71] - formatting psr-2 (Vitaliy Rudnyh)
+* [GitHub:#697b1e3e8] - Check exists mysqi extension (Vitaliy Rudnyh)
+* [GitHub:#638334d94] - Fix install error on PHP 7.2 (Vitaliy Rudnyh)
+* [GitHub:#663a1fdb4] - Commented "plugin locks" / lock-file (Deesen)
+* [GitHub:#00fbcc2fc] - [F] #523 If config.inc.php exists, change chmod to 0666 (Deesen)
+* [GitHub:#0f6f45a85] - - Fix classname Imagic and Gmagic - Refactor  (Agel_Nash)
+* [GitHub:#ae66352b5] - Step 2 (Agel_Nash)
+* [GitHub:#de7245b0a] - Fix Imagick class name (Agel_Nash)
+* [GitHub:#0d0d9ae28] - Fix Gmagic class name (Agel_Nash)
+* [GitHub:#af9476613] - refactor array_change_key_case function (Agel_Nash)
+* [GitHub:#426b74903] - Fix IN_MANAGER_MODE (Agel_Nash)
+* [GitHub:#8d4595dc7] - Step 1 (Agel_Nash)
+* [GitHub:#a1b09fad5] - fix install (Pathologic)
+* [GitHub:#1581c4c75] - Fix readme (Agel_Nash)
+* [GitHub:#8061c2891] - Update badges (Agel_Nash)
+* [GitHub:#63117c3b0] - sqlParser for PHP5 (Agel_Nash)
+* [GitHub:#095021f7d] - Remove closing tag ```?>``` in files (Agel_Nash)
+* [GitHub:#d98fbcb3e] - random table prefix (Agel_Nash)
+* [GitHub:#868b6aaa7] - Code style (Agel_Nash)
+* [GitHub:#932ceff2f] - Update .gitignore and .htaccess files (Agel_Nash)
+* [GitHub:#923a1c674] - [F] #481 Fix export of Static-HTML with FURLs enabled (Deesen)
+* [GitHub:#fcd59ef78] - fix #397 (Pathologic)
+* [GitHub:#1ce8cb620] - fix #484 (64j)
+* [GitHub:#a22a4ddb3] - fix #396 (Pathologic)
+* [GitHub:#5c176a09a] - fix #484 need permission for editing templates or chunks or snippets or plugins (64j)
+* [GitHub:#3738d46a5] - fix #484 need permission for editing documents (64j)
+* [GitHub:#65d13ad82] - fix error session "nrtotalmessages" for role editor (64j)
+* [GitHub:#654b69146] - fix russian lang extrascheck (Serg)
+* [GitHub:#93d503295] - single entry point (Pathologic)
+* [GitHub:#93e702991] - fixed something (Pathologic)
+* [GitHub:#52dd369e1] - single entry point (Pathologic)
+* [GitHub:#7e06c92bf] - fix Store module unparsed placeholders (Pathologic)
+* [GitHub:#b530747af] - moved page icon to style.php (Nicola)
+* [GitHub:#1db4e4baf] - page icon - mutate password (Nicola)
+* [GitHub:#83318077b] - icon_help (Nicola)
+* [GitHub:#6ac0a5c24] - fix broken OnWUsrFormRender event (Pathologic)
+* [GitHub:#47b459a0e] - update SystemEvent (Pathologic)
+* [GitHub:#c7873b6b0] - Update plugin.updater.php (Mr B)
+* [GitHub:#81df65a80] - [MODxMailer] log only public properties (Pathologic)
+* [GitHub:#a4081217d] - Update modxmailer.class.inc.php (Pathologic)
+* [GitHub:#c9ca177af] - fix #493 (Pathologic)
+* [GitHub:#bb4152705] - fix #475 (64j)
+* [GitHub:#2f0685fe2] - [F] fix for moving content to another tab (Mr B)
+* [GitHub:#b010fe286] - fix #42 (Pathologic)
+* [GitHub:#d902a2ce6] - fix #258 (Pathologic)
+* [GitHub:#20ff0eb2e] - fix #258 (Pathologic)
+* [GitHub:#7b63c4293] - Update style.css (Mr B)
+* [GitHub:#a91dc393d] - [I] Add right menu section ids (Mr B)
+* [GitHub:#28a085634] - [I] QM+ Remove space from Edit Resource text (Mr B)
+* [GitHub:#b34a39c60] - [F] Quick Manager+ ID text fix (Mr B)
+* [GitHub:#4aa572f2f] - [I] #483 Provide [+base_path+] and [+base_url+] (Deesen)
+* [GitHub:#8a6338966] - [F] #477 Cache plugin-properties using parseProperties() (Deesen)
+* [GitHub:#26def6fef] - fix #478 (Pathologic)
+* [GitHub:#6a754cc4b] - Fix tree buttons JS (Piotr Matysiak)
+* [GitHub:#2987cfff4] - fix and improvements (Outdated Extras Check) (Nicola)
+* [GitHub:#cd946c440] - ability to use extended DocumentParser class (Pathologic)
+* [GitHub:#83b776239] - [F] Fix Information tab logo path (Mr B)
+* [GitHub:#2902c56b2] - [I] Allow default-placeholders like [+which_browser+] in theme-values - $this-set('browserPath', '[+site_manager_url+]media/browser/[+which_browser+]/...') (Deesen)
+* [GitHub:#c49d50d2d] - [F] #442 New inlite-theme is only compatible with inline-mode - backend falls back to modern-theme (Deesen)
+* [GitHub:#f29ec8638] - [I] Extras/Store - New feature "Install by file-upload" - accepts ZIP-files from https://github.com/extras-evolution/ (Deesen)
+* [GitHub:#633908ec0] - Replaced "MODX Content Manager" by "EVO Content Manager" (Deesen)
+* [GitHub:#5aeb2a3f7] - Updated project-description (MODX to EVO) (Deesen)
+* [GitHub:#cfea32cab] - Update mm_hidefields.php (Mr B)
+* [GitHub:#6df0e1c33] - Update jquery.ddMM.js (Mr B)
+* [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)
+* [GitHub:#6cff1adc0] - fix #463 (Pathologic)
+
+
 Evolution CMS 1.4.0 (Jan 25, 2018)
 * [GitHub:#b1fffc26] - fix for php 7.2 (dmi3yy)
 * [GitHub:#da5b0533] - [F] Moving which_editor with resource content for MM (Mr B)

diff --git a/assets/export/.htaccess b/assets/export/.htaccess
@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/files/.htaccess b/assets/files/.htaccess
@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/images/.htaccess b/assets/images/.htaccess
@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/import/.htaccess b/assets/import/.htaccess
@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/js/euiuploader/lang/de.js b/assets/js/euiuploader/lang/de.js
@@ -0,0 +1,23 @@
+_euiuLang = [];
+_euiuLang['upload'] = 'Upload';
+_euiuLang['file'] = 'Datei';
+_euiuLang['size'] = 'Größe';
+_euiuLang['progress'] = 'Fortschritt';
+_euiuLang['files_upload'] = 'Dateien hochladen';
+_euiuLang['cancel'] = 'Abbrechen';
+_euiuLang['close'] = 'Schließen';
+_euiuLang['uploaded'] = 'Hochgeladen';
+_euiuLang['server_error'] = 'Server-Fehler: ';
+_euiuLang['parse_error'] = 'Fehler bei der Verarbeitung';
+_euiuUploadResult = [];
+_euiuUploadResult['upload_failed_1'] = 'Datei ist größer als upload_max_filesize';
+_euiuUploadResult['upload_failed_2'] = 'Datei ist größer als erlaubt';
+_euiuUploadResult['upload_failed_3'] = 'Die Datei wurde nur teilweise hochgeladen';
+_euiuUploadResult['upload_failed_4'] = 'Es wurde keine Datei hochgeladen';
+_euiuUploadResult['upload_failed_6'] = 'Es ist kein temporärer Ordner vorhanden';
+_euiuUploadResult['upload_failed_7'] = 'Fehler beim Schreiben der Datei auf die Festplatte';
+_euiuUploadResult['upload_failed_8'] = 'Eine PHP-Erweiterung hat den Datei-Upload gestoppt';
+_euiuUploadResult['unable_to_process_file'] = 'Fehler bei der Verarbeitung der hochgeladenen Datei';
+_euiuUploadResult['unable_to_move'] = 'Fehler beim Speichern der Datei';
+_euiuUploadResult['forbidden_file'] = 'Upload der Datei unzulässig';
+_euiuUploadResult['unable_to_create_folder'] = 'Fehler beim Erstellen des Upload-Ordners';
diff --git a/assets/js/euiuploader/lang/nl.js b/assets/js/euiuploader/lang/nl.js
@@ -0,0 +1,23 @@
+_euiuLang = [];
+_euiuLang['upload'] = 'Uploaden';
+_euiuLang['file'] = 'Bestand';
+_euiuLang['size'] = 'Afmeting';
+_euiuLang['progress'] = 'Voortgang';
+_euiuLang['files_upload'] = 'Bestanden uploaden';
+_euiuLang['cancel'] = 'Annuleer';
+_euiuLang['close'] = 'Sluit';
+_euiuLang['uploaded'] = 'Geupload';
+_euiuLang['server_error'] = 'Server error: ';
+_euiuLang['parse_error'] = 'Serverrespons mislukt';
+_euiuUploadResult = [];
+_euiuUploadResult['upload_failed_1'] = 'Bestandsgrootte is groter dan upload_max_filesize';
+_euiuUploadResult['upload_failed_2'] = 'Bestandsgrootte is groter dan toegestaan';
+_euiuUploadResult['upload_failed_3'] = 'Het geuploade bestand is slechts gedeeltelijk geupload';
+_euiuUploadResult['upload_failed_4'] = 'Er is geen bestand geupload';
+_euiuUploadResult['upload_failed_6'] = 'Een tijdelijke map ontbreekt';
+_euiuUploadResult['upload_failed_7'] = 'Bestand uploaden mislukt';
+_euiuUploadResult['upload_failed_8'] = 'Een PHP-extensie heeft de upload van bestanden gestopt';
+_euiuUploadResult['unable_to_process_file'] = 'Het bestand uploaden is mislukt';
+_euiuUploadResult['unable_to_move'] = 'Kan het bestand niet opslaan';
+_euiuUploadResult['forbidden_file'] = 'Bestand is niet toegestaan om te uploaden';
+_euiuUploadResult['unable_to_create_folder'] = 'Kan uploadmap niet aanmaken';
diff --git a/assets/lib/APIHelpers.class.php b/assets/lib/APIHelpers.class.php
@@ -1,10 +1,11 @@
 <?php
-// extension_loaded('mbstring') ???
+
 /**
  * Class APIhelpers
  */
 class APIhelpers
 {
+
     /**
      * Преобразует первый символ в нижний регистр
      * @param $str
@@ -13,8 +14,12 @@ class APIhelpers
      */
     public static function mb_lcfirst($str, $encoding = 'UTF-8')
     {
-        return mb_strtolower(mb_substr($str, 0, 1, $encoding), $encoding) . mb_substr($str, 1, mb_strlen($str),
-            $encoding);
+        return mb_strtolower(mb_substr($str, 0, 1, $encoding), $encoding) . mb_substr(
+            $str,
+            1,
+            mb_strlen($str),
+            $encoding
+        );
     }
 
     /**
@@ -26,8 +31,12 @@ public static function mb_lcfirst($str, $encoding = 'UTF-8')
     public static function mb_ucfirst($str, $encoding = 'UTF-8')
     {
         $str = mb_ereg_replace('^[\ ]+', '', $str);
-        $str = mb_strtoupper(mb_substr($str, 0, 1, $encoding), $encoding) . mb_substr($str, 1, mb_strlen($str),
-                $encoding);
+        $str = mb_strtoupper(mb_substr($str, 0, 1, $encoding), $encoding) . mb_substr(
+            $str,
+            1,
+            mb_strlen($str),
+            $encoding
+        );
 
         return $str;
     }
@@ -65,7 +74,7 @@ public static function mb_trim_word($html, $len, $encoding = 'UTF-8')
      * @param Closure $validate null функция дополнительной валидации значения (должна возвращать true или false)
      * @return mixed
      */
-    public static function getkey($data, $key, $default = null)
+    public static function getkey($data, $key, $default = null, $validate = null)
     {
         $out = $default;
         if (is_array($data) && (is_int($key) || is_string($key)) && $key !== '' && array_key_exists($key, $data)) {

diff --git a/assets/lib/Formatter/HtmlFormatter.php b/assets/lib/Formatter/HtmlFormatter.php
@@ -6,6 +6,7 @@
  */
 class HtmlFormatter
 {
+
     /**
      * @param string $string
      * @param bool $decode
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
      */
     class HtmlFormatter
     {
         /**
          * @param string $string
          * @param bool $decode
@@ Expand Down @@