2.0.1

admin/tab_publish.php

@@ -30,8 +30,7 @@
         if (isset($_GET["delete_published_form"])) {
             $override = (isset($_GET["override"])) ? true : false;
             $published_form_id = $_GET["delete_published_form"];
-            list($success, $message) = $module->deletePublishedForm($form_id, $published_form_id,
-            $_GET["delete_form_config"], $override);
+            list($success, $message) = $module->deletePublishedForm($form_id, $published_form_id, $_GET["delete_form_config"], $L, $override);
         } else {
             if (isset($_POST["update_order"])) {
                 list($success, $message) = Forms::updatePublishedFormOrder($form_id, $L, $_POST);

code/Forms.class.php

@@ -171,7 +171,7 @@ public static function deleteFormConfiguration($form_id, $published_form_id, $L)
      * @param string $delete_form_config "yes" / "no"
      * @param boolean $override
      */
-    public static function deletePublishedForm($form_id, $published_form_id, $delete_form_config, $override = false, $L)
+    public static function deletePublishedForm($form_id, $published_form_id, $delete_form_config, $L, $override = false)
     {
         $db = Core::$db;
 

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.0";
-    protected $date = "2017-12-02";
+    protected $version = "2.0.1";
+    protected $date = "2017-12-14";
     protected $originLanguage = "en_us";
 
     // important! This needs to be updated any time the default template set filename changes
@@ -502,17 +502,19 @@ public static function inlineDataOverride($vars)
     public function deleteForm($info)
     {
         $form_id = $info["form_id"];
+        $L = $this->getLangStrings();
+
         $published_forms = Forms::getPublishedForms($form_id);
         foreach ($published_forms["results"] as $config)
         {
             $published_form_id = $config["published_form_id"];
-            list($success, $message) = Forms::deletePublishedForm($form_id, $published_form_id, "yes");
+            list($success, $message) = Forms::deletePublishedForm($form_id, $published_form_id, "yes", $L);
 
             // if there was a problem with the last function call, there was probably just a problem deleting
             // one of the files. Ignore this: just re-call the function with override "on". This ensures the configuration
             // is at least deleted
             if (!$success) {
-                Forms::deletePublishedForm($form_id, $published_form_id, "yes", true);
+                Forms::deletePublishedForm($form_id, $published_form_id, "yes", $L, true);
             }
         }
     }
@@ -527,6 +529,7 @@ public function deleteForm($info)
     public function fb_hook_delete_view($info)
     {
         $db = Core::$db;
+        $L = $this->getLangStrings();
 
         if (!isset($info["view_id"]) || !is_numeric($info["view_id"])) {
             return;
@@ -548,7 +551,7 @@ public function fb_hook_delete_view($info)
             // always attempt to delete the published form as well as the config first. If that fails, just delete the configuration
             list($success, $message) = Forms::deletePublishedForm($form_id, $published_form_id, "yes", $L);
             if (!$success) {
-                Forms::deletePublishedForm($form_id, $published_form_id, "yes", true);
+                Forms::deletePublishedForm($form_id, $published_form_id, "yes", $L, true);
             }
         }
     }

templates/help.tpl

@@ -1,4 +1,4 @@
-{include file='modules_header.tpl'}
+{ft_include file='modules_header.tpl'}
 
   <table cellpadding="0" cellspacing="0">
   <tr>
@@ -12,9 +12,9 @@
     </td>
   </tr>
   </table>
-
-  <p>
-    {$L.text_help}
+
+  <p>
+    {$L.text_help}
   </p>
 
-{include file='modules_footer.tpl'}
+{ft_include file='modules_footer.tpl'}

templates/index.tpl

@@ -1,4 +1,4 @@
-{include file='modules_header.tpl'}
+{ft_include file='modules_header.tpl'}
 
 <table cellpadding="0" cellspacing="0">
     <tr>
@@ -12,7 +12,7 @@
     </tr>
 </table>
 
-{include file='messages.tpl'}
+{ft_include file='messages.tpl'}
 
 <div class="margin_bottom_large">
     {$L.text_template_set_intro}
@@ -124,4 +124,4 @@
 </div>
 
 
-{include file='modules_footer.tpl'}
+{ft_include file='modules_footer.tpl'}

templates/settings.tpl

@@ -1,4 +1,4 @@
-{include file='modules_header.tpl'}
+{ft_include file='modules_header.tpl'}
 
 <table cellpadding="0" cellspacing="0" class="margin_bottom_large">
     <tr>
@@ -13,7 +13,7 @@
     </tr>
 </table>
 
-{include file='tabset_open.tpl'}
+{ft_include file='tabset_open.tpl'}
 
 {if $page == "main"}
     {include file='./tab_settings_main.tpl'}
@@ -25,6 +25,6 @@
     {include file='./tab_settings_main.tpl'}
 {/if}
 
-{include file='tabset_close.tpl'}
+{ft_include file='tabset_close.tpl'}
 
-{include file='modules_footer.tpl'}
+{ft_include file='modules_footer.tpl'}

templates/tab_settings_form_offline.tpl

@@ -1,6 +1,6 @@
 <div class="subtitle margin_top_large underline">{$L.phrase_form_offline_settings|upper}</div>
 
-{include file="messages.tpl"}
+{ft_include file="messages.tpl"}
 
 <form method="post" action="{$same_page}">
 

templates/tab_settings_main.tpl

@@ -1,6 +1,6 @@
 <div class="subtitle margin_top_large underline">{$L.phrase_default_publish_folder|upper}</div>
 
-{include file="messages.tpl"}
+{ft_include file="messages.tpl"}
 
 <form method="post" action="{$same_page}">
     <table cellspacing="0" cellpadding="1" class="list_table margin_bottom_large">

templates/tab_settings_thanks.tpl

@@ -1,6 +1,6 @@
 <div class="subtitle margin_top_large underline">{$L.phrase_thankyou_page|upper}</div>
 
-{include file="messages.tpl"}
+{ft_include file="messages.tpl"}
 
 <div class="margin_bottom_large">
     {$L.text_default_thankyou_page_desc}