Skip to content

Commit 91fe387

Browse files
committed
Merge branch 'develop'
2 parents 76e20da + 1d3a093 commit 91fe387

428 files changed

Lines changed: 19989 additions & 12823 deletions

File tree

Some content is hidden

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

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Version 2.7.2
1919
- add better metainfo for forms and records
2020
- add feature to add dates to an existing event
2121
- new blog dates calendar view
22+
- add invisible reCaptcha option
2223
- fixes several warnings/issues with PHP v8
2324
- fixes and tweaks many issues in previous versions
2425

exponent_constants.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,8 @@
532532
if (!defined('JQUERY_RELATIVE')) {
533533
define('JQUERY_VERSION', '1.12.4');
534534
define('JQUERY2_VERSION', '2.2.4');
535-
define('JQUERY3_VERSION', '3.6.3');
536-
define('JQUERY3_MIGRATE_VERSION', '3.4.0');
535+
define('JQUERY3_VERSION', '3.7.0');
536+
define('JQUERY3_MIGRATE_VERSION', '3.4.1');
537537
define('JQUERYUI_VERSION', '1.13.2');
538538
define('JQUERY_RELATIVE', PATH_RELATIVE . 'external/jquery/');
539539
define('JQUERY_PATH', BASE . 'external/jquery/');
@@ -592,6 +592,7 @@
592592
} // cdn Bootstrap v4.x script
593593
if (!defined('BS5_SCRIPT')) {
594594
define('BS5_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>');
595+
// define('BS5_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz" crossorigin="anonymous"></script>');
595596
} // cdn Bootstrap v5.x script
596597
/**
597598
* Font-Awesome CDN links
@@ -604,7 +605,7 @@
604605
define('FA5_SCRIPT', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css');
605606
} // cdn FontAwesome v5.x stylesheet
606607
if (!defined('FA6_SCRIPT')) {
607-
define('FA6_SCRIPT', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.3.0/css/all.min.css');
608+
define('FA6_SCRIPT', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css');
608609
} // cdn FontAwesome v6.x stylesheet
609610
//}
610611

@@ -616,7 +617,7 @@
616617
if (version_compare(PHP_VERSION, '7.1.0', 'lt')) {
617618
define('SMARTY_VERSION', '3.1.27');
618619
} else {
619-
define('SMARTY_VERSION', '4.3.0'); //note smarty v3.1.28+ won't work properly with php < v7.1+
620+
define('SMARTY_VERSION', '4.3.1'); //note smarty v3.1.28+ won't work properly with php < v7.1+
620621
}
621622
define('SMARTY_PATH', BASE . 'external/smarty-' . SMARTY_VERSION . '/libs/');
622623
// define('SMARTY_DEVELOPMENT', false);
@@ -661,7 +662,7 @@
661662
define('MPDF8_VERSION', '8.0.17');
662663
}
663664
if (!defined('MPDF81_VERSION')) {
664-
define('MPDF81_VERSION', '8.1.4');
665+
define('MPDF81_VERSION', '8.1.4'); // 8.1.6
665666
}
666667
/**
667668
* Log is needed for MPDF v7+

external/ExtPrograms.csv

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
Program,Version,URL,Avail version,Exponent Customization Notes:
22
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
33
Doctrine Lexer,2.1.0,github.com/doctrine/lexer,2.1.0/3.0.0,needed by swiftmailer v6
4-
Doctrine Deprecations,1.0.0,github.com/doctrine/deprecations,1.0.0,needed by Doctrine Lexer v2
4+
Doctrine Deprecations,1.0.0,github.com/doctrine/deprecations,1.1.0,needed by Doctrine Lexer v2
55
EmailValidator,3.2.4,github.com/egulias/EmailValidator,3.2.5/4.0.1,needed by swiftmailer v6; change folder structure and add autoloader to main file
66
ups-php,0.2,github.com/sanbornm/ups-php,0.2,"updated/fixed xml, etc to work"
77
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()
8-
Smarty,3.1.27/4.3.0,smarty.net,4.3.0,
8+
Smarty,3.1.27/4.3.1,smarty.net,4.3.1,
99
phpthumb,1.7.20exp,github.com/JamesHeinrich/phpThumb,1.7.20,phpThumb.config.php - we also allow &amp in parsing and err command
1010
getid3,1.9.22,github.com/JamesHeinrich/getID3,1.9.22,
1111
minify,2.3.3,github.com/mrclay/minify,2.3.3/3.0.13,modify config.php
1212
YUI2,2.9.0,developer.yahoo.com/yui/2,2.9.0,
1313
YUI3,3.18.1,github.com/yui/yui3,3.18.1,
1414
yui2in3,0.3,github.com/yui/2in3,0.3,
15-
recaptchalib,1.2.4,github.com/google/ReCAPTCHA,1.2.4,
15+
recaptchalib,1.2.4/1.3.0,github.com/google/ReCAPTCHA,1.3.0,
1616
barcode,1 5/10/2005,www.sid6581.net/cs/php-scripts/barcode,1 5/10/2005,
1717
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"
1818
xmlrpc.php,4.10.1,github.com/gggeek/phpxmlrpc,4.10.1,
@@ -21,51 +21,51 @@ Twitter API,1.0.6,github.com/J7mbo/twitter-api-php,1.0.6,used by socialmedia mod
2121
SimplePie,1.7.0,github.com/simplepie/simplepie,1.8.0,php 8 fix
2222
pixidou,0.1exp,github.com/asvinb/pixidou,0.1,"placed in Pixidou module, heavily modified at this point"
2323
class.upload,2.1.3exp,github.com/verot/class.upload.php,2.1.3,"Correct flip operation where flip vertical & horizontal were inverted/swapped, php 8 fix"
24-
iCalCreator,2.28.2,github.com/iCalcreator/iCalcreator,2.40.10/2.41.71,uncomment load utilities; php 8 fix
24+
iCalCreator,2.28.2,github.com/iCalcreator/iCalcreator,2.40.10/2.41.76,uncomment load utilities; php 8 fix
2525
scssphp,1.11.0exp,github.com/scssphp/scssphp,1.11.0,includes example server; hack to compile newui
2626
lessphp,0.5.0exp,github.com/leafo/lessphp,0.5.0,"will not compile bootstrap v3+, hack to allow prefix"
27-
less.php,3.2.0exp,github.com/wikimedia/less.php,3.2.1,php v5.6 regression fixes
27+
less.php,3.2.0exp,github.com/wikimedia/less.php,3.2.1/4.1.0,php v5.6 regression fixes
2828
Twitter-Bootstrap2,2.3.2,twitter.github.com/bootstrap,2.3.2,"patched bootstrap.less includes swatches, fontawesome & exp variables"
2929
Twitter-Bootstrap3,3.4.1,twitter.github.com/bootstrap,3.4.1,patched bootstrap.less includes swatches & exp variables
3030
Twitter-Bootstrap4,4.6.2,twitter.github.com/bootstrap,4.6.2,"patched bootstrap.scss includes swatches & exp variables, remove @page"
31-
Twitter-Bootstrap5,5.2.3,twitter.github.com/bootstrap,5.2.3,patched bootstrap.scss includes swatches & exp variables
32-
popper.js/floating-ui,1.16.1,github.com/FezVrasta/popper.js,1.16.1/2.11.6,needed by BS4/BS5 (umd)
31+
Twitter-Bootstrap5,5.2.3,twitter.github.com/bootstrap,5.3.0,patched bootstrap.scss includes swatches & exp variables
32+
popper.js/floating-ui,1.16.1,github.com/FezVrasta/popper.js,1.16.1/2.11.7,needed by BS4/BS5 (umd)
3333
Bootswatch2,2.3.2,bootswatch.com,2.3.2,
3434
Bootswatch3,3.4.1+1,bootswatch.com,3.4.1+1,change 1st line variables.less comment to output to .css file
3535
Bootswatch4,4.6.2,bootswatch.com,4.6.2,change 1st line variables.scss comment to output to .css file
3636
Bootswatch5,5.2.3,bootswatch.com,5.2.3,change 1st line variables.scss comment to output to .css file
3737
Font-Awesome3,3.2.1,fontawesome.github.com/Font-Awesome,3.2.1,updated FontAwesomePath in variables.less
3838
Font-Awesome4,4.7.0,fontawesome.github.com/Font-Awesome,4.7.0,
3939
Font-Awesome5,5.15.4,fontawesome.com,5.15.4,add import all 'fonts' sheets into main sheet
40-
Font-Awesome6,6.3.0,fontawesome.com,6.3.0,add import all 'fonts' sheets into main sheet
41-
Bootstrap-Icons,1.10.3,icons.getbootstrap.com,1.10.3,"patched bootstrap-icons.scss for custom folder structure, includes animation & size variables"
40+
Font-Awesome6,6.4.0,fontawesome.com,6.4.0,add import all 'fonts' sheets into main sheet
41+
Bootstrap-Icons,1.10.5,icons.getbootstrap.com,1.10.5,"patched bootstrap-icons.scss for custom folder structure, includes animation & size variables"
4242
Adminer,4.8.1exp,www.adminer.org,4.8.1,"customized plugins: tinymce, ckeditor, previewSerialized, edit-textarea & edit-calendar; edit sql tweak"
4343
SimpleAjaxUploader,2.6.7,github.com/LPology/Simple-Ajax-Uploader,2.6.7,also converted to yui module 2.5.3
4444
normalize.css,8.0.1,necolas.github.com/normalize.css,8.0.1,auto included in bootstrap 3
45-
MediaElement.js,5.1.0,mediaelementjs.com,6.0.1,
46-
MediaElement plugins,2.6.3,github.com/johndyer/mediaelement-plugins,2.6.3,
45+
MediaElement.js,6.0.3,mediaelementjs.com,6.0.3,
46+
MediaElement plugins,2.6.6,github.com/johndyer/mediaelement-plugins,2.6.6,
4747
Facebook PHP SDK3,3.2.3,github.com/facebook/php-graph-sdk,5.7.0,
4848
Facebook PHP SDK4,4.0.23,github.com/facebook/php-graph-sdk,5.7.0,
4949
Respond,1.4.2,github.com/scottjehl/Respond,1.4.2,IE6-8 shim
5050
html5shiv,3.7.3,github.com/aFarkas/html5shiv,3.7.3,IE6-8 shim
5151
csshover.htc,3.11,peterned.home.xs4all.nl/csshover.html,3.11,IE6 shim
52-
CKEditor,4.20.2,ckeditor.com,4.20.2/36.0.1,"add fieldinsert (exp), autosave, sourcedialog & kama and moono skins"
52+
CKEditor,4.21.0,ckeditor.com,4.21.0/38.0.1,"add fieldinsert (exp), autosave, sourcedialog & kama and moono skins"
5353
TinyMCE,4.9.11,tiny.cloud,4.9.11,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins, & xenmce skin"
54-
TinyMCE v5,5.10.7,tiny.cloud,5.10.7/6.3.2,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins"
54+
TinyMCE v5,5.10.7,tiny.cloud,5.10.7/6.4.2,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins"
5555
PLUpload,2.3.9,github.com/moxiecode/plupload,2.3.9/3.1.5,"needed for TinyMCE Quick Upload, placed in that plugin folder"
5656
elFinder,2.1.61,elfinder.org,2.1.61,customized in /framework with Exponent php classes and .js files
5757
jQuery1,1.12.4,jquery.com,1.12.4,v1.11.3 still needed for old firefox
5858
jQuery2,2.2.4,jquery.com,2.2.4,
5959
jQuery2 Migrate,1.4.1,jquery.com,1.4.1,renamed to migrate.js for easy loading as an addon
60-
jQuery3,3.6.3,jquery.com,3.6.3,
61-
jQuery3 Migrate,3.4.0,jquery.com,3.4.0,
60+
jQuery3,3.7.0,jquery.com,3.7.0,
61+
jQuery3 Migrate,3.4.1,jquery.com,3.4.1,
6262
jQueryUI,1.13.2,jqueryui.com,1.13.2,
6363
stepy,1.1.0exp,github.com/wbotelhos/stepy,1.2.0,"added button class, jquery.validate option passing"
6464
validate,1.19.5exp,jqueryvalidation.org,1.19.5,edit for 'undefined' in 'min' & 'max'
6565
Countdown,1.1,tutorialzine.com/2011/12/countdown-jquery,1.1,
6666
timepicker,1.6.3,trentrichardson.com/examples/timepicker,1.6.3,used by adminer
6767
TimeCircles,1.5.3,github.com/wimbarelds/TimeCircles,1.5.3,
68-
DataTables,1.13.3,www.datatables.net,1.13.3,includes boostrap2 integration w/ renamed 1.10.7 version
68+
DataTables,1.13.4,www.datatables.net,1.13.4,includes boostrap2 integration w/ renamed 1.10.7 version
6969
DataTables Checkboxes,1.2.13,github.com/gyrocode/jquery-datatables-checkboxes,1.2.13,
7070
DataTables Tabletools,2.2.4,www.datatables.net,2.2.4,replaced by 'Buttons' in 1.10.8
7171
Responsive DataTables,0.2.0,github.com/Comanche/datatables-responsive,0.2.0,replaced by 'Responsive' in 1.10.8
@@ -76,16 +76,17 @@ excoloSlider,1.1.0,excolo.github.io/Excolo-Slider,1.1.0,
7676
OwlCarousel2,2.3.4,github.com/smashingboxes/OwlCarousel2,2.3.4,
7777
colorbox,1.6.4,www.jacklmoore.com/colorbox,1.6.4,using style #5 renamed to jquery.colorbox.css
7878
Searcher,0.3.0,github.com/lloiser/jquery-searcher,0.3.0,
79-
DateTimePicker,2.5.21exp,xdsoft.net/jqplugins/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
79+
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
8080
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"
8181
Tempus Dominus Bootstrap 4,5.39.0,github.com/tempusdominus/bootstrap-4,5.39.0,
82-
Tempus Dominus Bootstrap 5,6.2.10,github.com/Eonasdan/tempus-dominus,6.2.10,added .inline z-index style
82+
Tempus Dominus Bootstrap 5,6.7.7,github.com/Eonasdan/tempus-dominus,6.7.7,added .inline z-index style; scss change @use color
8383
moment.js,2.29.4,github.com/moment/moment,2.29.4,needed for Bootstrap DateTimePicker; min/moment-with-locales.js renamed
8484
strength-meter,1.1.4,github.com/kartik-v/strength-meter,1.1.4,
8585
Sortable,1.15.0,github.com/SortableJS/Sortable,1.15.0,
8686
jstree,3.3.15,github.com/vakata/jstree,3.3.15,added nav menu icons to stylesheet
8787
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
8888
impromptu,6.2.3,trentrichardson.com/Impromptu,6.2.3,add some colors to .css
89+
jquery-confirm,3.3.4,github.com/craftpip/jquery-confirm,3.3.4,
8990
bootbox,6.0.0,github.com/makeusabrew/bootbox,6.0.0,
9091
bootstrap-touch-carousel,0.8.0exp,github.com/ixisio/bootstrap-touch-carousel,0.8.0,patched with vertical drag fix
9192
bootstrap-tagsinput,0.8.0exp,github.com/timschlechter/bootstrap-tagsinput,0.8.0,patched with android fix
@@ -95,28 +96,28 @@ select2,4.0.13,github.com/select2/select2,4.0.13,renamed select2.full.js to sele
9596
shuffle.js,v3.1.1,github.com/Vestride/Shuffle,4.2.0/5.4.1/6.1.0,
9697
Jasny Bootstrap2,2.3.1,jasny.github.io/bootstrap,2.3.1,only using bootstrap-fileupload at this time
9798
Jasny Bootstrap,4.0.0,jasny.github.io/bootstrap,4.0.0,only using fileinput at this time
98-
easypost sdk,4.0.3,github.com/EasyPost/easypost-php,4.0.3/6.3.0,
99+
easypost sdk,4.0.3,github.com/EasyPost/easypost-php,4.0.3/6.6.0,
99100
jquery.cookie.js,1.4.1,github.com/carhartl/jquery-cookie,1.4.1,
100101
jquery.history.js,1.8b2,github.com/browserstate/history.js,1.8.0,
101102
Webshim,1.16.0,github.com/aFarkas/webshim,1.16.0,
102103
,,,,
103104
"Optional, not included",,,,
104-
dompdf,"2.0.3exp,1.2.2exp/0.7.0exp/0.6.2exp",github.com/dompdf/dompdf,2.0.3,"optional, patched to display our images and not break on bad tables and disable links"
105-
mPDF,8.1.4/8.0.17/7.1.9/6.1.4/5.7.4a,github.com/mpdf/mpdf,8.1.4,optional
105+
dompdf,2.0.3exp/1.2.2exp/0.7.0exp/0.6.2exp,github.com/dompdf/dompdf,2.0.3,"optional, patched to display our images and not break on bad tables and disable links"
106+
mPDF,8.1.4/8.0.17/7.1.9/6.1.4/5.7.4a,github.com/mpdf/mpdf,8.1.6,optional
106107
log,1.1.4,github.com/php-fig/log,1.1.4,"optional, required by mPDF v7+"
107-
DeepCopy,1.7.0,github.com/myclabs/DeepCopy,1.11.0,"optional, suggested by mPDF v7+ for TOC"
108+
DeepCopy,1.7.0,github.com/myclabs/DeepCopy,1.11.1,"optional, suggested by mPDF v7+ for TOC"
108109
random_compat,2.0.21,github.com/paragonie/random_compat,2.0.21,"optional, required by mPDF v7+"
109110
http-message,1,github.com/php-fig/http-message,1,"optional, required by mPDF v8.1+"
110111
message-factory,1.0.1,github.com/php-http/message-factory,1.0.1,"optional, required by mPDF v8.1+"
111112
FPDI,2.3.6,github.com/Setasign/FPDI,2.3.7,"optional, required by mPDF v7+"
112113
HTML2PDF,5.2.7/4.6.1,github.com/spipu/html2pdf,5.2.7,"optional, we tweak tcpdfConfig.php"
113114
TCPDF,6.6.2,sourceforge.net/projects/tcpdf,6.6.2,"optional, used by HTML2PDF"
114115
iLess,2.2.0,github.com/mishal/iless,2.2.0,"optional, has issues with bootstrap v2"
115-
Kint,1.1/2.2/5.0.4,github.com/kint-php/kint,5.0.4,"optional, for formatted edebug output"
116+
Kint,1.1/2.2/5.0.5,github.com/kint-php/kint,5.0.5,"optional, for formatted edebug output"
116117
,,,,
117118
Not included yet,,,,
118-
DataTables Buttons,,www.datatables.net,2.3.5,
119-
DataTables Responsive,,www.datatables.net,2.4.0,
119+
DataTables Buttons,,www.datatables.net,2.3.6,
120+
DataTables Responsive,,www.datatables.net,2.4.1,
120121
,,,,
121122
No longer included,,,,
122123
pwstrength-bootstrap,2.0.0,github.com/ablanco/jquery.pwstrength.bootstrap,,

external/ReCaptcha/README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ and v3.
1313
- reCAPTCHA: https://www.google.com/recaptcha
1414
- This repo: https://github.com/google/recaptcha
1515
- Hosted demo: https://recaptcha-demo.appspot.com/
16-
- Version: 1.2.4
16+
- Version: 1.3.0
1717
- License: BSD, see [LICENSE](LICENSE)
1818

1919
## Installation
@@ -26,17 +26,22 @@ Use [Composer](https://getcomposer.org) to install this library from Packagist:
2626
Run the following command from your project directory to add the dependency:
2727

2828
```sh
29-
composer require google/recaptcha "^1.2"
29+
composer require google/recaptcha "^1.3"
3030
```
3131

3232
Alternatively, add the dependency directly to your `composer.json` file:
3333

3434
```json
3535
"require": {
36-
"google/recaptcha": "^1.2"
36+
"google/recaptcha": "^1.3"
3737
}
3838
```
3939

40+
### Support for earlier versions of PHP
41+
42+
The 1.3 release moves to PHP 8 and up. For earlier versions, you will need to
43+
stay with the 1.2 releases.
44+
4045
### Direct download
4146

4247
Download the [ZIP file](https://github.com/google/recaptcha/archive/master.zip)
@@ -66,7 +71,9 @@ This library comes in when you need to verify the user's response. On the PHP
6671
side you need the response from the reCAPTCHA service and secret key from your
6772
credentials. Instantiate the `ReCaptcha` class with your secret key, specify any
6873
additional validation rules, and then call `verify()` with the reCAPTCHA
69-
response and user's IP address. For example:
74+
response (usually in `$_POST['g-recaptcha-response']` or the response from
75+
`grecaptcha.execute()` in JS which is in `$gRecaptchaResponse` in the example)
76+
and user's IP address. For example:
7077

7178
```php
7279
<?php

0 commit comments

Comments
 (0)