[GNUnet-SVN] r14789 - gauger

[gnunet]

Author: bartpolot
Date: 2011-03-30 18:34:10 +0200 (Wed, 30 Mar 2011)
New Revision: 14789

Modified:
   gauger/ajax.php
   gauger/params.php
   gauger/plot.php
   gauger/template.php
Log:
Fixed the way auto-range works, both global and local, added persistence


Modified: gauger/ajax.php
===================================================================
--- gauger/ajax.php     2011-03-30 16:18:24 UTC (rev 14788)
+++ gauger/ajax.php     2011-03-30 16:34:10 UTC (rev 14789)
@@ -18,13 +18,30 @@
     along with gauger.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-include "explore.php";
-include "params.php";
+
+include "params.php";   // Manage all parameters given by the user
+include "explore.php";  // Gather all existing hosts and counters
 init_params();
 explore();
 
-process_range();
-
+$persist = get_param('persist') == 'true';
+foreach ($range_parameters as $param_name) {
+    $prev = array_key_exists($param_name, $_SESSION);
+    if ($prev) $bck = $_SESSION[$param_name];
+    $$param_name = get_param($param_name, '', $persist, false);
+    if($$param_name === '') continue;
+    if(!is_numeric($$param_name) && $persist) {
+        if($prev) {
+            $_SESSION[$param_name] = $bck;
+        } else {
+            $_SESSION[$param_name] = '';
+        }
+        $_SESSION[$param_name."_a"] = 1;
+        $$param_name = '*';
+    } else if($persist) {
+        $_SESSION[$param_name."_a"] = 0;
+    }
+}
 $req = get_param('req');
 if($req) {
     $reqa = Array();

Modified: gauger/params.php
===================================================================
--- gauger/params.php   2011-03-30 16:18:24 UTC (rev 14788)
+++ gauger/params.php   2011-03-30 16:34:10 UTC (rev 14789)
@@ -27,13 +27,13 @@
 $current = "";
 $currentg = "";
 
-function get_param($name, $default = '', $persist = FALSE) {
+function get_param($name, $default = '', $persist = FALSE, $usesession = TRUE) 
{
     if (array_key_exists($name, $_REQUEST)) {
         $ret = $_REQUEST[$name];
         if($persist) {
             $_SESSION[$name] = $ret;
         }
-    } else if (array_key_exists($name, $_SESSION)) {
+    } else if ($usesession && array_key_exists($name, $_SESSION)) {
         $ret = $_SESSION[$name];
     } else {
         $ret = $default;
@@ -41,8 +41,8 @@
     return $ret;
 }
 
-function get_param_escsh($name, $default = '', $persist = FALSE) {
-    return escapeshellcmd(get_param($name, $default, $persist));
+function get_param_escsh($name, $default = '', $persist = FALSE, $sess = TRUE) 
{
+    return escapeshellcmd(get_param($name, $default, $persist, $sess));
 }
 
 function get_session($name, $default = '') {
@@ -53,26 +53,6 @@
     }
 }
 
-function process_range() {
-    global $range_parameters;
-    foreach ($range_parameters as $param_name) {
-        $prev = array_key_exists($param_name, $_SESSION);
-        if ($prev) $bck = $_SESSION[$param_name];
-        $$param_name = get_param($param_name, '', 
get_param('persist')=='true');
-        if(!is_numeric($$param_name) && get_param('persist') == 'true') {
-            if($prev) {
-                $_SESSION[$param_name] = $bck;
-            } else {
-                $_SESSION[$param_name] = '';
-            }
-            $_SESSION[$param_name."_a"] = 1;
-            $$param_name = '*';
-        } else if(get_param('persist') == 'true') {
-            $_SESSION[$param_name."_a"] = 0;
-        }
-    }
-}
-
 function init_params() {
     global $mode_host;
     global $mode_graph;
@@ -110,4 +90,4 @@
     }
 
     $q = get_param('q', '');
-}
\ No newline at end of file
+}

Modified: gauger/plot.php
===================================================================
--- gauger/plot.php     2011-03-30 16:18:24 UTC (rev 14788)
+++ gauger/plot.php     2011-03-30 16:34:10 UTC (rev 14789)
@@ -88,7 +88,10 @@
 
     foreach (Array('x_max', 'x_min', 'y_max', 'y_min') as $param_name) {
         $$param_name = get_param_escsh($param_name, '', false);
-        if(!is_numeric($$param_name)) $$param_name = '*';
+        $explicit = get_param_escsh($param_name, '', false, false);
+        if(!is_numeric($$param_name) ||
+                (get_session($param_name.'_a') == 1 && !$explicit))
+            $$param_name = '*';
     }
     $cmd .= " set xrange [$x_min:$x_max];";
     $cmd .= " set yrange [$y_min:$y_max];";

Modified: gauger/template.php
===================================================================
--- gauger/template.php 2011-03-30 16:18:24 UTC (rev 14788)
+++ gauger/template.php 2011-03-30 16:34:10 UTC (rev 14789)
@@ -159,28 +159,38 @@
                     }
                 });
                 $( ".auto_min" ).click(function(){
+                    var chk = this.checked;
                     if($(this).parents("#default_range_control").length > 0) {
-                        $( ".auto_min" ).attr('checked', this.checked);
-                        min = this.checked ? "auto" : 
$(this).parents(".slider_control").find(".slider-range").slider('values', 0);
+                        $( ".auto_min" ).attr('checked', chk);
+                        min = chk ? "auto" : 
$(this).parents(".slider_control").find(".slider-range").slider('values', 0);
                         $( ".plot" ).each(function() {
                             this.src = this.src.replace(/&x_min=[^&]+/g, 
'')+"&x_min="+min;
                         });
+                        $.get("ajax.php", {
+                            x_min: min,
+                            persist: "true"
+                        });
                     } else {
-                        min = this.checked ? "auto" : 
$(this).parents("tr").find(".slider-range").slider('values', 0);
+                        min = chk ? "auto" : 
$(this).parents("tr").find(".slider-range").slider('values', 0);
                         $(this).parents("tr").find(".plot").each(function(){
                             this.src = this.src.replace(/&x_min=[^&]+/g, 
'')+"&x_min="+min;
                         });
                     }
                 });
                 $( ".auto_max" ).click(function(){
+                    var chk = this.checked;
                     if($(this).parents("#default_range_control").length > 0) {
-                        $( ".auto_max" ).attr('checked', this.checked);
-                        max = this.checked ? "auto" : 
$(this).parents(".slider_control").find(".slider-range").slider('values', 1);
+                        $( ".auto_max" ).attr('checked', chk);
+                        max = chk ? "auto" : 
$(this).parents(".slider_control").find(".slider-range").slider('values', 1);
                         $( ".plot" ).each(function() {
                             this.src = this.src.replace(/&x_max=[^&]+/g, 
'')+"&x_max="+max;
                         });
+                        $.get("ajax.php", {
+                            x_max: max,
+                            persist: "true"
+                        });
                     } else {
-                        max = this.checked ? "auto" : 
$(this).parents("tr").find(".slider-range").slider('values', 1);
+                        max = chk ? "auto" : 
$(this).parents("tr").find(".slider-range").slider('values', 1);
                         $(this).parents("tr").find(".plot").each(function(){
                             this.src = this.src.replace(/&x_max=[^&]+/g, 
'')+"&x_max="+max;
                         });