Returning to FT for PHP 8 support

Author: benkeen

.nvmrc

@@ -0,0 +1 @@
+v14.20.0

gruntfile.js

@@ -1,14 +1,13 @@
 const fs = require('fs');
 const path = require('path');
 const lineByLine = require('n-readlines');
-const sass = require('node-sass');
+const sass = require('sass');
 const pkg = require('./package.json');
 const child_process = require('child_process');
 
 const release_folder = 'formtools_releases';
 const formtools_releases_folder = path.resolve(__dirname, '..', release_folder);
 
-
 // i18n string keys that aren't used in the Core, but useful for multiple other modules, so placed here. These allow
 // the `grunt i18n` task to pass
 const globalI18nStrings = [
@@ -116,7 +115,7 @@ const config = {
 			tasks: ['sync']
 		},
 		api: {
-			files: [path.resolve(__dirname, '..', active_api) + '/**'],
+			files: [path.resolve(__dirname, '..', active_api || '') + '/**'],
 			tasks: ['sync']
 		}
 	},
@@ -467,5 +466,4 @@ module.exports = function (grunt) {
 
 	// builds everything into the dist folder
 	grunt.registerTask('prod', ['i18n', 'sync', 'sass', 'run:webpack_prod']);
-
 };

package.json

@@ -95,8 +95,8 @@
     "eslint": "^6.5.1",
     "eslint-plugin-react": "^7.16.0",
     "exec": "^0.2.1",
-    "grunt": "^1.0.3",
-    "grunt-cli": "^1.2.0",
+    "grunt": "^1.5.3",
+    "grunt-cli": "^1.4.3",
     "grunt-concurrent": "^2.3.1",
     "grunt-contrib-cssmin": "^3.0.0",
     "grunt-contrib-uglify": "^4.0.0",
@@ -111,7 +111,6 @@
     "mini-css-extract-plugin": "^0.8.0",
     "moment": "^2.22.2",
     "n-readlines": "^1.0.0",
-    "node-sass": "^4.12.0",
     "postcss-loader": "^3.0.0",
     "prop-types": "^15.6.1",
     "reselect": "^3.0.1",
@@ -135,6 +134,7 @@
     "react-select": "^3.0.4",
     "redux": "^4.0.0",
     "redux-actions": "^2.3.2",
-    "redux-thunk": "^2.2.0"
+    "redux-thunk": "^2.2.0",
+    "sass": "^1.57.1"
   }
 }

src/global/code/Emails.class.php

@@ -301,7 +301,7 @@ public static function sendTestEmail($info)
 		$email_id = Sessions::get("email_id");
 		$submission_id = (isset($info["submission_id"]) && !empty($info["submission_id"])) ? $info["submission_id"] : "";
 
-		list ($success, $email_info) = self::getEmailComponents($form_id, $submission_id, $email_id, true, $info);
+		list ($success, $email_info) = self::getEmailComponents($form_id, $email_id, $submission_id, true, $info);
 		if (!$success) {
 			return array(false, $email_info);
 		}
@@ -386,7 +386,7 @@ public static function sendTestEmail($info)
 	 * @param integer $email_id
 	 * @return array
 	 */
-	public static function getEmailComponents($form_id, $submission_id = "", $email_id, $is_test = false, $test_settings = array())
+	public static function getEmailComponents($form_id, $email_id, $submission_id = "", $is_test = false, $test_settings = array())
 	{
 		$LANG = Core::$L;
 		$root_dir = Core::getRootDir();
@@ -1282,7 +1282,7 @@ public static function sendEmails($event, $form_id, $submission_id)
 	 */
 	public static function processEmailTemplate($form_id, $submission_id, $email_id)
 	{
-		list($success, $email_components) = self::getEmailComponents($form_id, $submission_id, $email_id);
+		list($success, $email_components) = self::getEmailComponents($form_id, $email_id, $submission_id);
 
 		if (!$success) {
 			return array(false, "Email components not returned properly (Emails::getEmailComponents).");

src/global/code/FieldTypes.class.php

@@ -4,7 +4,7 @@
  * This file contains all functions relating to the field types (select, radios etc). Added in 2.1.0
  * with the addition of Custom Fields.
  *
- * @copyright Benjamin Keen 2018
+ * @copyright Benjamin Keen 2023
  * @author Benjamin Keen <ben.keen@gmail.com>
  * @package 3-0-x
  */
@@ -710,7 +710,7 @@ public static function getFieldTypeProcessingInfo()
 	 * @param $field_ids
 	 * @return array a hash of [field_id][identifier] = values
 	 */
-	public static function getFormFieldFieldTypeSettings($field_ids = array(), $form_fields)
+	public static function getFormFieldFieldTypeSettings($field_ids, $form_fields)
 	{
 		$db = Core::$db;
 
@@ -1439,7 +1439,7 @@ public static function get($return_settings = false, $field_type_ids = array())
                 SELECT *, g.list_order as group_list_order, ft.list_order as field_type_list_order
                 FROM   {PREFIX}field_types ft, {PREFIX}list_groups g
                 WHERE  g.group_type = :field_types AND
-                       ft.group_id = g.group_id AND 
+                       ft.group_id = g.group_id AND
                        ft.field_type_id IN ($field_type_id_str)
                 ORDER BY g.list_order, ft.list_order
             ");
@@ -1534,7 +1534,7 @@ public static function addFieldTypeSettingOptions($options)
 	{
 		$db = Core::$db;
 
-		$query = "INSERT INTO {PREFIX}field_type_setting_options (setting_id, option_text, option_value, option_order, 
+		$query = "INSERT INTO {PREFIX}field_type_setting_options (setting_id, option_text, option_value, option_order,
             is_new_sort_group) VALUES (:setting_id, :option_text, :option_value, :option_order, :is_new_sort_group)";
 
 		foreach ($options as $option) {
@@ -1558,7 +1558,7 @@ public static function deleteFieldTypeSettingsByFieldTypeId($field_type_id)
 		$db->query("
             SELECT setting_id
             FROM   {PREFIX}field_type_settings
-            WHERE  field_type_id = :field_type_id 
+            WHERE  field_type_id = :field_type_id
         ");
 		$db->bind("field_type_id", $field_type_id);
 		$db->execute();
@@ -1878,7 +1878,7 @@ public static function resetFieldTypeSettings ($field_type_data)
 			// here, this is a new setting added to the field type that the users installation doesn't have
 			if ($found_setting === null) {
 				$db->query("
-					INSERT INTO {PREFIX}field_type_settings (field_label, field_type, field_orientation, default_value_type, 
+					INSERT INTO {PREFIX}field_type_settings (field_label, field_type, field_orientation, default_value_type,
 						default_value, list_order)
 					VALUES (:field_label, :field_type, :field_orientation, :default_value_type, :default_value, :list_order)
 				");

src/global/code/actions.php

@@ -171,7 +171,7 @@
 	case "display_test_email":
 		$form_id  = Sessions::get("form_id");
 		$email_id = Sessions::get("email_id");
-		$info = Emails::getEmailComponents($form_id, "", $email_id, true, $request);
+		$info = Emails::getEmailComponents($form_id, $email_id, "", true, $request);
 		echo returnJSON($info);
 		break;
 

src/install/index.php

@@ -18,6 +18,7 @@
 Core::setCurrentLang(General::loadField("lang", "lang", Core::getDefaultLang()));
 $root_url = Core::getRootUrl();
 $LANG = Core::$L;
+
 ?>
 <!doctype html>
 <html>

src/react/installation/pages/Step5.component.js

@@ -13,7 +13,7 @@ class Step5 extends Component {
 
 		if (errorLoading) {
 			return (
-				<div>blah.</div>
+				<div>Error: {errorLoading}</div>
 			);
 		}
 

src/react/store/components/index.js

@@ -1,4 +1,4 @@
-import reducer from './reducers';
+import * as reducer from './reducers';
 import * as actions from './actions';
 import * as selectors from './selectors';