2.1.3

Author: benkeen

code/General.class.php

@@ -234,15 +234,6 @@ public static function getFieldTypeSettingIds()
     }
 
 
-    public static function getValidationRuleIds()
-    {
-        $db = Core::$db;
-        $db->query("SELECT rule_id FROM {PREFIX}field_type_validation_rules");
-        $db->execute();
-        return $db->fetchAll(PDO::FETCH_COLUMN);
-    }
-
-
     public static function getFormFieldIds($form_id)
     {
         $db = Core::$db;

code/Hooks.class.php

@@ -44,6 +44,7 @@ public static function verifyModuleHooks($module_folder)
 
         $actual_num_hooks = $db->numRows();
 
+        $extra_info = "";
         $result = "pass";
         if ($actual_num_hooks < $expected_num_hooks) {
             $result = "missing_hooks";
@@ -86,13 +87,14 @@ public static function verifyModuleHooks($module_folder)
 
                     if (!$found) {
                         $result = "invalid_hooks";
+                        $extra_info = "[missing: $hook_type,$action_location,$function_name,$hook_function,$priority]";
                         break;
                     }
                 }
             }
         }
 
-        return $result;
+        return array($result, $extra_info);
     }
 
 

code/Module.class.php

@@ -13,8 +13,8 @@ class Module extends FormToolsModule
     protected $author = "Ben Keen";
     protected $authorEmail = "[email protected]";
     protected $authorLink = "http://formtools.org";
-    protected $version = "2.1.2";
-    protected $date = "2017-11-25";
+    protected $version = "2.1.3";
+    protected $date = "2017-12-20";
     protected $originLanguage = "en_us";
     protected $jsFiles = array("scripts/tests.js");
     protected $cssFiles = array("css/styles.css");

code/Orphans.class.php

@@ -1026,6 +1026,13 @@ private static function testFieldTypeValidationRules($remove_orphans)
     }
 
 
+    /**
+     * N.B. The field_validation table has a composite primary key of rule_id and field_id. rule_id is just an integer
+     * from 1-N, where N is the number of validation rules for the field type. So this test just looks for and clears out
+     * invalid field IDs - rule IDs are neither here nor there.
+     * @param $remove_orphans
+     * @return array
+     */
     private static function testFieldValidation($remove_orphans)
     {
         $db = Core::$db;
@@ -1036,37 +1043,23 @@ private static function testFieldValidation($remove_orphans)
         );
 
         $valid_field_ids = General::getFieldIds();
-        $valid_rule_ids = General::getValidationRuleIds();
 
         $db->query("SELECT rule_id, field_id FROM {PREFIX}field_validation");
         $db->execute();
         $rows = $db->fetchAll();
 
         $num_tests = 0;
         foreach ($rows as $row) {
-            if (!in_array($row["rule_id"], $valid_rule_ids)) {
-                $response["problems"][] = "Invalid reference to rule_id: {$row["rule_id"]} for field_id: {$row["field_id"]}";
-
-                // clean-up code
-                if ($remove_orphans) {
-                    $db->query("
-                        DELETE FROM {PREFIX}field_validation
-                        WHERE  rule_id = :rule_id
-                    ");
-                    $db->bind("rule_id", $row["rule_id"]);
-                    $db->execute();
-                }
-            }
             if (!in_array($row["field_id"], $valid_field_ids)) {
                 $response["problems"][] = "Invalid reference to field_id: {$row["field_id"]} for rule_id: {$row["rule_id"]}";
 
                 // clean-up code
                 if ($remove_orphans) {
                     $db->query("
                         DELETE FROM {PREFIX}field_validation
-                        WHERE  rule_id = :rule_id
+                        WHERE  field_id = :field_id
                     ");
-                    $db->bind("rule_id", $row["rule_id"]);
+                    $db->bind("field_id", $row["field_id"]);
                     $db->execute();
                 }
             }

code/actions.php

@@ -71,13 +71,14 @@
         $module_info   = Modules::getModule($module_id);
         $module_folder  = $module_info["module_folder"];
         $module_version = $module_info["version"];
-        $result = Hooks::verifyModuleHooks($module_folder);
+        list ($result, $extra_info) = Hooks::verifyModuleHooks($module_folder);
 
         echo json_encode(array(
             "module_id" => $module_id,
             "module_folder" => $module_folder,
             "module_name" => $module_info["module_name"],
-            "result" => $result
+            "result" => $result,
+            "extra" => $extra_info
         ));
         break;