2.0.2

Author: benkeen

code/Module.class.php

@@ -18,8 +18,8 @@ class Module extends FormToolsModule
     protected $author = "Ben Keen";
     protected $authorEmail = "[email protected]";
     protected $authorLink = "http://formtools.org";
-    protected $version = "2.0.1";
-    protected $date = "2017-11-07";
+    protected $version = "2.0.2";
+    protected $date = "2017-11-26";
     protected $originLanguage = "en_us";
 
     protected $nav = array(
@@ -333,12 +333,13 @@ public function includeGoogleMaps($template, $page_data)
      */
     public function includeStandaloneGoogleMaps($template, $page_data)
     {
-        $settings = Modules::getModuleSettings();
-        if (!isset($settings["google_maps_key"]) || empty($settings["google_maps_key"])) {
+        $google_maps_key = Modules::getModuleSettings("google_maps_key", "field_type_google_maps");
+
+        if (empty($google_maps_key)) {
             return "";
         }
 
-        $string = "<script async defer id=\"google-maps-field-lib\" src=\"https://maps.googleapis.com/maps/api/js?key={$settings["google_maps_key"]}&callback=googleMapsInit\"></script>\n";
+        $string = "<script async defer id=\"google-maps-field-lib\" src=\"https://maps.googleapis.com/maps/api/js?key={$google_maps_key}&callback=googleMapsInit\"></script>\n";
 
         // this function can either return or just echo the code directly. The Form Builder needs it returned,
         // as the template hook is called via code to keep the actual templates entered by the administrator's as simple

module_config.php

@@ -3,32 +3,32 @@
 $STRUCTURE = array();
 
 $HOOKS = array(
-  array(
-    "hook_type"       => "template",
-    "action_location" => "head_bottom",
-    "function_name"   => "",
-    "hook_function"   => "includeGoogleMaps",
-    "priority"        => "50"
-  ),
-  array(
-    "hook_type"       => "template",
-    "action_location" => "standalone_form_fields_head_bottom",
-    "function_name"   => "",
-    "hook_function"   => "includeStandaloneGoogleMaps",
-    "priority"        => "50"
-  )
+    array(
+        "hook_type"       => "template",
+        "action_location" => "head_bottom",
+        "function_name"   => "",
+        "hook_function"   => "includeGoogleMaps",
+        "priority"        => "50"
+    ),
+    array(
+        "hook_type"       => "template",
+        "action_location" => "standalone_form_fields_head_bottom",
+        "function_name"   => "",
+        "hook_function"   => "includeStandaloneGoogleMaps",
+        "priority"        => "50"
+    )
 );
 
 $FILES = array(
-  "code/",
-  "code/Module.class.php",
-  "images/",
-  "images/google_maps_icon.png",
-  "index.php",
-  "lang/",
-  "lang/en_us.php",
-  "library.php",
-  "module_config.php",
-  "templates/",
-  "templates/index.tpl"
+    "code/",
+    "code/Module.class.php",
+    "images/",
+    "images/google_maps_icon.png",
+    "index.php",
+    "lang/",
+    "lang/en_us.php",
+    "library.php",
+    "module_config.php",
+    "templates/",
+    "templates/index.tpl"
 );