2.0.3

formtools · Nov 23, 2017 · a57f8ee · a57f8ee
1 parent c550cf9
commit a57f8ee
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/code/ActivityCharts.class.php b/code/ActivityCharts.class.php
@@ -7,7 +7,7 @@
 use FormTools\General as CoreGeneral;
 use FormTools\Modules;
 use FormTools\ViewFilters;
-use PDO, PDOException;
+use PDO, Exception;
 
 
 class ActivityCharts
@@ -66,7 +66,7 @@ public static function addActivityChart($info, $L)
                 "line_width" => $line_width
             ));
             $db->execute();
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             return array(false, $L["notify_error_creating_activity_chart"] . $e->getMessage(), "");
         }
 
@@ -93,7 +93,7 @@ public static function updateActivityChart($vis_id, $tab, $info, $L)
 
             // always clear the cache
             Visualizations::clearVisualizationCache($vis_id);
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             return array(false, $L["notify_error_updating_activity_chart"], "");
         }
 
@@ -293,7 +293,6 @@ public static function getActivityAccountSelectQueryInfo($submission_count_group
             // if no date range clause was specified, the user wants to return everything. In which case, the start date
             // is dependant on what's stored in the database. [The end date is ALWAYS today - regardless of how messed up the
             // submission data info actually is]
-            $first_day = "";
             if (empty($date_range_clause))  {
                 $where_clause = "";
                 if (!empty($filter_sql_clause)) {

diff --git a/code/FieldCharts.class.php b/code/FieldCharts.class.php
@@ -10,7 +10,7 @@
 use FormTools\OptionLists;
 use FormTools\Modules;
 use FormTools\ViewFilters;
-use PDOException;
+use Exception;
 
 
 class FieldCharts
@@ -62,7 +62,7 @@ public static function addFieldChart($info, $L)
                 "include_legend_full_size" => $include_legend_full_size
             ));
             $db->execute();
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             return array(false, $L["notify_error_creating_field_chart"], "");
         }
 
@@ -268,7 +268,7 @@ private static function updateFieldChartMainTab($vis_id, $info)
                 "vis_id" => $vis_id
             ));
             $db->execute();
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             return array(false, $e->getMessage());
         }
 
@@ -313,7 +313,7 @@ private static function updateFieldChartAppearanceTab($vis_id, $info)
                 "vis_id" => $vis_id
             ));
             $db->execute();
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             return array(false, $e->getMessage());
         }
 

diff --git a/code/General.class.php b/code/General.class.php
@@ -6,7 +6,7 @@
 use FormTools\Forms;
 use FormTools\General as CoreGeneral;
 use FormTools\Views;
-use PDO, PDOException;
+use PDO, Exception;
 
 
 class General
@@ -200,7 +200,7 @@ public static function updateVisualizationCache($vis_id, $data)
                 "data" => $data
             ));
             $db->execute();
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             // TODO
         }
     }

diff --git a/code/Module.class.php b/code/Module.class.php
@@ -7,7 +7,7 @@
 use FormTools\Hooks;
 use FormTools\Settings;
 use FormTools\Module as FormToolsModule;
-use PDO, PDOException;
+use Exception;
 
 
 class Module extends FormToolsModule
@@ -17,8 +17,8 @@ class Module extends FormToolsModule
     protected $author = "Ben Keen";
     protected $authorEmail = "ben.keen@gmail.com";
     protected $authorLink = "http://formtools.org";
-    protected $version = "2.0.2";
-    protected $date = "2017-11-07";
+    protected $version = "2.0.3";
+    protected $date = "2017-11-22";
     protected $originLanguage = "en_us";
     protected $jsFiles = array(
         "https://www.gstatic.com/charts/loader.js",
@@ -92,7 +92,7 @@ public function install($module_id)
                 $db->execute();
             }
             $db->processTransaction();
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             $db->rollbackTransaction();
             $L = $this->getLangStrings();
             return array(false, $L["notify_installation_problem_c"] . " <b>" . $e->getMessage() . "</b>");

diff --git a/code/Visualizations.class.php b/code/Visualizations.class.php
@@ -5,7 +5,7 @@
 use FormTools\Core;
 use FormTools\Menus;
 use FormTools\Modules;
-use PDO, PDOException;
+use PDO, Exception;
 
 class Visualizations
 {
@@ -35,7 +35,7 @@ public static function addVisualization($info, $L)
             ));
             $db->execute();
 
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             return array(true, $L["notify_visualization_not_added"]);
         }
 

diff --git a/lang/en_us.php b/lang/en_us.php
@@ -214,6 +214,7 @@
 $L["notify_visualization_cache_cleared"] = "The visualization cache has been cleared.";
 $L["notify_specific_visualization_cache_cleared"] = "The cache for this visualization has been cleared.";
 $L["notify_no_internet_connection"] = "Sorry, we cannot load the Google Charts library. This is most likely caused by there being no internet connection available.";
+$L["notify_installation_problem_c"] = "There was a problem installing the module: ";
 
 $L["confirm_delete_visualization"] = "Are you sure you want to delete this visualization?";
 
diff --git a/module_config.php b/module_config.php
@@ -220,7 +220,7 @@
     "activity_charts/page_permissions.php",
     "activity_charts/settings.php",
     "code/ActivityCharts.class.php",
-    "code/FIeldCharts.class.php",
+    "code/FieldCharts.class.php",
     "code/General.class.php",
     "code/Module.class.php",
     "code/Visualizations.class.php",