Merge branch 'develop'

# Conflicts:
#	framework/core/controllers/expController.php
#	framework/modules/blog/controllers/blogController.php
#	framework/modules/events/assets/css/calendar.css

Author: dleffler

CHANGELOG.md

@@ -10,6 +10,18 @@ For a more detailed changelog visit [https://github.com/exponentcms/exponent-cms
 
 ---
 
+Version 2.7.2
+-------------
+
+### Address issues in v2.7.1 and Prepare for v3.0.2
+
+- compatible with PHP v7.4.x, v8.0.x, v8.1.x and v8.2.x
+- add better metainfo for forms and records
+- add feature to add dates to an existing event
+- new blog dates calendar view
+- fixes several warnings/issues with PHP v8
+- fixes and tweaks many issues in previous versions
+
 Version 2.7.1
 -------------
 

OPTIONAL.md

@@ -125,7 +125,7 @@ installing the [Kint](https://github.com/kint-php/kint) PHP library. Simply plac
 into the /external folder (for v1 & v2 extract into the /external folder to create a subfolder).
 The feature is auto-activated by this installation.
 
-- v3.3.0 to v5.0.3 (/external/kint.phar), (requires Exponent CMS v2.6.0patch2 or later)
+- v3.3.0 to v5.0.4 (/external/kint.phar), (requires Exponent CMS v2.6.0patch2 or later)
 - v2.2 (/external/kint-2.2/) is the last 2.x version,
 - but v1.1 (/external/kint/) is also supported
 

RELEASE.md

@@ -8,8 +8,8 @@ Copyright (c) 2004-2023 OIC Group, Inc.
 
 For a complete list of the changes made from release to release, see the [CHANGELOG.md](CHANGELOG.md)
 
-## 2.7.1 - February 2023
+## 2.7.2 - July 2023
 
 ----------
 
-### Finalize PHP v8.1 and Initial support for PHP v8.2 stricter standards. Also addresses issues in v2.7.0 and Prepares for v3.0.0.
+### Finalize support for PHP v8.2. Also addresses issues in v2.7.1 and Prepares for v3.0.2.

exponent_constants.php

@@ -661,7 +661,7 @@
     define('MPDF8_VERSION', '8.0.17');
 }
 if (!defined('MPDF81_VERSION')) {
-    define('MPDF81_VERSION', '8.1.4');  // 8.1.4
+    define('MPDF81_VERSION', '8.1.4');
 }
 /**
  * Log is needed for MPDF v7+
@@ -673,13 +673,13 @@
  * random_compat is needed for MPDF v7+ under PHP v5.6
  */
 if (!defined('RANDOM_VERSION')) {
-    define('RANDOM_VERSION', '2.0.20');
+    define('RANDOM_VERSION', '2.0.21');
 }
 /**
  * FPDI is needed for MPDF v8+
  */
 if (!defined('FPDI_VERSION')) {
-    define('FPDI_VERSION', '2.3.6');
+    define('FPDI_VERSION', '2.3.6');  // 2.3.7
 }
 
 if (!defined('DOMPDF8_VERSION')) {
@@ -690,13 +690,13 @@
 }
 
 if (!defined('HTML2PDF5_VERSION')) {
-    define('HTML2PDF5_VERSION', '5.2.7');  // 5.2.7
+    define('HTML2PDF5_VERSION', '5.2.7');
 }
 /**
  * TCPDF is needed for HTML2PDF5
  */
 if (!defined('TCPDF5_VERSION')) {
-    define('TCPDF5_VERSION', '6.6.2');  // 6.6.2
+    define('TCPDF5_VERSION', '6.6.2');
 }
 
 ?>

exponent_php_setup.php

@@ -31,7 +31,12 @@
 	// Display all errors (some production servers have this set to off)
 	ini_set('display_errors',1);
 	// Up the ante on the error reporting so we can see notices as well.
-	ini_set('error_reporting',E_ALL);
+    if (NO_DEPRECATIONS) {
+        $level = E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED;
+    } else {
+        $level = E_ALL;
+    }
+	ini_set('error_reporting',$level);
 	// This is rarely set to true, but the first time it is, we'll be ready.
 	ini_set('ignore_repeated_errors',0);
 } else {
@@ -52,7 +57,6 @@
 	BASE.'framework/core/forms/controls',
 	BASE.'framework/modules/ecommerce/billingcalculators',
 	BASE.'framework/modules/ecommerce/shippingcalculators',
-//	BASE.'framework/modules/ecommerce/products/controllers',  //FIXME does NOT exist
 	BASE.'framework/modules/ecommerce/products/models',  // models
 );
 /**

exponent_version.php

@@ -50,7 +50,7 @@
         // the info for the "next" version if we are a pre-release from the repository
         define('EXPONENT_VERSION_MAJOR', 2);
         define('EXPONENT_VERSION_MINOR', 7);
-        define('EXPONENT_VERSION_REVISION', 1);
+        define('EXPONENT_VERSION_REVISION', 2);
         define('EXPONENT_VERSION_TYPE', 'develop');
         define('EXPONENT_VERSION_ITERATION', '');
         define('EXPONENT_VERSION_BUILDDATE', time());

external/ExtPrograms.csv

@@ -15,7 +15,7 @@ yui2in3,0.3,github.com/yui/2in3,0.3,
 recaptchalib,1.2.4,github.com/google/ReCAPTCHA,1.2.4,
 barcode,1 5/10/2005,www.sid6581.net/cs/php-scripts/barcode,1 5/10/2005,
 feedcreator.class.php,1.80exp,sourceforge.net/projects/feedcreator,1.80dev,"blog.pothoven.net/2006/01/changing-feedcreatorclassphp-for.html, also merged 1.7.3 from Drupal"
-xmlrpc.php,4.9.5,github.com/gggeek/phpxmlrpc,4.9.5,
+xmlrpc.php,4.10.1,github.com/gggeek/phpxmlrpc,4.10.1,
 Twitter model,2.3.1,github.com/tijsverkoyen/TwitterOAuth,2.3.1,placed in Twitter module with _construct tweaked & namespace deleted
 Twitter API,1.0.6,github.com/J7mbo/twitter-api-php,1.0.6,used by socialmedia module
 SimplePie,1.7.0,github.com/simplepie/simplepie,1.8.0,php 8 fix
@@ -24,7 +24,7 @@ class.upload,2.1.3exp,github.com/verot/class.upload.php,2.1.3,"Correct flip oper
 iCalCreator,2.28.2,github.com/iCalcreator/iCalcreator,2.40.10/2.41.71,uncomment load utilities; php 8 fix
 scssphp,1.11.0exp,github.com/scssphp/scssphp,1.11.0,includes example server; hack to compile newui
 lessphp,0.5.0exp,github.com/leafo/lessphp,0.5.0,"will not compile bootstrap v3+, hack to allow prefix"
-less.php,3.2.0exp,github.com/wikimedia/less.php,3.2.0,php v5.6 regression fixes
+less.php,3.2.0exp,github.com/wikimedia/less.php,3.2.1,php v5.6 regression fixes
 Twitter-Bootstrap2,2.3.2,twitter.github.com/bootstrap,2.3.2,"patched bootstrap.less includes swatches, fontawesome & exp variables"
 Twitter-Bootstrap3,3.4.1,twitter.github.com/bootstrap,3.4.1,patched bootstrap.less includes swatches & exp variables
 Twitter-Bootstrap4,4.6.2,twitter.github.com/bootstrap,4.6.2,"patched bootstrap.scss includes swatches & exp variables, remove @page"
@@ -42,16 +42,16 @@ Bootstrap-Icons,1.10.3,icons.getbootstrap.com,1.10.3,"patched bootstrap-icons.sc
 Adminer,4.8.1exp,www.adminer.org,4.8.1,"customized plugins: tinymce, ckeditor, previewSerialized, edit-textarea & edit-calendar; edit sql tweak"
 SimpleAjaxUploader,2.6.7,github.com/LPology/Simple-Ajax-Uploader,2.6.7,also converted to yui module 2.5.3
 normalize.css,8.0.1,necolas.github.com/normalize.css,8.0.1,auto included in bootstrap 3
-MediaElement.js,5.1.0,mediaelementjs.com,5.1.0,
+MediaElement.js,5.1.0,mediaelementjs.com,6.0.1,
 MediaElement plugins,2.6.3,github.com/johndyer/mediaelement-plugins,2.6.3,
 Facebook PHP SDK3,3.2.3,github.com/facebook/php-graph-sdk,5.7.0,
 Facebook PHP SDK4,4.0.23,github.com/facebook/php-graph-sdk,5.7.0,
 Respond,1.4.2,github.com/scottjehl/Respond,1.4.2,IE6-8 shim
 html5shiv,3.7.3,github.com/aFarkas/html5shiv,3.7.3,IE6-8 shim
 csshover.htc,3.11,peterned.home.xs4all.nl/csshover.html,3.11,IE6 shim
-CKEditor,4.20.1,ckeditor.com,4.20.1/36.0.0,"add fieldinsert (exp), autosave, sourcedialog & kama and moono skins"
+CKEditor,4.20.2,ckeditor.com,4.20.2/36.0.1,"add fieldinsert (exp), autosave, sourcedialog & kama and moono skins"
 TinyMCE,4.9.11,tiny.cloud,4.9.11,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins, & xenmce skin"
-TinyMCE v5,5.10.7,tiny.cloud,5.10.7/6.3.1,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins"
+TinyMCE v5,5.10.7,tiny.cloud,5.10.7/6.3.2,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins"
 PLUpload,2.3.9,github.com/moxiecode/plupload,2.3.9/3.1.5,"needed for TinyMCE Quick Upload, placed in that plugin folder"
 elFinder,2.1.61,elfinder.org,2.1.61,customized in /framework with Exponent php classes and .js files
 jQuery1,1.12.4,jquery.com,1.12.4,v1.11.3 still needed for old firefox
@@ -65,7 +65,7 @@ validate,1.19.5exp,jqueryvalidation.org,1.19.5,edit for 'undefined' in 'min' & '
 Countdown,1.1,tutorialzine.com/2011/12/countdown-jquery,1.1,
 timepicker,1.6.3,trentrichardson.com/examples/timepicker,1.6.3,used by adminer
 TimeCircles,1.5.3,github.com/wimbarelds/TimeCircles,1.5.3,
-DataTables,1.13.2,www.datatables.net,1.13.2,includes boostrap2 integration w/ renamed 1.10.7 version
+DataTables,1.13.3,www.datatables.net,1.13.3,includes boostrap2 integration w/ renamed 1.10.7 version
 DataTables Checkboxes,1.2.13,github.com/gyrocode/jquery-datatables-checkboxes,1.2.13,
 DataTables Tabletools,2.2.4,www.datatables.net,2.2.4,replaced by 'Buttons' in 1.10.8
 Responsive DataTables,0.2.0,github.com/Comanche/datatables-responsive,0.2.0,replaced by 'Responsive' in 1.10.8
@@ -83,7 +83,7 @@ Tempus Dominus Bootstrap 5,6.2.10,github.com/Eonasdan/tempus-dominus,6.2.10,adde
 moment.js,2.29.4,github.com/moment/moment,2.29.4,needed for Bootstrap DateTimePicker; min/moment-with-locales.js renamed
 strength-meter,1.1.4,github.com/kartik-v/strength-meter,1.1.4,
 Sortable,1.15.0,github.com/SortableJS/Sortable,1.15.0,
-jstree,3.3.14,github.com/vakata/jstree,3.3.14,added nav menu icons to stylesheet
+jstree,3.3.15,github.com/vakata/jstree,3.3.15,added nav menu icons to stylesheet
 bootstrap3-dialog,1.35.4,github.com/nakupanda/bootstrap3-dialog,1.35.4,use /src .less file and add our .less variable imports; w/ bs4 fixes
 impromptu,6.2.3,trentrichardson.com/Impromptu,6.2.3,add some colors to .css
 bootbox,6.0.0,github.com/makeusabrew/bootbox,6.0.0,
@@ -95,7 +95,7 @@ select2,4.0.13,github.com/select2/select2,4.0.13,renamed select2.full.js to sele
 shuffle.js,v3.1.1,github.com/Vestride/Shuffle,4.2.0/5.4.1/6.1.0,
 Jasny Bootstrap2,2.3.1,jasny.github.io/bootstrap,2.3.1,only using bootstrap-fileupload at this time
 Jasny Bootstrap,4.0.0,jasny.github.io/bootstrap,4.0.0,only using fileinput at this time
-easypost sdk,4.0.3,github.com/EasyPost/easypost-php,4.0.3/6.2.0,
+easypost sdk,4.0.3,github.com/EasyPost/easypost-php,4.0.3/6.3.0,
 jquery.cookie.js,1.4.1,github.com/carhartl/jquery-cookie,1.4.1,
 jquery.history.js,1.8b2,github.com/browserstate/history.js,1.8.0,
 Webshim,1.16.0,github.com/aFarkas/webshim,1.16.0,
@@ -108,14 +108,14 @@ DeepCopy,1.7.0,github.com/myclabs/DeepCopy,1.11.0,"optional, suggested by mPDF v
 random_compat,2.0.21,github.com/paragonie/random_compat,2.0.21,"optional, required by mPDF v7+"
 http-message,1,github.com/php-fig/http-message,1,"optional, required by mPDF v8.1+"
 message-factory,1.0.1,github.com/php-http/message-factory,1.0.1,"optional, required by mPDF v8.1+"
-FPDI,2.3.6,github.com/Setasign/FPDI,2.3.6,"optional, required by mPDF v7+"
+FPDI,2.3.6,github.com/Setasign/FPDI,2.3.7,"optional, required by mPDF v7+"
 HTML2PDF,5.2.7/4.6.1,github.com/spipu/html2pdf,5.2.7,"optional, we tweak tcpdfConfig.php"
 TCPDF,6.6.2,sourceforge.net/projects/tcpdf,6.6.2,"optional, used by HTML2PDF"
 iLess,2.2.0,github.com/mishal/iless,2.2.0,"optional, has issues with bootstrap v2"
-Kint,1.1/2.2/5.0.3,github.com/kint-php/kint,5.0.3,"optional, for formatted edebug output"
+Kint,1.1/2.2/5.0.4,github.com/kint-php/kint,5.0.4,"optional, for formatted edebug output"
 ,,,,
 Not included yet,,,,
-DataTables Buttons,,www.datatables.net,2.3.4,
+DataTables Buttons,,www.datatables.net,2.3.5,
 DataTables Responsive,,www.datatables.net,2.4.0,
 ,,,,
 No longer included,,,,

external/editors/ckeditor/CHANGES.md

@@ -1,6 +1,21 @@
 CKEditor 4 Changelog
 ====================
 
+## CKEditor 4.20.2
+
+Fixed Issues:
+
+* [#439](https://github.com/ckeditor/ckeditor4/issues/439): Fixed: Incorrect <kbd>Tab</kbd> and <kbd>Shift</kbd>+<kbd>Tab</kbd> navigation for radio buttons inside the dialog.
+* [#4829](https://github.com/ckeditor/ckeditor4/issues/4829): Fixed: Undo reversed entire table content instead of a single cell. Thanks to that fix, multiple changes in a table can be undone one by one.
+* [#5396](https://github.com/ckeditor/ckeditor4/issues/5396): Fixed: Event listeners for `popstate` and `hashchange` events on the `window`, added by the [Maximize](https://ckeditor.com/cke4/addon/maximize) plugin, were not removed when destroying the editor instance.
+* [#5414](https://github.com/ckeditor/ckeditor4/issues/5414): Fixed: File and image uploaders based on the [Upload Widget plugin](https://ckeditor.com/cke4/addon/uploadwidget) and [Easy Image plugin ](https://ckeditor.com/cke4/addon/easyimage) didn't fire the [`change` event](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#event-change) upon finishing upload, resulting in passing incorrect data in form controls for integration frameworks, like [Reactive forms in Angular](https://angular.io/guide/reactive-forms).
+* [#698](https://github.com/ckeditor/ckeditor4/issues/698): Fixed: An error was thrown after applying formatting to the widget with inline editable and switching to the source mode. Thanks to [Glen](https://github.com/glen-84)!
+
+API changes:
+
+* [#3540](https://github.com/ckeditor/ckeditor4/issues/3540): The [startup data](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html) passed to the widget's command is now used to also populate the widget's template.
+* [#5352](https://github.com/ckeditor/ckeditor4/issues/5352): Added the [`colorButton_contentsCss`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-colorButton_contentsCss) configuration option allowing to add custom CSS to the [Color Button](https://ckeditor.com/cke4/addon/colorbutton) menu content. Thanks to [mihilion](https://github.com/mihilion)!
+
 ## CKEditor 4.20.1
 
 Fixed Issues:

external/editors/ckeditor/LICENSE.md

@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 CKEditor - The text editor for Internet - https://ckeditor.com/
-Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your
 choice:
@@ -37,7 +37,7 @@ done by developers outside of CKSource with their express permission.
 
 The following libraries are included in CKEditor under the MIT license (see Appendix D):
 
-* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2022, CKSource Holding sp. z o.o.
+* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2023, CKSource Holding sp. z o.o.
 * PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
 * CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
 * ES6Promise - Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors.