2.1.0 - PHP 8 support

Author: benkeen

code/FormGenerator.class.php

@@ -679,7 +679,7 @@ public static function deleteUnfinalizedSubmissions($form_id)
             $submission_id = $submission_info["submission_id"];
 
             // delete any files associated with the submission
-            while (list($col_name, $file_upload_dir) = each($file_field_info)) {
+            foreach ($file_field_info as $col_name => $file_upload_dir) {
                 if (!empty($submission_info[$col_name])) {
                     @unlink("{$file_upload_dir}/{$submission_info[$col_name]}");
                 }

code/Forms.class.php

@@ -77,7 +77,7 @@ public static function getPublishedForms($form_id)
         $configured_forms = $db->fetchAll();
 
         $db->query("
-            SELECT count(*) 
+            SELECT count(*)
             FROM   {PREFIX}module_form_builder_forms
         ");
         $db->execute();
@@ -124,7 +124,7 @@ public static function updateConfiguredFormTemplates($published_form_id, $info,
             "error_message"  => $info["error_message_template_id"]
         );
 
-        while (list($key, $template_id) = each($template_data)) {
+        foreach ($template_data as $key => $template_id) {
             $db->query("
                 INSERT INTO {PREFIX}module_form_builder_form_templates (published_form_id, template_type, template_id)
                 VALUES (:form_id, :template_type, :template_id)
@@ -809,7 +809,7 @@ public static function saveBuilderSettings($info)
             "form_offline_page" => $info["form_offline_page_template_id"]
         );
 
-        while (list($key, $template_id) = each($template_data)) {
+        foreach ($template_data as $key => $template_id) {
             $db->query("
                 INSERT INTO {PREFIX}module_form_builder_form_templates (published_form_id, template_type, template_id)
                 VALUES (:published_form_id, :template_type, :template_id)

code/Module.class.php

@@ -18,8 +18,8 @@ class Module extends CoreModule
     protected $author = "Ben Keen";
     protected $authorEmail = "ben.keen@gmail.com";
     protected $authorLink = "https://formtools.org";
-    protected $version = "2.0.10";
-    protected $date = "2018-06-09";
+    protected $version = "2.1.0";
+    protected $date = "2023-02-26";
     protected $originLanguage = "en_us";
 
     // important! This needs to be updated any time the default template set filename changes
@@ -314,7 +314,7 @@ public function populateDefaultTemplateSets()
             TemplateSets::importTemplateSetData($template_set);
         }
     }
-    
+
 
     /**
      * This adds the "Form Builder" section on the Add Form page.

code/TemplateSets.class.php

@@ -263,8 +263,8 @@ public static function getTemplateTypeName($template_type, $L)
         $templateTypes = self::getTemplateTypes();
 
         $name = "";
-        while (list($group_name, $types) = each($templateTypes))  {
-            while (list($key, $lang_key) = each($types)) {
+        foreach ($templateTypes as $group_name => $types)  {
+            foreach ($types as $key => $lang_key) {
                 if ($key == $template_type) {
                     $name = CoreGeneral::evalSmartyString("{\$" . $lang_key . "}", $L);
                 }

form_resources/css.php

@@ -51,7 +51,7 @@
 
     $placeholder_id_to_values = $_SESSION["ft"]["form_builder"]["placeholders"];
 
-    while (list($placeholder_id, $value) = each($placeholder_id_to_values)) {
+    foreach ($placeholder_id_to_values as $placeholder_id => $value) {
         if (!isset($placeholder_hash[$placeholder_id])) {
             continue;
         }

form_resources/js.php

@@ -50,7 +50,7 @@
 
     $placeholder_id_to_values = $_SESSION["ft"]["form_builder"]["placeholders"];
 
-    while (list($placeholder_id, $value) = each($placeholder_id_to_values)) {
+    foreach ($placeholder_id_to_values as $placeholder_id => $value) {
         if (!isset($placeholder_hash[$placeholder_id])) {
             continue;
         }

smarty_plugins/function.display_template_set_type.php

@@ -10,9 +10,9 @@ function smarty_function_display_template_set_type($params, &$smarty)
 
     $type = $params["type"];
 
-    while (list($group_name, $vals) = each($template_types)) {
+    foreach ($template_types as $group_name => $vals) {
         $found = false;
-        while (list($section_key, $section_name) = each($vals)) {
+        foreach ($vals as $section_key => $section_name) {
             if ($section_key == $type) {
                 echo "<span class=\"set_type_$section_key\">$section_name</span>";
                 $found = true;

smarty_plugins/function.display_template_set_usage.php

@@ -22,7 +22,7 @@ function smarty_function_display_template_set_usage($params, &$smarty)
         echo "<span class=\"light_grey pad_left_small\">{$L["phrase_not_used"]}</span>";
     } else {
         echo "<select>";
-        while (list($form_id, $data) = each($results)) {
+        foreach ($results as $form_id => $data) {
             $form_name = htmlspecialchars($data["form_name"]);
             $usage = $data["usage"];
 

smarty_plugins/function.display_template_type.php

@@ -12,9 +12,9 @@ function smarty_function_display_template_type($params, &$smarty)
 
     $type = $params["type"];
 
-    while (list($group_name, $vals) = each($template_types)) {
+    foreach ($template_types as $group_name => $vals) {
         $found = false;
-        while (list($section_key, $section_name) = each($vals)) {
+        foreach ($vals as $section_key => $section_name) {
             if ($section_key == $type) {
                 $section_name = General::evalSmartyString("{\$" . $section_name . "}", $L);
                 echo "<span class=\"set_type_$section_key\">$section_name</span>";

smarty_plugins/function.display_template_usage.php

@@ -19,7 +19,7 @@ function smarty_function_display_template_usage($params, &$smarty)
         echo "<span class=\"light_grey pad_left_small\">{$L["phrase_not_used"]}</span>";
     } else {
         echo "<select>";
-        while (list($form_id, $data) = each($usage)) {
+        foreach ($usage as $form_id => $data) {
             $form_name = htmlspecialchars($data["form_name"]);
             $usage = $data["usage"];
             echo "<optgroup label=\"$form_name\"></optgroup>";