Skip to content

Commit f5943f4

Browse files
committed
3.0.5
1 parent 86d684b commit f5943f4

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

code/Module.class.php

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class Module extends FormToolsModule
2525
protected $moduleDesc = "Define your own ways of exporting form submission data for view / download. Excel, Printer-friendly HTML, XML and CSV are included by default.";
2626
protected $author = "Ben Keen";
2727
protected $authorEmail = "[email protected]";
28-
protected $authorLink = "http://formtools.org";
29-
protected $version = "3.0.4";
30-
protected $date = "2017-11-22";
28+
protected $authorLink = "https://formtools.org";
29+
protected $version = "3.0.5";
30+
protected $date = "2018-01-28";
3131
protected $originLanguage = "en_us";
3232
protected $jsFiles = array(
3333
"{MODULEROOT}/scripts/admin.js",
@@ -49,15 +49,12 @@ class Module extends FormToolsModule
4949

5050
public function install($module_id)
5151
{
52-
$db = Core::$db;
5352
$L = $this->getLangStrings();
5453

5554
$success = true;
5655
$message = "";
5756

5857
try {
59-
$db->beginTransaction();
60-
6158
$this->createTables();
6259

6360
General::clearTableData();
@@ -66,11 +63,7 @@ public function install($module_id)
6663
$this->addXmlExportGroup();
6764
$this->addCsvExportGroup();
6865
$this->addModuleSettings();
69-
70-
$db->processTransaction();
71-
7266
} catch (Exception $e) {
73-
$db->rollbackTransaction();
7467
$success = false;
7568
$message = $L["notify_installation_problem_c"] . " <b>" . $e->getMessage() . "</b>";
7669
}
@@ -105,33 +98,27 @@ public function upgrade($module_id, $old_module_version)
10598

10699
public function resetHooks()
107100
{
108-
Hooks::unregisterModuleHooks("export_manager");
101+
$this->clearHooks();
109102

110103
Hooks::registerHook("template", "export_manager", "admin_submission_listings_bottom", "", "displayExportOptions");
111104
Hooks::registerHook("template", "export_manager", "client_submission_listings_bottom", "", "displayExportOptions");
112105
}
113106

114107
public function resetData()
115108
{
116-
$db = Core::$db;
117109
$L = $this->getLangStrings();
118110

119111
$success = true;
120112
$message = $L["notify_reset_to_default"];
121113

122114
try {
123-
$db->beginTransaction();
124-
125115
General::clearTableData();
126116
$this->addHtmlExportGroup();
127117
$this->addExcelExportGroup();
128118
$this->addXmlExportGroup();
129119
$this->addCsvExportGroup();
130120
$this->addModuleSettings();
131-
132-
$db->processTransaction();
133121
} catch (Exception $e) {
134-
$db->rollbackTransaction();
135122
$success = false;
136123
$message = $L["notify_installation_problem_c"] . " <b>" . $e->getMessage() . "</b>";
137124
}

0 commit comments

Comments
 (0)