packages: cacti/cacti-PA.patch - updated to 2.8

paszczus paszczus at pld-linux.org
Tue Jul 13 14:20:24 CEST 2010 

Author: paszczus                     Date: Tue Jul 13 12:20:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.8

---- Files affected:
packages/cacti:
   cacti-PA.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/cacti/cacti-PA.patch
diff -u packages/cacti/cacti-PA.patch:1.2 packages/cacti/cacti-PA.patch:1.3
--- packages/cacti/cacti-PA.patch:1.2	Fri May 28 10:05:35 2010
+++ packages/cacti/cacti-PA.patch	Tue Jul 13 14:20:18 2010
@@ -1,6 +1,6 @@
-diff -Naur cacti-0.8.7f-old/auth_changepassword.php cacti-0.8.7f/auth_changepassword.php
---- cacti-0.8.7f-old/auth_changepassword.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/auth_changepassword.php	2010-05-17 06:21:16.000000000 -0500
+diff -Naur cacti-0.8.7g-old/auth_changepassword.php cacti-0.8.7g/auth_changepassword.php
+--- cacti-0.8.7g-old/auth_changepassword.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/auth_changepassword.php	2010-07-09 18:34:11.000000000 -0400
 @@ -59,6 +59,8 @@
  					header("Location: index.php"); break;
  				case '3': /* default graph page */
@@ -10,10 +10,10 @@
  			}
  		}else{
  			header("Location: graph_view.php");
-diff -Naur cacti-0.8.7f-old/auth_login.php cacti-0.8.7f/auth_login.php
---- cacti-0.8.7f-old/auth_login.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/auth_login.php	2010-05-17 06:21:16.000000000 -0500
-@@ -122,10 +122,12 @@
+diff -Naur cacti-0.8.7g-old/auth_login.php cacti-0.8.7g/auth_login.php
+--- cacti-0.8.7g-old/auth_login.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/auth_login.php	2010-07-09 18:34:11.000000000 -0400
+@@ -124,10 +124,12 @@
  		}
  
  	default:
@@ -30,7 +30,7 @@
  		}
  	}
  	/* end of switch */
-@@ -187,29 +189,35 @@
+@@ -189,29 +191,42 @@
  		decide what to do next */
  		switch ($user["login_opts"]) {
  			case '1': /* referer */
@@ -56,17 +56,23 @@
 +					$referer = $_SERVER["HTTP_REFERER"];
 +					if (basename($referer) == "logout.php") {
 +						$referer = $config['url_path'] . "index.php";
- 					}
--					header("Location: " . $referer);
++					}
 +				} else if (isset($_SERVER["REQUEST_URI"])) {
 +					$referer = $_SERVER["REQUEST_URI"];
 +					if (basename($referer) == "logout.php") {
 +						$referer = $config['url_path'] . "index.php";
-+					}
+ 					}
 +				} else {
 +					$referer = $config['url_path'] . "index.php";
++				}
++
++				if (substr_count($referer, "plugins")) {
+ 					header("Location: " . $referer);
++				} elseif (sizeof(db_fetch_assoc("SELECT realm_id FROM user_auth_realm WHERE realm_id = 8 AND user_id = " . $_SESSION["sess_user_id"])) == 0) {
++					header("Location: graph_view.php");
++				} else {
++					header("Location: $referer");
  				}
-+				header("Location: " . $referer);
 +
  				break;
  			case '2': /* default console page */
@@ -84,7 +90,7 @@
  		}
  		exit;
  	}else{
-@@ -260,9 +268,17 @@
+@@ -264,9 +279,17 @@
  <body bgcolor="#FFFFFF" onload="document.login.login_username.focus()">
  	<form name="login" method="post" action="<?php print basename($_SERVER["PHP_SELF"]);?>">
  	<input type="hidden" name="action" value="login">
@@ -103,7 +109,7 @@
  		</tr>
  		<?php
  
-@@ -299,22 +315,29 @@
+@@ -303,22 +326,29 @@
  			<td><input type="password" name="login_password" size="40" style="width: 295px;"></td>
  		</tr>
  		<?php
@@ -120,7 +126,7 @@
 +				<select name="realm" style="width: 295px;"><?php
 +				if (sizeof($realms)) {
 +				foreach($realms as $name => $realm) {
-+					print "\t\t\t\t\t<option value='" . $name . "'" . ($realm["selected"] ? " selected":"") . ">" . $realm["name"] . "</option>\n";
++					print "\t\t\t\t\t<option value='" . $name . "'" . ($realm["selected"] ? " selected":"") . ">" . htmlspecialchars($realm["name"]) . "</option>\n";
 +				}
 +				}
 +				?>
@@ -138,9 +144,9 @@
  	</form>
  </body>
  </html>
-diff -Naur cacti-0.8.7f-old/data_sources.php cacti-0.8.7f/data_sources.php
---- cacti-0.8.7f-old/data_sources.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/data_sources.php	2010-05-18 12:24:16.000000000 -0500
+diff -Naur cacti-0.8.7g-old/data_sources.php cacti-0.8.7g/data_sources.php
+--- cacti-0.8.7g-old/data_sources.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/data_sources.php	2010-07-09 18:34:11.000000000 -0400
 @@ -44,6 +44,8 @@
  	7 => "Disable"
  	);
@@ -200,9 +206,9 @@
  			$data_template_name = ((empty($data_source["data_template_name"])) ? "<em>None</em>" : $data_source["data_template_name"]);
  			$data_input_name    = ((empty($data_source["data_input_name"])) ? "<em>External</em>" : $data_source["data_input_name"]);
  			$poller_interval    = ((isset($poller_intervals[$data_source["local_data_id"]])) ? $poller_intervals[$data_source["local_data_id"]] : 0);
-diff -Naur cacti-0.8.7f-old/graph_image.php cacti-0.8.7f/graph_image.php
---- cacti-0.8.7f-old/graph_image.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/graph_image.php	2010-05-17 06:21:16.000000000 -0500
+diff -Naur cacti-0.8.7g-old/graph_image.php cacti-0.8.7g/graph_image.php
+--- cacti-0.8.7g-old/graph_image.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/graph_image.php	2010-07-09 18:34:11.000000000 -0400
 @@ -44,6 +44,8 @@
  /* flush the headers now */
  ob_end_clean();
@@ -212,18 +218,40 @@
  session_write_close();
  
  $graph_data_array = array();
-diff -Naur cacti-0.8.7f-old/graph.php cacti-0.8.7f/graph.php
---- cacti-0.8.7f-old/graph.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/graph.php	2010-05-17 06:21:16.000000000 -0500
-@@ -100,6 +100,7 @@
- 							<a href='<?php print htmlspecialchars("graph.php?action=zoom&local_graph_id=" . $_GET["local_graph_id"]. "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
- 							<a href='<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
- 							<a href='<?php print htmlspecialchars("graph.php?action=properties&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a>
-+							<?php api_plugin_hook('graph_buttons', array('hook' => 'view', 'local_graph_id' => $_GET['local_graph_id'], 'rra' => $rra['id'], 'view_type' => $_REQUEST['view_type'])); ?>
- 						</td>
- 					</tr>
- 					<tr>
-@@ -215,6 +216,7 @@
+diff -Naur cacti-0.8.7g-old/graph.php cacti-0.8.7g/graph.php
+--- cacti-0.8.7g-old/graph.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/graph.php	2010-07-09 18:34:11.000000000 -0400
+@@ -32,6 +32,8 @@
+ include_once("./lib/html_tree.php");
+ include_once("./include/top_graph_header.php");
+ 
++api_plugin_hook_function('graph');
++
+ /* ================= input validation ================= */
+ input_validate_input_regex(get_request_var("rra_id"), "^([0-9]+|all)$");
+ input_validate_input_number(get_request_var("local_graph_id"));
+@@ -94,17 +96,18 @@
+ 					<table width='1' cellpadding='0'>
+ 						<tr>
+ 							<td>
+-								<img class='graphimage' id='graph_<?php print $_GET["local_graph_id"] ?>' src='<?php print htmlspecialchars("graph_image.php?action=view&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"]);?>' border='0' alt='<?php print htmlspecialchars($graph_title);?>'>
++									<img class='graphimage' id='graph_<?php print $_GET["local_graph_id"] ?>' src='<?php print htmlspecialchars("graph_image.php?action=view&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"]);?>' border='0' alt='<?php print htmlspecialchars($graph_title);?>'>
+ 							</td>
+ 							<td valign='top' style='padding: 3px;' class='noprint'>
+ 								<a href='<?php print htmlspecialchars("graph.php?action=zoom&local_graph_id=" . $_GET["local_graph_id"]. "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
+ 								<a href='<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
+ 								<a href='<?php print htmlspecialchars("graph.php?action=properties&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a>
++								<?php api_plugin_hook('graph_buttons', array('hook' => 'view', 'local_graph_id' => $_GET['local_graph_id'], 'rra' => $rra['id'], 'view_type' => $_REQUEST['view_type'])); ?>
+ 							</td>
+ 						</tr>
+ 						<tr>
+ 							<td colspan='2' align='center'>
+-								<strong><?php print htmlspecialchars($rra["name"]);?></strong>
++									<strong><?php print htmlspecialchars($rra["name"]);?></strong>
+ 							</td>
+ 						</tr>
+ 					</table>
+@@ -215,6 +218,7 @@
  					<td valign='top' style='padding: 3px;' class='noprint'>
  						<a href='<?php print htmlspecialchars("graph.php?action=properties&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $_GET["rra_id"] . "&view_type=" . $_REQUEST["view_type"] . "&graph_start=" . $graph_start . "&graph_end=" . $graph_end);?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a>
  						<a href='<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $_GET["rra_id"] . "&view_type=" . $_REQUEST["view_type"]);?>&graph_start=<?php print $graph_start;?>&graph_end=<?php print $graph_end;?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
@@ -231,7 +259,7 @@
  					</td>
  				</tr>
  				<tr>
-@@ -247,6 +249,7 @@
+@@ -247,6 +251,7 @@
  					<td valign='top' style='padding: 3px;'>
  						<a href='<?php print htmlspecialchars("graph.php?action=zoom&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $_GET["rra_id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
  						<a href='<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $_GET["rra_id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
@@ -239,97 +267,10 @@
  					</td>
  				</tr>
  				<tr>
-diff -Naur cacti-0.8.7f-old/graphs_new.php cacti-0.8.7f/graphs_new.php
---- cacti-0.8.7f-old/graphs_new.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/graphs_new.php	2010-05-18 06:18:40.000000000 -0500
-@@ -397,7 +397,7 @@
- 	if (!empty($debug_log)) {
- 		debug_log_clear("new_graphs");
- 		?>
--		<div id='message' style='display:none;color:#FFFFFF;background-color:"#<?php print $colors["light"];?>;border:1px solid #00438C;'>
-+		<div id='message' style='color:#FFFFFF;background-color:"#<?php print $colors["light"];?>;border:1px solid #00438C;'>
- 			<?php print "<center style='font-size:16pt;background-color:#" . $colors["header"] . ";text-align:center;'>Graphs Created</center>";?>
- 			<?php print "<ul style='text-align:left;white-space:nowrap;color:#000000;padding:5px 20px;'>" . $debug_log . "</ul>";?>
- 		</div>
-@@ -407,40 +407,45 @@
- 	<script type="text/javascript">
- 	<!--
- 	var obj = document.getElementById('message');
--	if (window.innerHeight) {
--		height = window.innerHeight;
--		width  = window.innerWidth;
--	}else{
--		height = document.body.clientHeight;
--		width  = document.body.clientWidth;
--	}
--	var opacity=1;
--
--	obj.style.position = "absolute";
--	obj.style.backgroundColor = "#EAEAEA";
--	obj.style.padding = "5px 5px";
--	obj.style.display = "";
--	cw = obj.offsetWidth;
--	// Adjust for IE6
--	if (!cw) cw = 150;
--	ch = obj.offsetHeight;
--	obj.style.top = '150px';
--	obj.style.left = ((width/2) - (cw / 2) - 165)+'px';
--	obj.style.border = 'medium solid #AEAEAE';
--	opacity = 1;
--	obj.style.opacity = opacity;
--	obj.zoom = "100%";
--	if (document.getElementById('message')) {
--		setTimeout("removeMessage()", 4000);
--	}
- 
--	function removeMessage() {
--		if (obj.style.opacity <= 0) return;
--		opacity-=0.15;
--		iopacity = opacity * 100;
-+	if (obj) {
-+		if (window.innerHeight) {
-+			height = window.innerHeight;
-+			width  = window.innerWidth;
-+		}else{
-+			height = document.body.clientHeight;
-+			width  = document.body.clientWidth;
-+		}
-+		var opacity=1;
-+	
-+		obj.style.position = "absolute";
-+		obj.style.backgroundColor = "#EAEAEA";
-+		obj.style.padding = "5px 5px";
-+		obj.style.display = "";
-+		cw = obj.offsetWidth;
-+		// Adjust for IE6
-+		if (!cw) cw = 150;
-+		ch = obj.offsetHeight;
-+		obj.style.top = '150px';
-+		obj.style.left = ((width/2) - (cw / 2) - 165)+'px';
-+		obj.style.border = 'medium solid #AEAEAE';
-+		opacity = 1;
- 		obj.style.opacity = opacity;
--		obj.style.filter = 'alpha(opacity='+iopacity+')';
--		setTimeout("removeMessage()",40);
-+		obj.zoom = "100%";
-+		if (document.getElementById('message')) {
-+	
-+	
-+			setTimeout("removeMessage()", 4000);
-+		}
-+
-+		function removeMessage() {
-+			if (obj.style.opacity <= 0) return;
-+			opacity-=0.15;
-+			iopacity = opacity * 100;
-+			obj.style.opacity = opacity;
-+			obj.style.filter = 'alpha(opacity='+iopacity+')';
-+			setTimeout("removeMessage()",40);
-+		}
- 	}
- 
- 	function applyGraphsNewFilterChange(objForm) {
-@@ -514,7 +519,8 @@
+diff -Naur cacti-0.8.7g-old/graphs_new.php cacti-0.8.7g/graphs_new.php
+--- cacti-0.8.7g-old/graphs_new.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/graphs_new.php	2010-07-09 18:34:11.000000000 -0400
+@@ -511,7 +511,8 @@
  			</td>
  			<td nowrap style='white-space: nowrap;' class="textInfo" align="center" valign="top">
  				<span style="white-space: nowrap; color: #c16921;">*</span><a href="<?php print htmlspecialchars("host.php?action=edit&id=" . $_REQUEST["host_id"]);?>">Edit this Host</a><br>
@@ -339,9 +280,9 @@
  			</td>
  		</tr>
  	</table>
-diff -Naur cacti-0.8.7f-old/graphs.php cacti-0.8.7f/graphs.php
---- cacti-0.8.7f-old/graphs.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/graphs.php	2010-05-18 06:22:28.000000000 -0500
+diff -Naur cacti-0.8.7g-old/graphs.php cacti-0.8.7g/graphs.php
+--- cacti-0.8.7g-old/graphs.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/graphs.php	2010-07-09 18:34:11.000000000 -0400
 @@ -45,6 +45,8 @@
  	4 => "Convert to Graph Template"
  	);
@@ -373,9 +314,9 @@
  		}
  	}else{
  		print "<tr><td bgcolor='#" . $colors["form_alternate1"]. "'><span class='textError'>You must select at least one graph.</span></td></tr>\n";
-diff -Naur cacti-0.8.7f-old/host.php cacti-0.8.7f/host.php
---- cacti-0.8.7f-old/host.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/host.php	2010-05-18 06:19:32.000000000 -0500
+diff -Naur cacti-0.8.7g-old/host.php cacti-0.8.7g/host.php
+--- cacti-0.8.7g-old/host.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/host.php	2010-07-09 18:34:11.000000000 -0400
 @@ -44,6 +44,8 @@
  	6 => "Change Availability Options"
  	);
@@ -403,7 +344,7 @@
 +			$save['host_list'] = $host_list;
 +			$save['host_array'] = (isset($host_array)? $host_array : array());
 +			api_plugin_hook_function('device_action_prepare', $save);
-+			$save_html = "<input type='button' value='Cancel' onClick='window.history.back()'>&nbsp;<input type='submit'>";
++			$save_html = "<input type='button' value='Cancel' onClick='window.history.back()'>&nbsp;<input type='submit' value='Continue'>";
  		}
  	}else{
  		print "<tr><td bgcolor='#" . $colors["form_alternate1"]. "'><span class='textError'>You must select at least one device.</span></td></tr>\n";
@@ -415,7 +356,7 @@
 +
  	if (!empty($_GET["id"])) {
  		$host = db_fetch_row("select * from host where id=" . $_GET["id"]);
- 		$header_label = "[edit: " . $host["description"] . "]";
+ 		$header_label = "[edit: " . htmlspecialchars($host["description"]) . "]";
 @@ -643,6 +655,7 @@
  					<span style="color: #c16921;">*</span><a href="<?php print htmlspecialchars("graphs_new.php?host_id=" . $host["id"]);?>">Create Graphs for this Host</a><br>
  					<span style="color: #c16921;">*</span><a href="<?php print htmlspecialchars("data_sources.php?host_id=" . $host["id"] . "&ds_rows=30&filter=&template_id=-1&method_id=-1&page=1");?>">Data Source List</a><br>
@@ -433,9 +374,90 @@
  }
  
  function host() {
-diff -Naur cacti-0.8.7f-old/include/auth.php cacti-0.8.7f/include/auth.php
---- cacti-0.8.7f-old/include/auth.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/include/auth.php	2010-05-17 06:21:16.000000000 -0500
+diff -Naur cacti-0.8.7g-old/images/disable_icon.png cacti-0.8.7g/images/disable_icon.png
+--- cacti-0.8.7g-old/images/disable_icon.png	1969-12-31 19:00:00.000000000 -0500
++++ cacti-0.8.7g/images/disable_icon.png	2010-07-09 18:34:11.000000000 -0400
+@@ -0,0 +1,4 @@
++‰PNG
++
+++IHDR++Á3Â8À<×2Ô8à9á>ÙDÞAØG#ßH"ÞN%ÛQ,ÚQ/ÜP*ÜS0àB
+éHàGàKâN&äP$áP,èV$é],âT1ãZ8ã];ã`?èc7äaBåeFågHælOçoSçpTèuZèv[èy^è}cѐêgî‡eéƒkê…kìvìyðkñ’qµ&+¤+\ No newline at end of file
+diff -Naur cacti-0.8.7g-old/images/enable_icon_disabled.png cacti-0.8.7g/images/enable_icon_disabled.png
+--- cacti-0.8.7g-old/images/enable_icon_disabled.png	1969-12-31 19:00:00.000000000 -0500
++++ cacti-0.8.7g/images/enable_icon_disabled.png	2010-07-09 18:34:11.000000000 -0400
+@@ -0,0 +1,3 @@
++‰PNG
++
+++IHDR+\ No newline at end of file
+diff -Naur cacti-0.8.7g-old/images/enable_icon.png cacti-0.8.7g/images/enable_icon.png
+--- cacti-0.8.7g-old/images/enable_icon.png	1969-12-31 19:00:00.000000000 -0500
++++ cacti-0.8.7g/images/enable_icon.png	2010-07-09 18:34:11.000000000 -0400
+@@ -0,0 +1,5 @@
++‰PNG
++
+++IHDR+¤
++­
++¤¯¢¬#Œ#%š%)—).”.0•00˜01˜1;ž;$¯$!µ!? ?8ª8BŸBB BA¨AO§OR¦RT©T[­[a¯ag³gkµkv»v°y¼y+\ No newline at end of file
+diff -Naur cacti-0.8.7g-old/images/install_icon_disabled.png cacti-0.8.7g/images/install_icon_disabled.png
+--- cacti-0.8.7g-old/images/install_icon_disabled.png	1969-12-31 19:00:00.000000000 -0500
++++ cacti-0.8.7g/images/install_icon_disabled.png	2010-07-09 18:34:11.000000000 -0400
+@@ -0,0 +1,5 @@
++‰PNG
++
+++IHDR++1Ð"+RK TŠôÿtéìarË;D[{Í”JØ_uÒ‹žî«’‰#)±’È
+F
++DáÝ3‡p¹ÀjÑ2
+tе™É½¬ß ZRÉ~+\ No newline at end of file
+diff -Naur cacti-0.8.7g-old/images/install_icon.png cacti-0.8.7g/images/install_icon.png
+--- cacti-0.8.7g-old/images/install_icon.png	1969-12-31 19:00:00.000000000 -0500
++++ cacti-0.8.7g/images/install_icon.png	2010-07-09 18:34:11.000000000 -0400
+@@ -0,0 +1,5 @@
++‰PNG
++
+++IHDR++Ü%XXÄÝàÜ vn''=w(ßÊ61:4$"\›	¬(™Í6%Ø)4ØÞ)PÛ*(àÌëïd—šdnkïÈk
+34×6LNÒÕÖ¶U
++0š:Ú©&%(99é*1˜u”#S“œRC…8€’j2j‘©@ª($'	p•6RNMR‘ѱYËef&om$olÆ	²–ÁOÀÒËÌÂÂÌËKÐâT?~
+o__o#~W˜g’<¤¤<â°+\ No newline at end of file
+diff -Naur cacti-0.8.7g-old/images/uninstall_icon.gif cacti-0.8.7g/images/uninstall_icon.gif
+--- cacti-0.8.7g-old/images/uninstall_icon.gif	1969-12-31 19:00:00.000000000 -0500
++++ cacti-0.8.7g/images/uninstall_icon.gif	2010-07-09 18:34:11.000000000 -0400
+@@ -0,0 +1,4 @@
++GIF89a++
++
++
+   !!!"""###$$$%%%&&&'''((()))***+++,,,---...///000111222333444555666777888999:::;;;<<<===>>>???A??C??D??F@@H??J>>M<<N::O99O88P88P77P77P77Q66Q66P66P66P77O77O77X99c==m??xBB‚EEŠGGŽJJ“LL™NNžPP SSŸVV XX YYŸZZ›\\Ÿ]]¦``±cc½ggÄiiÈooÎvvÐzzÑ}}ÒӁÓ‚‚Ô‚‚Ô„„Õ††Õ‡‡ÕˆˆÖŠŠÖŠŠÖ‹‹Ö‹‹ÖŒŒÖÖÒŒŒÌ‹‹ÃŠŠ¸‰‰©‡‡ž……”„„‹‚‚ƒ€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€‚ƒ~~†~~Š}}{{–zzxx¦uu¯ss¸qq»ppºpp»uu¼yy»~~»ƒƒ¿ŒŒÂ““Æ™™ÉžžÌ¡¡Ï££Ñ¥¥Ó¥¥Õ¥¥Ö¥¥Ö¥¥×¤¤×££×¢¢×  ×ŸŸÖžžÖžžÖÖÖžž×ŸŸ×  ×¡¡Ø££Ú§§ÛªªÛ­­Ü°°Þ´´ß¶¶ß¸¸àººá»»á¼¼â½½ã¿¿äÁÁåÃÃæÅÅçÈÈèÉÉèÊÊéËËéÌÌéÍÍêÎÎëÐÐìÒÒíÓÓîÔÔîÕÕïÖÖïØØðÚÚñÝÝòááóååôèèôêêôêêôêêôêêôëëõëëõììõííõîîõïïõððöññ÷òòøóóùôôúööûøøüùùüûûýüüýüüþýýþýýþýý!ù	+Ó¿HÜ
+Lv8œåppÏZ+ÈÌI¯e» Ù1™'OÈl„Ⱥ`@+\ No newline at end of file
+diff -Naur cacti-0.8.7g-old/images/view_none.gif cacti-0.8.7g/images/view_none.gif
+--- cacti-0.8.7g-old/images/view_none.gif	1969-12-31 19:00:00.000000000 -0500
++++ cacti-0.8.7g/images/view_none.gif	2010-07-09 18:34:11.000000000 -0400
+@@ -0,0 +1,4 @@
++GIF89a++
++
++
+   !!!"""###$$$%%%&&&'''((()))***+++,,,---...///000111222333444555666777888999:::;;;<<<===>>>???@@@AAABBBCCCDDDEEEFFFGGGHHHIIIJJJKKKLLLMMMNNNOOOPPPQQQRRRSSSTTTUUUVVVWWWXXXYYYZZZ[[[\\\]]]^^^___```dddhhhnnntttyyy}}}~~~€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€‚‚‚†††‹‹‹‘‘‘———›››   ¡¡¡¢¢¢£££¤¤¤¥¥¥¦¦¦§§§¨¨¨©©©ªªª«««¬¬¬­­­®®®¯¯¯°°°±±±²²²³³³´´´µµµ¶¶¶···¸¸¸¹¹¹ººº»»»¼¼¼½½½¾¾¾¿¿¿ÀÀÀÁÁÁÂÂÂÃÃÃÄÄÄÅÅÅÆÆÆÇÇÇÈÈÈÉÉÉÊÊÊËËËÌÌÌÍÍÍÎÎÎÏÏÏÐÐÐÑÑÑÒÒÒÓÓÓÔÔÔÕÕÕÖÖÖ×××ØØØÙÙÙÚÚÚÛÛÛÜÜÜÝÝÝÞÞÞßßßàààáááâââãããäääåååæææçççèèèéééêêêëëëìììíííîîîïïïðððñññòòòóóóôôôõõõööö÷÷÷øøøùùùúúúûûûüüüýýýþþþÿÿÿ!ù	+\ No newline at end of file
+diff -Naur cacti-0.8.7g-old/include/auth.php cacti-0.8.7g/include/auth.php
+--- cacti-0.8.7g-old/include/auth.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/auth.php	2010-07-09 18:34:11.000000000 -0400
 @@ -31,6 +31,9 @@
  }
  
@@ -458,10 +480,10 @@
  			}
  
  			?>
-@@ -82,14 +85,14 @@
- 			<html>
+@@ -83,14 +86,14 @@
  			<head>
  				<title>Cacti</title>
+ 				<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 -				<link href="include/main.css" type="text/css" rel="stylesheet">
 +				<link href="<?php echo $config['url_path']; ?>include/main.css" type="text/css" rel="stylesheet">
  			</head>
@@ -475,9 +497,9 @@
  				</tr>
  				<tr style='height:10px;'><td></td></tr>
  				<tr>
-diff -Naur cacti-0.8.7f-old/include/bottom_footer.php cacti-0.8.7f/include/bottom_footer.php
---- cacti-0.8.7f-old/include/bottom_footer.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/include/bottom_footer.php	2010-05-17 06:21:16.000000000 -0500
+diff -Naur cacti-0.8.7g-old/include/bottom_footer.php cacti-0.8.7g/include/bottom_footer.php
+--- cacti-0.8.7g-old/include/bottom_footer.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/bottom_footer.php	2010-07-09 18:34:11.000000000 -0400
 @@ -21,6 +21,10 @@
   | http://www.cacti.net/                                                   |
   +-------------------------------------------------------------------------+
@@ -499,9 +521,30 @@
  /* we use this session var to store field values for when a save fails,
  this way we can restore the field's previous values. we reset it here, because
  they only need to be stored for a single page */
-diff -Naur cacti-0.8.7f-old/include/global_arrays.php cacti-0.8.7f/include/global_arrays.php
---- cacti-0.8.7f-old/include/global_arrays.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/include/global_arrays.php	2010-05-17 06:21:16.000000000 -0500
+diff -Naur cacti-0.8.7g-old/include/config.php cacti-0.8.7g/include/config.php
+--- cacti-0.8.7g-old/include/config.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/config.php	2010-07-09 18:34:11.000000000 -0400
+@@ -30,6 +30,17 @@
+ $database_password = "cactiuser";
+ $database_port = "3306";
+ 
++/* load up old style plugins here */
++$plugins = array();
++//$plugins[] = 'thold';
++
++/*
++   Edit this to point to the default URL of your Cacti install
++   ex: if your cacti install as at http://serverip/cacti/ this
++   would be set to /cacti/
++*/
++$url_path = "/";
++
+ /* Default session name - Session name must contain alpha characters */
+ #$cacti_session_name = "Cacti";
+ 
+diff -Naur cacti-0.8.7g-old/include/global_arrays.php cacti-0.8.7g/include/global_arrays.php
+--- cacti-0.8.7g-old/include/global_arrays.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/global_arrays.php	2010-07-09 18:34:11.000000000 -0400
 @@ -22,6 +22,8 @@
   +-------------------------------------------------------------------------+
  */
@@ -511,21 +554,21 @@
  $messages = array(
  	1  => array(
  		"message" => 'Save Successful.',
-@@ -653,4 +655,10 @@
+@@ -654,4 +656,10 @@
  	GDC_SLASH => "/"
  	);
  
 +$plugin_architecture = array(
-+	'version' => '2.7'
++	'version' => '2.8'
 +	);
 +
 +api_plugin_hook('config_arrays');
 +
  ?>
-diff -Naur cacti-0.8.7f-old/include/global_constants.php cacti-0.8.7f/include/global_constants.php
---- cacti-0.8.7f-old/include/global_constants.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/include/global_constants.php	2010-05-17 06:21:16.000000000 -0500
-@@ -171,4 +171,8 @@
+diff -Naur cacti-0.8.7g-old/include/global_constants.php cacti-0.8.7g/include/global_constants.php
+--- cacti-0.8.7g-old/include/global_constants.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/global_constants.php	2010-07-09 18:34:11.000000000 -0400
+@@ -173,4 +173,8 @@
  define("SNMP_CMDPHP", 1);
  define("SNMP_WEBUI", 2);
  
@@ -536,9 +579,9 @@
 +
 +?>
 \ No newline at end of file
-diff -Naur cacti-0.8.7f-old/include/global_form.php cacti-0.8.7f/include/global_form.php
---- cacti-0.8.7f-old/include/global_form.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/include/global_form.php	2010-05-17 06:21:16.000000000 -0500
+diff -Naur cacti-0.8.7g-old/include/global_form.php cacti-0.8.7g/include/global_form.php
+--- cacti-0.8.7g-old/include/global_form.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/global_form.php	2010-07-09 18:34:11.000000000 -0400
 @@ -22,8 +22,9 @@
   +-------------------------------------------------------------------------+
  */
@@ -560,41 +603,24 @@
 +
 +api_plugin_hook('config_form');
 +
-diff -Naur cacti-0.8.7f-old/include/global.php cacti-0.8.7f/include/global.php
---- cacti-0.8.7f-old/include/global.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/include/global.php	2010-05-17 06:21:16.000000000 -0500
-@@ -41,6 +41,22 @@
- /* Default session name - Session name must contain alpha characters */
- $cacti_session_name = "Cacti";
- 
-+$plugins = array();
-+//$plugins[] = 'thold';
-+
-+/* Do not edit this line */
-+$config = array();
-+
-+/*
-+   Edit this to point to the default URL of your Cacti install
-+   ex: if your cacti install as at http://serverip/cacti/ this
-+   would be set to /cacti/
-+*/
-+
-+$config['url_path'] = '/';
-+
-+define('URL_PATH', $config['url_path']);
-+
- /* Include configuration */
- include(dirname(__FILE__) . "/config.php");
- 
-@@ -84,7 +100,6 @@
- 	"structure_rra_paths.php"
- );
- 
--$config = array();
- $colors = array();
- 
- /* this should be auto-detected, set it manually if needed */
-@@ -188,15 +203,17 @@
+diff -Naur cacti-0.8.7g-old/include/global.php cacti-0.8.7g/include/global.php
+--- cacti-0.8.7g-old/include/global.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/global.php	2010-07-09 18:34:11.000000000 -0400
+@@ -93,6 +93,13 @@
+ /* built-in snmp support */
+ $config["php_snmp_support"] = function_exists("snmpget");
+ 
++/* set URL path */
++if (! isset($url_path)) { 
++	$url_path = "";
++}
++$config['url_path'] = $url_path;
++define('URL_PATH', $url_path);
++
+ /* used for includes */
+ $config["base_path"] = strtr(ereg_replace("(.*)[\\\/]include", "\\1", dirname(__FILE__)), "\\", "/");
+ $config["library_path"] = ereg_replace("(.*[\\\/])include", "\\1lib", dirname(__FILE__));
+@@ -188,15 +195,17 @@
  /* include base modules */
  include($config["library_path"] . "/adodb/adodb.inc.php");
  include($config["library_path"] . "/database.php");
@@ -616,29 +642,29 @@
  include_once($config["include_path"] . "/global_form.php");
  include_once($config["library_path"] . "/html.php");
  include_once($config["library_path"] . "/html_form.php");
-@@ -205,6 +222,8 @@
+@@ -205,6 +214,8 @@
  include_once($config["library_path"] . "/variables.php");
  include_once($config["library_path"] . "/auth.php");
  
 +api_plugin_hook("config_insert");
 +
  /* current cacti version */
- $config["cacti_version"] = "0.8.7f";
+ $config["cacti_version"] = "0.8.7g";
  
-diff -Naur cacti-0.8.7f-old/include/global_settings.php cacti-0.8.7f/include/global_settings.php
---- cacti-0.8.7f-old/include/global_settings.php	2010-05-20 14:02:08.000000000 -0500
-+++ cacti-0.8.7f/include/global_settings.php	2010-05-17 06:21:16.000000000 -0500
-@@ -1185,4 +1185,6 @@
+diff -Naur cacti-0.8.7g-old/include/global_settings.php cacti-0.8.7g/include/global_settings.php
+--- cacti-0.8.7g-old/include/global_settings.php	2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/global_settings.php	2010-07-09 18:34:11.000000000 -0400
+@@ -1190,4 +1190,6 @@
  		)
  	);
  
 +api_plugin_hook('config_settings');
 +
  ?>
-diff -Naur cacti-0.8.7f-old/include/plugins.php cacti-0.8.7f/include/plugins.php
---- cacti-0.8.7f-old/include/plugins.php	1969-12-31 17:00:00.000000000 -0700
-+++ cacti-0.8.7f/include/plugins.php	2010-05-17 06:21:16.000000000 -0500
-@@ -0,0 +1,36 @@
+diff -Naur cacti-0.8.7g-old/include/plugins.php cacti-0.8.7g/include/plugins.php
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/cacti-PA.patch?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list