Merge branch 'develop'

.htaccess

@@ -34,6 +34,8 @@ DirectoryIndex index.php
 #    RewriteCond %{HTTPS} !=on
 #    RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
 
+    RewriteRule ^.*\.git.* - [R=404]
+
 # the next two lines will dish out .html pages if they exist, which may not be a desired effect!
     RewriteRule ^$ index.html [QSA]
     RewriteRule ^([^.]+)$ $1.html [QSA]

CHANGELOG.md

@@ -10,6 +10,13 @@ For a more detailed changelog visit [https://github.com/exponentcms/exponent-cms
 
 ----------
 
+Version 2.5.0
+-------------
+### Address issues in v2.4.3 and Prepare for v3.0.0
+ - compatible with PHP 7.1.x, 7.2.x and 7.3.x
+   - adds support for PHP v 7.3.x
+   - removed support for PHP 5.5.x, 5.6.x and 7.0.x
+
 Version 2.4.3
 -------------
 ### Address issues in v2.4.2 and Prepare for v3.0.0

RELEASE.md

@@ -8,8 +8,8 @@ Copyright (c) 2004-2018 OIC Group, Inc.
 
 For a complete list of the changes made from release to release, see the [CHANGELOG.md](CHANGELOG.md)
 
-## 2.4.3 - July 2018
+## 2.5.0 - December 2018
 
 ----------
 
-### Address issues in v2.4.2 and Prepare for v3.0.0
+### Address issues in v2.4.3 and Prepare for v3.0.0

cron/lang_extract.php

@@ -117,7 +117,7 @@ function do_extract($file, $regex, $isalist=false) {
            $matches,
            PREG_PATTERN_ORDER
    	);
-    print "$file"." - ";
+    print "$file" . " - ";
     $num_added = 0;
 	for ($i = 0, $iMax = count($matches[0]); $i < $iMax; $i++) {
         str_replace('"', "\'", $matches[0][$i]);  // remove the killer double-quotes
@@ -140,11 +140,11 @@ function do_extract($file, $regex, $isalist=false) {
 function do_file($file, $fileext) {
 	global $regex_gt, $regex_gettext_mod, $regex_gettxtlist_mod, $regex_gettext_func, $regex_glist;
 
-    if ($fileext == 'tpl') {
+    if ($fileext === 'tpl') {
         do_extract($file,$regex_gettext_mod);
         do_extract($file,$regex_gettxtlist_mod,true);
 //        do_extract($file,$regex_gettext_func);  //FIXME these tend to hold computations and likewise break things?
-    } elseif ($fileext == 'php') {
+    } elseif ($fileext === 'php') {
         do_extract($file,$regex_gt);
         do_extract($file,$regex_glist,true);
     }
@@ -157,7 +157,7 @@ function do_dir($dir) {
 	$d = dir($dir);
 
 	while (false !== ($entry = $d->read())) {
-		if ($entry == '.' || $entry == '..') {
+		if ($entry === '.' || $entry === '..') {
 			continue;
 		}
 
@@ -179,9 +179,9 @@ function do_dir($dir) {
 
 for ($ac=1; $ac < $_SERVER['argc']; $ac++) {
     print "Extracting Language Phrases\n";
-	if ($_SERVER['argv'][$ac] == '-r') {
+	if ($_SERVER['argv'][$ac] === '-r') {
 		$recur = false;
-	} elseif ($_SERVER['argv'][$ac] == '-t'){
+	} elseif ($_SERVER['argv'][$ac] === '-t'){
 		$custom = true;
     } elseif (is_dir($_SERVER['argv'][$ac])) { // go through directory
 		do_dir($_SERVER['argv'][$ac]);

cron/lang_translate.php

@@ -44,7 +44,7 @@
 if (empty($default_lang))
     $default_lang = include(BASE."framework/core/lang/English - US.php");
 
-if (LANGUAGE=="English - US") {
+if (LANGUAGE === "English - US") {
     print "You can't update the current language 'English - US' which is also the default translation!\n";
     print "Create and/or Switch to another Translation using Manage Translations!\n";
     print "Or use the 'lang_extract.php' script to add new phrases to it.\n";

cron/lang_update.php

@@ -26,10 +26,10 @@
 $trans_only = false;
 $extract_only = false;
 for ($ac=1; $ac < $_SERVER['argc']; $ac++) {
-	if ($_SERVER['argv'][$ac] == '-t') {
+	if ($_SERVER['argv'][$ac] === '-t') {
         $trans_only = true;  // only do translation, NO phrase extraction
-    } elseif ($_SERVER['argv'][$ac] == '-e'){
-               $extract_only = true;  // only do phrase extraction, NO translation
+    } elseif ($_SERVER['argv'][$ac] === '-e'){
+        $extract_only = true;  // only do phrase extraction, NO translation
 	} else { // set translation type
         if (!defined('TRANSLATE')) {
             define('TRANSLATE', $_SERVER['argv'][$ac]);
@@ -88,7 +88,7 @@
 //exit();
 
 foreach ($lang_list as $key=>$value) {
-    if (!empty($key) && $key!="English - US") {
+    if (!empty($key) && $key !== "English - US") {
         output("Now attempting to translate new ".$key." phrases\n");
         expSettings::change('LANGUAGE', $key);
         exec ('php ./lang_translate.php', $output);

exponent_bootstrap.php

@@ -20,9 +20,9 @@
 /**
  * Minimum PHP version check
  */
-//if (version_compare(PHP_VERSION, '5.5.0', 'lt')) {
+//if (version_compare(PHP_VERSION, '5.6.0', 'lt')) {
 //    echo "<h1 style='padding:10px;border:5px solid #992222;color:red;background:white;position:absolute;top:100px;left:300px;width:400px;z-index:999'>
-//        PHP 5.5.0+ is required!  Please refer to the Exponent documentation for details:<br />
+//        PHP 5.6.0+ is required!  Please refer to the Exponent documentation for details:<br />
 //        <a href=\"http://docs.exponentcms.org/docs/current/requirements-running-exponent-cms\" target=\"_blank\">http://docs.exponentcms.org/</a>
 //        </h1>";
 //    die();

exponent_constants.php

@@ -589,10 +589,10 @@
  * Changing the versions here lets Exponent adjust where to look
  */
 if (!defined('MPDF7_VERSION')) {
-    define('MPDF7_VERSION', '7.1.1');
+    define('MPDF7_VERSION', '7.1.4');
 }
 if (!defined('HTML2PDF5_VERSION')) {
-    define('HTML2PDF5_VERSION', '5.1.0');
+    define('HTML2PDF5_VERSION', '5.2.0');
 }
 
 ?>

exponent_version.php

@@ -49,8 +49,8 @@
 	} else {
 		// the info for the "next" version if we are a pre-release from the repository
 		define('EXPONENT_VERSION_MAJOR','2');
-		define('EXPONENT_VERSION_MINOR','4');
-		define('EXPONENT_VERSION_REVISION','3');
+		define('EXPONENT_VERSION_MINOR','5');
+		define('EXPONENT_VERSION_REVISION','0');
 		define('EXPONENT_VERSION_TYPE','develop');
 		define('EXPONENT_VERSION_ITERATION','');
 		define('EXPONENT_VERSION_BUILDDATE',time());

external/ExtPrograms.csv

@@ -10,13 +10,13 @@ minify,2.3.3,github.com/mrclay/minify,2.3.3/3.0.3,modify config.php
 YUI2,2.9.0,developer.yahoo.com/yui/2,2.9.0,
 YUI3,3.18.1,github.com/yui/yui3/releases,3.18.1,
 yui2in3,,github.com/yui/2in3,,
-recaptchalib,1.1.3,github.com/google/ReCAPTCHA,1.1.3,
+recaptchalib,1.2.1,github.com/google/ReCAPTCHA,1.2.1,
 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.3.1,github.com/gggeek/phpxmlrpc,4.3.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.5.1,github.com/simplepie/simplepie,1.5.1,
+SimplePie,1.5.2,github.com/simplepie/simplepie,1.5.2,
 pixidou,0.1exp,github.com/asvinb/pixidou,0.1,"placed in Pixidou module, heavily modified at this point"
 class.upload,0.33,github.com/verot/class.upload.php,0.34,Correct flip operation where flip vertical & horizontal were inverted/swapped
 iCalCreator,2.24.0,github.com/iCalcreator/iCalcreator,2.24.0,php7 fixes & vcalendar $this->filename fix
@@ -25,10 +25,14 @@ lessphp,0.5.0,github.com/leafo/lessphp,0.5.0,will not compile bootstrap v3+
 less.php,1.7.0.14,github.com/oyejorge/less.php,1.7.0.14,
 Twitter-Bootstrap2,2.3.2,twitter.github.com/bootstrap,2.3.2,"patched bootstrap.less includes swatches, fontawesome & exp variables"
 Twitter-Bootstrap3,3.3.7,twitter.github.com/bootstrap,3.3.7,patched bootstrap.less includes swatches & exp variables
+Twitter-Bootstrap4,4.1.3,twitter.github.com/bootstrap,4.1.3,patched bootstrap.scss includes swatches & exp variables
+popper.js,1.14.4,github.com/FezVrasta/popper.js,1.14.4,needed by BS4
 Bootswatch2,2.3.2,bootswatch.com/,2.3.2,
 Bootswatch3,3.3.7,bootswatch.com/,3.3.7,change 1st line variables.less comment to output to .css file
+Bootswatch4,4.1.3,bootswatch.com/,4.1.3,change 1st line variables.scss comment to output to .css file
 Font-Awesome3,3.2.1,fortawesome.github.com/Font-Awesome,3.2.1,updated FontAwesomePath in variables.less
 Font-Awesome4,4.7.0,fortawesome.github.com/Font-Awesome,4.7.0,
+Font-Awesome5,5.3.1,fontawesome.com,5.3.1,add 'fonts' to main sheet
 Adminer,4.6.3exp,www.adminer.org,4.6.3,"customized plugins: tinymce, ckeditor, previewSerialized, edit-textarea & edit-calendar; edit sql tweak"
 SimpleAjaxUploader,2.6.2,github.com/LPology/Simple-Ajax-Uploader,2.6.2,also converted to yui module 2.5.3
 normalize.css,8.0.0,necolas.github.com/normalize.css/,8.0.0,auto included in bootstrap 3
@@ -40,9 +44,9 @@ 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.10.0,ckeditor.com,4.10.0,"add fieldinsert (exp), tableresize, sourcedialog, image2 fileupload & imageupload widgets & kama skin"
-TinyMCE,4.8.1,tinymce.com,4.8.1,"add fieldinsert (exp) & quickupload (exp) plugins, & xenmce skin"
+TinyMCE,4.8.2,tinymce.com,4.8.2,"add fieldinsert (exp) & quickupload (exp) plugins, & xenmce skin"
 PLUpload,2.3.6,github.com/moxiecode/plupload,2.3.6/3.1.2,"needed for TinyMCE Quick Upload, placed in that plugin folder"
-elFinder,2.1.39,elfinder.org,2.1.39,customized in /framework with Exponent php classes and .js files
+elFinder,2.1.42,elfinder.org,2.1.42,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
 jQuery,2.2.4,jquery.com,2.2.4,
 jQuery Migrate,1.4.1,jquery.com,1.4.1,renamed to migrate.js for easy loading as an addon
@@ -55,6 +59,7 @@ Countdown,1,tutorialzine.com/2011/12/countdown-jquery/,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.10.19,www.datatables.net,1.10.19,includes boostrap2 integration w/ renamed 1.10.7 version
+DataTables Checkboxes,1.2.11,github.com/gyrocode/jquery-datatables-checkboxes,1.2.11,
 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
 yadcf,0.9.3,github.com/vedmack/yadcf,0.9.3,
@@ -87,21 +92,17 @@ Webshim,1.16.0,github.com/aFarkas/webshim,1.16.0,
 ,,,,
 "Optional, not included",,,,
 dompdf,0.8.2exp/0.7.0exp/0.6.2exp,github.com/dompdf/dompdf,0.8.2,"optional, patched to display our images and not break on bad tables"
-mPDF,7.0.3/6.1.4/5.7.4a,github.com/mpdf/mpdf,7.1.1,optional
+mPDF,7.0.3/6.1.4/5.7.4a,github.com/mpdf/mpdf,7.1.4,optional
 log,1.0.2,github.com/php-fig/log,1.0.2,"optional, required by mPDF v7"
-HTML2PDF,5.1.0/4.6.1,github.com/spipu/html2pdf,5.1.0,"optional, we tweak tcpdfConfig.php"
+DeepCopy,1.7.0,github.com/myclabs/DeepCopy,1.7.0,"optional, required by mPDF v7"
+HTML2PDF,5.1.0/4.6.1,github.com/spipu/html2pdf,5.2.0,"optional, we tweak tcpdfConfig.php"
 TCPDF,6.2.17,sourceforge.net/projects/tcpdf,6.2.17,"optional, used by HTML2PDF"
 iLess,2.2.0,github.com/mishal/iless,2.2.0,"optional, has issues with bootstrap v2"
 Kint,2.2.0,github.com/kint-php/kint,2.2.0,"optional, for formatted edebug output"
 ,,,,
 Not included yet,,,,
-Twitter-Bootstrap,,twitter.github.com/bootstrap,4.1.3,patched bootstrap.scss includes swatches & exp variables
-popper.js,,github.com/FezVrasta/popper.js,1.14.3,needed by BS4
-Bootswatch,,bootswatch.com/,4.1.3,change 1st line variables.scss comment to output to .css file
-Font-Awesome,,fontawesome.com,5.2.0,add 'fonts' to main sheet
 DataTables Buttons,,www.datatables.net,1.5.3,
 DataTables Responsive,,www.datatables.net,2.2.3,
-DataTables Checkboxes,,github.com/gyrocode/jquery-datatables-checkboxes,1.2.11,
 ,,,,
 No longer included,,,,
 pwstrength-bootstrap,2.0.0,github.com/ablanco/jquery.pwstrength.bootstrap,2.1.3,