closes #11, closes #6

Author: benkeen

code/Module.class.php

@@ -228,8 +228,8 @@ public function resetHooks()
 
         CoreHooks::registerHook("code", "form_builder", "start", "FormTools\\Modules::moduleOverrideData", "inlineDataOverride", 50, true);
         CoreHooks::registerHook("code", "form_builder", "end", "FormTools\\General::displayCustomPageMessage", "displayFormCreatedMessage", 50, true);
-        CoreHooks::registerHook("code", "form_builder", "start", "FormTools\\Forms::deleteForm", "deleteForm", 50);
-        CoreHooks::registerHook("code", "form_builder", "end", "FormTools\\Views::deleteView", "deleteView", 50);
+        CoreHooks::registerHook("code", "form_builder", "start", "FormTools\\Forms::deleteForm", "onDeleteForm", 50);
+        CoreHooks::registerHook("code", "form_builder", "end", "FormTools\\Views::deleteView", "onDeleteView", 50);
     }
 
 
@@ -506,7 +506,7 @@ public static function inlineDataOverride($vars)
      *
      * @param array $info
      */
-    public function deleteForm($info)
+    public function onDeleteForm($info)
     {
         $form_id = $info["form_id"];
         $L = $this->getLangStrings();
@@ -537,7 +537,7 @@ public function deletePublishedForm($form_id, $published_form_id, $delete_form_c
      *
      * @param array $info
      */
-    public function fb_hook_delete_view($info)
+    public function onDeleteView($info)
     {
         $db = Core::$db;
         $L = $this->getLangStrings();

smarty_plugins/function.form_builder_edit_link.php

@@ -22,14 +22,13 @@ function smarty_function_form_builder_edit_link($params, &$smarty)
     if ($smarty->getTemplateVars("mode") != "live") {
         return;
     }
-
-    global $g_root_url;
+    $root_url = Core::getRootUrl();
 
     $published_form_id = $smarty->getTemplateVars("published_form_id");
     $form_id = $smarty->getTemplateVars("form_id");
 
     $action = Modules::getModuleSettings("edit_form_builder_link_action", "form_builder");
     $target = ($action == "new_window") ? "target=\"_blank\"" : "";
 
-    echo "<a href=\"$g_root_url/admin/forms/edit.php?form_id=$form_id&published_form_id=$published_form_id&page=publish&action=auto_open\" id=\"form_builder__edit_link\" $target>EDIT IN FORM BUILDER</a>";
+    echo "<a href=\"$root_url/admin/forms/edit/?form_id=$form_id&published_form_id=$published_form_id&page=publish&action=auto_open\" id=\"form_builder__edit_link\" $target>EDIT IN FORM BUILDER</a>";
 }