2.0.4; closes #6

Author: benkeen

activity_charts/edit.php

@@ -43,8 +43,8 @@
 
 // start compiling the page vars here (save duplicate code!)
 $page_vars = array(
-    "success" => $success,
-    "message" => $message,
+    "g_success" => $success,
+    "g_message" => $message,
     "page" => $page,
     "tabs" => $tabs,
     "show_tabset_nav_links" => true,

activity_charts/page_permissions.php

@@ -9,8 +9,12 @@
 $page_vars["vis_info"] = $vis_info;
 $page_vars["views"] = $views;
 $page_vars["access_views"] = $access_views;
-$page_vars["js_messages"] = array("phrase_please_select", "phrase_please_select_form", "word_edit", "word_delete", "word_yes", "word_no");
-$page_vars["module_js_messages"] = array("phrase_delete_visualization", "confirm_delete_visualization");
+$page_vars["js_messages"] = array(
+    "phrase_please_select", "phrase_please_select_form", "word_edit", "word_delete", "word_yes", "word_no"
+);
+$page_vars["module_js_messages"] = array(
+    "phrase_delete_visualization", "confirm_delete_visualization"
+);
 
 $page_vars["head_js"] =<<< END
 $(function() {

activity_charts/settings.php

@@ -33,8 +33,8 @@
 }
 
 $page_vars = array(
-    "success" => $success,
-    "message" => $message,
+    "g_success" => $success,
+    "g_message" => $message,
     "module_settings" => $module->getSettings()
 );
 

code/ActivityCharts.class.php

@@ -492,7 +492,7 @@ private static function updateVisualizationMainTab($vis_id, $info)
             SET    vis_name = :vis_name,
                    form_id = :form_id,
                    cache_update_frequency = :cache_update_frequency
-            WHERE  vis_id = $vis_id
+            WHERE  vis_id = :vis_id
         ");
         $db->bindAll(array(
             "vis_name" => $info["vis_name"],
@@ -506,6 +506,8 @@ private static function updateVisualizationMainTab($vis_id, $info)
 
     private static function updateVisualizationAppearanceTab($vis_id, $info)
     {
+        $db = Core::$db;
+
         $db->query("
             UPDATE {PREFIX}module_data_visualizations
             SET    chart_type = :chart_type,
@@ -546,8 +548,8 @@ private static function updateVisualizationPermissionsTab($vis_id, $info)
                 VALUES ($vis_id, $account_id)
             ");
             $db->bindAll(array(
-            "vis_id" => $vis_id,
-            "account_id" => $account_id
+                "vis_id" => $vis_id,
+                "account_id" => $account_id
             ));
             $db->execute();
         }
@@ -572,5 +574,6 @@ private static function updateVisualizationPermissionsTab($vis_id, $info)
             "access_views" => $access_views,
             "vis_id" => $vis_id
         ));
+        $db->execute();
     }
 }

code/Module.class.php

@@ -16,9 +16,9 @@ class Module extends FormToolsModule
     protected $moduleDesc = "This module utilizes Google Charts API to create custom graphs and charts of your form submission data, providing an alternative, visual interpretation of your data.";
     protected $author = "Ben Keen";
     protected $authorEmail = "[email protected]";
-    protected $authorLink = "http://formtools.org";
-    protected $version = "2.0.3";
-    protected $date = "2017-11-22";
+    protected $authorLink = "https://formtools.org";
+    protected $version = "2.0.4";
+    protected $date = "2017-11-29";
     protected $originLanguage = "en_us";
     protected $jsFiles = array(
         "https://www.gstatic.com/charts/loader.js",

code/Visualizations.class.php

@@ -520,7 +520,10 @@ public static function getTabsetLinks($vis_id)
 
         $results = self::searchVisualizations($search_criteria);
 
-        $return_info = array("prev_link" => "", "next_link" => "");
+        $return_info = array(
+            "prev_link" => "",
+            "next_link" => ""
+        );
 
         // it's possible that there are NO visualization IDs: the user may have done a search that returns no results
         // but be editing a visualization on a different tab
@@ -536,8 +539,13 @@ public static function getTabsetLinks($vis_id)
         }
         $current_index = array_search($vis_id, $sorted_vis_ids);
 
+        if (!$current_index) {
+            return $return_info;
+        }
+
+        $num_results = count($sorted_vis_ids);
         if ($current_index === 0) {
-            if (count($sorted_vis_ids) > 1) {
+            if ($num_results > 1) {
                 $next_vis_id = $sorted_vis_ids[$current_index + 1];
                 if ($vis_id_to_types[$next_vis_id] == "activity") {
                     $return_info["next_link"] = "../activity_charts/edit.php?vis_id=$next_vis_id";
@@ -546,8 +554,8 @@ public static function getTabsetLinks($vis_id)
                 }
             }
         } else {
-            if ($current_index === count($sorted_vis_ids) - 1) {
-                if (count($sorted_vis_ids) > 1) {
+            if ($current_index === $num_results - 1) {
+                if ($num_results > 1) {
                     $prev_vis_id = $sorted_vis_ids[$current_index - 1];
                     if ($vis_id_to_types[$prev_vis_id] == "activity") {
                         $return_info["prev_link"] = "../activity_charts/edit.php?vis_id=$prev_vis_id";

field_charts/settings.php

@@ -35,8 +35,8 @@
 }
 
 $page_vars = array(
-    "success" => $success,
-    "message" => $message,
+    "g_success" => $success,
+    "g_message" => $message,
     "module_settings" => $module->getSettings()
 );