From 6a249e980d28bad08103dfe5be8c8fe2abbb8393 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 25 Nov 2007 17:14:07 +0000 Subject: [PATCH] - outdated Changed files: cacti-opera.patch -> 1.2 graph_debug_lockup_fix.patch -> 1.2 ping_php_version4_snmpgetnext.patch -> 1.2 sec_sql_injection-0.8.6j.patch -> 1.2 snmpwalk_fix.patch -> 1.2 thumbnail_graphs_not_working.patch -> 1.2 tree_console_missing_hosts.patch -> 1.2 --- cacti-opera.patch | 299 ---------------------------- graph_debug_lockup_fix.patch | 18 -- ping_php_version4_snmpgetnext.patch | 42 ---- sec_sql_injection-0.8.6j.patch | 14 -- snmpwalk_fix.patch | 15 -- thumbnail_graphs_not_working.patch | 20 -- tree_console_missing_hosts.patch | 20 -- 7 files changed, 428 deletions(-) delete mode 100644 cacti-opera.patch delete mode 100644 graph_debug_lockup_fix.patch delete mode 100644 ping_php_version4_snmpgetnext.patch delete mode 100644 sec_sql_injection-0.8.6j.patch delete mode 100644 snmpwalk_fix.patch delete mode 100644 thumbnail_graphs_not_working.patch delete mode 100644 tree_console_missing_hosts.patch diff --git a/cacti-opera.patch b/cacti-opera.patch deleted file mode 100644 index d64a1e2..0000000 --- a/cacti-opera.patch +++ /dev/null @@ -1,299 +0,0 @@ ---- cacti/include/zoom.js 2005/06/11 18:14:47 2959 -+++ cacti/include/zoom.js 2007/07/29 13:56:52 4035 -@@ -120,11 +120,11 @@ - function mouseObjLeftButtonPressed() { - var LeftButtonPressed = false; - // alert ("Button Pressed"); -- if (gBrowserObj.browser == "Netscape") { -- LeftButtonPressed = (this.event.which == 1); -+ if (gBrowserObj.browser == "IE") { -+ LeftButtonPressed = (this.event.button < 2); - // alert ("Net"); - } else { -- LeftButtonPressed = (this.event.button == 1); -+ LeftButtonPressed = (this.event.which < 2); - } - - return LeftButtonPressed; -@@ -134,12 +134,16 @@ - - function mouseObjRightButtonPressed() { - var RightButtonPressed = false; -- // alert ("Button Pressed"); -- if (gBrowserObj.browser == "Netscape") { -- RightButtonPressed = (this.event.which == 3); -+ //alert ("Button Pressed"); -+ if (gBrowserObj.browser == "IE") { -+ if ((this.event.button >= 2) && (this.event.button != 4)) { -+ RightButtonPressed = true; -+ } - // alert ("Net"); - } else { -- RightButtonPressed = (this.event.button == 2); -+ if (this.event.which > 2) { -+ RightButtonPressed = true; -+ } - } - - return RightButtonPressed; -@@ -178,28 +182,28 @@ - // launch the zoom function - - this.zoomGraphName = zoomGraphName; -- this.imgObject = document.getElementById(this.zoomGraphName); -- gUrlObj = new urlObj(this.imgObject.src); -+ this.imgObject = document.getElementById(this.zoomGraphName); -+ gUrlObj = new urlObj(this.imgObject.src); - -- this.zoomGraphLeft = 0; -- this.zoomGraphTop = 0; -- this.zoomGraphRight = 0; -+ this.zoomGraphLeft = 0; -+ this.zoomGraphTop = 0; -+ this.zoomGraphRight = 0; - this.zoomGraphBottom = 0; -- this.zoomGraphWidth = 0; -+ this.zoomGraphWidth = 0; - this.zoomGraphHeight = 0; - -- this.zoomBoxLeft = 0; -- this.zoomBoxTop = 0; -- this.zoomBoxRight = 0; -+ this.zoomBoxLeft = 0; -+ this.zoomBoxTop = 0; -+ this.zoomBoxRight = 0; - this.zoomBoxBottom = 0; -- this.zoomBoxWidth = 0; -+ this.zoomBoxWidth = 0; - this.zoomBoxHeight = 0; - -- this.zoomSensitiveZoneLeft = 0; -- this.zoomSensitiveZoneTop = 0; -- this.zoomSensitiveZoneRight = 0; -+ this.zoomSensitiveZoneLeft = 0; -+ this.zoomSensitiveZoneTop = 0; -+ this.zoomSensitiveZoneRight = 0; - this.zoomSensitiveZoneBottom = 0; -- this.zoomSensitiveZoneWith = 0; -+ this.zoomSensitiveZoneWith = 0; - this.zoomSensitiveZoneHeight = 0; - - this.refresh = zoomGraphObjRefresh; -@@ -218,16 +222,16 @@ - - if (titleFontSize == 0) { - var cZoomBoxTopOffsetWOText = 15 - 1; -- var cZoomBoxTopOffsetWText = 32 - 1; -- var cZoomBoxRightOffset = -16; -+ var cZoomBoxTopOffsetWText = 32 - 1; -+ var cZoomBoxRightOffset = -16; - } else { - var cZoomBoxTopOffsetWOText = 10 - 1; -- var cZoomBoxTopOffsetWText = titleFontSize + (titleFontSize * 1.6) + 10 - 1; -- var cZoomBoxRightOffset = -28; -+ var cZoomBoxTopOffsetWText = titleFontSize + (titleFontSize * 1.6) + 10 - 1; -+ var cZoomBoxRightOffset = -28; - } - - // zone outside of Zoom box where user can move cursor to without causing odd behavior -- var cZoomSensitiveZoneName = "zoomSensitiveZone"; -+ var cZoomSensitiveZoneName = "zoomSensitiveZone"; - var cZoomSensitiveZoneOffset = 30; - - // variables -@@ -251,11 +255,11 @@ - imgAlt = imgObject.alt; - - // determine the overall graph size -- width = imgObject.width; -+ width = imgObject.width; - height = imgObject.height; - - // get the graph area size from the url -- zoomBoxWidth = parseInt(gUrlObj.getUrlParameterValue("graph_width")) + 1; -+ zoomBoxWidth = parseInt(gUrlObj.getUrlParameterValue("graph_width")) + 1; - zoomBoxHeight = parseInt(gUrlObj.getUrlParameterValue("graph_height")) + 1; - - // Get absolute image position relative to the overall window. -@@ -265,19 +269,19 @@ - // we're at the top of the display. Along the way we add in each element's - // coordinates to get absolute image postion. - left = 0; -- top = 0; -+ top = 0; - do { - left += imgObject.offsetLeft; -- top += imgObject.offsetTop; -+ top += imgObject.offsetTop; - imgObject = imgObject.offsetParent; - } while(imgObject); - - // set the images's Ix1,Iy1 and Ix2,Iy2 postions based upon results -- this.zoomGraphLeft = left; -- this.zoomGraphTop = top; -- this.zoomGraphRight = left + width; -- this.zoomGraphBottom = top + height; -- this.zoomGraphWidth = width; -+ this.zoomGraphLeft = left; -+ this.zoomGraphTop = top; -+ this.zoomGraphRight = left + width; -+ this.zoomGraphBottom = top + height; -+ this.zoomGraphWidth = width; - this.zoomGraphHeight = height; - - // calculate the right hand coordinate (rrdGAx2) of the zoom box (aka rrd Graph area) -@@ -297,30 +301,30 @@ - this.zoomBoxBottom = this.zoomBoxTop + zoomBoxHeight; - - // set the objects zoom sizes from the url values (aka rrd Graph size) -- this.zoomBoxWidth = zoomBoxWidth; -+ this.zoomBoxWidth = zoomBoxWidth; - this.zoomBoxHeight = zoomBoxHeight; - - // this.drawSelection(this.zoomBoxLeft, this.zoomBoxTop, this.zoomBoxRight, this.zoomBoxBottom); - this.drawSelection(0, 0, 0, 0); // reset selection - -- divObject = document.getElementById(cZoomBoxName); -- divObject.style.left = this.zoomBoxLeft; -- divObject.style.top = this.zoomBoxTop; -- divObject.style.width = this.zoomBoxWidth; -+ divObject = document.getElementById(cZoomBoxName); -+ divObject.style.left = this.zoomBoxLeft; -+ divObject.style.top = this.zoomBoxTop; -+ divObject.style.width = this.zoomBoxWidth; - divObject.style.height = this.zoomBoxHeight; - - // allow the crosshair to extend outside of the Graph area without graphical glitches -- this.zoomSensitiveZoneLeft = this.zoomBoxLeft - cZoomSensitiveZoneOffset; -- this.zoomSensitiveZoneTop = this.zoomBoxTop - cZoomSensitiveZoneOffset; -- this.zoomSensitiveZoneRight = this.zoomBoxRight + cZoomSensitiveZoneOffset; -+ this.zoomSensitiveZoneLeft = this.zoomBoxLeft - cZoomSensitiveZoneOffset; -+ this.zoomSensitiveZoneTop = this.zoomBoxTop - cZoomSensitiveZoneOffset; -+ this.zoomSensitiveZoneRight = this.zoomBoxRight + cZoomSensitiveZoneOffset; - this.zoomSensitiveZoneBottom = this.zoomBoxBottom + cZoomSensitiveZoneOffset; -- this.zoomSensitiveZoneWidth = this.zoomSensitiveZoneRight - this.zoomSensitiveZoneLeft; -+ this.zoomSensitiveZoneWidth = this.zoomSensitiveZoneRight - this.zoomSensitiveZoneLeft; - this.zoomSensitiveZoneHeight = this.zoomSensitiveZoneBottom - this.zoomSensitiveZoneTop; - -- divObject = document.getElementById(cZoomSensitiveZoneName); -- divObject.style.left = this.zoomSensitiveZoneLeft; -- divObject.style.top = this.zoomSensitiveZoneTop; -- divObject.style.width = this.zoomSensitiveZoneWidth; -+ divObject = document.getElementById(cZoomSensitiveZoneName); -+ divObject.style.left = this.zoomSensitiveZoneLeft; -+ divObject.style.top = this.zoomSensitiveZoneTop; -+ divObject.style.width = this.zoomSensitiveZoneWidth; - divObject.style.height = this.zoomSensitiveZoneHeight; - } - -@@ -366,7 +370,7 @@ - var retVal = ""; - var start = 0; - while ((start < inString.length) && (inString.charAt(start) == ' ')) { -- ++start; -+ ++start; - } - - var end = inString.length; -@@ -418,7 +422,7 @@ - for (var i=0; i < tokens.length; i++) { - token = Trim(tokens[i]); - //## compatible - might want to reset from Netscape -- if (token == "compatible") { -+ if (token == "compatible") { - //## One might want to reset browVer to a null string - //## here, but instead, we'll assume that if we don't - //## find out otherwise, then it really is Mozilla -@@ -433,7 +437,7 @@ - this.platform = "Unix"; - } else if (token.indexOf("Win") >= 0) { - this.platform = token; -- } else if ((token.indexOf("Mac") >= 0) || (token.indexOf("PPC") >= 0)) { -+ } else if ((token.indexOf("Mac") >= 0) || (token.indexOf("PPC") >= 0)) { - this.platform = token; - } - } -@@ -484,21 +488,21 @@ - /*++++++++++++++++++++++++++ initBonsai ++++++++++++++++++++++++++*/ - - function initBonsai() { -- gBrowserObj = new BrowserDetector(navigator.userAgent); -+ gBrowserObj = new BrowserDetector(navigator.userAgent); - // alert("Browser: " + gBrowserObj.browser + "\nPlatform: " + gBrowserObj.platform + "\nVersion: " + gBrowserObj.version + "\nMajorVer: " + gBrowserObj.majorver + "\nMinorVer: " + gBrowserObj.minorver); - - // gUrlObj = new urlObj(document.URL); - gZoomGraphObj = new zoomGraphObj(gZoomGraphName); -- gMouseObj = new mouseObj(); -+ gMouseObj = new mouseObj(); - initEvents(); - } - - /*+++++++++++++++++++++++++++ insideZoomBox +++++++++++++++++++++++++++++++*/ - - function insideZoomBox() { -- var szLeft = gZoomGraphObj.zoomSensitiveZoneLeft; -- var szTop = gZoomGraphObj.zoomSensitiveZoneTop; -- var szRight = gZoomGraphObj.zoomSensitiveZoneRight; -+ var szLeft = gZoomGraphObj.zoomSensitiveZoneLeft; -+ var szTop = gZoomGraphObj.zoomSensitiveZoneTop; -+ var szRight = gZoomGraphObj.zoomSensitiveZoneRight; - var szBottom = gZoomGraphObj.zoomSensitiveZoneBottom; - - var mpX = gMouseObj.currentX; -@@ -572,15 +576,15 @@ - var Timespan = graphEnd - graphStart; - - gMouseObj.dragging = false; -- newGraphEnd = graphEnd + Timespan * 2; -- newGraphStart = graphStart - Timespan * 2; -+ newGraphEnd = graphEnd + Timespan * 2; -+ newGraphStart = graphStart - Timespan * 2; - -- var urlBase = cURLBase; -- var localGraphId = gUrlObj.getUrlParameterValue("local_graph_id"); -- var rraId = gUrlObj.getUrlParameterValue("rra_id"); -- var graphWidth = gUrlObj.getUrlParameterValue("graph_width"); -- var graphHeight = gUrlObj.getUrlParameterValue("graph_height"); -- var viewType = gUrlObj.getUrlParameterValue("view_type"); -+ var urlBase = cURLBase; -+ var localGraphId = gUrlObj.getUrlParameterValue("local_graph_id"); -+ var rraId = gUrlObj.getUrlParameterValue("rra_id"); -+ var graphWidth = gUrlObj.getUrlParameterValue("graph_width"); -+ var graphHeight = gUrlObj.getUrlParameterValue("graph_height"); -+ var viewType = gUrlObj.getUrlParameterValue("view_type"); - var titleFontSize = gUrlObj.getUrlParameterValue("title_font_size"); - - open(urlBase + "&local_graph_id=" + localGraphId + "&rra_id=" + rraId + "&view_type=" + viewType + "&graph_start=" + newGraphStart + "&graph_end=" + newGraphEnd + "&graph_height=" + graphHeight + "&graph_width=" + graphWidth + "&title_font_size=" + titleFontSize, "_self"); -@@ -593,10 +597,10 @@ - gMouseObj.dragging = false; - - // check for appropriate selection zone -- if (((gMouseObj.startedX < gZoomGraphObj.zoomBoxLeft) && (gMouseObj.stoppedX < gZoomGraphObj.zoomBoxLeft)) || -- ((gMouseObj.startedX > gZoomGraphObj.zoomBoxRight) && (gMouseObj.stoppedX > gZoomGraphObj.zoomBoxRight)) || -+ if (((gMouseObj.startedX < gZoomGraphObj.zoomBoxLeft) && (gMouseObj.stoppedX < gZoomGraphObj.zoomBoxLeft)) || -+ ((gMouseObj.startedX > gZoomGraphObj.zoomBoxRight) && (gMouseObj.stoppedX > gZoomGraphObj.zoomBoxRight)) || - ((gMouseObj.startedY > gZoomGraphObj.zoomBoxBottom) && (gMouseObj.stoppedY > gZoomGraphObj.zoomBoxBottom)) || -- ((gMouseObj.startedY < gZoomGraphObj.zoomBoxTop) && (gMouseObj.stoppedY < gZoomGraphObj.zoomBoxTop))) { -+ ((gMouseObj.startedY < gZoomGraphObj.zoomBoxTop) && (gMouseObj.stoppedY < gZoomGraphObj.zoomBoxTop))) { - // alert("Selection Outside of Allowed Area"); - }else { - var x1 = gMouseObj.startedX - gZoomGraphObj.zoomBoxLeft; -@@ -633,12 +637,12 @@ - newGraphStart = Math.round(graphStart + minX * OnePixel); - - // var urlBase = gUrlObj.getUrlBase(); -- var urlBase = cURLBase; -- var localGraphId = gUrlObj.getUrlParameterValue("local_graph_id"); -- var rraId = gUrlObj.getUrlParameterValue("rra_id"); -- var graphWidth = gUrlObj.getUrlParameterValue("graph_width"); -- var graphHeight = gUrlObj.getUrlParameterValue("graph_height"); -- var viewType = gUrlObj.getUrlParameterValue("view_type"); -+ var urlBase = cURLBase; -+ var localGraphId = gUrlObj.getUrlParameterValue("local_graph_id"); -+ var rraId = gUrlObj.getUrlParameterValue("rra_id"); -+ var graphWidth = gUrlObj.getUrlParameterValue("graph_width"); -+ var graphHeight = gUrlObj.getUrlParameterValue("graph_height"); -+ var viewType = gUrlObj.getUrlParameterValue("view_type"); - var titleFontSize = gUrlObj.getUrlParameterValue("title_font_size"); - - open(urlBase + "&local_graph_id=" + localGraphId + "&rra_id=" + rraId + "&view_type=" + viewType + "&graph_start=" + newGraphStart + "&graph_end=" + newGraphEnd + "&graph_height=" + graphHeight + "&graph_width=" + graphWidth + "&title_font_size=" + titleFontSize, "_self"); diff --git a/graph_debug_lockup_fix.patch b/graph_debug_lockup_fix.patch deleted file mode 100644 index d740a2a..0000000 --- a/graph_debug_lockup_fix.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- cacti-0.8.6j/lib/rrd.php 2007-01-17 19:23:10.000000000 -0500 -+++ cacti-0.8.6j-patch/lib/rrd.php 2007-03-01 15:32:18.609375000 -0500 -@@ -83,6 +83,7 @@ - if ($config["cacti_server_os"] == "unix") { - /* an empty $rrd_struc array means no fp is available */ - if (sizeof($rrd_struc) == 0) { -+ session_write_close(); - $fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "r"); - }else{ - fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n"); -@@ -91,6 +92,7 @@ - }elseif ($config["cacti_server_os"] == "win32") { - /* an empty $rrd_struc array means no fp is available */ - if (sizeof($rrd_struc) == 0) { -+ session_write_close(); - $fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "rb"); - }else{ - fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n"); diff --git a/ping_php_version4_snmpgetnext.patch b/ping_php_version4_snmpgetnext.patch deleted file mode 100644 index 10576f6..0000000 --- a/ping_php_version4_snmpgetnext.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- cacti-0.8.6j/lib/ping.php 2007-01-17 19:23:10.000000000 -0500 -+++ cacti-0.8.6j-patch/lib/ping.php 2007-01-20 19:45:55.015625000 -0500 -@@ -281,7 +281,13 @@ - - /* poll sysUptime for status */ - $retry_count = 0; -+ -+ /* getnext does not work in php versions less than 5 */ -+ if (version_compare("5", phpversion(), "<")) { - $oid = ".1"; -+ }else{ $oid = ".1.3.6.1.2.1.1.3.0"; -+ } -+ - while (1) { - if ($retry_count >= $this->retries) { - $this->snmp_status = "down"; -@@ -289,6 +295,8 @@ - return false; - } - -+ /* getnext does not work in php versions less than 5 */ -+ if (version_compare("5", phpversion(), "<")) { - $output = cacti_snmp_getnext($this->host["hostname"], - $this->host["snmp_community"], - $oid, -@@ -298,6 +306,16 @@ - $this->host["snmp_port"], - $this->host["snmp_timeout"], - SNMP_CMDPHP); -+ }else{ $output = cacti_snmp_get($this->host["hostname"], -+ $this->host["snmp_community"], -+ $oid, -+ $this->host["snmp_version"], -+ $this->host["snmp_username"], -+ $this->host["snmp_password"], -+ $this->host["snmp_port"], -+ $this->host["snmp_timeout"], -+ SNMP_CMDPHP); -+ } - - /* determine total time +- ~10% */ - $this->time = $this->get_time($this->precision); diff --git a/sec_sql_injection-0.8.6j.patch b/sec_sql_injection-0.8.6j.patch deleted file mode 100644 index 37b2838..0000000 --- a/sec_sql_injection-0.8.6j.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruBbdN cacti-0.8.6j/include/top_graph_header.php cacti-0.8.6j-patched/include/top_graph_header.php ---- cacti-0.8.6j/include/top_graph_header.php 2007-01-17 19:23:10.000000000 -0500 -+++ cacti-0.8.6j-patched/include/top_graph_header.php 2007-11-03 12:53:46.000000000 -0400 -@@ -27,6 +27,10 @@ - $using_guest_account = false; - $show_console_tab = true; - -+/* ================= input validation ================= */ -+input_validate_input_number(get_request_var_request("local_graph_id")); -+/* ==================================================== */ -+ - if (read_config_option("global_auth") == "on") { - /* at this point this user is good to go... so get some setting about this - user and put them into variables to save excess SQL in the future */ diff --git a/snmpwalk_fix.patch b/snmpwalk_fix.patch deleted file mode 100644 index 9661ac6..0000000 --- a/snmpwalk_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruBbd cacti-0.8.6j/lib/snmp.php cacti-0.8.6j-patched/lib/snmp.php ---- cacti-0.8.6j/lib/snmp.php 2007-01-17 19:23:10.000000000 -0500 -+++ cacti-0.8.6j-patched/lib/snmp.php 2007-05-15 21:26:14.000000000 -0400 -@@ -221,9 +219,9 @@ - $temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -v$version -t $timeout -r $retries $hostname:$port $snmp_auth $oid"); - }else { - if (file_exists($path_snmpbulkwalk) && ($version > 1)) { -- $temp_array = exec_into_array($path_snmpbulkwalk . " -O n $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid"); -+ $temp_array = exec_into_array($path_snmpbulkwalk . " -O Qn $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid"); - }else{ -- $temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O n $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid"); -+ $temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O Qn $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid"); - } - } - diff --git a/thumbnail_graphs_not_working.patch b/thumbnail_graphs_not_working.patch deleted file mode 100644 index 26010a9..0000000 --- a/thumbnail_graphs_not_working.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- cacti-0.8.6j/lib/rrd.php 2007-01-17 19:23:10.000000000 -0500 -+++ cacti-0.8.6j-patch/lib/rrd.php 2007-02-01 20:29:59.687500000 -0500 -@@ -1080,9 +1080,15 @@ - - if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") { - if (read_config_option("rrdtool_version") == "rrd-1.2.x") { -- $txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" "; -+ $comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" "; -+ if (trim($comment_string) != "COMMENT:\"\"") { -+ $txt_graph_items .= $comment_string; -+ } - }else { -- $txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" "; -+ $comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" "; -+ if (trim($command_string) != "COMMENT:\"\"") { -+ $txt_graph_items .= $comment_string; -+ } - } - }elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) { - $graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */ diff --git a/tree_console_missing_hosts.patch b/tree_console_missing_hosts.patch deleted file mode 100644 index dde7a00..0000000 --- a/tree_console_missing_hosts.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- cacti-0.8.6j/lib/html_tree.php 2007-01-17 19:23:10.000000000 -0500 -+++ cacti-0.8.6j-patch/lib/html_tree.php 2007-01-27 15:48:50.390625000 -0500 -@@ -328,7 +328,7 @@ - while ($i > 1) { - $i--; - -- $parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER); -+ $parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER)); - $parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier; - - $effective = @$_SESSION[$parent_variable]; -@@ -365,8 +365,6 @@ - @returns - the string representing the leaf position - */ - function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) { -- $root_test = str_pad('', $chars_per_tier, '0'); -- - $new_string = preg_replace("/0+$/",'',$order_key); - - return $new_string; -- 2.44.0