Merge branch 'develop'

# Conflicts:
#	exponent_version.php

Author: dleffler

CHANGELOG.md

@@ -10,6 +10,16 @@ For a more detailed changelog visit [https://github.com/exponentcms/exponent-cms
 
 ---
 
+Version 2.7.3
+-------------
+
+### Address issues in v2.7.2 and add fixes found in v3.0.3
+
+- compatible with PHP v7.4.x, v8.0.x, v8.1.x and v8.2.x
+  - deprecated support for PHP v5.6.x, v7.0.x, v7.1.x, v7.2.x and v7.3.x still exists
+  - support for PHP v8.3.x and later has NOT been tested and can't be guaranteed
+- fixes and tweaks many issues in previous versions
+
 Version 2.7.2
 -------------
 

exponent_constants.php

@@ -576,37 +576,35 @@
     } // local jQueryUI stylesheet
 }
 
-//if (USE_CDN) {
 /**
  * Twitter Bootstrap CDN links
  * Use the entire script tag to include integrity, etc...
  */
-    if (!defined('BS2_SCRIPT')) {
-        define('BS2_SCRIPT', '<script src="https://stackpath.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js" integrity="sha384-vOWIrgFbxIPzY09VArRHMsxned7WiY6hzIPtAIIeTFuii9y3Cr6HE6fcHXy5CFhc" crossorigin="anonymous"></script>');
-    } // cdn Bootstrap v2.x script
-    if (!defined('BS3_SCRIPT')) {
-        define('BS3_SCRIPT', '<script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>');
-    } // cdn Bootstrap v3.x script
-    if (!defined('BS4_SCRIPT')) {
-        define('BS4_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct" crossorigin="anonymous"></script>');
-    } // cdn Bootstrap v4.x script
-    if (!defined('BS5_SCRIPT')) {
-        define('BS5_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>');
-    } // cdn Bootstrap v5.x script
+if (!defined('BS2_SCRIPT')) {
+    define('BS2_SCRIPT', '<script src="https://stackpath.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js" integrity="sha384-vOWIrgFbxIPzY09VArRHMsxned7WiY6hzIPtAIIeTFuii9y3Cr6HE6fcHXy5CFhc" crossorigin="anonymous"></script>');
+} // cdn Bootstrap v2.x script
+if (!defined('BS3_SCRIPT')) {
+    define('BS3_SCRIPT', '<script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>');
+} // cdn Bootstrap v3.x script
+if (!defined('BS4_SCRIPT')) {
+    define('BS4_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct" crossorigin="anonymous"></script>');
+} // cdn Bootstrap v4.x script
+if (!defined('BS5_SCRIPT')) {
+    define('BS5_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js" integrity="sha384-ndDqU0Gzau9qJ1lfW4pNLlhNTkCfHzAVBReH9diLvGRem5+R9g2FzA8ZGN954O5Q" crossorigin="anonymous"></script>');
+} // cdn Bootstrap v5.x script
 /**
  * Font-Awesome CDN links
  * Use the CDN link
  */
-    if (!defined('FA4_SCRIPT')) {
-        define('FA4_SCRIPT', 'https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css');
-    } // cdn FontAwesome v4.x stylesheet
-    if (!defined('FA5_SCRIPT')) {
-        define('FA5_SCRIPT', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css');
-    } // cdn FontAwesome v5.x stylesheet
-    if (!defined('FA6_SCRIPT')) {
-        define('FA6_SCRIPT', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css');
-    } // cdn FontAwesome v6.x stylesheet
-//}
+if (!defined('FA4_SCRIPT')) {
+    define('FA4_SCRIPT', 'https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css');
+} // cdn FontAwesome v4.x stylesheet
+if (!defined('FA5_SCRIPT')) {
+    define('FA5_SCRIPT', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css');
+} // cdn FontAwesome v5.x stylesheet
+if (!defined('FA6_SCRIPT')) {
+    define('FA6_SCRIPT', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css');
+} // cdn FontAwesome v6.x stylesheet
 
 /**
  * Smarty Version Constants
@@ -641,12 +639,12 @@
     /**
      * Deprecations is needed for Lexer v2
      */
-    define('DEPRECATIONS_VERSION', '1.1.2');  // 1.1.3
+    define('DEPRECATIONS_VERSION', '1.1.2');  // 1.1.5
     define('SWIFT_DEPRECATIONS_PATH', BASE . 'external/deprecations-' . DEPRECATIONS_VERSION . '/lib/Doctrine/Deprecations/');
     /**
      * EmailValidator is needed for Swiftmailer v6
      */
-    define('EMAIL_VALIDATOR_VERSION', '3.2.6');  // 4.0.2
+    define('EMAIL_VALIDATOR_VERSION', '3.2.6');  // 4.0.4
     define('SWIFT_EMAIL_PATH', BASE . 'external/EmailValidator-' . EMAIL_VALIDATOR_VERSION . '/EmailValidator/');
 }
 
@@ -661,18 +659,18 @@
     define('MPDF8_VERSION', '8.0.17');
 }
 if (!defined('MPDF81_VERSION')) {
-    define('MPDF81_VERSION', '8.2.5');
+    define('MPDF81_VERSION', '8.2.5');  // 8.2.6
 }
 
 if (!defined('DOMPDF8_VERSION')) {
     define('DOMPDF8_VERSION', '-1.2.2');
 }
 if (!defined('DOMPDF2_VERSION')) {
-    define('DOMPDF2_VERSION', '3.0.1');
+    define('DOMPDF2_VERSION', '3.0.1');  // 3.1.0
 }
 
 if (!defined('HTML2PDF5_VERSION')) {
-    define('HTML2PDF5_VERSION', '5.2.8');
+    define('HTML2PDF5_VERSION', '5.2.8');  // 5.3.3
 }
 
 ?>

external/ExtPrograms.csv

@@ -1,44 +1,44 @@
 Program,Version,URL,Avail version,Exponent Customization Notes:
 Swiftmailer,5.4.12/6.3.0,github.com/swiftmailer/swiftmailer,6.3.0,we add  eDebugLogger & eDebugHtmlReporter plugins & fix php 5.6 ssl issue
 Doctrine Lexer,2.1.0,github.com/doctrine/lexer,2.1.1/3.0.1,needed by swiftmailer v6
-Doctrine Deprecations,1.1.2,github.com/doctrine/deprecations,1.1.3,needed by Doctrine Lexer v2
-EmailValidator,3.2.6,github.com/egulias/EmailValidator,3.2.6/4.0.2,needed by swiftmailer v6; change folder structure and add autoloader to main file
+Doctrine Deprecations,1.1.2,github.com/doctrine/deprecations,1.1.5,needed by Doctrine Lexer v2
+EmailValidator,3.2.6,github.com/egulias/EmailValidator,3.2.6/4.0.4,needed by swiftmailer v6; change folder structure and add autoloader to main file
 ups-php,0.2,github.com/sanbornm/ups-php,0.2,"updated/fixed xml, etc to work"
 fedex-php,31.0.0,www.fedex.com/wpor/web/jsp/drclinks.jsp?links=wss/getstarted.html,31.0.0,copy/edit RateAvailableServicesWebServiceClient.php into fedexshippingcalculator->getRates()
-Smarty,3.1.27/4.4.1,smarty.net,4.5.5/5.4.3,
-phpthumb,1.7.22exp,github.com/JamesHeinrich/phpThumb,1.7.22,phpThumb.config.php - we also allow &amp in parsing and err command
+Smarty,3.1.27/4.4.1,smarty.net,4.5.5/5.5.2,
+phpthumb,1.7.23exp,github.com/JamesHeinrich/phpThumb,1.7.23,phpThumb.config.php - we also allow &amp in parsing and err command
 getid3,1.9.23,github.com/JamesHeinrich/getID3,1.9.23,
-minify,2.3.3,github.com/mrclay/minify,2.3.3/3.0.4/4.0.0,modify config.php
+minify,2.3.3,github.com/mrclay/minify,2.3.3/3.0.4/4.0.1,modify config.php
 YUI2,2.9.0,developer.yahoo.com/yui/2,2.9.0,
 YUI3,3.18.1,github.com/yui/yui3,3.18.1,
 yui2in3,0.3,github.com/yui/2in3,0.3,
 recaptchalib,1.2.4/1.3.0,github.com/google/ReCAPTCHA,1.3.0,
 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.11.0,github.com/gggeek/phpxmlrpc,4.11.0,
+xmlrpc.php,4.11.2,github.com/gggeek/phpxmlrpc,4.11.2,
 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.1,php 8 fix
 pixidou,0.1exp,github.com/asvinb/pixidou,0.1,"placed in Pixidou module, heavily modified at this point"
 class.upload,2.1.6exp,github.com/verot/class.upload.php,2.1.6,"Correct flip operation where flip vertical & horizontal were inverted/swapped, php 8 fix"
-iCalCreator,2.28.2,github.com/iCalcreator/iCalcreator,2.40.10/2.41.90,uncomment load utilities; php 8 fix
-scssphp,1.11.1exp,github.com/scssphp/scssphp,2.0.0,includes example server; hack to compile newui
+iCalCreator,2.28.2,github.com/iCalcreator/iCalcreator,2.40.10/2.41.92,uncomment load utilities; php 8 fix
+scssphp,1.11.1exp,github.com/scssphp/scssphp,1.13.0/2.0.1,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.1/4.4.1/5.1.2,php v5.6 regression fixes
+less.php,3.2.0exp,github.com/wikimedia/less.php,3.2.1/4.4.1/5.4.0,php v5.6 regression fixes
 Twitter-Bootstrap2,2.3.2,github.com/twbs/bootstrap,2.3.2,"patched bootstrap.less includes swatches, fontawesome & exp variables"
 Bootstrap3,3.4.1,github.com/twbs/bootstrap,3.4.1,patched bootstrap.less includes swatches & exp variables
 Bootstrap4,4.6.2,github.com/twbs/bootstrap,4.6.2,"patched bootstrap.scss includes swatches & exp variables, remove @page"
-Bootstrap5,5.3.3,github.com/twbs/bootstrap,5.3.3,patched bootstrap.scss includes swatches & exp variables
+Bootstrap5,5.3.8,github.com/twbs/bootstrap,5.3.8,patched bootstrap.scss includes swatches & exp variables
 popper.js/floating-ui,1.16.1,github.com/FezVrasta/popper.js,1.16.1/2.11.8,needed by BS4/BS5 (umd)
 Bootswatch2,2.3.2,bootswatch.com,2.3.2,
 Bootswatch3,3.4.1+1,bootswatch.com,3.4.1+1,change 1st line variables.less comment to output to .css file
 Bootswatch4,4.6.2,bootswatch.com,4.6.2,change 1st line variables.scss comment to output to .css file
-Bootswatch5,5.3.3,bootswatch.com,5.3.3,change 1st line variables.scss comment to output to .css file
+Bootswatch5,5.3.7,bootswatch.com,5.3.7,change 1st line variables.scss comment to output to .css file
 Font-Awesome3,3.2.1,fontawesome.github.com/Font-Awesome,3.2.1,updated FontAwesomePath in variables.less
 Font-Awesome4,4.7.0,fontawesome.github.com/Font-Awesome,4.7.0,
 Font-Awesome5,5.15.4,fontawesome.com,5.15.4,add import all 'fonts' sheets into main sheet
-Font-Awesome6,6.7.2,fontawesome.com,6.7.2,add import all 'fonts' sheets into main sheet
-Bootstrap-Icons,1.11.3,icons.getbootstrap.com,1.11.3,"patched bootstrap-icons.scss for custom folder structure, includes animation & size variables"
+Font-Awesome6,6.7.2,fontawesome.com,6.7.2/7.0.0,add import all 'fonts' sheets into main sheet
+Bootstrap-Icons,1.13.1,icons.getbootstrap.com,1.13.1,"patched bootstrap-icons.scss for custom folder structure, includes animation & size variables"
 Adminer,4.8.1exp,www.adminer.org,4.8.4evo,"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
@@ -49,9 +49,9 @@ 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.21.0,ckeditor.com,4.22.1/44.1.0,"add fieldinsert (exp), autosave, sourcedialog & kama and moono skins"
+CKEditor,4.21.0,ckeditor.com,4.22.1/45.2.0,"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.9,tiny.cloud,5.10.9/6.8.5/7.5.1,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins"
+TinyMCE v5,5.10.9,tiny.cloud,5.10.9/6.8.6/8.0.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.65,elfinder.org,2.1.65,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.21.0exp,jqueryvalidation.org,1.21.0,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,2.1.8,www.datatables.net,1.13.8/2.1.8,includes boostrap2 integration w/ renamed 1.10.7 version
+DataTables,2.3.3,www.datatables.net,1.13.8/2.3.3,includes boostrap2 integration w/ renamed 1.10.7 version
 DataTables Checkboxes,1.3.0,github.com/gyrocode/jquery-datatables-checkboxes,1.3.0,
 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
@@ -79,38 +79,38 @@ Searcher,0.3.0,github.com/lloiser/jquery-searcher,0.3.0,
 DateTimePicker,2.5.21exp,github.com/xdan/datetimepicker,2.5.21,rename .full version; we add .js auto-close on inline date select and extra 'reset' work & remove .css z-index issue
 Bootstrap DateTimePicker,4.17.49,github.com/Eonasdan/bootstrap-datetimepicker,4.17.49,"patch for 'today' button in side-by-side view, modded version placed in bootstrap4theme & bootstrap5theme to help yadcf"
 Tempus Dominus Bootstrap 4,5.39.0,github.com/tempusdominus/bootstrap-4,5.39.0,
-Tempus Dominus Bootstrap 5,6.9.5,github.com/Eonasdan/tempus-dominus,6.9.11,added .inline z-index style; scss change @use color
+Tempus Dominus Bootstrap 5,6.10.4,github.com/Eonasdan/tempus-dominus,6.10.4,added .inline z-index style; scss change @use color
 moment.js,2.30.1,github.com/moment/moment,2.30.1,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.4,github.com/SortableJS/Sortable,1.15.4,
+Sortable,1.15.6,github.com/SortableJS/Sortable,1.15.6,
 jstree,3.3.17,github.com/vakata/jstree,3.3.17,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
 jquery-confirm,3.3.4,github.com/craftpip/jquery-confirm,3.3.4,
-bootbox,6.0.0,github.com/makeusabrew/bootbox,6.0.0,
+bootbox,6.0.4,github.com/makeusabrew/bootbox,6.0.4,
 bootstrap-touch-carousel,0.8.0exp,github.com/ixisio/bootstrap-touch-carousel,0.8.0,patched with vertical drag fix
 bootstrap-tagsinput,0.8.0exp,github.com/timschlechter/bootstrap-tagsinput,0.8.0,patched with android fix
 bootstrap-duallistbox,3.0.9/4.0.2,github.com/istvan-ujjmeszaros/bootstrap-duallistbox,4.0.2,v4.0.2 placed in bootstrap4/5theme
 Typeahead,0.11.1,twitter.github.io/typeahead.js,0.11.1,needed by bootstrap-tagsinput
 select2,4.0.13,github.com/select2/select2,4.0.13,renamed select2.full.js to select2.js
-shuffle.js,v3.1.1,github.com/Vestride/Shuffle,4.2.0/5.4.1/6.1.1,
+shuffle.js,v3.1.1,github.com/glen-cheney/Shuffle,4.2.0/5.4.1/6.1.2,
 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/5.9.0/7.4.2,
+easypost sdk,4.0.3,github.com/EasyPost/easypost-php,4.0.3/5.9.0/8.2.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,
 ,,,,
 "Optional, not included",,,,
-dompdf,3.0.1exp/1.2.2exp/0.7.0exp/0.6.2exp,github.com/dompdf/dompdf,3.0.1,"optional, patched to display our images and not break on bad tables and disable links"
-mPDF,8.2.5/8.0.17/7.1.9/6.1.4/5.7.4a,github.com/mpdf/mpdf,8.2.5,optional
-HTML2PDF,5.2.8,github.com/spipu/html2pdf,5.2.8,"optional, we tweak tcpdfConfig.php"
+dompdf,3.0.1exp/1.2.2exp/0.7.0exp/0.6.2exp,github.com/dompdf/dompdf,3.1.0,"optional, patched to display our images and not break on bad tables and disable links"
+mPDF,8.2.5/8.0.17/7.1.9/6.1.4/5.7.4a,github.com/mpdf/mpdf,8.2.6,optional
+HTML2PDF,5.2.8,github.com/spipu/html2pdf,5.3.3,"optional, we tweak tcpdfConfig.php"
 iLess,2.2.0,github.com/mishal/iless,2.2.0,"optional, has issues with bootstrap v2"
-Kint,1.1/2.2/6.0.0,github.com/kint-php/kint,6.0.0,"optional, for formatted edebug output"
+Kint,1.1/2.2/6.0.1,github.com/kint-php/kint,6.0.1,"optional, for formatted edebug output"
 ,,,,
 Not included yet,,,,
-DataTables Buttons,,www.datatables.net,2.4.2/3.2.0,
-DataTables Responsive,,www.datatables.net,2.5.0/3.0.3,
+DataTables Buttons,,www.datatables.net,2.4.2/3.2.4,
+DataTables Responsive,,www.datatables.net,2.5.0/3.0.6,
 ,,,,
 No longer included,,,,
 pwstrength-bootstrap,2.0.0,github.com/ablanco/jquery.pwstrength.bootstrap,,