On Wed, Feb 13, 2008 at 10:44:50AM -0800, Bernard Li wrote:
>
> So what's the latest? Can I check in my original patch to the branch?
the original patch should work (if the spaces/tab is correct for the changes
to get_context.php just like it was done in revision 964).
> Anything else needs to be done?
to avoid noise would like to add later a "formatting" patch to 3.0.6 which
should be kept separated from the one you are going to commit and that could be
used independently for anyone which would like to cherry pick this fix into
their own 3.0.6 tree for any reason (a distribution which for some reason has
to backport the patch, for example).
Carlo
PS. extra proposed patch attached
Index: web/graph.php
===================================================================
--- web/graph.php (revision 966)
+++ web/graph.php (working copy)
@@ -41,7 +41,7 @@
$vertical_label = "";
# Assumes we have a $start variable (set in get_context.php).
-# $graph_sizes and $graph_sizes_keys defined in conf.php. Add custom sized
there.
+# $graph_sizes and $graph_sizes_keys defined in conf.php. Add custom sizes
there.
if( in_array( $size, $graph_sizes_keys ) ) {
$height = $graph_sizes[ $size ][ 'height' ];
$width = $graph_sizes[ $size ][ 'width' ];
Index: web/get_context.php
===================================================================
--- web/get_context.php (revision 966)
+++ web/get_context.php (working copy)
@@ -11,7 +11,7 @@
escapeshellcmd( clean_string( rawurldecode($_GET["G"]) ) ) : NULL;
$hostname = isset($_GET["h"]) ?
escapeshellcmd( clean_string( rawurldecode($_GET["h"]) ) ) : NULL;
-$range = isset( $_GET['r'] ) && in_array($_GET["r"], array_keys( $time_ranges
) ) ?
+$range = isset( $_GET["r"] ) && in_array($_GET["r"], array_keys( $time_ranges
) ) ?
escapeshellcmd( rawurldecode($_GET["r"])) : NULL;
$metricname = isset($_GET["m"]) ?
escapeshellcmd( clean_string( rawurldecode($_GET["m"]) ) ) : NULL;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Ganglia-developers mailing list
Ganglia-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ganglia-developers
