Merge remote-tracking branch 'origin/2.x' into 3.x

* origin/2.x: (104 commits) Change the RSS feed URLs to HTTPS MODX Revolution 2.7.1-pl Update lexicons from crowdin Change after review Update phpThumb 1.7.15-201902101903 Restore html in resource tree (#14358) while preserving XSS protections in trees by default Handle deprecated $type and $responseCode parameters in $modx->sendRedirect and fix message Update lexicon entry Include not deleted children of deleted parents in the list Using cltr/cmd and click will open the url in a new tab/window again for ExtJS elements that use `loadPage()` to open URLs Forbid generating child resources for deleted resources Fix #14094 XSS in the tree Fix #14105 Fix #14104 Fix #14103 Fix #14102 Enable remote avatars Fix regression in resourcelist that prevents parents from working correctly Improve wording in variables ...
modxcms · Feb 22, 2019 · ac7a649 · ac7a649
2 parents e6feacb + 8528d10
commit ac7a649
Show file tree

Hide file tree

Showing 329 changed files with 2,051 additions and 1,208 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -13,27 +13,46 @@ Only English lexicon changes are handled in GitHub. If you want to update anythi
  * Did you find an issue in a MODX Extra? Please submit it to that component's repository or contact the author.
  * Looking for advise or help? Please search the [MODX documentation](http://rtfm.modx.com/), the [MODX forums](http://forums.modx.com/) or join to #modx or #xpdo room on IRC FreeNode server (irc.freenode.net).
 
-## Submit an issue
+## Submit a bug report
 
-[Clicking here will open a new issue which will have the below template prefilled](https://github.com/modxcms/revolution/issues/new?title=Issue%3A%20&body=%23%23%23%20Summary%0AQuick%20summary%20what%27s%20this%20issue%20about.%0A%0A%23%23%23%20Step%20to%20reproduce%0AHow%20to%20reproduce%20the%20issue%2C%20including%20custom%20code%20if%20needed.%0A%0A%23%23%23%20Observed%20behavior%0AHow%20it%20behaved%20after%20following%20steps%20above.%0A%0A%23%23%23%20Expected%20behavior%0AHow%20it%20should%20behave%20after%20following%20steps%20above.%0A%0A%23%23%23%20Environment%0AMODX%20version%2C%20apache%2Fnginx%20and%20version%2C%20mysql%20version%2C%20browser%2C%20etc.%20Any%20relevant%20information.)
+[Clicking here will open a new issue which will have the below template prefilled](https://github.com/modxcms/revolution/issues/new?title=%5BBug%5D%20&?template=bug_report.md)
 
 #### Template
 
+    ## Bug report
     ### Summary
     Quick summary what's this issue about.
-
+    
     ### Step to reproduce
     How to reproduce the issue, including custom code if needed.
-
+    
     ### Observed behavior
     How it behaved after following steps above.
-
+    
     ### Expected behavior
     How it should behave after following steps above.
-
+    
     ### Environment
     MODX version, apache/nginx and version, mysql version, browser, etc. Any relevant information.
 
+## Submit a feature request
+
+[Clicking here will open a new issue which will have the below template prefilled](https://github.com/modxcms/revolution/issues/new?title=%5BFeature%20request%5D%20&?template=feature_report.md)
+
+#### Template
+
+    ## Feature request
+    ### Summary
+    Quick summary what's this feature request about.
+
+    ### Why is it needed?
+    A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+    ### Suggested solution(s)
+    A clear and concise description of what you want to happen.
+
+    ### Related issue(s)/PR(s)
+    Let us know if this is related to any issue/pull request.
 
 ## Submit a Pull Request
 If this is your first PR, please create an account on the [MODX website](http://www.modx.com) and sign the [Contributors License Agreement](http://develop.modx.com/contribute/cla/). This is needed to ensure all code is licensed properly. We cannot merge pull requests without a signed CLA.

diff --git a/.github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug_report.md
@@ -1,3 +1,10 @@
+---
+name: Bug report
+about: Create a report to help us improve MODX Revolution
+
+---
+
+## Bug report
 ### Summary
 Quick summary what's this issue about.
 

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest an idea that makes MODX Revolution even better
+
+---
+
+## Feature request
+### Summary
+Quick summary what's this feature request about.
+
+### Why is it needed?
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+### Suggested solution(s)
+A clear and concise description of what you want to happen.
+
+### Related issue(s)/PR(s)
+Let us know if this is related to any issue/pull request.
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1,3 +1,3 @@
-MODX Revolution is Copyright (c) 2006-2018 by MODX, LLC.
+MODX Revolution is Copyright (c) 2006-present by MODX, LLC.
 
 All Rights Reserved.
diff --git a/_build/data/transport.core.system_settings.php b/_build/data/transport.core.system_settings.php
@@ -540,7 +540,7 @@
 $settings['feed_modx_news']= $xpdo->newObject('modSystemSetting');
 $settings['feed_modx_news']->fromArray(array (
   'key' => 'feed_modx_news',
-  'value' => 'http://feeds.feedburner.com/modx-announce',
+  'value' => 'https://feeds.feedburner.com/modx-announce',
   'xtype' => 'textfield',
   'namespace' => 'core',
   'area' => 'system',
@@ -558,7 +558,7 @@
 $settings['feed_modx_security']= $xpdo->newObject('modSystemSetting');
 $settings['feed_modx_security']->fromArray(array (
   'key' => 'feed_modx_security',
-  'value' => 'http://forums.modx.com/board.xml?board=294',
+  'value' => 'https://forums.modx.com/board.xml?board=294',
   'xtype' => 'textfield',
   'namespace' => 'core',
   'area' => 'system',

diff --git a/_build/docs/themes/modx/template.xml b/_build/docs/themes/modx/template.xml
@@ -2,7 +2,7 @@
 <template>
   <author>MODX CMF</author>
   <version>1.0</version>
-  <copyright>2011-2018 MODX, LLC</copyright>
+  <copyright>2011-present MODX, LLC</copyright>
   <transformations>
     <transformation query="copy" writer="FileIo" source="ajax_search.php" artifact="ajax_search.php"/>
     <transformation query="copy" writer="FileIo" source="js" artifact="js"/>

diff --git a/_build/templates/default/package.json b/_build/templates/default/package.json
@@ -16,7 +16,7 @@
     "grunt-notify": "^0.4.5",
     "grunt-imageoptim": "^1.4.4",
     "grunt-sass": "^3.0.2",
-    "node-sass": "^4.9.4"
+    "node-sass": "^4.10.0"
   },
   "dependencies": {
     "bourbon": "^5.1.0",

diff --git a/_build/templates/default/sass/_forms.scss b/_build/templates/default/sass/_forms.scss
@@ -1128,6 +1128,7 @@ input::-moz-focus-inner {
   font: $fontSmall;
   margin-top: 2px;
   position: relative;
+  min-width: 95%;
 	&:before {
 		@extend %pseudo-font;
 		content: fa-content($fa-var-exclamation-triangle); /* : "\f071" */

diff --git a/_build/templates/default/sass/_tabs.scss b/_build/templates/default/sass/_tabs.scss
@@ -260,7 +260,7 @@ ul.x-tab-strip-bottom {
     float: left;
     margin-bottom: -10000px; /* dirty hack to make vertical tabs container stretch to bottom */
     padding-bottom: 10000px !important; /* dirty hack to make vertical tabs container stretch to bottom */
-    width: 169px !important; /* aligns the vertical tabs with the TVs tab left edge, will not work that nicely with non-english langs */
+    width: 168px !important; /* aligns the vertical tabs with the TVs tab left edge, will not work that nicely with non-english langs */
 
     .x-tab-strip-wrap {
       background-color: transparent; /* as vertical tab panels are nested ones too, do not apply the background color for nested tab panels */
@@ -297,7 +297,7 @@ ul.x-tab-strip-bottom {
             border-right-color: $white;
             box-shadow: none; /* removes the active tab strip on top */
             color: $tabActiveText;
-            width: 169px; /* make the active li 1px more wide to cover the containers right border, this makes the right border on inactive tabs necessary as the whole tab-strip wrap gets wider */
+            width: 168px; /* make the active li 1px more wide to cover the containers right border, this makes the right border on inactive tabs necessary as the whole tab-strip wrap gets wider */
           }
 
           &.x-tab-edge {
@@ -312,7 +312,8 @@ ul.x-tab-strip-bottom {
           .x-tab-strip-text {
             line-height: 1.4;
             padding: 2px 0 2px 0;
-            white-space: normal; /* prevent long category names from breaking out of the tab strip width */
+            word-break: break-all;
+            white-space: pre-wrap;
           }
         }
       }

diff --git a/_build/templates/default/sass/_xtheme-modx.scss b/_build/templates/default/sass/_xtheme-modx.scss
@@ -1199,7 +1199,7 @@ td.x-grid3-hd-menu-open .x-grid3-hd-inner {
   }
   /* distance to the right for all following columns, this makes the first one 15px wider than the rest*/
   /* but allows for more than 2 columns layouts */
-  > .x-column ~ .x-column {
+  > .x-column:not(.x-hide-display) ~ .x-column {
     margin-right: 0;
     margin-left: 15px;
   }

diff --git a/_build/test/Tests/Transport/TransportCoreTest.php b/_build/test/Tests/Transport/TransportCoreTest.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ * This file is part of the MODX Revolution package.
+ *
+ * Copyright (c) MODX, LLC
+ *
+ * For complete copyright and license information, see the COPYRIGHT and LICENSE
+ * files found in the top-level directory of this distribution.
+ *
+ * @package modx-test
+*/
+
+/**
+ * Tests related to creating transport packages
+ *
+ * @package modx-test
+ * @subpackage modx
+ * @group Transport
+ */
+class TransportCoreTest extends MODxTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        if (!defined('MODX_SOURCE_PATH')) {
+            define('MODX_SOURCE_PATH', dirname(__DIR__) . '/../../../');
+        }
+
+        if (!defined('MODX_BUILD_DIR')) {
+            define('MODX_BUILD_DIR', MODX_SOURCE_PATH . '_build/');
+        }
+
+        if (!defined('MODX_PACKAGES_PATH')) {
+            define('MODX_PACKAGES_PATH', MODX_SOURCE_PATH . 'core/packages/');
+        }
+    }
+
+    public function tearDown()
+    {
+        @unlink(MODX_PACKAGES_PATH. "core.transport.zip");
+    }
+
+    public function testBuildCoreTransportPackage()
+    {
+        $transportCoreFile = MODX_BUILD_DIR. 'transport.core.php';
+        $transportCorePackFile = MODX_PACKAGES_PATH. 'core.transport.zip';
+
+        $result = shell_exec("php $transportCoreFile");
+        $this->assertContains('Transport zip created. Build script finished.', $result);
+
+        $this->assertFileExists($transportCorePackFile);
+    }
+}
diff --git a/_build/test/phpunit.xml b/_build/test/phpunit.xml
@@ -53,6 +53,9 @@
             <!--<directory>Tests/Processors/System</directory>
             <directory>Tests/Processors/Resource</directory>-->
         </testsuite>
+        <testsuite name="Transport">
+            <directory>Tests/Transport</directory>
+        </testsuite>
         <testsuite name="Cases">
             <directory>Tests/Cases/Modx/</directory>
             <directory>Tests/Cases/Request/</directory>

diff --git a/composer.json b/composer.json
@@ -35,6 +35,7 @@
         "email": "help@modx.com",
         "forum": "https://forums.modx.com/",
         "irc": "irc://irc.freenode.org/modx",
+        "chat": "https://modx.org/",
         "issues": "https://github.com/modxcms/revolution/issues/",
         "source": "https://github.com/modxcms/revolution/"
     },

diff --git a/core/docs/changelog.txt b/core/docs/changelog.txt
@@ -62,6 +62,62 @@ MODX Revolution 3.0.0-beta1  (TBD)
 - Set manager favicon to the MODX logo by default [#14324]
 - Reorder tabs on the template and template variable panels [#14251]
 
+MODX Revolution 2.7.2-pl (TBD)
+====================================
+- The default RSS feed URLs `feed_modx_security` and `feed_modx_news` now use HTTPS [#14392]
+
+MODX Revolution 2.7.1-pl (February 14, 2019)
+====================================
+- Fix ctl/cmd+click behavior to open URL in new window/tab [#14348]
+- Show all resources to purge in the trash manager and change tree options for deleted resources [#14350]
+- Handle deprecated warnings for sendRedirect in modX class instead of modResponse [#14359]
+- Updated phpThumb to version 1.7.15-201902101903 which has basic support for WebP [#14366]
+- Fixed CVE-2018-17556 [#14336]
+- Fixes bunch of various XSS issues in the manager [#14335]
+- Fix issue with resource list preventing parents from working correctly [#14329]
+- Fixed issues with tab width and very long strings in the vertical tabs [#14317]
+- Refactored tag input renderer to fix rendering with empty options list [#14319]
+- Fix duplicating static templates, snippets etc. with an empty category [#14203]
+- Don't include the resource ID in real time aliases [#14210]
+- Move resource_uri and resource_uri_overide to page-settings-right-box-left region [#14297]
+- Fix position slide-in/slide-out button of Resource tree [#14298]
+- Fix context menu position on user page "Access Permissions" tab [#14295]
+- Fixed bug with unexpected incremented TV ranks in Form Customization [#14281]
+- Improve description of the system setting user_settings_desc to clarify meaning [#14249]
+- Improved display of information about (missing) dependencies when you install a package/extra [#14255]
+- Fix an issue where old static files where removed even if the automate static files system setting was turned off for that element type [#14208]
+- Nested categories display their name instead of their id [#14205]
+- Fixed case when empty date TVs can be saved even if "allow blank" is set to false [#14290]
+- Fix empty Constraint column in Form Customization if constraint value is zero [#14287]
+- Don't remove the trailing slash when redirecting to the manager after logging in [#14278]
+- Added explanatory text with MODX tag to the description of the System Settings, Context Settings and Lexicon Management sections [#14265]
+- Bugfix for transport resolution, if the package is not found on the current provider [#14260]
+- When deleting an element in the tree, the confirmation window will show the translated element type name [#14272]
+- Fix edit empty files from tree [#14284]
+- Enhanced the error message of a wrong MODX_CORE_PATH [#14276]
+- Fix checkDownloadedDependencies query to make package dependencies work properly [#14261]
+- Don't remove static files if automated static files are turned off [#14228]
+- Image template variable values escape/encode JavaScript tags only [#14263]
+- Switch to the tab where the validation error occurs when saving an element [#14235]
+- Make working Preview menu option in the recent edited resources widget [#14234]
+- Apply Form Customization rules for TV's when a wildcard action is used [#14224]
+- Add a Unit Test for testing the build process [#14213]
+- Don't force the manager date time format for the date of birth field [#14214]
+- Prevent symlinks and weblink to target itself [#14211]
+- Checkbox Use current alias in alias path in the Form Customization sets [#14209]
+- Use the right table name when fetching the MODX package providers [#14222]
+- Fixed position of context menu in the media browser [#14199]
+- Fix "undefined" text in Trash manager button tooltip. [#14191]
+- Fix a broken top-menu [#14186]
+- Fix the missing description for the system setting "Automatic Template Assignment" [#14173]
+- Update config.js.php processor to be class based [#14161]
+- Make the flat file processor deprecated message more useful [#14160]
+- Fix missing styles on resource data heading [#14142]
+- Remove unnecessary h2 on resource update heading [#14230]
+- Use proper element icons in elements tree [#14001]
+- Fix incorrect margin on the uberbar submit button [#14142]
+- Fix error message overflowing on TVs [#14142]
+
 MODX Revolution 2.7.0-pl (November 27, 2018)
 ====================================
 - Add recursive method to replace reserved characters [#14156]

diff --git a/core/lexicon/ar/context.inc.php b/core/lexicon/ar/context.inc.php
@@ -28,7 +28,7 @@
 $_lang['context_remove'] = 'حذف السياق';
 $_lang['context_remove_confirm'] = 'هل أنت متأكد أنك تريد حذف هذا السياق؟ هذا الحذف دائم وغير قابل للرجوع.';
 $_lang['context_settings'] = 'إعدادات السياق';
-$_lang['context_settings_desc'] = 'هنا تستطيع أن تضع الإعدادات الخاصة بهذا السياق. إعدادات السياق سوف تتجاوز جميع إعدادات النظام التي تمتلك نفس المفتاح.';
+$_lang['context_settings_desc'] = 'Here you can set settings specific to this Context. Context settings will override any System Settings with the same key. <b>Each setting will be available via the [[++key]] placeholder.</b>';
 $_lang['context_update'] = 'ترقية السياق';
 $_lang['context_with_key_not_found'] = 'لم يتم العثور على السياق ذو المفتاح %s !';
-$_lang['contexts'] = 'السياقات';
+$_lang['contexts'] = 'السياقات';
diff --git a/core/lexicon/ar/default.inc.php b/core/lexicon/ar/default.inc.php
@@ -77,7 +77,7 @@
 $_lang['confirm_remove_locks'] = 'يقوم المستخدمون أحياناً بإغلاق المستعرض الخاص بهم أثناء تعديل المستندات، القوالب، كتل الكود او المحللات وربما ترك هذا العنصر الذي كانو يقومون بتعديله بحالة إقفال. بالضغط على "موافق" يمكنك إزالة كافة الأقفال الموجودة حاليا.
 </ br /><br> متابعة؟';
 $_lang['confirm_undelete'] = 'إن أي كان الوثائق الأبناء المحذوفة في نفس وقت هذه الوثيقة سوف يتم التراجع عن حذفها، لكن الوثائق الأبناء المحذوفة في وقت أبكر سوف تبقى محذوفة.';
-$_lang['confirm_unpublish'] = 'عدم نشر هذه الوثيقة الآن سيؤدي إلى إزالة أي من التواريخ المنشورة أو غير المنشورة التي من الممكن ان تكون قد أرسلت. اذا كنت ترغب بتعيين أو إبقاء التواريخ المنشورة أو غير المنشورة، الرجاء قم باختيار تعديل الملف عوضاً عن ذلك n\\n\\.متابعة؟';
+$_lang['confirm_unpublish'] = 'عدم نشر هذه الوثيقة الآن سيؤدي إلى إزالة أي من التواريخ المنشورة أو غير المنشورة التي من الممكن ان تكون قد أرسلت. اذا كنت ترغب بتعيين أو إبقاء التواريخ المنشورة أو غير المنشورة، الرجاء قم باختيار تعديل الملف عوضاً عن ذلك n\n\.متابعة؟';
 $_lang['console'] = 'الطرفية';
 $_lang['console_download_output'] = 'تحميل الخرج إلى ملف';
 $_lang['console_running'] = 'الطرفة تعمل...';

diff --git a/core/lexicon/ar/lexicon.inc.php b/core/lexicon/ar/lexicon.inc.php
@@ -27,9 +27,9 @@
 $_lang['lexicon_import_err_ns'] = 'موضوع ملف المعجم لم يتم تحديده.';
 $_lang['lexicon_import_err_upload'] = 'حدث خطأ أثناء محاولة رفع ملف موضوع معجم جديد. يرجى فحص صلاحيات مخدم الوب  فيما يخص رفع ملف الى مجلد tmp . وقم أيضا بالتأكد من أن الملف الذي تحاول رفعه هو ملف صالح.';
 $_lang['lexicon_management'] = 'أدارة المعجم';
-$_lang['lexicon_management_desc'] = 'هنا يمكنك تجاوز اي مدخل معجم عبر فضاءات الاسماء ومايقابلها من مواضيع, قم بالضغط نقرتين على قيمة المدخل لتجاوزها. لإضافة مدخل جديد للقاموس او الموضوع فقط قم بإنشاء ملف للموضوع في فضاء الأسماء الخاص له في المجلد المقابل.';
+$_lang['lexicon_management_desc'] = 'Here you can override any Lexicon Entries across Namespaces and their respective Topics. Just double-click on any Entry\'s value to override it. To add new Lexicon Entries or Topics, just create their Topic files in their Namespace\'s respective directory.<br /><b>Each Entry will be available via the [[%name]] placeholder.</b>';
 $_lang['lexicon_rlfb_msg'] = 'تم بنجاح اعادة توليد [[+num]] سلسلة نصية.';
 $_lang['reload_from_base'] = 'تراجع عن جميع الإدخالات الأساسية';
 $_lang['reload_success'] = 'تم بنجاح اعادة تحميل [[+total]] سلسلة نصية.';
 $_lang['search_by_key'] = 'البحث عن طريق المفتاح:';
-$_lang['topic'] = 'الموضوع';
+$_lang['topic'] = 'الموضوع';
diff --git a/core/lexicon/ar/resource.inc.php b/core/lexicon/ar/resource.inc.php
@@ -75,12 +75,14 @@
 $_lang['resource_err_select_parent'] = 'الرجاء اختيار المصدر الحاوي.';
 $_lang['resource_err_symlink_target_invalid'] = 'The symlink target does not contain an integer value.';
 $_lang['resource_err_symlink_target_nf'] = 'You cannot symlink to a resource that does not exist.';
+$_lang['resource_err_symlink_target_self'] = 'You cannot symlink to itself.';
 $_lang['resource_err_undelete'] = 'حدث خطأ أثناء محاولة التراجع عن حذف المصدر.';
 $_lang['resource_err_undelete_children'] = 'حدث خطأ أثناء محاولة التراجع عن حذف إبن المصدر.';
 $_lang['resource_err_unpublish'] = 'حدث خطأ أثناء محاولة عدم نشر المصدر.';
 $_lang['resource_err_unpublish_sitestart'] = 'المصدر مربوط مع العنصر site_start ولا يستطيع أن يكون غير منشور!';
 $_lang['resource_err_unpublish_sitestart_dates'] = 'المصدر مربوط مع العنصر site_start ولا يستطيع أن الحصول على نشر أو عدم نشر مجموعة التواريخ!';
 $_lang['resource_err_weblink_target_nf'] = 'You cannot set a weblink to a resource that does not exist.';
+$_lang['resource_err_weblink_target_self'] = 'You cannot set a weblink to itself.';
 $_lang['resource_folder'] = 'حاوي';
 $_lang['resource_folder_help'] = 'قم بالاختيار لجعل هذا المصدر يعمل كحاوي للمصادر اﻷخرى. الحاوي هو عبارة عن مجلّد ، إلا انه يمكن أن يكون به محتوى.';
 $_lang['resource_group_resource_err_ae'] = 'المصدر هو بالأصل جزء من مجموعة المصدر هذه.';