2.0.3; closes #4, #12

Author: benkeen

code/Forms.class.php

@@ -507,8 +507,8 @@ public static function updatePublishSettings($info, $L)
                 SET    is_published = 'yes',
                        publish_date = :publish_date,
                        filename = :filename,
-                       folder_path = :new_folder_path,
-                       folder_url = :new_folder_url
+                       folder_path = :folder_path,
+                       folder_url = :folder_url
                 WHERE  published_form_id = :published_form_id
             ");
             $db->bindAll(array(
@@ -521,8 +521,8 @@ public static function updatePublishSettings($info, $L)
             $db->execute();
 
             return array(
-                "success"     => true,
-                "url"         => $url
+                "success" => true,
+                "url"     => $url
             );
         }
 

code/Module.class.php

@@ -9,7 +9,7 @@
 use FormTools\Modules;
 use FormTools\Schemas;
 
-use PDO, Exception;
+use Exception;
 
 class Module extends CoreModule
 {
@@ -18,8 +18,8 @@ class Module extends CoreModule
     protected $author = "Ben Keen";
     protected $authorEmail = "[email protected]";
     protected $authorLink = "https://formtools.org";
-    protected $version = "2.0.2";
-    protected $date = "2017-12-15";
+    protected $version = "2.0.3";
+    protected $date = "2018-01-20";
     protected $originLanguage = "en_us";
 
     // important! This needs to be updated any time the default template set filename changes

code/actions.php

@@ -24,13 +24,13 @@
         $template_set_name = $request["template_set_name"];
         $original_set_id = isset($request["original_set_id"]) ? $request["original_set_id"] : "";
         $results = TemplateSets::createNewTemplateSet($template_set_name, $original_set_id);
-        echo json_encode($results);
+        echo returnJSON($results);
         break;
 
     case "create_new_template":
         $results = Templates::createNewTemplate($request["set_id"], $request["template_name"], $request["template_type"],
             $request["new_template_source"], $request["source_template_id"]);
-        echo json_encode($results);
+        echo returnJSON($results);
         break;
 
     case "add_resource":
@@ -39,12 +39,12 @@
         $placeholder = $request["placeholder"];
         $resource_type = $request["resource_type"];
         $result = Resources::addNewResource($set_id, $resource_name, $placeholder, $resource_type);
-        echo json_encode($result);
+        echo returnJSON($result);
         break;
 
     case "save_builder_settings":
         $result = Forms::saveBuilderSettings($request);
-        echo json_encode($result);
+        echo returnJSON($result);
         break;
 
     case "get_template_set_templates_html":
@@ -68,15 +68,21 @@
         $module_settings = $module->getSettings();
         if ($module_settings["demo_mode"] != "on") {
             $result = Forms::publishForm($request, $L);
-            echo json_encode($result);
+            echo returnJSON($result);
         }
         break;
 
     case "update_publish_settings":
         $module_settings = $module->getSettings();
         if ($module_settings["demo_mode"] != "on") {
-            $result = fb_update_publish_settings($request);
-            echo json_encode($result);
+            $result = Forms::updatePublishSettings($request, $L);
+            echo returnJSON($result);
         }
         break;
 }
+
+function returnJSON($php)
+{
+    header("Content-Type: application/json");
+    return json_encode($php);
+}

module_config.php

@@ -47,14 +47,14 @@
         "hook_type" => "code",
         "action_location" => "start",
         "function_name" => "FormTools\\Forms::deleteForm",
-        "hook_function" => "deleteForm",
+        "hook_function" => "onDeleteForm",
         "priority" => "50"
     ),
     array(
         "hook_type" => "code",
         "action_location" => "end",
         "function_name" => "FormTools\\Views::deleteView",
-        "hook_function" => "deleteView",
+        "hook_function" => "onDeleteView",
         "priority" => "50"
     )
 );

scripts/builder.js

@@ -766,7 +766,7 @@ builder_js.update_publish_settings = function (params) {
   }, params);
 
   $.ajax({
-    url: g.root_url + "/modules/form_builder/global/code/actions.php",
+    url: g.root_url + "/modules/form_builder/code/actions.php",
     type: "POST",
     data: {
       action: "update_publish_settings",
@@ -781,7 +781,8 @@ builder_js.update_publish_settings = function (params) {
     },
     dataType: "json",
     success: function (json) {
-      if (json.success == 1) {
+
+      if (json.success) {
         $("#publish_url").find("a").attr("href", json.url).html(json.url);
         $("#publish_dialog_open_form_link").attr("href", json.url);
         $("#publish_settings_response .large_textbox").val(json.url);