From 6cb0a1ae67ea3d0b6fab485f60de46515b3f8bde Mon Sep 17 00:00:00 2001
From: Ben Keen <ben.keen@gmail.com>
Date: Wed, 22 Nov 2017 19:54:00 -0800
Subject: [PATCH] 3.0.4

---
 code/General.class.php |  1 -
 code/Module.class.php  | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/code/General.class.php b/code/General.class.php
index 9b725bd..f57fe3e 100644
--- a/code/General.class.php
+++ b/code/General.class.php
@@ -6,7 +6,6 @@
 use FormTools\Files;
 use FormTools\General as CoreGeneral;
 use FormTools\Modules;
-use PDO;
 
 
 class General
diff --git a/code/Module.class.php b/code/Module.class.php
index 9b9159c..7181a98 100644
--- a/code/Module.class.php
+++ b/code/Module.class.php
@@ -16,7 +16,7 @@
 use FormTools\Submissions;
 use FormTools\Views;
 
-use PDOException;
+use Exception;
 
 
 class Module extends FormToolsModule
@@ -26,8 +26,8 @@ class Module extends FormToolsModule
     protected $author = "Ben Keen";
     protected $authorEmail = "ben.keen@gmail.com";
     protected $authorLink = "http://formtools.org";
-    protected $version = "3.0.3";
-    protected $date = "2017-11-07";
+    protected $version = "3.0.4";
+    protected $date = "2017-11-22";
     protected $originLanguage = "en_us";
     protected $jsFiles = array(
         "{MODULEROOT}/scripts/admin.js",
@@ -69,7 +69,7 @@ public function install($module_id)
 
             $db->processTransaction();
 
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             $db->rollbackTransaction();
             $success = false;
             $message = $L["notify_installation_problem_c"] . " <b>" . $e->getMessage() . "</b>";
@@ -117,7 +117,7 @@ public function resetData()
             $this->addModuleSettings();
 
             $db->processTransaction();
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             $db->rollbackTransaction();
             $success = false;
             $message = $L["notify_installation_problem_c"] . " <b>" . $e->getMessage() . "</b>";
@@ -383,7 +383,7 @@ public function addExcelExportGroup()
         ExportTypes::addExportType(array(
             "export_type_name" => $L["phrase_table_format"],
             "visibility" => "show",
-            "filename" => "submissions-{\$M}.{\$j}.html",
+            "filename" => "submissions-{\$M}.{\$j}.xls",
             "export_group_id" => $export_group_id,
             "smarty_template" => $excel_smarty_template
         ), $L);
@@ -671,7 +671,7 @@ public function export ($params)
         $placeholders["export_type_name"] = $export_type_info["export_type_name"];
 
         $plugin_dirs = array("$root_dir/modules/export_manager/smarty_plugins");
-        $export_type_smarty_template = CoreGeneral::evalSmartyString($template, $placeholders, "", $plugin_dirs);
+        $export_type_smarty_template = CoreGeneral::evalSmartyString($template, $placeholders, $plugin_dirs);
 
 
         // next, add the placeholders needed for the export group smarty template