- release 3

[packages/cacti.git] / cacti-PA.patch

diff -ruBbdNa cacti-0.8.7h/auth_changepassword.php cacti-0.8.7h-pia//auth_changepassword.php
--- cacti-0.8.7h/auth_changepassword.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//auth_changepassword.php	2011-09-25 21:10:07.620946156 -0400
@@ -59,6 +59,8 @@
 					header("Location: index.php"); break;
 				case '3': /* default graph page */
 					header("Location: graph_view.php"); break;
+				default:
+					api_plugin_hook_function('login_options_navigate', $user['login_opts']);
 			}
 		}else{
 			header("Location: graph_view.php");
diff -ruBbdNa cacti-0.8.7h/auth_login.php cacti-0.8.7h-pia//auth_login.php
--- cacti-0.8.7h/auth_login.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//auth_login.php	2011-09-25 21:46:39.701939535 -0400
@@ -124,12 +124,14 @@
 		}
 
 	default:
+		if (!api_plugin_hook_function('login_process', false)) {
 		/* Builtin Auth */
 		if ((!$user_auth) && (!$ldap_error)) {
 			/* if auth has not occured process for builtin - AKA Ldap fall through */
 			$user = db_fetch_row("SELECT * FROM user_auth WHERE username = " . $cnn_id->qstr($username) . " AND password = '" . md5(get_request_var_post("login_password")) . "' AND realm = 0");
 		}
 	}
+	}
 	/* end of switch */
 
 	/* Create user from template if requested */
@@ -168,7 +170,7 @@
 	/* Process the user  */
 	if (sizeof($user) > 0) {
 		cacti_log("LOGIN: User '" . $user["username"] . "' Authenticated", false, "AUTH");
-		db_execute("INSERT INTO user_log (username,user_id,result,ip,time) VALUES (" . $cnn_id->qstr($username) ."," . $user["id"] . ",1,'" . $_SERVER["REMOTE_ADDR"] . "',NOW())");
+		db_execute("INSERT INTO user_log (username,user_id,result,ip,time) VALUES (" . $cnn_id->qstr($username) . "," . $user["id"] . ",1,'" . $_SERVER["REMOTE_ADDR"] . "',NOW())");
 		/* is user enabled */
 		$user_enabled = $user["enabled"];
 		if ($user_enabled != "on") {
@@ -189,29 +191,42 @@
 		decide what to do next */
 		switch ($user["login_opts"]) {
 			case '1': /* referer */
-				if (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{
+				/* because we use plugins, we can't redirect back to graph_view.php if they don't
+				 * have console access
+				 */
 					if (isset($_SERVER["HTTP_REFERER"])) {
 						$referer = $_SERVER["HTTP_REFERER"];
 						if (basename($referer) == "logout.php") {
-							$referer = "index.php";
+						$referer = $config['url_path'] . "index.php";
 						}
 					} else if (isset($_SERVER["REQUEST_URI"])) {
 						$referer = $_SERVER["REQUEST_URI"];
 						if (basename($referer) == "logout.php") {
-							$referer = "index.php";
+						$referer = $config['url_path'] . "index.php";
 						}
 					} else {
-						$referer = "index.php";
+					$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");
 				}
+
 				break;
 			case '2': /* default console page */
-				header("Location: index.php"); break;
+				header("Location: " . $config['url_path'] . "index.php");
+
+				break;
 			case '3': /* default graph page */
-				header("Location: graph_view.php"); break;
+				header("Location: " . $config['url_path'] . "graph_view.php");
+
+				break;
+			default:
+				api_plugin_hook_function('login_options_navigate', $user['login_opts']);
 		}
 		exit;
 	}else{
@@ -222,7 +237,7 @@
 			exit;
 		}else{
 			/* BAD username/password builtin and LDAP */
-			db_execute("INSERT INTO user_log (username,user_id,result,ip,time) VALUES ('" . $username . "',0,0,'" . $_SERVER["REMOTE_ADDR"] . "',NOW())");
+			db_execute("INSERT INTO user_log (username,user_id,result,ip,time) VALUES (" . $cnn_id->qstr($username) . ",0,0,'" . $_SERVER["REMOTE_ADDR"] . "',NOW())");
 		}
 	}
 }
@@ -249,7 +264,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-	<title>Login to Cacti</title>
+	<title><?php print api_plugin_hook_function("login_title", "Login to Cacti");?></title>
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 	<STYLE TYPE="text/css">
 	<!--
@@ -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">
+<?php
+
+api_plugin_hook_function("login_before", array('ldap_error' => $ldap_error, 'ldap_error_message' => $ldap_error_message, 'username' => $username, 'user_enabled' => $user_enabled, 'action' => $action));
+
+$cacti_logo = $config['url_path'] . 'images/auth_login.gif';
+$cacti_logo = api_plugin_hook_function('cacti_image', $cacti_logo);
+
+?>
 	<table id="login" align="center">
 		<tr>
-			<td colspan="2"><img src="images/auth_login.gif" border="0" alt=""></td>
+			<td colspan="2"><center><?php if ($cacti_logo != '') { ?><img src="<?php echo $cacti_logo; ?>" border="0" alt=""><?php } ?></center></td>
 		</tr>
 		<?php
 
@@ -303,13 +326,19 @@
 			<td><input type="password" name="login_password" size="40" style="width: 295px;"></td>
 		</tr>
 		<?php
-		if (read_config_option("auth_method") == "3") {?>
+		if (read_config_option("auth_method") == "3" || api_plugin_hook_function('login_realms_exist')) {
+			$realms = api_plugin_hook_function('login_realms', array("local" => array("name" => "Local", "selected" => false), "ldap" => array("name" => "LDAP", "selected" => true)));
+			?>
 		<tr id="realm_row">
 			<td>Realm:</td>
 			<td>
-				<select name="realm" style="width: 295px;">
-					<option value="local">Local</option>
-					<option value="ldap" selected>LDAP</option>
+				<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":"") . ">" . htmlspecialchars($realm["name"]) . "</option>\n";
+				}
+				}
+				?>
 				</select>
 			</td>
 			</tr>
@@ -319,6 +348,7 @@
 			<td><input type="submit" value="Login"></td>
 		</tr>
 	</table>
+<?php api_plugin_hook('login_after'); ?>
 	</form>
 </body>
 </html>
diff -ruBbdNa cacti-0.8.7h/cli/add_graph_template.php cacti-0.8.7h-pia//cli/add_graph_template.php
--- cacti-0.8.7h/cli/add_graph_template.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//cli/add_graph_template.php	2011-09-25 21:10:07.621946045 -0400
@@ -144,6 +144,7 @@
 		exit(1);
 	}else{
 		db_execute("replace into host_graph (host_id,graph_template_id) values (" . $host_id . "," . $graph_template_id . ")");
+		api_plugin_hook_function('add_graph_template_to_host', array("host_id" => $host_id, "graph_template_id" => $graph_template_id));
 	}
 
 	if (is_error_message()) {
diff -ruBbdNa cacti-0.8.7h/cli/host_update_template.php cacti-0.8.7h-pia//cli/host_update_template.php
--- cacti-0.8.7h/cli/host_update_template.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//cli/host_update_template.php	2011-09-25 21:10:07.621946045 -0400
@@ -136,6 +136,7 @@
 
 			foreach ($graph_templates as $graph_template) {
 				db_execute("REPLACE INTO host_graph (host_id, graph_template_id) VALUES (" . $host["id"] . ", " . $graph_template["graph_template_id"] . ")");
+				api_plugin_hook_function('add_graph_template_to_host', array("host_id" => $host["id"], "graph_template_id" => $graph_template["graph_template_id"]));
 			}
 		}
 	}
diff -ruBbdNa cacti-0.8.7h/data_sources.php cacti-0.8.7h-pia//data_sources.php
--- cacti-0.8.7h/data_sources.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//data_sources.php	2011-09-25 21:10:07.621946045 -0400
@@ -44,6 +44,8 @@
 	7 => "Disable"
 	);
 
+$ds_actions = api_plugin_hook_function('data_source_action_array', $ds_actions);
+
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
 
@@ -321,6 +323,8 @@
 						db_execute("delete from graph_templates_item where task_item_id IN (" . implode(",", $data_template_rrds) . ") and local_graph_id > 0");
 					}
 
+					api_plugin_hook_function('graph_items_remove', $data_template_rrds);
+
 					break;
 				case '3': /* delete all graphs tied to this data source */
 					$graphs = array_rekey(db_fetch_assoc("select
@@ -336,6 +340,8 @@
 						api_graph_remove_multi($graphs);
 					}
 
+					api_plugin_hook_function('graphs_remove', $graphs);
+
 					break;
 			}
 
@@ -346,6 +352,8 @@
 			}
 
 			api_data_source_remove_multi($selected_items);
+
+			api_plugin_hook_function('data_source_remove', $selected_items);
 		}elseif ($_POST["drp_action"] == "2") { /* change graph template */
 			for ($i=0;($i<count($selected_items));$i++) {
 				/* ================= input validation ================= */
@@ -398,6 +406,8 @@
 				api_reapply_suggested_data_source_title($selected_items[$i]);
 				update_data_source_title_cache($selected_items[$i]);
 			}
+		} else {
+			api_plugin_hook_function('data_source_action_execute', $_POST['drp_action']);
 		}
 		header("Location: data_sources.php");
 		exit;
@@ -541,6 +551,12 @@
 				</tr>\n
 				";
 			$save_html = "<input type='button' value='Cancel' onClick='window.history.back()'>&nbsp;<input type='submit' value='Continue' title='Reapply Suggested Naming to Data Source(s)'>";
+		}else{
+			$save['drp_action'] = $_POST['drp_action'];
+			$save['ds_list'] = $ds_list;
+			$save['ds_array'] = (isset($ds_array)? $ds_array : array());
+			api_plugin_hook_function('data_source_action_prepare', $save);
+			$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 data source.</span></td></tr>\n";
@@ -679,6 +695,8 @@
 	input_validate_input_number(get_request_var("host_id"));
 	/* ==================================================== */
 
+	api_plugin_hook('data_source_edit_top');
+
 	$use_data_template = true;
 	$host_id = 0;
 
@@ -971,6 +989,8 @@
 
 	form_save_button("data_sources.php");
 
+	api_plugin_hook('data_source_edit_bottom');
+
 	include_once("./include/bottom_footer.php");
 }
 
@@ -1305,10 +1325,35 @@
 	$i = 0;
 	if (sizeof($data_sources) > 0) {
 		foreach ($data_sources as $data_source) {
+			$data_source["data_template_name"] = htmlspecialchars($data_source["data_template_name"]);
+			$data_name_cache = title_trim(htmlspecialchars($data_source["name_cache"]), read_config_option("max_title_data_source"));
+
+			if (trim(get_request_var_request("filter") != "")) {
+				$data_source['data_input_name'] = (preg_replace("/(" . preg_quote(get_request_var_request("filter")) . ")/i", "<span style='background-color: #F8D93D;'>\\1</span>", htmlspecialchars($data_source['data_input_name'])));
+				$data_source['data_template_name'] = preg_replace("/(" . preg_quote(get_request_var_request("filter")) . ")/i", "<span style='background-color: #F8D93D;'>\\1</span>", $data_source['data_template_name']);
+				$data_name_cache = preg_replace("/(" . preg_quote(get_request_var_request("filter")) . ")/i", "<span style='background-color: #F8D93D;'>\\1</span>", ($data_name_cache));
+			}
+
+			/* keep copy of data source for comparison */
+			$data_source_orig = $data_source;
+			$data_source = api_plugin_hook_function('data_sources_table', $data_source);
 			/* we're escaping strings here, so no need to escape them on form_selectable_cell */
+			if ($data_source_orig["data_template_name"] != $data_source["data_template_name"]) {
+				/* was changed by plugin, plugin has to take care for html-escaping */
+				$data_template_name = ((empty($data_source["data_template_name"])) ? "<em>None</em>" : $data_source["data_template_name"]);
+			} else {
+				/* we take care of html-escaping */
 			$data_template_name = ((empty($data_source["data_template_name"])) ? "<em>None</em>" : htmlspecialchars($data_source["data_template_name"]));
+			}
+			if ($data_source_orig["data_input_name"] != $data_source["data_input_name"]) {
+				/* was changed by plugin, plugin has to take care for html-escaping */
+				$data_input_name = ((empty($data_source["data_input_name"])) ? "<em>None</em>" : $data_source["data_input_name"]);
+			} else {
+				/* we take care of html-escaping */
 			$data_input_name    = ((empty($data_source["data_input_name"])) ? "<em>External</em>" : htmlspecialchars($data_source["data_input_name"]));
+			}
 			$poller_interval    = ((isset($poller_intervals[$data_source["local_data_id"]])) ? $poller_intervals[$data_source["local_data_id"]] : 0);
+
 			form_alternate_row_color($colors["alternate"], $colors["light"], $i, 'line' . $data_source["local_data_id"]); $i++;
 			form_selectable_cell("<a class='linkEditMain' href='" . htmlspecialchars("data_sources.php?action=ds_edit&id=" . $data_source["local_data_id"]) . "' title='" . $data_source["name_cache"] . "'>" . ((get_request_var_request("filter") != "") ? preg_replace("/(" . preg_quote(get_request_var_request("filter")) . ")/i", "<span style='background-color: #F8D93D;'>\\1</span>", title_trim(htmlspecialchars($data_source["name_cache"]), read_config_option("max_title_data_source"))) : title_trim(htmlspecialchars($data_source["name_cache"]), read_config_option("max_title_data_source"))) . "</a>", $data_source["local_data_id"]);
 			form_selectable_cell($data_source['local_data_id'], $data_source['local_data_id']);
diff -ruBbdNa cacti-0.8.7h/graph.php cacti-0.8.7h-pia//graph.php
--- cacti-0.8.7h/graph.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//graph.php	2011-09-25 21:10:07.622945935 -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"));
@@ -77,6 +79,12 @@
 
 switch ($_REQUEST["action"]) {
 case 'view':
+	api_plugin_hook_function('page_buttons',
+		array('lgid' => $_GET["local_graph_id"],
+			'leafid' => '',//$leaf_id,
+			'mode' => 'mrtg',
+			'rraid' => $_GET["rra_id"])
+		);
 	?>
 	<tr bgcolor='#<?php print $colors["header"];?>'>
 		<td colspan='3' class='textHeaderDark'>
@@ -102,7 +110,8 @@
 								<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"] . "&graph_start=" . $graph_start . "&graph_end=" . $graph_end);?>'><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"] .  "&graph_start=" . $graph_start . "&graph_end=" . $graph_end);?>'><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"] .  "&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='#page_top'><img src='images/graph_page_top.gif' border='0' alt='Page Top' title='Page Top' style='padding: 3px;'></a><br>
+								<?php api_plugin_hook('graph_buttons', array('hook' => 'view', 'local_graph_id' => $_GET['local_graph_id'], 'rra' => $rra['id'], 'view_type' => $_REQUEST['view_type'])); ?>
+								<a href='#page_top'><img src='<?php print $config['url_path']; ?>images/graph_page_top.gif' border='0' alt='Page Top' title='Page Top' style='padding: 3px;'></a><br>
 							</td>
 						</tr>
 						<tr>
@@ -116,6 +125,7 @@
 			<?php
 			$i++;
 		}
+		api_plugin_hook_function('tree_view_page_end');
 	}
 
 	break;
@@ -218,6 +228,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>
+						<?php api_plugin_hook('graph_buttons', array('hook' => 'zoom', 'local_graph_id' => $_GET['local_graph_id'], 'rra' =>  $_GET['rra_id'], 'view_type' => $_REQUEST['view_type'])); ?>
 					</td>
 				</tr>
 				<tr>
@@ -250,6 +261,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"] . "&graph_start=" . get_request_var("graph_start") . "&graph_end=" . get_request_var("graph_end"));?>'><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>
+						<?php api_plugin_hook('graph_buttons', array('hook' => 'properties', 'local_graph_id' => $_GET['local_graph_id'], 'rra' =>  $_GET['rra_id'], 'view_type' => $_REQUEST['view_type'])); ?>
 					</td>
 				</tr>
 				<tr>
diff -ruBbdNa cacti-0.8.7h/graph_image.php cacti-0.8.7h-pia//graph_image.php
--- cacti-0.8.7h/graph_image.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//graph_image.php	2011-09-25 21:10:07.622945935 -0400
@@ -48,6 +48,8 @@
 /* flush the headers now */
 ob_end_clean();
 
+api_plugin_hook_function('graph_image');
+
 session_write_close();
 
 $graph_data_array = array();
diff -ruBbdNa cacti-0.8.7h/graphs.php cacti-0.8.7h-pia//graphs.php
--- cacti-0.8.7h/graphs.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//graphs.php	2011-09-25 21:10:07.622945935 -0400
@@ -45,6 +45,8 @@
 	4 => "Convert to Graph Template"
 	);
 
+$graph_actions = api_plugin_hook_function('graphs_action_array', $graph_actions);
+
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
 
@@ -287,12 +289,15 @@
 
 					if (sizeof($data_sources)) {
 						api_data_source_remove_multi($data_sources);
+						api_plugin_hook_function('data_source_remove', $data_sources);
 					}
 
 					break;
 			}
 
 			api_graph_remove_multi($selected_items);
+
+			api_plugin_hook_function('graphs_remove', $selected_items);
 		}elseif ($_POST["drp_action"] == "2") { /* change graph template */
 			input_validate_input_number(get_request_var_post("graph_template_id"));
 			for ($i=0;($i<count($selected_items));$i++) {
@@ -357,6 +362,8 @@
 
 				api_resize_graphs($selected_items[$i], $_POST["graph_width"], $_POST["graph_height"]);
 			}
+		} else {
+			api_plugin_hook_function('graphs_action_execute', $_POST['drp_action']);
 		}
 
 		header("Location: graphs.php");
@@ -509,6 +516,12 @@
 				";
 
 			$save_html = "<input type='button' value='Cancel' onClick='window.history.back()'>&nbsp;<input type='submit' value='Continue' title='Resize Selected Graph(s)'>";
+		} else {
+			$save['drp_action'] = $_POST['drp_action'];
+			$save['graph_list'] = $graph_list;
+			$save['graph_array'] = (isset($graph_array) ? $graph_array : array());
+			api_plugin_hook_function('graphs_action_prepare', $save);
+			$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 graph.</span></td></tr>\n";
@@ -1247,6 +1260,9 @@
 		$sql_where .= " AND graph_templates_graph.graph_template_id=" . get_request_var_request("template_id");
 	}
 
+	/* allow plugins to modify sql_where */
+	$sql_where .= api_plugin_hook_function('graphs_sql_where', $sql_where);
+
 	/* print checkbox form for validation */
 	print "<form name='chk' method='post' action='graphs.php'>\n";
 
diff -ruBbdNa cacti-0.8.7h/graphs_new.php cacti-0.8.7h-pia//graphs_new.php
--- cacti-0.8.7h/graphs_new.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//graphs_new.php	2011-09-25 21:10:07.622945935 -0400
@@ -512,6 +512,7 @@
 			<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>
 				<span style="white-space: nowrap; color: #c16921;">*</span><a href="<?php print htmlspecialchars("host.php?action=edit");?>">Create New Host</a><br>
+				<?php api_plugin_hook('graphs_new_top_links'); ?>
 			</td>
 		</tr>
 	</table>
@@ -836,7 +837,7 @@
 					}
 
 					while (list($field_name, $field_array) = each($xml_array["fields"])) {
-						if ($field_array["direction"] == "input" && sizeof($field_names)) {
+						if ($field_array["direction"] == "input") {
 							foreach($field_names as $row) {
 								if ($row["field_name"] == $field_name) {
 									$html_dq_header .= "<td style='height:1px;'><strong><font color='#" . $colors["header_text"] . "'>" . $field_array["name"] . "</font></strong></td>\n";
diff -ruBbdNa cacti-0.8.7h/host.php cacti-0.8.7h-pia//host.php
--- cacti-0.8.7h/host.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//host.php	2011-09-25 21:10:07.623945827 -0400
@@ -44,6 +44,8 @@
 	6 => "Change Availability Options"
 	);
 
+$device_actions = api_plugin_hook_function('device_action_array', $device_actions);
+
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
 
@@ -137,6 +139,7 @@
 		/* ==================================================== */
 
 		db_execute("replace into host_graph (host_id,graph_template_id) values (" . $_POST["id"] . "," . $_POST["graph_template_id"] . ")");
+		api_plugin_hook_function('add_graph_template_to_host', array("host_id" => $_POST["id"], "graph_template_id" => $_POST["graph_template_id"]));
 
 		header("Location: host.php?action=edit&id=" . $_POST["id"]);
 		exit;
@@ -289,16 +292,22 @@
 				case '1': /* leave graphs and data_sources in place, but disable the data sources */
 					api_data_source_disable_multi($data_sources_to_act_on);
 
+					api_plugin_hook_function('data_source_remove', $data_sources_to_act_on);
+
 					break;
 				case '2': /* delete graphs/data sources tied to this device */
 					api_data_source_remove_multi($data_sources_to_act_on);
 
 					api_graph_remove_multi($graphs_to_act_on);
 
+					api_plugin_hook_function('graphs_remove', $graphs_to_act_on);
+
 					break;
 			}
 
 			api_device_remove_multi($devices_to_act_on);
+
+			api_plugin_hook_function('device_remove', $devices_to_act_on);
 		}elseif (preg_match("/^tr_([0-9]+)$/", $_POST["drp_action"], $matches)) { /* place on tree */
 			for ($i=0;($i<count($selected_items));$i++) {
 				/* ================= input validation ================= */
@@ -309,6 +318,8 @@
 
 				api_tree_item_save(0, $_POST["tree_id"], TREE_ITEM_TYPE_HOST, $_POST["tree_item_id"], "", 0, read_graph_config_option("default_rra_id"), $selected_items[$i], 1, 1, false);
 			}
+		} else {
+			api_plugin_hook_function('device_action_execute', $_POST['drp_action']);
 		}
 
 		header("Location: host.php");
@@ -454,6 +465,12 @@
 				<input type='hidden' name='tree_id' value='" . $matches[1] . "'>\n
 				";
 			$save_html = "<input type='button' value='Cancel' onClick='window.history.back()'>&nbsp;<input type='submit' value='Continue' title='Place Device(s) on Tree'>";
+		} else {
+			$save['drp_action'] = $_POST['drp_action'];
+			$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' value='Continue'>";
 		}
 	}else{
 		print "<tr><td bgcolor='#" . $colors["form_alternate1"]. "'><span class='textError'>You must select at least one device.</span></td></tr>\n";
@@ -536,6 +553,8 @@
 	input_validate_input_number(get_request_var("id"));
 	/* ==================================================== */
 
+	api_plugin_hook('host_edit_top');
+
 	if (!empty($_GET["id"])) {
 		$host = db_fetch_row("select * from host where id=" . $_GET["id"]);
 		$header_label = "[edit: " . htmlspecialchars($host["description"]) . "]";
@@ -647,6 +666,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>
 					<span style="color: #c16921;">*</span><a href="<?php print htmlspecialchars("graphs.php?host_id=" . $host["id"] . "&graph_rows=30&filter=&template_id=-1&page=1");?>">Graph List</a>
+					<?php api_plugin_hook('device_edit_top_links'); ?>
 				</td>
 			</tr>
 		</table>
@@ -1111,6 +1131,8 @@
 	}
 
 	form_save_button("host.php", "return");
+
+	api_plugin_hook('host_edit_bottom');
 }
 
 function host() {
diff -ruBbdNa cacti-0.8.7h/images/disable_icon.png cacti-0.8.7h-pia//images/disable_icon.png
diff -ruBbdNa cacti-0.8.7h/images/enable_icon.png cacti-0.8.7h-pia//images/enable_icon.png
diff -ruBbdNa cacti-0.8.7h/images/enable_icon_disabled.png cacti-0.8.7h-pia//images/enable_icon_disabled.png
diff -ruBbdNa cacti-0.8.7h/images/install_icon.png cacti-0.8.7h-pia//images/install_icon.png
diff -ruBbdNa cacti-0.8.7h/images/install_icon_disabled.png cacti-0.8.7h-pia//images/install_icon_disabled.png
diff -ruBbdNa cacti-0.8.7h/images/uninstall_icon.gif cacti-0.8.7h-pia//images/uninstall_icon.gif
diff -ruBbdNa cacti-0.8.7h/images/view_none.gif cacti-0.8.7h-pia//images/view_none.gif
diff -ruBbdNa cacti-0.8.7h/include/auth.php cacti-0.8.7h-pia//include/auth.php
--- cacti-0.8.7h/include/auth.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//include/auth.php	2011-09-25 21:10:07.625945615 -0400
@@ -26,14 +26,17 @@
 
 /* check to see if this is a new installation */
 if (db_fetch_cell("select cacti from version") != $config["cacti_version"]) {
-	header ("Location: install/");
+	header ("Location: " . $config['url_path'] . "install/");
 	exit;
 }
 
 if (read_config_option("auth_method") != 0) {
+	/* handle alternate authentication realms */
+	api_plugin_hook_function('auth_alternate_realms');
+
 	/* handle change password dialog */
 	if ((isset($_SESSION['sess_change_password'])) && (read_config_option("webbasic_enabled") != "on")) {
-		header ("Location: auth_changepassword.php?ref=" . (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "index.php"));
+		header ("Location: " . $config['url_path'] . "auth_changepassword.php?ref=" . (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "index.php"));
 		exit;
 	}
 
@@ -72,9 +75,9 @@
 			and user_auth_realm.realm_id='$realm_id'")) || (empty($realm_id)))) {
 
 			if (isset($_SERVER["HTTP_REFERER"])) {
-				$goBack = "<td class='textArea' colspan='2' align='center'>( <a href='" . htmlspecialchars($_SERVER["HTTP_REFERER"]) . "'>Return</a> | <a href='logout.php'>Login Again</a> )</td>";
+				$goBack = "<td class='textArea' colspan='2' align='center'>( <a href='" . htmlspecialchars($_SERVER["HTTP_REFERER"]) . "'>Return</a> | <a href='" . $config['url_path'] . "logout.php'>Login Again</a> )</td>";
 			}else{
-				$goBack = "<td class='textArea' colspan='2' align='center'>( <a href='logout.php'>Login Again</a> )</td>";
+				$goBack = "<td class='textArea' colspan='2' align='center'>( <a href='" . $config['url_path'] . "logout.php'>Login Again</a> )</td>";
 			}
 
 			?>
@@ -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>
 			<body>
 			<br><br>
 
 			<table width="450" align='center'>
 				<tr>
-					<td colspan='2'><img src='images/auth_deny.gif' border='0' alt='Access Denied'></td>
+					<td colspan='2'><img src='<?php echo $config['url_path']; ?>images/auth_deny.gif' border='0' alt='Access Denied'></td>
 				</tr>
 				<tr style='height:10px;'><td></td></tr>
 				<tr>
diff -ruBbdNa cacti-0.8.7h/include/bottom_footer.php cacti-0.8.7h-pia//include/bottom_footer.php
--- cacti-0.8.7h/include/bottom_footer.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//include/bottom_footer.php	2011-09-25 21:10:07.625945615 -0400
@@ -21,17 +21,25 @@
  | http://www.cacti.net/                                                   |
  +-------------------------------------------------------------------------+
 */
+
+$oper_mode = api_plugin_hook_function('bottom_footer', OPER_MODE_NATIVE);
+if (($oper_mode == OPER_MODE_NATIVE) || ($oper_mode == OPER_MODE_IFRAME_NONAV)) {
+
 ?>
 			</div>
-			<br>
+			</br>
 		</td>
 	</tr>
 	
 </table>
+<?php api_plugin_hook('page_bottom');?>
 </body>
 </html>
 
 <?php
+
+}
+
 /* 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 -ruBbdNa cacti-0.8.7h/include/config.php.dist cacti-0.8.7h-pia//include/config.php.dist
--- cacti-0.8.7h/include/config.php.dist	1969-12-31 19:00:00.000000000 -0500
+++ cacti-0.8.7h-pia//include/config.php.dist	2011-09-25 21:10:07.624945720 -0400
@@ -0,0 +1,44 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2011 The Cacti Group                                 |
+ |                                                                         |
+ | This program is free software; you can redistribute it and/or           |
+ | modify it under the terms of the GNU General Public License             |
+ | as published by the Free Software Foundation; either version 2          |
+ | of the License, or (at your option) any later version.                  |
+ |                                                                         |
+ | This program is distributed in the hope that it will be useful,         |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of          |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           |
+ | GNU General Public License for more details.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDTool-based Graphing Solution                     |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See  |
+ | about.php and/or the AUTHORS file for specific developer information.   |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/                                                   |
+ +-------------------------------------------------------------------------+
+*/
+
+/* make sure these values refect your actual database/host/user/password */
+$database_type = "mysql";
+$database_default = "cacti";
+$database_hostname = "localhost";
+$database_username = "cactiuser";
+$database_password = "cactiuser";
+$database_port = "3306";
+$database_ssl = false;
+
+/*
+   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 -ruBbdNa cacti-0.8.7h/include/global.php cacti-0.8.7h-pia//include/global.php
--- cacti-0.8.7h/include/global.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//include/global.php	2011-09-25 21:10:07.626945512 -0400
@@ -94,6 +94,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 */
 if ($config["cacti_server_os"] == "win32") {
 	$config["base_path"]    = str_replace("\\", "/", substr(dirname(__FILE__),0,-8));
@@ -194,15 +201,17 @@
 /* include base modules */
 include_once($config["library_path"] . "/adodb/adodb.inc.php");
 include_once($config["library_path"] . "/database.php");
-include_once($config["library_path"] . "/functions.php");
-include_once($config["include_path"] . "/global_constants.php");
-include_once($config["include_path"] . "/global_arrays.php");
-include_once($config["include_path"] . "/global_settings.php");
 
 /* connect to the database server */
 db_connect_real($database_hostname, $database_username, $database_password, $database_default, $database_type, $database_port, $database_ssl);
 
 /* include additional modules */
+include_once($config["library_path"] . "/functions.php");
+include_once($config["include_path"] . "/global_constants.php");
+include_once($config["library_path"] . "/plugins.php");
+include_once($config["include_path"] . "/plugins.php");
+include_once($config["include_path"] . "/global_arrays.php");
+include_once($config["include_path"] . "/global_settings.php");
 include_once($config["include_path"] . "/global_form.php");
 include_once($config["library_path"] . "/html.php");
 include_once($config["library_path"] . "/html_form.php");
@@ -211,6 +220,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.7h";
 
diff -ruBbdNa cacti-0.8.7h/include/global_arrays.php cacti-0.8.7h-pia//include/global_arrays.php
--- cacti-0.8.7h/include/global_arrays.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//include/global_arrays.php	2011-09-25 21:10:07.624945720 -0400
@@ -22,6 +22,8 @@
  +-------------------------------------------------------------------------+
 */
 
+global $menu;
+
 $messages = array(
 	1  => array(
 		"message" => 'Save Successful.',
@@ -689,4 +691,10 @@
 	GDC_SLASH => "/"
 	);
 
+$plugin_architecture = array(
+	'version' => '3.0'
+	);
+
+api_plugin_hook('config_arrays');
+
 ?>
diff -ruBbdNa cacti-0.8.7h/include/global_constants.php cacti-0.8.7h-pia//include/global_constants.php
--- cacti-0.8.7h/include/global_constants.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//include/global_constants.php	2011-09-25 21:10:07.626945512 -0400
@@ -182,4 +182,9 @@
 define("SNMP_CMDPHP", 1);
 define("SNMP_WEBUI", 2);
 
+define('OPER_MODE_NATIVE', 0);
+define('OPER_MODE_RESKIN', 1);
+define('OPER_MODE_IFRAME_NONAV', 2);
+define('OPER_MODE_NOTABS', 3);
+
 ?>
diff -ruBbdNa cacti-0.8.7h/include/global_form.php cacti-0.8.7h-pia//include/global_form.php
--- cacti-0.8.7h/include/global_form.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//include/global_form.php	2011-09-25 21:10:07.624945720 -0400
@@ -22,8 +22,9 @@
  +-------------------------------------------------------------------------+
 */
 
-if (!defined("VALID_HOST_FIELDS")) {
-	define("VALID_HOST_FIELDS", "(hostname|snmp_community|snmp_username|snmp_password|snmp_auth_protocol|snmp_priv_passphrase|snmp_priv_protocol|snmp_context|snmp_version|snmp_port|snmp_timeout)");
+if (!defined('VALID_HOST_FIELDS')) {
+	$string = api_plugin_hook_function('valid_host_fields', '(hostname|snmp_community|snmp_username|snmp_password|snmp_auth_protocol|snmp_priv_passphrase|snmp_priv_protocol|snmp_context|snmp_version|snmp_port|snmp_timeout)');
+	define('VALID_HOST_FIELDS', $string);
 }
 
 /* file: cdef.php, action: edit */
@@ -1241,4 +1242,6 @@
 		"sql_all" => "select rra.id from rra where id in (1,2,3,4) order by id",
 		),
 	);
+
+api_plugin_hook('config_form');
 ?>
diff -ruBbdNa cacti-0.8.7h/include/global_settings.php cacti-0.8.7h-pia//include/global_settings.php
--- cacti-0.8.7h/include/global_settings.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//include/global_settings.php	2011-09-25 21:10:07.625945615 -0400
@@ -1190,4 +1190,6 @@
 		)
 	);
 
+api_plugin_hook('config_settings');
+
 ?>
diff -ruBbdNa cacti-0.8.7h/include/plugins.php cacti-0.8.7h-pia//include/plugins.php
--- cacti-0.8.7h/include/plugins.php	1969-12-31 19:00:00.000000000 -0500
+++ cacti-0.8.7h-pia//include/plugins.php	2011-09-25 21:10:07.625945615 -0400
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team (http://squirrelmail.org)
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ */
+
+global $plugin_hooks, $plugins_system, $plugins;
+$plugin_hooks = array();
+$plugins_system = array('settings', 'boost', 'dsstats');
+
+function use_plugin ($name) {
+	global $config;
+	if (file_exists($config['base_path'] . "/plugins/$name/setup.php")) {
+		include_once($config['base_path'] . "/plugins/$name/setup.php");
+		$function = "plugin_init_$name";
+		if (function_exists($function)) {
+			$function();
+		}
+	}
+}
+
+/**
+ * This function executes a hook.
+ * @param string $name Name of hook to fire
+ * @return mixed $data
+ */
+if (!is_array($plugins)) {
+	$plugins = array();
+}
+
+$oldplugins = read_config_option('oldplugins');
+if (strlen(trim($oldplugins))) {
+	$oldplugins = explode(',', $oldplugins);
+	$plugins    = array_merge($plugins, $oldplugins);
+}
+
+/* On startup, register all plugins configured for use. */
+if (isset($plugins) && is_array($plugins)) {
+	foreach ($plugins as $name) {
+		use_plugin($name);
+	}
+}
diff -ruBbdNa cacti-0.8.7h/include/top_graph_header.php cacti-0.8.7h-pia//include/top_graph_header.php
--- cacti-0.8.7h/include/top_graph_header.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//include/top_graph_header.php	2011-09-25 21:10:07.625945615 -0400
@@ -22,9 +22,15 @@
  +-------------------------------------------------------------------------+
 */
 
+global $menu;
 $using_guest_account = false;
 $show_console_tab = true;
 
+$oper_mode = api_plugin_hook_function('top_graph_header', OPER_MODE_NATIVE);
+if ($oper_mode == OPER_MODE_RESKIN) {
+	return;
+}
+
 /* ================= input validation ================= */
 input_validate_input_number(get_request_var_request("local_graph_id"));
 input_validate_input_number(get_request_var_request("graph_start"));
@@ -52,52 +58,69 @@
 	$_SESSION["sess_nav_level_cache"][2]["url"] = "graph.php?local_graph_id=" . $_REQUEST["local_graph_id"] . "&rra_id=all";
 }
 
+$page_title = api_plugin_hook_function('page_title', draw_navigation_text("title"));
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<title><?php echo draw_navigation_text("title");?></title>
+	<title><?php echo $page_title; ?></title>
 	<?php
 	if (isset($_SESSION["custom"]) && $_SESSION["custom"] == true) {
 		print "<meta http-equiv=refresh content='99999'>\r\n";
 	}else if (isset($_REQUEST["action"]) && $_REQUEST["action"] == 'zoom') {
 		print "<meta http-equiv=refresh content='99999'>\r\n";
 	}else{
-		print "<meta http-equiv=refresh content='" . htmlspecialchars(read_graph_config_option("page_refresh"),ENT_QUOTES) . "'>\r\n";
+		$refresh = api_plugin_hook_function('top_graph_refresh', htmlspecialchars(read_graph_config_option("page_refresh"),ENT_QUOTES));
+		if (is_array($refresh)) {
+			print "<meta http-equiv=refresh content='" . $refresh["seconds"] . "; url=" . $refresh["page"] . "'>\r\n";
+		}else{
+			print "<meta http-equiv=refresh content='" . $refresh . "'>\r\n";
+		}
 	}
 	?>
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<link href="include/main.css" type="text/css" rel="stylesheet">
-	<link href="images/favicon.ico" rel="shortcut icon"/>
-	<script type="text/javascript" src="include/layout.js"></script>
-	<script type="text/javascript" src="include/treeview/ua.js"></script>
-	<script type="text/javascript" src="include/treeview/ftiens4.js"></script>
-	<script type="text/javascript" src="include/jscalendar/calendar.js"></script>
-	<script type="text/javascript" src="include/jscalendar/lang/calendar-en.js"></script>
-	<script type="text/javascript" src="include/jscalendar/calendar-setup.js"></script>
+	<link href="<?php echo $config['url_path']; ?>include/main.css" type="text/css" rel="stylesheet">
+	<link href="<?php echo $config['url_path']; ?>images/favicon.ico" rel="shortcut icon"/>
+	<script type="text/javascript" src="<?php echo $config['url_path']; ?>include/layout.js"></script>
+	<script type="text/javascript" src="<?php echo $config['url_path']; ?>include/treeview/ua.js"></script>
+	<script type="text/javascript" src="<?php echo $config['url_path']; ?>include/treeview/ftiens4.js"></script>
+	<script type="text/javascript" src="<?php echo $config['url_path']; ?>include/jscalendar/calendar.js"></script>
+	<script type="text/javascript" src="<?php echo $config['url_path']; ?>include/jscalendar/lang/calendar-en.js"></script>
+	<script type="text/javascript" src="<?php echo $config['url_path']; ?>include/jscalendar/calendar-setup.js"></script>
+	<?php api_plugin_hook('page_head'); ?>
 </head>
 
-<body>
+<?php if ($oper_mode == OPER_MODE_NATIVE) {?>
+<body <?php print api_plugin_hook_function("body_style", "");?>>
 <a name='page_top'></a>
+<?php }else{?>
+<body <?php print api_plugin_hook_function("body_style", "");?>>
+<?php }?>
+
 <table style="width:100%;height:100%;" cellspacing="0" cellpadding="0">
+<?php if ($oper_mode == OPER_MODE_NATIVE) { ;?>
 	<tr style="height:25px;" bgcolor="#a9a9a9" class="noprint">
 		<td colspan="2" valign="bottom" nowrap>
 			<table width="100%" cellspacing="0" cellpadding="0">
-				<tr style="background: transparent url('images/cacti_backdrop2.gif') no-repeat center right;">
+				<tr style="background: transparent url('<?php echo $config['url_path']; ?>images/cacti_backdrop2.gif') no-repeat center right;">
 					<td id="tabs" nowrap>
-						&nbsp;<?php if ($show_console_tab == true) {?><a href="index.php"><img src="images/tab_console.gif" alt="Console" align="absmiddle" border="0"></a><?php }?><a href="graph_view.php"><img src="images/tab_graphs<?php if ((substr(basename($_SERVER["PHP_SELF"]),0,5) == "graph") || (basename($_SERVER["PHP_SELF"]) == "graph_settings.php")) { print "_down"; } print ".gif";?>" alt="Graphs" align="absmiddle" border="0"></a>&nbsp;
+						&nbsp;<?php if ($show_console_tab == true) {?><a href="<?php echo $config['url_path']; ?>index.php"><img src="<?php echo $config['url_path']; ?>images/tab_console.gif" alt="Console" align="absmiddle" border="0"></a><?php }?><a href="<?php echo $config['url_path']; ?>graph_view.php"><img src="<?php echo $config['url_path']; ?>images/tab_graphs<?php if ((substr(basename($_SERVER["PHP_SELF"]),0,5) == "graph") || (basename($_SERVER["PHP_SELF"]) == "graph_settings.php")) { print "_down"; } print ".gif";?>" alt="Graphs" align="absmiddle" border="0"></a><?php
+						api_plugin_hook('top_graph_header_tabs');
+						?>
 					</td>
 					<td id="gtabs" align="right" nowrap>
-						<?php if ((!isset($_SESSION["sess_user_id"])) || ($current_user["graph_settings"] == "on")) { print '<a href="graph_settings.php"><img src="images/tab_settings'; if (basename($_SERVER["PHP_SELF"]) == "graph_settings.php") { print "_down"; } print '.gif" border="0" alt="Settings" align="absmiddle"></a>';}?>&nbsp;&nbsp;<?php if ((!isset($_SESSION["sess_user_id"])) || ($current_user["show_tree"] == "on")) {?><a href="<?php print htmlspecialchars("graph_view.php?action=tree");?>"><img src="images/tab_mode_tree<?php if (isset($_REQUEST["action"]) && $_REQUEST["action"] == "tree") { print "_down"; }?>.gif" border="0" title="Tree View" alt="Tree View" align="absmiddle"></a><?php }?><?php if ((!isset($_SESSION["sess_user_id"])) || ($current_user["show_list"] == "on")) {?><a href="graph_view.php?action=list"><img src="images/tab_mode_list<?php if (isset($_REQUEST["action"]) && $_REQUEST["action"] == "list") { print "_down"; }?>.gif" border="0" title="List View" alt="List View" align="absmiddle"></a><?php }?><?php if ((!isset($_SESSION["sess_user_id"])) || ($current_user["show_preview"] == "on")) {?><a href="graph_view.php?action=preview"><img src="images/tab_mode_preview<?php if (isset($_REQUEST["action"]) && $_REQUEST["action"] == "preview") { print "_down"; }?>.gif" border="0" title="Preview View" alt="Preview View" align="absmiddle"></a><?php }?>&nbsp;<br>
+						<?php if ((!isset($_SESSION["sess_user_id"])) || ($current_user["graph_settings"] == "on")) { print '<a href="' . $config['url_path'] . 'graph_settings.php"><img src="' . $config['url_path'] . 'images/tab_settings'; if (basename($_SERVER["PHP_SELF"]) == "graph_settings.php") { print "_down"; } print '.gif" border="0" alt="Settings" align="absmiddle"></a>';}?>&nbsp;&nbsp;<?php if ((!isset($_SESSION["sess_user_id"])) || ($current_user["show_tree"] == "on")) {?><a href="<?php print htmlspecialchars($config['url_path'] . "graph_view.php?action=tree");?>"><img src="<?php echo $config['url_path']; ?>images/tab_mode_tree<?php if (isset($_REQUEST["action"]) && $_REQUEST["action"] == "tree") { print "_down"; }?>.gif" border="0" title="Tree View" alt="Tree View" align="absmiddle"></a><?php }?><?php if ((!isset($_SESSION["sess_user_id"])) || ($current_user["show_list"] == "on")) {?><a href="<?php print htmlspecialchars($config['url_path'] . "graph_view.php?action=list");?>"><img src="<?php echo $config['url_path']; ?>images/tab_mode_list<?php if (isset($_REQUEST["action"]) && $_REQUEST["action"] == "list") { print "_down"; }?>.gif" border="0" title="List View" alt="List View" align="absmiddle"></a><?php }?><?php if ((!isset($_SESSION["sess_user_id"])) || ($current_user["show_preview"] == "on")) {?><a href="<?php print htmlspecialchars($config['url_path'] . "graph_view.php?action=preview");?>"><img src="<?php echo $config['url_path']; ?>images/tab_mode_preview<?php if (isset($_REQUEST["action"]) && $_REQUEST["action"] == "preview") { print "_down"; }?>.gif" border="0" title="Preview View" alt="Preview View" align="absmiddle"></a><?php }?>&nbsp;<br>
 					</td>
 				</tr>
 			</table>
 		</td>
 	</tr>
+<?php } elseif ($oper_mode == OPER_MODE_NOTABS) { api_plugin_hook_function('print_top_header'); } ?>
 	<tr style="height:2px;" bgcolor="#183c8f" class="noprint">
 		<td colspan="2">
-			<img src="images/transparent_line.gif" style="height:2px;width:170px;" border="0"><br>
+			<img src="<?php echo $config['url_path']; ?>images/transparent_line.gif" style="height:2px;width:170px;" border="0"><br>
 		</td>
 	</tr>
 	<tr style="height:5px;" bgcolor="#e9e9e9" class="noprint">
@@ -109,7 +132,7 @@
 					</td>
 					<td align="right">
 						<?php if ((isset($_SESSION["sess_user_id"])) && ($using_guest_account == false)) { ?>
-						Logged in as <strong><?php print db_fetch_cell("select username from user_auth where id=" . $_SESSION["sess_user_id"]);?></strong> (<a href="logout.php">Logout</a>)&nbsp;
+						Logged in as <strong><?php print db_fetch_cell("select username from user_auth where id=" . $_SESSION["sess_user_id"]);?></strong> (<a href="<?php echo $config['url_path']; ?>logout.php">Logout</a>)&nbsp;
 						<?php } ?>
 					</td>
 				</tr>
@@ -117,10 +140,10 @@
 		</td>
 	</tr>
 	<tr class="noprint">
-		<td bgcolor="#efefef" colspan="1" style="height:8px;background-image: url(images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
-			<img src="images/transparent_line.gif" width="<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>" style="height:2px;" border="0"><br>
+		<td bgcolor="#efefef" colspan="1" style="height:8px;background-image: url(<?php echo $config['url_path']; ?>images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
+			<img src="<?php echo $config['url_path']; ?>images/transparent_line.gif" width="<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>" style="height:2px;" border="0"><br>
 		</td>
-		<td bgcolor="#ffffff" colspan="1" style="height:8px;background-image: url(images/shadow.gif); background-repeat: repeat-x;">
+		<td bgcolor="#ffffff" colspan="1" style="height:8px;background-image: url(<?php echo $config['url_path']; ?>images/shadow.gif); background-repeat: repeat-x;">
 
 		</td>
 	</tr>
@@ -146,6 +169,8 @@
 		</td>
 	</tr>
 	<?php }
+
+	global $graph_views;
 	load_current_session_value("action", "sess_cacti_graph_action", $graph_views[read_graph_config_option("default_tree_view_mode")]);
 	?>
 	<tr>
diff -ruBbdNa cacti-0.8.7h/include/top_header.php cacti-0.8.7h-pia//include/top_header.php
--- cacti-0.8.7h/include/top_header.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//include/top_header.php	2011-09-25 21:10:07.626945512 -0400
@@ -22,39 +22,59 @@
  +-------------------------------------------------------------------------+
 */
 
-global $colors;
+global $colors, $config, $menu, $refresh;
+
+$oper_mode = api_plugin_hook_function('top_header', OPER_MODE_NATIVE);
+if ($oper_mode == OPER_MODE_RESKIN) {
+	return;
+}
+
+$page_title = api_plugin_hook_function('page_title', draw_navigation_text("title"));
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<title><?php echo draw_navigation_text("title");?></title>
-	<link href="include/main.css" type="text/css" rel="stylesheet">
-	<link href="images/favicon.ico" rel="shortcut icon"/>
+	<title><?php echo $page_title; ?></title>
+	<link href="<?php echo $config['url_path']; ?>include/main.css" type="text/css" rel="stylesheet">
+	<link href="<?php echo $config['url_path']; ?>images/favicon.ico" rel="shortcut icon">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<script type="text/javascript" src="include/layout.js"></script>
-	<?php if (isset($refresh)) {
-	print "<meta http-equiv=refresh content=\"" . $refresh["seconds"] . "; url='" . $refresh["page"] . "'\">";
-	}?>
+	<script type="text/javascript" src="<?php echo $config['url_path']; ?>include/layout.js"></script>
+	<?php
+	if (isset($refresh)) {
+		if (is_array($refresh)) {
+			print "<meta http-equiv=refresh content=\"" . $refresh["seconds"] . "; url='" . $refresh["page"] . "'\">\r\n";
+		}else{
+			print "<meta http-equiv=refresh content='" . $refresh . "'>\r\n";
+		}
+	}
+	api_plugin_hook('page_head'); ?>
 </head>
 
-<body style="background-image:url('images/left_border.gif');background-repeat:repeat-y;">
+<?php if ($oper_mode == OPER_MODE_NATIVE) {?>
+<body style="background-image:url('<?php print $config['url_path'];?>images/left_border.gif');background-repeat:repeat-y;" <?php print api_plugin_hook_function("body_style", "");?>>
+<?php }else{?>
+<body style="background-image:url('<?php print $config['url_path'];?>images/left_border.gif');background-repeat:repeat-y;" <?php print api_plugin_hook_function("body_style", "");?>>
+<?php }?>
 
 <table width="100%" cellspacing="0" cellpadding="0">
+<?php if ($oper_mode == OPER_MODE_NATIVE) { ;?>
 	<tr style="height:1px;" bgcolor="#a9a9a9">
 		<td valign="bottom" colspan="3" nowrap>
 			<table width="100%" cellspacing="0" cellpadding="0">
-				<tr style="background: transparent url('images/cacti_backdrop.gif') no-repeat center right;">
+				<tr style="background: transparent url('<?php echo $config['url_path']; ?>images/cacti_backdrop.gif') no-repeat center right;">
 					<td id="tabs" valign="bottom">
-						&nbsp;<a href="index.php"><img src="images/tab_console_down.gif" alt="Console" align="absmiddle" border="0"></a><a href="graph_view.php"><img src="images/tab_graphs.gif" alt="Graphs" align="absmiddle" border="0"></a>
-					</td>
+						&nbsp;<a href="<?php echo $config['url_path']; ?>index.php"><img src="<?php echo $config['url_path']; ?>images/tab_console_down.gif" alt="Console" align="absmiddle" border="0"></a><a href="<?php echo $config['url_path']; ?>graph_view.php"><img src="<?php echo $config['url_path']; ?>images/tab_graphs.gif" alt="Graphs" align="absmiddle" border="0"></a><?php
+						api_plugin_hook('top_header_tabs');
+					?></td>
 				</tr>
 			</table>
 		</td>
 	</tr>
 	<tr style="height:2px;" bgcolor="#183c8f">
 		<td colspan="3">
-			<img src="images/transparent_line.gif" style="height:2px;" border="0"><br>
+			<img src="<?php echo $config['url_path']; ?>images/transparent_line.gif" style="height:2px;" border="0"><br>
 		</td>
 	</tr>
 	<tr style="height:5px;" bgcolor="#e9e9e9">
@@ -66,7 +86,7 @@
 					</td>
 					<td align="right">
 						<?php if (read_config_option("auth_method") != 0) { ?>
-						Logged in as <strong><?php print db_fetch_cell("select username from user_auth where id=" . $_SESSION["sess_user_id"]);?></strong> (<a href="logout.php">Logout</a>)&nbsp;
+						Logged in as <strong><?php print db_fetch_cell("select username from user_auth where id=" . $_SESSION["sess_user_id"]);?></strong> (<a href="<?php echo $config['url_path']; ?>logout.php">Logout</a>)&nbsp;
 						<?php } ?>
 					</td>
 				</tr>
@@ -74,22 +94,25 @@
 		</td>
 	</tr>
 	<tr>
-		<td bgcolor="#f5f5f5" colspan="1" style="height:8px;width:135px;background-image: url(images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
-			<img src="images/transparent_line.gif" style="height:2px;width:135px;" border="0"><br>
+		<td bgcolor="#f5f5f5" colspan="1" style="height:8px;width:135px;background-image: url(<?php echo $config['url_path']; ?>images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
+			<img src="<?php echo $config['url_path']; ?>images/transparent_line.gif" style="height:2px;width:135px;" border="0"><br>
 		</td>
-		<td colspan="2" style="height:8px;background-image: url(images/shadow.gif); background-repeat: repeat-x;" bgcolor="#ffffff">
+		<td colspan="2" style="height:8px;background-image: url(<?php echo $config['url_path']; ?>images/shadow.gif); background-repeat: repeat-x;" bgcolor="#ffffff">
 
 		</td>
 	</tr>
 	<tr>
-		<td valign="top" colspan="1" rowspan="2" width="135" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#f5f5f5'>
-			<table bgcolor="#f5f5f5" width="100%" cellpadding="1" cellspacing="0" border="0">
+		<td valign="top" colspan="1" rowspan="2" width="135" style="width:135px;padding:5px;border-right:#aaaaaa 1px solid;" bgcolor='#f5f5f5'>
+			<table bgcolor="#f5f5f5" width="100%" cellpadding="1" cellspacing="0" border="0" style="width:135px;">
 				<?php draw_menu();?>
 			</table>
 
-			<img src="images/transparent_line.gif" style="height:5px;width:135px;" border="0"><br>
-			<p align="center"><a href='about.php'><img src="images/cacti_logo.gif" border="0"></a></p>
-			<img src="images/transparent_line.gif" style="height:5px;width:135px;" border="0"><br>
+			<img src="<?php echo $config['url_path']; ?>images/transparent_line.gif" style="height:5px;width:135px;" border="0"><br>
+			<p style="width:135px;" align="center"><a href='<?php echo $config['url_path']; ?>about.php'><img src="<?php echo $config['url_path']; ?>images/cacti_logo.gif" border="0"></a></p>
+			<img src="<?php echo $config['url_path']; ?>images/transparent_line.gif" style="height:5px;width:135px;" border="0"><br>
 		</td>
 		<td width="100%" colspan="2" valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;"><?php display_output_messages();?><div style='position:relative;' id='main'>
-
+<?php }else{ ?>
+	<tr>
+		<td width="100%" valign="top"><?php display_output_messages();?>
+<?php } ?>
diff -ruBbdNa cacti-0.8.7h/index.php cacti-0.8.7h-pia//index.php
--- cacti-0.8.7h/index.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//index.php	2011-09-25 21:10:07.626945512 -0400
@@ -25,6 +25,8 @@
 include("./include/auth.php");
 include("./include/top_header.php");
 
+api_plugin_hook('console_before');
+
 ?>
 <table width="100%" align="center">
 	<tr>
@@ -46,6 +48,8 @@
 
 <?php
 
+api_plugin_hook('console_after');
+
 include("./include/bottom_footer.php");
 
 ?>
diff -ruBbdNa cacti-0.8.7h/lib/api_device.php cacti-0.8.7h-pia//lib/api_device.php
--- cacti-0.8.7h/lib/api_device.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/api_device.php	2011-09-25 21:10:07.626945512 -0400
@@ -141,6 +141,8 @@
 	$save["max_oids"]             = form_input_validate($max_oids, "max_oids", "^[0-9]+$", true, 3);
 	$save["device_threads"]       = form_input_validate($device_threads, "device_threads", "^[0-9]+$", true, 3);
 
+	$save = api_plugin_hook_function('api_device_save', $save);
+
 	$host_id = 0;
 
 	if (!is_error_message()) {
@@ -180,11 +182,16 @@
 			if (sizeof($graph_templates) > 0) {
 			foreach ($graph_templates as $graph_template) {
 				db_execute("replace into host_graph (host_id,graph_template_id) values ($host_id," . $graph_template["graph_template_id"] . ")");
+				api_plugin_hook_function('add_graph_template_to_host', array("host_id" => $host_id, "graph_template_id" => $graph_template["graph_template_id"]));
 			}
 			}
 		}
 	}
 
+	# now that we have the id of the new host, we may plugin postprocessing code
+	$save["id"] = $host_id;
+	api_plugin_hook_function('api_device_new', $save);
+
 	return $host_id;
 }
 
diff -ruBbdNa cacti-0.8.7h/lib/api_graph.php cacti-0.8.7h-pia//lib/api_graph.php
--- cacti-0.8.7h/lib/api_graph.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/api_graph.php	2011-09-25 21:10:07.629945213 -0400
@@ -132,17 +132,17 @@
 		"AND field_name = 'title' " .
 		"ORDER BY sequence");
 
-	$suggested_values_graph = array();
+	$found = false;
 	if (sizeof($suggested_values) > 0) {
 		foreach ($suggested_values as $suggested_value) {
 			/* once we find a match; don't try to find more */
-			if (!isset($suggested_values_graph{$suggested_value["field_name"]})) {
+			if (!$found) {
 				$subs_string = substitute_snmp_query_data($suggested_value["text"], $graph_local["host_id"], $graph_local["snmp_query_id"], $graph_local["snmp_index"], read_config_option("max_data_query_field_length"));
 				/* if there are no '|' characters, all of the substitutions were successful */
 				if ((!substr_count($subs_string, "|query"))) {
 					db_execute("UPDATE graph_templates_graph SET " . $suggested_value["field_name"] . "='" . $suggested_value["text"] . "' WHERE local_graph_id=" . $local_graph_id);
-					/* once we find a working value for this very field, stop */
-					$suggested_values_graph{$suggested_value["field_name"]} = true;
+					/* once we find a working value, stop */
+					$found = true;
 				}
 			}
 		}
diff -ruBbdNa cacti-0.8.7h/lib/auth.php cacti-0.8.7h-pia//lib/auth.php
--- cacti-0.8.7h/lib/auth.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/auth.php	2011-09-25 21:10:07.629945213 -0400
@@ -121,8 +121,9 @@
 		}
 	}
 
-	return true;
+	api_plugin_hook_function('copy_user', array('template_id' => $template_id, 'new_id' => $new_id));
 
+	return true;
 }
 
 
@@ -152,6 +153,7 @@
 	db_execute("delete from settings_graphs where user_id=" . $user_id);
 	db_execute("delete from settings_tree where user_id=" . $user_id);
 
+	api_plugin_hook_function('user_remove', $user_id);
 }
 
 /* user_disable - disable a user account
diff -ruBbdNa cacti-0.8.7h/lib/data_query.php cacti-0.8.7h-pia//lib/data_query.php
--- cacti-0.8.7h/lib/data_query.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/data_query.php	2011-09-25 21:10:07.630945115 -0400
@@ -54,6 +54,8 @@
 	/* update the poller cache */
 	update_poller_cache_from_query($host_id, $snmp_query_id);
 
+	api_plugin_hook_function('run_data_query', array("host_id" => $host_id, "snmp_query_id" => $snmp_query_id));
+
 	return (isset($result) ? $result : true);
 }
 
diff -ruBbdNa cacti-0.8.7h/lib/functions.php cacti-0.8.7h-pia//lib/functions.php
--- cacti-0.8.7h/lib/functions.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/functions.php	2011-09-25 21:10:07.628945311 -0400
@@ -1691,6 +1691,8 @@
    @arg $type - (string) Either 'url' or 'title'
    @returns (string> Either the navigation text or title */
 function draw_navigation_text($type = "url") {
+	global $config;
+
 	$nav_level_cache = (isset($_SESSION["sess_nav_level_cache"]) ? $_SESSION["sess_nav_level_cache"] : array());
 
 	$nav = array(
@@ -1703,8 +1705,8 @@
 		"graph.php:zoom" => array("title" => "Zoom", "mapping" => "graph_view.php:,?,graph.php:view", "level" => "3"),
 		"graph.php:properties" => array("title" => "Properties", "mapping" => "graph_view.php:,?,graph.php:view", "level" => "3"),
 		"graph_settings.php:" => array("title" => "Settings", "mapping" => "graph_view.php:", "url" => "graph_settings.php", "level" => "1"),
-		"index.php:" => array("title" => "Console", "mapping" => "", "url" => "index.php", "level" => "0"),
-		"index.php:login" => array("title" => "Console", "mapping" => "", "url" => "index.php", "level" => "0"),
+		"index.php:" => array("title" => "Console", "mapping" => "", "url" => $config['url_path'] . "index.php", "level" => "0"),
+		"index.php:login" => array("title" => "Console", "mapping" => "", "url" => $config['url_path'] . "index.php", "level" => "0"),
 		"graphs.php:" => array("title" => "Graph Management", "mapping" => "index.php:", "url" => "graphs.php", "level" => "1"),
 		"graphs.php:graph_edit" => array("title" => "(Edit)", "mapping" => "index.php:,graphs.php:", "url" => "", "level" => "2"),
 		"graphs.php:graph_diff" => array("title" => "Change Graph Template", "mapping" => "index.php:,graphs.php:,graphs.php:graph_edit", "url" => "", "level" => "3"),
@@ -1782,6 +1784,8 @@
 		"templates_import.php:" => array("title" => "Import Templates", "mapping" => "index.php:", "url" => "templates_import.php", "level" => "1"),
 		);
 
+	$nav =  api_plugin_hook_function('draw_navigation_text', $nav);
+
 	$current_page = basename($_SERVER["PHP_SELF"]);
 
 	input_validate_input_regex(get_request_var_request("action"), "^([a-zA-Z0-9_-]+)$");
diff -ruBbdNa cacti-0.8.7h/lib/html.php cacti-0.8.7h-pia//lib/html.php
--- cacti-0.8.7h/lib/html.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/html.php	2011-09-25 21:10:07.627945411 -0400
@@ -144,14 +144,15 @@
 					<table align='center' cellpadding='0'>
 						<tr>
 							<td align='center'>
-								<div style="min-height: <?php echo (1.6 * $graph["height"]) . "px"?>;"><a href='<?php print htmlspecialchars("graph.php?action=view&local_graph_id=" . $graph["local_graph_id"] . "&rra_id=all");?>'><img class='graphimage' id='graph_<?php print $graph["local_graph_id"] ?>' src='<?php print htmlspecialchars("graph_image.php?local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0" . (($extra_url_args == "") ? "" : "&$extra_url_args"));?>' border='0' alt='<?php print htmlspecialchars($graph["title_cache"]);?>'></a></div>
+								<div style="min-height: <?php echo (1.6 * $graph["height"]) . "px"?>;"><a href='<?php print htmlspecialchars($config['url_path'] . "graph.php?action=view&local_graph_id=" . $graph["local_graph_id"] . "&rra_id=all");?>'><img class='graphimage' id='graph_<?php print $graph["local_graph_id"] ?>' src='<?php print htmlspecialchars($config['url_path'] . "graph_image.php?local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0" . (($extra_url_args == "") ? "" : "&$extra_url_args"));?>' border='0' alt='<?php print htmlspecialchars($graph["title_cache"]);?>'></a></div>
 								<?php print (read_graph_config_option("show_graph_title") == "on" ? "<p style='font-size: 10;' align='center'><strong>" . htmlspecialchars($graph["title_cache"]) . "</strong></p>" : "");?>
 							</td>
 							<td valign='top' style='align: left; padding: 3px;' class='noprint'>
-								<a href='<?php print htmlspecialchars("graph.php?action=zoom&local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0&". $extra_url_args);?>'><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=" . $graph["local_graph_id"] . "&rra_id=0&" . $extra_url_args);?>'><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=" . $graph["local_graph_id"] . "&rra_id=0&" . $extra_url_args);?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a><br>
-								<a href='#page_top'><img src='images/graph_page_top.gif' border='0' alt='Page Top' title='Page Top' style='padding: 3px;'></a><br>
+								<a href='<?php print htmlspecialchars($config['url_path'] . "graph.php?action=zoom&local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0&". $extra_url_args);?>'><img src='<?php print $config['url_path'];?>images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
+								<a href='<?php print htmlspecialchars($config['url_path'] . "graph_xport.php?local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0&" . $extra_url_args);?>'><img src='<?php print $config['url_path'];?>images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
+								<a href='<?php print htmlspecialchars($config['url_path'] . "graph.php?action=properties&local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0&" . $extra_url_args);?>'><img src='<?php print $config['url_path'];?>images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a><br>
+								<?php api_plugin_hook('graph_buttons', array('hook' => 'graphs_thumbnails', 'local_graph_id' => $graph['local_graph_id'], 'rra' =>  0, 'view_type' => 'view')); ?>
+								<a href='#page_top'><img src='<?php print $config['url_path']; ?>images/graph_page_top.gif' border='0' alt='Page Top' title='Page Top' style='padding: 3px;'></a><br>
 							</td>
 						</tr>
 					</table>
@@ -177,6 +178,7 @@
    @arg $extra_url_args - extra arguments to append to the url
    @arg $header - html to use as a header */
 function html_graph_thumbnail_area(&$graph_array, $no_graphs_message = "", $extra_url_args = "", $header = "") {
+	global $config;
 	$i = 0; $k = 0; $j = 0;
 
 	$num_graphs = sizeof($graph_array);
@@ -268,14 +270,15 @@
 				<table align='center' cellpadding='0'>
 					<tr>
 						<td align='center'>
-							<div style="min-height: <?php echo (1.6 * read_graph_config_option("default_height")) . "px"?>;"><a href='<?php print htmlspecialchars("graph.php?action=view&rra_id=all&local_graph_id=" . $graph["local_graph_id"]);?>'><img class='graphimage' id='graph_<?php print $graph["local_graph_id"] ?>' src='<?php print htmlspecialchars("graph_image.php?local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0&graph_height=" . read_graph_config_option("default_height") . "&graph_width=" . read_graph_config_option("default_width") . "&graph_nolegend=true" . (($extra_url_args == "") ? "" : "&$extra_url_args"));?>' border='0' alt='<?php print htmlspecialchars($graph["title_cache"]);?>'></a></div>
+							<div style="min-height: <?php echo (1.6 * read_graph_config_option("default_height")) . "px"?>;"><a href='<?php print htmlspecialchars($config['url_path'] . "graph.php?action=view&rra_id=all&local_graph_id=" . $graph["local_graph_id"]);?>'><img class='graphimage' id='graph_<?php print $graph["local_graph_id"] ?>' src='<?php print htmlspecialchars($config["url_path"] . "graph_image.php?local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0&graph_height=" . read_graph_config_option("default_height") . "&graph_width=" . read_graph_config_option("default_width") . "&graph_nolegend=true" . (($extra_url_args == "") ? "" : "&$extra_url_args"));?>' border='0' alt='<?php print htmlspecialchars($graph["title_cache"]);?>'></a></div>
 							<?php print (read_graph_config_option("show_graph_title") == "on" ? "<p style='font-size: 10;' align='center'><strong>" . htmlspecialchars($graph["title_cache"]) . "</strong></p>" : "");?>
 						</td>
 						<td valign='top' style='align: left; padding: 3px;'>
-							<a href='<?php print htmlspecialchars("graph.php?action=zoom&local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0&" . $extra_url_args);?>'><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=" . $graph["local_graph_id"] . "&rra_id=0&" . $extra_url_args);?>'><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=" . $graph["local_graph_id"] . "&rra_id=0&" . $extra_url_args);?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a><br>
-							<a href='#page_top'><img src='images/graph_page_top.gif' border='0' alt='Page Top' title='Page Top' style='padding: 3px;'></a><br>
+							<a href='<?php print htmlspecialchars($config['url_path'] . "graph.php?action=zoom&local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0&" . $extra_url_args);?>'><img src='<?php print $config['url_path'];?>images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
+							<a href='<?php print htmlspecialchars($config['url_path'] . "graph_xport.php?local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0&" . $extra_url_args);?>'><img src='<?php print $config['url_path'];?>images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
+							<a href='<?php print htmlspecialchars($config['url_path'] . "graph.php?action=properties&local_graph_id=" . $graph["local_graph_id"] . "&rra_id=0&" . $extra_url_args);?>'><img src='<?php print $config['url_path'];?>images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a><br>
+							<?php api_plugin_hook('graph_buttons_thumbnails', array('hook' => 'graphs_thumbnails', 'local_graph_id' => $graph['local_graph_id'], 'rra' =>  0, 'view_type' => '')); ?>
+							<a href='#page_top'><img src='<?php print $config['url_path'] . "images/graph_page_top.gif";?>' border='0' alt='Page Top' title='Page Top' style='padding: 3px;'></a><br>
 						</td>
 					</tr>
 				</table>
@@ -638,9 +641,9 @@
 		print "<td style='$this_row_style'>" . $item["hex"] . "</td>\n";
 
 		if ($disable_controls == false) {
-			print "<td><a href='" . htmlspecialchars("$filename?action=item_movedown&id=" . $item["id"] . "&$url_data") . "'><img src='images/move_down.gif' border='0' alt='Move Down'></a>
-					<a href='" . htmlspecialchars("$filename?action=item_moveup&id=" . $item["id"] . "&$url_data") . "'><img src='images/move_up.gif' border='0' alt='Move Up'></a></td>\n";
-			print "<td align='right'><a href='" . htmlspecialchars("$filename?action=item_remove&id=" . $item["id"] . "&$url_data") . "'><img src='images/delete_icon.gif' style='height:10px;width:10px;' border='0' alt='Delete'></a></td>\n";
+			print "<td><a href='" . htmlspecialchars("$filename?action=item_movedown&id=" . $item["id"] . "&$url_data") . "'><img src='" . $config['url_path'] . "images/move_down.gif' border='0' alt='Move Down'></a>
+					<a href='" . htmlspecialchars("$filename?action=item_moveup&id=" . $item["id"] . "&$url_data") . "'><img src='" . $config['url_path'] . "images/move_up.gif' border='0' alt='Move Up'></a></td>\n";
+			print "<td align='right'><a href='" . htmlspecialchars("$filename?action=item_remove&id=" . $item["id"] . "&$url_data") . "'><img src='" . $config['url_path'] . "images/delete_icon.gif' style='height:10px;width:10px;' border='0' alt='Delete'></a></td>\n";
 		}
 
 		print "</tr>";
@@ -706,6 +709,8 @@
 					}
 
 					while (list($item_sub_url, $item_sub_title) = each($item_title)) {
+						$item_sub_url = $config['url_path'] . $item_sub_url;
+
 						/* indent sub-items */
 						if ($i > 0) {
 							$prepend_string = "---&nbsp;";
@@ -715,7 +720,7 @@
 
 						/* do not put a line between each sub-item */
 						if (($i == 0) || ($draw_sub_items == false)) {
-							$background = "images/menu_line.gif";
+							$background = $config['url_path'] . "images/menu_line.gif";
 						}else{
 							$background = "";
 						}
@@ -744,17 +749,18 @@
 			}else{
 				if ($current_realm_id == -1 || (isset($user_realms[$current_realm_id])) || (!isset($user_auth_realm_filenames{basename($item_url)}))) {
 					/* draw normal (non sub-item) menu item */
+					$item_url = $config['url_path'] . $item_url;
 					if (basename($_SERVER["PHP_SELF"]) == basename($item_url)) {
-						print "<tr><td class='textMenuItemSelected' style='background-image:url(\"images/menu_line.gif\");'><strong><a href='" . htmlspecialchars($item_url) . "'>$item_title</a></strong></td></tr>\n";
+						print "<tr><td class='textMenuItemSelected' style='background-image:url(\"" . $config['url_path'] . "images/menu_line.gif\");'><strong><a href='" . htmlspecialchars($item_url) . "'>$item_title</a></strong></td></tr>\n";
 					}else{
-						print "<tr><td class='textMenuItem' style='background-image:url(\"images/menu_line.gif\");'><a href='" . htmlspecialchars($item_url) . "'>$item_title</a></td></tr>\n";
+						print "<tr><td class='textMenuItem' style='background-image:url(\"" . $config['url_path'] . "images/menu_line.gif\");'><a href='" . htmlspecialchars($item_url) . "'>$item_title</a></td></tr>\n";
 					}
 				}
 			}
 		}
 	}
 
-	print "<tr><td class='textMenuItem' style='background-image:url(\"images/menu_line.gif\");'></td></tr>\n";
+	print "<tr><td class='textMenuItem' style='background-image:url(\"" . $config['url_path'] . "images/menu_line.gif\");'></td></tr>\n";
 
 	print "</table></td></tr>";
 }
@@ -764,11 +770,12 @@
    @arg $actions_array - an array that contains a list of possible actions. this array should
      be compatible with the form_dropdown() function */
 function draw_actions_dropdown($actions_array) {
+	global $config;
 	?>
 	<table align='center' width='100%'>
 		<tr>
 			<td width='1' valign='top'>
-				<img src='images/arrow.gif' alt=''>&nbsp;
+				<img src='<?php echo $config['url_path']; ?>images/arrow.gif' alt='' align='middle'>&nbsp;
 			</td>
 			<td align='right'>
 				Choose an action:
diff -ruBbdNa cacti-0.8.7h/lib/html_form.php cacti-0.8.7h-pia//lib/html_form.php
--- cacti-0.8.7h/lib/html_form.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/html_form.php	2011-09-25 21:10:07.627945411 -0400
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2011 The Cacti Group                                 |
@@ -766,11 +767,13 @@
      on a confirmation form
    @arg $cancel_url - the url to go to when the user clicks 'cancel'
    @arg $action_url - the url to go to when the user clicks 'delete' */
-function form_confirm_buttons($action_url, $cancel_url) { ?>
+function form_confirm_buttons($action_url, $cancel_url) {
+	global $config;
+	?>
 	<tr>
 		<td bgcolor="#E1E1E1">
-			<input type='button' onClick='cactiReturnTo("<?php print $cancel_url;?>")' value='Cancel'>
-			<input type='submit' onClick='cactiReturnTo("<?php print $action_url;?>&confirm=true")' value='Delete'>
+			<input type='button' onClick='cactiReturnTo("<?php print $config['url_path'] . $cancel_url;?>")' value='Cancel'>
+			<input type='submit' onClick='cactiReturnTo("<?php print $config['url_path'] . $action_url;?>&confirm=true")' value='Delete'>
 		</td>
 	</tr>
 <?php }
diff -ruBbdNa cacti-0.8.7h/lib/html_tree.php cacti-0.8.7h-pia//lib/html_tree.php
--- cacti-0.8.7h/lib/html_tree.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/html_tree.php	2011-09-25 21:10:07.630945115 -0400
@@ -985,6 +985,16 @@
 	<?php
 	html_end_box();
 
+	api_plugin_hook_function('graph_tree_page_buttons',
+		array(
+			'treeid' => $tree_id,
+			'leafid' => $leaf_id,
+			'mode' => 'tree',
+			'timespan' => $_SESSION["sess_current_timespan"],
+			'starttime' => get_current_graph_start(),
+			'endtime' => get_current_graph_end())
+	);
+
 	html_start_box("", "100%", $colors["header"], "3", "center", "");
 
 	$graph_list = array();
@@ -1189,6 +1199,12 @@
 		html_graph_area($new_graph_list, "", "view_type=tree&graph_start=" . get_current_graph_start() . "&graph_end=" . get_current_graph_end());
 	}
 
+	if (!empty($leaf_id)) {
+		api_plugin_hook_function('tree_after',$host_name.','.get_request_var("leaf_id"));
+	}
+
+	api_plugin_hook_function('tree_view_page_end');
+
 	print $nav;
 
 	html_end_box();
diff -ruBbdNa cacti-0.8.7h/lib/plugins.php cacti-0.8.7h-pia//lib/plugins.php
--- cacti-0.8.7h/lib/plugins.php	1969-12-31 19:00:00.000000000 -0500
+++ cacti-0.8.7h-pia//lib/plugins.php	2011-09-25 21:10:07.629945213 -0400
@@ -0,0 +1,469 @@
+<?php
+
+function do_hook ($name) {
+	$data = func_get_args();
+	$data = api_plugin_hook ($name, $data);
+	return $data;
+}
+
+function do_hook_function($name,$parm=NULL) {
+	return api_plugin_hook_function ($name, $parm);
+}
+
+function api_user_realm_auth ($filename = '') {
+	return api_plugin_user_realm_auth ($filename);
+}
+
+/**
+ * This function executes a hook.
+ * @param string $name Name of hook to fire
+ * @return mixed $data
+ */
+function api_plugin_hook ($name) {
+	global $config, $plugin_hooks, $plugins_system;
+	$data = func_get_args();
+	$ret = '';
+	$p = array();
+
+	$ps_where = '';
+	if (sizeof($plugins_system)) {
+		foreach($plugins_system as $plugin) {
+			$ps_where .= (strlen($ps_where) ? "', '":"('") . $plugin;
+		}
+		$ps_where .= "')";
+	}
+
+	/* order the plugin functions by system first, then followed by order */
+	$result = db_fetch_assoc("SELECT 1 AS id, ph.name, ph.file, ph.function
+		FROM plugin_hooks AS ph
+		LEFT JOIN plugin_config AS pc
+		ON pc.directory=ph.name
+		WHERE ph.status = 1 AND hook = '$name'
+		AND ph.name IN $ps_where
+		UNION
+		SELECT pc.id, ph.name, ph.file, ph.function
+		FROM plugin_hooks AS ph
+		LEFT JOIN plugin_config AS pc
+		ON pc.directory=ph.name
+		WHERE ph.status = 1 AND hook = '$name'
+		AND ph.name NOT IN $ps_where
+		ORDER BY id ASC", true);
+
+	if (count($result)) {
+		foreach ($result as $hdata) {
+			$p[] = $hdata['name'];
+			if (file_exists($config['base_path'] . '/plugins/' . $hdata['name'] . '/' . $hdata['file'])) {
+				include_once($config['base_path'] . '/plugins/' . $hdata['name'] . '/' . $hdata['file']);
+			}
+			$function = $hdata['function'];
+			if (function_exists($function)) {
+				$function($data);
+			}
+		}
+	}
+
+	if (isset($plugin_hooks[$name]) && is_array($plugin_hooks[$name])) {
+		foreach ($plugin_hooks[$name] as $pname => $function) {
+			if (function_exists($function)  && !function_exists('plugin_' . $pname . '_install') && !in_array($pname, $p)) {
+				$function($data);
+			}
+		}
+	}
+
+	/* Variable-length argument lists have a slight problem when */
+	/* passing values by reference. Pity. This is a workaround.  */
+	return $data;
+}
+
+function api_plugin_hook_function ($name, $parm=NULL) {
+	global $config, $plugin_hooks, $plugins_system;
+	$ret = $parm;
+	$p = array();
+	$ps_where = '';
+
+	if (sizeof($plugins_system)) {
+		foreach($plugins_system as $plugin) {
+			$ps_where .= (strlen($ps_where) ? "', '":"('") . $plugin;
+		}
+		$ps_where .= "')";
+	}
+
+	/* order the plugin functions by system first, then followed by order */
+	$result = db_fetch_assoc("SELECT 1 AS id, ph.name, ph.file, ph.function
+		FROM plugin_hooks AS ph
+		LEFT JOIN plugin_config AS pc
+		ON pc.directory=ph.name
+		WHERE ph.status = 1 AND hook = '$name'
+		AND ph.name IN $ps_where
+		UNION
+		SELECT pc.id, ph.name, ph.file, ph.function
+		FROM plugin_hooks AS ph
+		LEFT JOIN plugin_config AS pc
+		ON pc.directory=ph.name
+		WHERE ph.status = 1 AND hook = '$name'
+		AND ph.name NOT IN $ps_where
+		ORDER BY id ASC", true);
+
+	if (count($result)) {
+		foreach ($result as $hdata) {
+			$p[] = $hdata['name'];
+			if (file_exists($config['base_path'] . '/plugins/' . $hdata['name'] . '/' . $hdata['file'])) {
+				include_once($config['base_path'] . '/plugins/' . $hdata['name'] . '/' . $hdata['file']);
+			}
+			$function = $hdata['function'];
+			if (function_exists($function)) {
+				$ret = $function($ret);
+			}
+		}
+	}
+
+	if (isset($plugin_hooks[$name]) && is_array($plugin_hooks[$name])) {
+		foreach ($plugin_hooks[$name] as $pname => $function) {
+			if (function_exists($function)  && !function_exists('plugin_' . $pname . '_install') && !in_array($pname, $p)) {
+				$ret = $function($ret);
+			}
+		}
+	}
+
+	/* Variable-length argument lists have a slight problem when */
+	/* passing values by reference. Pity. This is a workaround.  */
+	return $ret;
+}
+
+function api_plugin_db_table_create ($plugin, $table, $data) {
+	global $config, $database_default;
+	include_once($config["library_path"] . "/database.php");
+
+	$result = db_fetch_assoc("show tables from `" . $database_default . "`") or die (mysql_error());
+	$tables = array();
+	foreach($result as $index => $arr) {
+		foreach ($arr as $t) {
+			$tables[] = $t;
+		}
+	}
+	if (!in_array($table, $tables)) {
+		$c = 0;
+		$sql = 'CREATE TABLE `' . $table . "` (\n";
+		foreach ($data['columns'] as $column) {
+			if (isset($column['name'])) {
+				if ($c > 0)
+					$sql .= ",\n";
+				$sql .= '`' . $column['name'] . '`';
+				if (isset($column['type']))
+					$sql .= ' ' . $column['type'];
+				if (isset($column['unsigned']))
+					$sql .= ' unsigned';
+				if (isset($column['NULL']) && $column['NULL'] == false)
+					$sql .= ' NOT NULL';
+				if (isset($column['NULL']) && $column['NULL'] == true && !isset($column['default']))
+					$sql .= ' default NULL';
+				if (isset($column['default']))
+					$sql .= ' default ' . (is_numeric($column['default']) ? $column['default'] : "'" . $column['default'] . "'");
+				if (isset($column['auto_increment']))
+					$sql .= ' auto_increment';
+				$c++;
+			}
+		}
+
+		if (isset($data['primary'])) {
+			$sql .= ",\n PRIMARY KEY (`" . $data['primary'] . '`)';
+		}
+
+		if (isset($data['keys']) && sizeof($data['keys'])) {
+		foreach ($data['keys'] as $key) {
+			if (isset($key['name'])) {
+				$sql .= ",\n KEY `" . $key['name'] . '` (`' . $key['columns'] . '`)';
+			}
+		}
+		}
+		$sql .= ') ENGINE = ' . $data['type'];
+
+		if (isset($data['comment'])) {
+			$sql .= " COMMENT = '" . $data['comment'] . "'";
+		}
+		if (db_execute($sql)) {
+			db_execute("INSERT INTO plugin_db_changes (plugin, `table`, method) VALUES ('$plugin', '$table', 'create')");
+		}
+	} else {
+		db_execute("INSERT INTO plugin_db_changes (plugin, `table`, method) VALUES ('$plugin', '$table', 'create')");
+	}
+}
+
+function api_plugin_db_changes_remove ($plugin) {
+	// Example: api_plugin_db_changes_remove ('thold');
+
+	$tables = db_fetch_assoc("SELECT `table` FROM plugin_db_changes WHERE plugin = '$plugin' AND method ='create'", false);
+	if (count($tables)) {
+		foreach ($tables as $table) {
+			db_execute("DROP TABLE IF EXISTS `" . $table['table'] . "`;");
+		}
+		db_execute("DELETE FROM plugin_db_changes where plugin = '$plugin' AND method ='create'", false);
+	}
+	$columns = db_fetch_assoc("SELECT `table`, `column` FROM plugin_db_changes WHERE plugin = '$plugin' AND method ='addcolumn'", false);
+	if (count($columns)) {
+		foreach ($columns as $column) {
+			db_execute('ALTER TABLE `' . $column['table'] . '` DROP `' . $column['column'] . '`');
+		}
+		db_execute("DELETE FROM plugin_db_changes where plugin = '$plugin' AND method = 'addcolumn'", false);
+	}
+}
+
+function api_plugin_db_add_column ($plugin, $table, $column) {
+	// Example: api_plugin_db_add_column ('thold', 'plugin_config', array('name' => 'test' . rand(1, 200), 'type' => 'varchar (255)', 'NULL' => false));
+
+	global $config, $database_default;
+	include_once($config['library_path'] . '/database.php');
+
+	$result = db_fetch_assoc('show columns from `' . $table . '`') or die (mysql_error());
+	$columns = array();
+	foreach($result as $index => $arr) {
+		foreach ($arr as $t) {
+			$columns[] = $t;
+		}
+	}
+	if (isset($column['name']) && !in_array($column['name'], $columns)) {
+		$sql = 'ALTER TABLE `' . $table . '` ADD `' . $column['name'] . '`';
+		if (isset($column['type']))
+			$sql .= ' ' . $column['type'];
+		if (isset($column['unsigned']))
+			$sql .= ' unsigned';
+		if (isset($column['NULL']) && $column['NULL'] == false)
+			$sql .= ' NOT NULL';
+		if (isset($column['NULL']) && $column['NULL'] == true && !isset($column['default']))
+			$sql .= ' default NULL';
+		if (isset($column['default']))
+			$sql .= ' default ' . (is_numeric($column['default']) ? $column['default'] : "'" . $column['default'] . "'");
+		if (isset($column['auto_increment']))
+			$sql .= ' auto_increment';
+		if (isset($column['after']))
+			$sql .= ' AFTER ' . $column['after'];
+
+		if (db_execute($sql)) {
+			db_execute("INSERT INTO plugin_db_changes (plugin, `table`, `column`, `method`) VALUES ('$plugin', '$table', '" . $column['name'] . "', 'addcolumn')");
+		}
+	}
+}
+
+function api_plugin_install ($plugin) {
+	global $config;
+	include_once($config['base_path'] . "/plugins/$plugin/setup.php");
+
+	$exists = db_fetch_assoc("SELECT id FROM plugin_config WHERE directory = '$plugin'", false);
+	if (sizeof($exists)) {
+		db_execute("DELETE FROM plugin_config WHERE directory = '$plugin'");
+	}
+
+	$name = $author = $webpage = $version = '';
+	$function = 'plugin_' . $plugin . '_version';
+	if (function_exists($function)){
+		$info = $function();
+		$name = $info['longname'];
+		if (isset($info['homepage'])) {
+			$webpage = $info['homepage'];
+		}elseif (isset($info['webpage'])) {
+			$webpage = $info['webpage'];
+		}else{
+			$webpage = "Not Stated";
+		}
+		$author = $info['author'];
+		$version = $info['version'];
+	}
+
+	db_execute("INSERT INTO plugin_config (directory, name, author, webpage, version) VALUES ('$plugin', '$name', '$author', '$webpage', '$version')");
+
+	$function = 'plugin_' . $plugin . '_install';
+	if (function_exists($function)){
+		$function();
+		$ready = api_plugin_check_config ($plugin);
+		if ($ready) {
+			// Set the plugin as "disabled" so it can go live
+			db_execute("UPDATE plugin_config SET status = 4 WHERE directory = '$plugin'");
+		} else {
+			// Set the plugin as "needs configuration"
+			db_execute("UPDATE plugin_config SET status = 2 WHERE directory = '$plugin'");
+		}
+	}
+}
+
+function api_plugin_uninstall ($plugin) {
+	global $config;
+	include_once($config['base_path'] . "/plugins/$plugin/setup.php");
+	// Run the Plugin's Uninstall Function first
+	$function = 'plugin_' . $plugin . '_uninstall';
+	if (function_exists($function)) {
+		$function();
+	}
+	api_plugin_remove_hooks ($plugin);
+	api_plugin_remove_realms ($plugin);
+	db_execute("DELETE FROM plugin_config WHERE directory = '$plugin'");
+	api_plugin_db_changes_remove ($plugin);
+}
+
+function api_plugin_check_config ($plugin) {
+	global $config;
+	include_once($config['base_path'] . "/plugins/$plugin/setup.php");
+	$function = 'plugin_' . $plugin . '_check_config';
+	if (function_exists($function)) {
+		return $function();
+	}
+	return TRUE;
+}
+
+function api_plugin_enable ($plugin) {
+	$ready = api_plugin_check_config ($plugin);
+	if ($ready) {
+		api_plugin_enable_hooks ($plugin);
+		db_execute("UPDATE plugin_config SET status = 1 WHERE directory = '$plugin'");
+	}
+}
+
+function api_plugin_is_enabled ($plugin) {
+	$status = db_fetch_cell("SELECT status FROM plugin_config WHERE directory = '$plugin'", false);
+	if ($status == '1')
+		return true;
+	return false;
+}
+
+function api_plugin_disable ($plugin) {
+	api_plugin_disable_hooks ($plugin);
+	db_execute("UPDATE plugin_config SET status = 4 WHERE directory = '$plugin'");
+}
+
+function api_plugin_moveup($plugin) {
+	global $plugins_system;
+
+	$sql_where = "";
+	if (sizeof($plugins_system)) {
+		foreach($plugins_system as $s) {
+			$sql_where .= (strlen($sql_where) ? " AND ":"(") . " directory!='$s'";
+		}
+
+		$sql_where .= ")";
+	}
+
+	$id = db_fetch_cell("SELECT id FROM plugin_config WHERE directory='$plugin'" . (strlen($sql_where) ? " AND " . $sql_where:""));
+	$temp_id = db_fetch_cell("SELECT MAX(id) FROM plugin_config")+1;
+	$prior_id = db_fetch_cell("SELECT MAX(id) FROM plugin_config WHERE id<$id" . (strlen($sql_where) ? " AND " . $sql_where:""));
+
+	/* update the above plugin to the prior temp id */
+	db_execute("UPDATE plugin_config SET id=$temp_id WHERE id=$prior_id");
+	db_execute("UPDATE plugin_config SET id=$prior_id WHERE id=$id");
+	db_execute("UPDATE plugin_config SET id=$id WHERE id=$temp_id");
+}
+
+function api_plugin_movedown($plugin) {
+	global $plugins_system;
+
+	$sql_where = "";
+	if (sizeof($plugins_system)) {
+		foreach($plugins_system as $s) {
+			$sql_where .= (strlen($sql_where) ? " AND ":"(") . " directory!='$s'";
+		}
+
+		$sql_where .= ")";
+	}
+
+	$id = db_fetch_cell("SELECT id FROM plugin_config WHERE directory='$plugin'" . (strlen($sql_where) ? " AND " . $sql_where:""));
+	$temp_id = db_fetch_cell("SELECT MAX(id) FROM plugin_config")+1;
+	$next_id = db_fetch_cell("SELECT MIN(id) FROM plugin_config WHERE id>$id" . (strlen($sql_where) ? " AND " . $sql_where:""));
+
+	/* update the above plugin to the prior temp id */
+	db_execute("UPDATE plugin_config SET id=$temp_id WHERE id=$next_id");
+	db_execute("UPDATE plugin_config SET id=$next_id WHERE id=$id");
+	db_execute("UPDATE plugin_config SET id=$id WHERE id=$temp_id");
+}
+
+function api_plugin_register_hook ($plugin, $hook, $function, $file) {
+	$exists = db_fetch_assoc("SELECT id FROM plugin_hooks WHERE name = '$plugin' AND hook = '$hook'", false);
+	if (!count($exists)) {
+		$settings = array('config_settings', 'config_arrays', 'config_form');
+		if (!in_array($hook, $settings)) {
+			db_execute("INSERT INTO plugin_hooks (name, hook, function, file) VALUES ('$plugin', '$hook', '$function', '$file')");
+		} else {
+			db_execute("INSERT INTO plugin_hooks (name, hook, function, file, status) VALUES ('$plugin', '$hook', '$function', '$file', 1)");
+		}
+	}
+}
+
+function api_plugin_remove_hooks ($plugin) {
+	db_execute("DELETE FROM plugin_hooks WHERE name = '$plugin'");
+}
+
+function api_plugin_enable_hooks ($plugin) {
+	db_execute("UPDATE plugin_hooks SET status = 1 WHERE name = '$plugin'");
+}
+
+function api_plugin_disable_hooks ($plugin) {
+	db_execute("UPDATE plugin_hooks SET status = 0 WHERE name = '$plugin' AND hook != 'config_settings' AND hook != 'config_arrays' AND hook != 'config_form'");
+}
+
+function api_plugin_register_realm ($plugin, $file, $display, $admin = false) {
+	$exists = db_fetch_assoc("SELECT id FROM plugin_realms WHERE plugin = '$plugin' AND file = '$file'", false);
+	if (!count($exists)) {
+		db_execute("INSERT INTO plugin_realms (plugin, file, display) VALUES ('$plugin', '$file', '$display')");
+		if ($admin) {
+			$realm_id = db_fetch_assoc("SELECT id FROM plugin_realms WHERE plugin = '$plugin' AND file = '$file'", false);
+			$realm_id = $realm_id[0]['id'] + 100;
+			$user_id = db_fetch_assoc("SELECT id FROM user_auth WHERE username = 'admin'", false);
+			if (count($user_id)) {
+				$user_id = $user_id[0]['id'];
+				$exists = db_fetch_assoc("SELECT realm_id FROM user_auth_realm WHERE user_id = $user_id and realm_id = $realm_id", false);
+				if (!count($exists)) {
+					db_execute("INSERT INTO user_auth_realm (user_id, realm_id) VALUES ($user_id, $realm_id)");
+				}
+			}
+		}
+	}
+}
+
+function api_plugin_remove_realms ($plugin) {
+	$realms = db_fetch_assoc("SELECT id FROM plugin_realms WHERE plugin = '$plugin'", false);
+	foreach ($realms as $realm) {
+		$id = $realm['id'] + 100;
+		db_execute("DELETE FROM user_auth_realm WHERE realm_id = '$id'");
+	}
+	db_execute("DELETE FROM plugin_realms WHERE plugin = '$plugin'");
+}
+
+function api_plugin_load_realms () {
+	global $user_auth_realms, $user_auth_realm_filenames;
+	$plugin_realms = db_fetch_assoc("SELECT * FROM plugin_realms ORDER BY plugin, display", false);
+	if (count($plugin_realms)) {
+		foreach ($plugin_realms as $plugin_realm) {
+			$plugin_files = explode(',', $plugin_realm['file']);
+			foreach($plugin_files as $plugin_file) {
+				$user_auth_realm_filenames[$plugin_file] = $plugin_realm['id'] + 100;
+			}
+			$user_auth_realms[$plugin_realm['id'] + 100] = $plugin_realm['display'];
+		}
+	}
+}
+
+function api_plugin_user_realm_auth ($filename = '') {
+	global $user_realms, $user_auth_realms, $user_auth_realm_filenames;
+	/* list all realms that this user has access to */
+	if (!isset($user_realms)) {
+		if (read_config_option('global_auth') == 'on' || read_config_option('auth_method') != 0) {
+			$user_realms = db_fetch_assoc("select realm_id from user_auth_realm where user_id=" . $_SESSION["sess_user_id"], false);
+			$user_realms = array_rekey($user_realms, "realm_id", "realm_id");
+		}else{
+			$user_realms = $user_auth_realms;
+		}
+	}
+	if ($filename != '' && isset($user_auth_realm_filenames[basename($filename)])) {
+		if (isset($user_realms[$user_auth_realm_filenames[basename($filename)]]))
+			return TRUE;
+	}
+	return FALSE;
+}
+
+function plugin_config_arrays () {
+	global $menu;
+	$menu['Configuration']['plugins.php'] = 'Plugin Management';
+	api_plugin_load_realms ();
+}
+
+function plugin_draw_navigation_text ($nav) {
+	$nav["plugins.php:"] = array("title" => "Plugin Management", "mapping" => "index.php:", "url" => "plugins.php", "level" => "1");
+	return $nav;
+}
diff -ruBbdNa cacti-0.8.7h/lib/poller.php cacti-0.8.7h-pia//lib/poller.php
--- cacti-0.8.7h/lib/poller.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/poller.php	2011-09-25 21:10:07.630945115 -0400
@@ -432,8 +432,12 @@
 			db_execute("DELETE FROM poller_output WHERE local_data_id IN (" . implode(",", $data_ids) . ")");
 		}
 
+		api_plugin_hook_function('poller_output', $rrd_update_array);
+
+		if (api_plugin_hook_function('poller_on_demand', $results)) {
 		$rrds_processed = rrdtool_function_update($rrd_update_array, $rrdtool_pipe);
 	}
+	}
 
 	return $rrds_processed;
 }
diff -ruBbdNa cacti-0.8.7h/lib/rrd.php cacti-0.8.7h-pia//lib/rrd.php
--- cacti-0.8.7h/lib/rrd.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/rrd.php	2011-09-25 21:10:07.628945311 -0400
@@ -441,6 +441,9 @@
 		$data_source_path = $rrdtool_file;
 	}
 
+	/* update the rrdfile if performing a fetch */
+	api_plugin_hook_function('rrdtool_function_fetch_cache_check', $local_data_id);
+
 	/* build and run the rrdtool fetch command with all of our data */
 	$cmd_line = "fetch $data_source_path AVERAGE -s $start_time -e $end_time";
 	if ($resolution > 0) {
@@ -548,6 +551,10 @@
 		}
 	}
 
+	$data = api_plugin_hook_function('rrdtool_function_graph_cache_check', array('local_graph_id' => $local_graph_id,'rra_id' => $rra_id,'rrd_struc' => $rrdtool_pipe,'graph_data_array' => $graph_data_array, 'return' => false));
+	if (isset($data['return']) && $data['return'] != false)
+		return $data['return'];
+
 	/* find the step and how often this graph is updated with new data */
 	$ds_step = db_fetch_cell("select
 		data_template_data.rrd_step
@@ -1386,6 +1393,13 @@
 	}
 	}
 
+	$graph_array = api_plugin_hook_function('rrd_graph_graph_options', array('graph_opts' => $graph_opts, 'graph_defs' => $graph_defs, 'txt_graph_items' => $txt_graph_items, 'graph_id' => $local_graph_id, 'start' => $graph_start, 'end' => $graph_end));
+	if (!empty($graph_array)) {
+		$graph_defs = $graph_array['graph_defs'];
+		$txt_graph_items = $graph_array['txt_graph_items'];
+		$graph_opts = $graph_array['graph_opts'];
+	}
+
 	/* either print out the source or pass the source onto rrdtool to get us a nice PNG */
 	if (isset($graph_data_array["print_source"])) {
 		print "<PRE>" . htmlspecialchars(read_config_option("path_rrdtool") . " graph " . $graph_opts . $graph_defs . $txt_graph_items) . "</PRE>";
@@ -1394,13 +1408,19 @@
 			rrdtool_execute("graph $graph_opts$graph_defs$txt_graph_items", false, RRDTOOL_OUTPUT_NULL, $rrdtool_pipe);
 			return 0;
 		}else{
+			$graph_data_array = api_plugin_hook_function('prep_graph_array', $graph_data_array);
+
 			if (isset($graph_data_array["output_flag"])) {
 				$output_flag = $graph_data_array["output_flag"];
 			}else{
 				$output_flag = RRDTOOL_OUTPUT_GRAPH_DATA;
 			}
 
-			return rrdtool_execute("graph $graph_opts$graph_defs$txt_graph_items", false, $output_flag, $rrdtool_pipe);
+			$output = rrdtool_execute("graph $graph_opts$graph_defs$txt_graph_items", false, $output_flag, $rrdtool_pipe);
+
+			api_plugin_hook_function('rrdtool_function_graph_set_file', array('output' => $output, 'local_graph_id' => $local_graph_id, 'rra_id' => $rra_id));
+
+			return $output;
 		}
 	}
 }
diff -ruBbdNa cacti-0.8.7h/lib/template.php cacti-0.8.7h-pia//lib/template.php
--- cacti-0.8.7h/lib/template.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/template.php	2011-09-25 21:10:07.628945311 -0400
@@ -882,6 +882,18 @@
 		update_graph_data_query_cache($cache_array["local_graph_id"]);
 	}
 
+	# now that we have the id of the new host, we may plugin postprocessing code
+	$save["id"] = $cache_array["local_graph_id"];
+	$save["graph_template_id"] = $graph_template_id;	// attention: unset!
+	if (is_array($snmp_query_array)) {
+		$save["snmp_query_id"] = $snmp_query_array["snmp_query_id"];
+		$save["snmp_index"] = $snmp_query_array["snmp_index"];
+	} else {
+		$save["snmp_query_id"] = 0;
+		$save["snmp_index"] = 0;
+	}
+	api_plugin_hook_function('create_complete_graph_from_template', $save);
+
 	return $cache_array;
 }
 
diff -ruBbdNa cacti-0.8.7h/lib/variables.php cacti-0.8.7h-pia//lib/variables.php
--- cacti-0.8.7h/lib/variables.php	2011-09-25 21:04:21.000000000 -0400
+++ cacti-0.8.7h-pia//lib/variables.php	2011-09-25 21:10:07.627945411 -0400
@@ -66,6 +66,7 @@
    @arg $local_data_id - (int) the ID of the data source to update the title cache for */
 function update_data_source_title_cache($local_data_id) {
 	db_execute("update data_template_data set name_cache='" . addslashes(get_data_source_title($local_data_id)) . "' where local_data_id=$local_data_id");
+	api_plugin_hook_function('update_data_source_title_cache', $local_data_id);
 }
 
 /* update_graph_title_cache_from_template - updates the title cache for all graphs
@@ -183,6 +184,9 @@
 	$string = str_replace($l_escape_string . "host_max_oids" . $r_escape_string, $_SESSION["sess_host_cache_array"][$host_id]["max_oids"], $string);
 	$string = str_replace($l_escape_string . "host_id" . $r_escape_string, $_SESSION["sess_host_cache_array"][$host_id]["id"], $string);
 
+	$temp = api_plugin_hook_function('substitute_host_data', array('string' => $string, 'l_escape_string' => $l_escape_string, 'r_escape_string' => $r_escape_string, 'host_id' => $host_id));
+	$string = $temp['string'];
+
 	return $string;
 }
 
diff -ruBbdNa cacti-0.8.7h/plugins/index.php cacti-0.8.7h-pia//plugins/index.php
--- cacti-0.8.7h/plugins/index.php	1969-12-31 19:00:00.000000000 -0500
+++ cacti-0.8.7h-pia//plugins/index.php	2011-09-25 21:10:07.631945019 -0400
@@ -0,0 +1,5 @@
+<?php
+
+header("Location:../index.php");
+
+?>
diff -ruBbdNa cacti-0.8.7h/plugins.php cacti-0.8.7h-pia//plugins.php
--- cacti-0.8.7h/plugins.php	1969-12-31 19:00:00.000000000 -0500
+++ cacti-0.8.7h-pia//plugins.php	2011-09-25 21:10:07.631945019 -0400
@@ -0,0 +1,665 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2011 The Cacti Group                                 |
+ |                                                                         |
+ | This program is free software; you can redistribute it and/or           |
+ | modify it under the terms of the GNU General Public License             |
+ | as published by the Free Software Foundation; either version 2          |
+ | of the License, or (at your option) any later version.                  |
+ |                                                                         |
+ | This program is distributed in the hope that it will be useful,         |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of          |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           |
+ | GNU General Public License for more details.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDTool-based Graphing Solution                     |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See  |
+ | about.php and/or the AUTHORS file for specific developer information.   |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/                                                   |
+ +-------------------------------------------------------------------------+
+*/
+
+include("./include/auth.php");
+
+define("MAX_DISPLAY_PAGES", 21);
+
+$actions = array("install" => "Install",
+	"enable" => "Enable",
+	"disable" => "Disable",
+	"uninstall" => "Uninstall",
+//	"check" => "Check"
+);
+
+$status_names = array(
+	-2 => 'Disabled',
+	-1 => 'Active',
+	0 => 'Not Installed',
+	1 => 'Active',
+	2 => 'Awaiting Configuration',
+	3 => 'Awaiting Upgrade',
+	4 => 'Installed'
+);
+
+/* get the comprehensive list of plugins */
+$pluginslist = retrieve_plugin_list();
+
+/* Check to see if we are installing, etc... */
+$modes = array('installold', 'uninstallold', 'install', 'uninstall', 'disable', 'enable', 'check', 'moveup', 'movedown');
+
+if (isset($_GET['mode']) && in_array($_GET['mode'], $modes)  && isset($_GET['id'])) {
+	input_validate_input_regex(get_request_var("id"), "^([a-zA-Z0-9]+)$");
+
+	$mode = $_GET['mode'];
+	$id   = sanitize_search_string($_GET['id']);
+
+	switch ($mode) {
+		case 'installold':
+			api_plugin_install_old($id);
+			header("Location: plugins.php");
+			exit;
+			break;
+		case 'uninstallold':
+			api_plugin_uninstall_old($id);
+			header("Location: plugins.php");
+			exit;
+			break;
+		case 'install':
+			api_plugin_install($id);
+			header("Location: plugins.php");
+			exit;
+			break;
+		case 'uninstall':
+			if (!in_array($id, $pluginslist)) break;
+			api_plugin_uninstall($id);
+			header("Location: plugins.php");
+			exit;
+			break;
+		case 'disable':
+			if (!in_array($id, $pluginslist)) break;
+			api_plugin_disable($id);
+			header("Location: plugins.php");
+			exit;
+			break;
+		case 'enable':
+			if (!in_array($id, $pluginslist)) break;
+			api_plugin_enable($id);
+			header("Location: plugins.php");
+			exit;
+			break;
+		case 'check':
+			if (!in_array($id, $pluginslist)) break;
+			break;
+		case 'moveup':
+			if (!in_array($id, $pluginslist)) break;
+			if (is_system_plugin($id)) break;
+			api_plugin_moveup($id);
+			header("Location: plugins.php");
+			exit;
+			break;
+		case 'movedown':
+			if (!in_array($id, $pluginslist)) break;
+			if (is_system_plugin($id)) break;
+			api_plugin_movedown($id);
+			header("Location: plugins.php");
+			exit;
+			break;
+	}
+}
+
+function retrieve_plugin_list () {
+	$pluginslist = array();
+	$temp = db_fetch_assoc('SELECT directory FROM plugin_config ORDER BY name');
+	foreach ($temp as $t) {
+		$pluginslist[] = $t['directory'];
+	}
+	return $pluginslist;
+}
+
+include("./include/top_header.php");
+
+update_show_current();
+
+include("./include/bottom_footer.php");
+
+function api_plugin_install_old ($plugin) {
+	global $config;
+	if (!file_exists($config['base_path'] . "/plugins/$plugin/setup.php")) {
+		return false;
+	}
+	$oldplugins = read_config_option('oldplugins');
+	if (strlen(trim($oldplugins))) {
+	$oldplugins = explode(',', $oldplugins);
+	}else{
+		$oldplugins = array();
+	}
+	if (!in_array($plugin, $oldplugins)) {
+		include_once($config['base_path'] . "/plugins/$plugin/setup.php");
+		$function = 'plugin_init_' . $plugin;
+		if (function_exists($function)){
+			$oldplugins[] = $plugin;
+			$oldplugins   = implode(',', $oldplugins);
+			set_config_option('oldplugins', $oldplugins);
+			unset($_SESSION['sess_config_array']['oldplugins']);
+			return true;
+		} else {
+			return false;
+		}
+	}
+	return false;
+}
+
+function api_plugin_uninstall_old ($plugin) {
+	global $config;
+	$oldplugins = read_config_option('oldplugins');
+	if (strlen(trim($oldplugins))) {
+	$oldplugins = explode(',', $oldplugins);
+	}else{
+		$oldplugins = array();
+	}
+	if (!empty($oldplugins)) {
+		if (in_array($plugin, $oldplugins)) {
+			for ($a = 0; $a < count($oldplugins); $a++) {
+				if ($oldplugins[$a] == $plugin) {
+					unset($oldplugins[$a]);
+					break;
+				}
+			}
+			$oldplugins = implode(',', $oldplugins);
+			set_config_option('oldplugins', $oldplugins);
+			unset($_SESSION['sess_config_array']['oldplugins']);
+			return true;
+		}
+	}
+	return false;
+}
+
+function update_show_updates () {
+	global $pluginslist, $colors, $config, $plugin_architecture;
+
+	$cinfo = array();
+	sort($pluginslist);
+
+	$cinfo = update_get_plugin_info ();
+
+	$x = 0;
+
+	$info = update_get_cached_plugin_info();
+
+	$cactinew = update_check_if_newer($cinfo['cacti']['version'], $info['cacti']['version']) ;
+	if (isset($cinfo['cacti_plugin_arch']['version'])) {
+		$archnew =  update_check_if_newer($cinfo['cacti_plugin_arch']['version'], $info['cacti_plugin_arch']['version']);
+	} else {
+		$archnew = 0;
+	}
+
+	if ($cactinew) {
+		$x++;
+		print "<tr><td width='25%' valign=top><table width='100%'>";
+		html_header(array("Cacti"), 2);
+		form_alternate_row_color($colors["alternate"],$colors["light"], 0);
+		print "<td width='25%'><strong>Version:</strong></td><td>" . $config["cacti_version"] . "</td></tr>";
+		form_alternate_row_color($colors["alternate"],$colors["light"], 0);
+		print "<td valign=top><strong>Changes:</strong></td><td>" . str_replace("\n", '<br>', $info['cacti']['changes']) . "</td></tr></table>";
+	}
+	if (isset($plugin_architecture['version']) && $archnew) {
+		$x++;
+		print "<table width='100%'>";
+		html_header(array("Plugin Architecture"), 2);
+		form_alternate_row_color($colors["alternate"],$colors["light"], 0);
+		print "<td width='25%'><strong>Version:</strong></td><td>" . $plugin_architecture['version'] . "</td>";
+		form_alternate_row_color($colors["alternate"],$colors["light"], 0);
+		print "<td valign=top><strong>Changes:</strong></td><td>" . str_replace("\n", '<br>', $info['cacti_plugin_arch']['changes']) . "</td></tr></table>";
+	}
+	print "<table width='100%' cellspacing=0 cellpadding=3>";
+
+	foreach ($pluginslist as $plugin) {
+		if (isset($cinfo[$plugin]) && update_check_if_newer($cinfo[$plugin]['version'], $info[$plugin]['version'])) {
+			$x++;
+			print "<table width='100%'>";
+			html_header(array((isset($cinfo[$plugin]['longname']) ? $cinfo[$plugin]['longname'] : $plugin)), 2);
+			form_alternate_row_color($colors["alternate"],$colors["light"], 0);
+			print "<td width='50%'><strong>Directory:</strong></td><td>$plugin</td>";
+			form_alternate_row_color($colors["alternate"],$colors["light"], 0);
+			print "<td><strong>Version:</strong></td><td>" . $info[$plugin]['version'] . "</td>";
+			form_alternate_row_color($colors["alternate"],$colors["light"], 0);
+			print "<td><strong>Author:</strong></td><td>" . (isset($cinfo[$plugin]['author']) && $cinfo[$plugin]['author'] != '' ? (isset($cinfo[$plugin]['email']) && $cinfo[$plugin]['email'] != '' ? "<a href='mailto:" . $cinfo[$plugin]['email'] . "'>" . $cinfo[$plugin]['author'] . "</a>"  : $cinfo[$plugin]['author']) : "") . "</td>";
+			form_alternate_row_color($colors["alternate"],$colors["light"], 0);
+			print "<td><strong>Home Page:</strong></td><td>" . (isset($cinfo[$plugin]['webpage']) && $cinfo[$plugin]['webpage'] != '' ? "<a href='" . $cinfo[$plugin]['webpage'] . "'>" . $cinfo[$plugin]['webpage'] . "</a>" : "") . "</td>";
+			form_alternate_row_color($colors["alternate"],$colors["light"], 0);
+			print "<td valign=top><strong>Changes:</strong></td><td>" . str_replace("\n", '<br>', $info[$plugin]['changes']) . "</td>";
+
+			print "</tr></table>";
+		}
+	}
+	if ($x == 0)
+		print "<br><center><b>There are currently no Updates!</b></center><br>";
+	print "</table>";
+	html_end_box(TRUE);
+}
+
+function update_check_if_newer() {
+	return false;
+}
+
+function plugins_temp_table_exists($table) {
+	return sizeof(db_fetch_row("SHOW TABLES LIKE '$table'"));
+}
+
+function plugins_load_temp_table() {
+	global $config, $plugins;
+
+	$pluginslist = retrieve_plugin_list();
+
+	if (isset($_SESSION["plugin_temp_table"])) {
+		$table = $_SESSION["plugin_temp_table"];
+	}else{
+		$table = "plugin_temp_table_" . rand();
+	}
+	$x = 0;
+	while ($x < 30) {
+		if (!plugins_temp_table_exists($table)) {
+			$_SESSION["plugin_temp_table"] = $table;
+			db_execute("CREATE TEMPORARY TABLE IF NOT EXISTS $table LIKE plugin_config");
+			db_execute("TRUNCATE $table");
+			db_execute("INSERT INTO $table SELECT * FROM plugin_config");
+			break;
+		}else{
+			$table = "plugin_temp_table_" . rand();
+		}
+		$x++;
+	}
+
+	$path = $config['base_path'] . '/plugins/';
+	$dh = opendir($path);
+	while (($file = readdir($dh)) !== false) {
+		if ((is_dir("$path/$file")) && (file_exists("$path/$file/setup.php")) && (!in_array($file, $pluginslist))) {
+			include_once("$path/$file/setup.php");
+			if (!function_exists('plugin_' . $file . '_install') && function_exists($file . '_version')) {
+				$function = $file . '_version';
+				$cinfo[$file] = $function();
+				if (!isset($cinfo[$file]['author']))   $cinfo[$file]['author']   = 'Unknown';
+				if (!isset($cinfo[$file]['homepage'])) $cinfo[$file]['homepage'] = 'Not Stated';
+				if (isset($cinfo[$file]['webpage']))   $cinfo[$file]['homepage'] = $cinfo[$file]['webpage'];
+				if (!isset($cinfo[$file]['longname'])) $cinfo[$file]['longname'] = ucfirst($file);
+				$cinfo[$file]['status'] = -2;
+				if (in_array($file, $plugins)) {
+					$cinfo[$file]['status'] = -1;
+				}
+				db_execute("REPLACE INTO $table (directory, name, status, author, webpage, version)
+					VALUES ('" .
+						$file . "', '" .
+						$cinfo[$file]['longname'] . "', '" .
+						$cinfo[$file]['status']   . "', '" .
+						$cinfo[$file]['author']   . "', '" .
+						$cinfo[$file]['homepage'] . "', '" .
+						$cinfo[$file]['version']  . "')");
+				$pluginslist[] = $file;
+			} elseif (function_exists('plugin_' . $file . '_install') && function_exists('plugin_' . $file . '_version')) {
+				$function               = $file . '_version';
+				$cinfo[$file]           = $function();
+				$cinfo[$file]['status'] = 0;
+				if (!isset($cinfo[$file]['author']))   $cinfo[$file]['author']   = 'Unknown';
+				if (!isset($cinfo[$file]['homepage'])) $cinfo[$file]['homepage'] = 'Not Stated';
+				if (isset($cinfo[$file]['webpage']))   $cinfo[$file]['homepage'] = $cinfo[$file]['webpage'];
+				if (!isset($cinfo[$file]['longname'])) $cinfo[$file]['homepage'] = ucfirst($file);
+
+				/* see if it's been installed as old, if so, remove from oldplugins array and session */
+				$oldplugins = read_config_option("oldplugins");
+				if (substr_count($oldplugins, $file)) {
+					$oldplugins = str_replace($file, "", $oldplugins);
+					$oldplugins = str_replace(",,", ",", $oldplugins);
+					$oldplugins = trim($oldplugins, ",");
+					set_config_option('oldplugins', $oldplugins);
+					$_SESSION['sess_config_array']['oldplugins'] = $oldplugins;
+				}
+
+				db_execute("REPLACE INTO $table (directory, name, status, author, webpage, version)
+					VALUES ('" .
+						$file . "', '" .
+						$cinfo[$file]['longname'] . "', '" .
+						$cinfo[$file]['status'] . "', '" .
+						$cinfo[$file]['author'] . "', '" .
+						$cinfo[$file]['homepage'] . "', '" .
+						$cinfo[$file]['version'] . "')");
+				$pluginslist[] = $file;
+			}
+		}
+	}
+	closedir($dh);
+
+	return $table;
+}
+
+function update_show_current () {
+	global $plugins, $pluginslist, $colors, $plugin_architecture, $config, $status_names, $actions;
+
+	/* ================= input validation ================= */
+	input_validate_input_number(get_request_var_request("page"));
+	/* ==================================================== */
+
+	/* clean up search string */
+	if (isset($_REQUEST["filter"])) {
+		$_REQUEST["filter"] = sanitize_search_string(get_request_var("filter"));
+	}
+
+	/* clean up sort_column */
+	if (isset($_REQUEST["sort_column"])) {
+		$_REQUEST["sort_column"] = sanitize_search_string(get_request_var("sort_column"));
+	}
+
+	/* clean up search string */
+	if (isset($_REQUEST["sort_direction"])) {
+		$_REQUEST["sort_direction"] = sanitize_search_string(get_request_var("sort_direction"));
+	}
+
+	/* if the user pushed the 'clear' button */
+	if (isset($_REQUEST["clear_x"])) {
+		kill_session_var("sess_plugins_filter");
+		kill_session_var("sess_plugins_sort_column");
+		kill_session_var("sess_plugins_sort_direction");
+
+		unset($_REQUEST["page"]);
+		unset($_REQUEST["filter"]);
+		unset($_REQUEST["sort_column"]);
+		unset($_REQUEST["sort_direction"]);
+		$_REQUEST["page"] = 1;
+	}
+
+	/* remember these search fields in session vars so we don't have to keep passing them around */
+	load_current_session_value("filter", "sess_plugins_filter", "");
+	load_current_session_value("sort_column", "sess_plugins_sort_column", "name");
+	load_current_session_value("sort_direction", "sess_plugins_sort_direction", "ASC");
+	load_current_session_value("page", "sess_plugins_current_page", "1");
+
+	$table = plugins_load_temp_table();
+
+	html_start_box("<strong>Plugin Management</strong> (Cacti Version: " . $config["cacti_version"] .
+		(isset($plugin_architecture['version']) ? ", Plugin Architecture Version: " . $plugin_architecture['version']:"") .
+		")", "100%", $colors["header"], "3", "center", "");
+
+	?>
+	<tr bgcolor="#<?php print $colors['panel'];?>">
+		<td class="noprint">
+		<form name="form_plugins" method="get" action="plugins.php">
+			<table width="100%" cellpadding="0" cellspacing="0">
+				<tr class="noprint">
+					<td nowrap style='white-space: nowrap;' width="50">
+						Search:&nbsp;
+					</td>
+					<td width="1">
+						<input type="text" name="filter" size="40" value="<?php print get_request_var_request("filter");?>">
+					</td>
+					<td nowrap style='white-space: nowrap;'>
+						&nbsp;<input type="submit" value="Go" title="Set/Refresh Filters">
+						<input type="submit" name="clear_x" value="Clear" title="Clear Filters">
+					</td>
+				</tr>
+			</table>
+			<input type='hidden' name='page' value='1'>
+		</form>
+		</td>
+	</tr>
+	<?php
+
+	html_end_box();
+
+	/* print checkbox form for validation */
+	print "<form name='chk' method='post' action='plugins.php'>\n";
+
+	html_start_box("", "100%", $colors["header"], "3", "center", "");
+
+	/* form the 'where' clause for our main sql query */
+	$sql_where = "WHERE ($table.name LIKE '%%" . get_request_var_request("filter") . "%%')";
+
+	if (get_request_var_request("sort_column") == "version") {
+		$sortc = "version+0";
+	}else{
+		$sortc = get_request_var_request("sort_column");
+	}
+
+	if (get_request_var_request("sort_column") == "id") {
+		$sortd = "ASC";
+	}else{
+		$sortd = get_request_var_request("sort_direction");
+	}
+
+	$total_rows = db_fetch_cell("SELECT
+		count(*)
+		FROM $table
+		$sql_where");
+
+	$plugins = db_fetch_assoc("SELECT *
+		FROM $table
+		$sql_where
+		ORDER BY " . $sortc . " " . $sortd . "
+		LIMIT " . (read_config_option("num_rows_device")*(get_request_var_request("page")-1)) . "," . read_config_option("num_rows_device"));
+
+	db_execute("DROP TABLE $table");
+
+	/* generate page list */
+	$url_page_select = get_page_list(get_request_var_request("page"), MAX_DISPLAY_PAGES, read_config_option("num_rows_device"), $total_rows, "plugins.php?filter=" . get_request_var_request("filter"));
+
+	if ($total_rows == 0) {
+		$nav = "<tr bgcolor='#" . $colors["header"] . "'>
+				<td colspan='9'>
+					<table width='100%' cellspacing='0' cellpadding='0' border='0'>
+						<tr>
+							<td align='center' class='textHeaderDark'>
+								No Plugins Found
+							</td>\n
+						</tr>
+					</table>
+				</td>
+			</tr>\n";
+	}elseif ($total_rows < read_config_option("num_rows_device")) {
+		$nav = "<tr bgcolor='#" . $colors["header"] . "'>
+				<td colspan='9'>
+					<table width='100%' cellspacing='0' cellpadding='0' border='0'>
+						<tr>
+							<td align='center' class='textHeaderDark'>
+								Showing All $total_rows Rows
+							</td>\n
+						</tr>
+					</table>
+				</td>
+			</tr>\n";
+	}else{
+		$nav = "<tr bgcolor='#" . $colors["header"] . "'>
+				<td colspan='9'>
+					<table width='100%' cellspacing='0' cellpadding='0' border='0'>
+						<tr>
+							<td align='left' class='textHeaderDark'>
+								<strong>&lt;&lt; "; if (get_request_var_request("page") > 1) { $nav .= "<a class='linkOverDark' href='" . htmlspecialchars("plugins.php?filter=" . get_request_var_request("filter") . "&page=" . (get_request_var_request("page")-1)) . "'>"; } $nav .= "Previous"; if (get_request_var_request("page") > 1) { $nav .= "</a>"; } $nav .= "</strong>
+							</td>\n
+							<td align='center' class='textHeaderDark'>
+								Showing Rows " . ((read_config_option("num_rows_device")*(get_request_var_request("page")-1))+1) . " to " . ((($total_rows < read_config_option("num_rows_device")) || ($total_rows < (read_config_option("num_rows_device")*get_request_var_request("page")))) ? $total_rows : (read_config_option("num_rows_device")*get_request_var_request("page"))) . " of $total_rows [$url_page_select]
+							</td>\n
+							<td align='right' class='textHeaderDark'>
+								<strong>"; if ((get_request_var_request("page") * read_config_option("num_rows_device")) < $total_rows) { $nav .= "<a class='linkOverDark' href='" . htmlspecialchars("plugins.php?filter=" . get_request_var_request("filter") . "&page=" . (get_request_var_request("page")+1)) . "'>"; } $nav .= "Next"; if ((get_request_var_request("page") * read_config_option("num_rows_device")) < $total_rows) { $nav .= "</a>"; } $nav .= " &gt;&gt;</strong>
+							</td>\n
+						</tr>
+					</table>
+				</td>
+			</tr>\n";
+	}
+
+	print $nav;
+
+	$display_text = array(
+		"nosort" => array("Actions", ""),
+		"directory" => array("Name", "ASC"),
+		"version" => array("Version", "ASC"),
+		"id" => array("Load Order", "ASC"),
+		"name" => array("Description", "ASC"),
+		"nosort1" => array("Type", "ASC"),
+		"status" => array("Status", "ASC"),
+		"author" => array("Author", "ASC"));
+
+	html_header_sort($display_text, get_request_var_request("sort_column"), get_request_var_request("sort_direction"), 1);
+
+	$i = 0;
+	if (sizeof($plugins)) {
+		if (get_request_var_request("sort_column") == "id") {
+			$inst_system_plugins = get_system_plugins($plugins);
+			if (sizeof($inst_system_plugins)) {
+				foreach($inst_system_plugins as $plugin) {
+					form_alternate_row_color($colors["alternate"], $colors["light"], $i); $i++;
+					print format_plugin_row($plugin, false, false, true);
+				}
+			}
+		}
+
+		$j = 0;
+		foreach ($plugins as $plugin) {
+			if ((isset($plugins[$j+1]) && $plugins[$j+1]['status'] < 0) || (!isset($plugins[$j+1]))) {
+				$last_plugin = true;
+			}else{
+				$last_plugin = false;
+			}
+			if ($plugin['status'] <= 0 || is_system_plugin($plugin) || (get_request_var_request('sort_column') != 'id')) {
+				$load_ordering = false;
+			}else{
+				$load_ordering = true;
+			}
+
+			if (get_request_var_request("sort_column") == "id") {
+				if (!is_system_plugin($plugin)) {
+					form_alternate_row_color($colors["alternate"], $colors["light"], $i);
+					print format_plugin_row($plugin, $last_plugin, $load_ordering, false);
+					$i++;
+				}
+			}else{
+				form_alternate_row_color($colors["alternate"], $colors["light"], $i);
+				print format_plugin_row($plugin, $last_plugin, $load_ordering, is_system_plugin($plugin));
+				$i++;
+			}
+
+			$j++;
+		}
+
+		print $nav;
+	}else{
+		print "<tr><td><em>No Plugins Found</em></td></tr>";
+	}
+
+	html_end_box(false);
+
+	html_start_box("", "100%", $colors["header"], "3", "center", "");
+	echo "<tr><td colspan=10><strong>NOTE:</strong> Please sort by 'Load Order' to change plugin load ordering.<br><strong>NOTE:</strong> SYSTEM plugins can not be ordered.</td></tr>";
+	html_end_box();
+
+	print "</form>\n";
+}
+
+function format_plugin_row($plugin, $last_plugin, $include_ordering, $system_plugin) {
+	global $status_names;
+	static $first_plugin = true;
+
+	$row = plugin_actions($plugin);
+	$row .= "<td><a href='" . htmlspecialchars($plugin["webpage"]) . "' target='_blank'><strong>" . (strlen(get_request_var_request("filter")) ? eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")", "<span style='background-color: #F8D93D;'>\\1</span>", ucfirst($plugin["directory"])) : ucfirst($plugin["directory"])) . "</strong></a></td>";
+	$row .= "<td>" . $plugin["version"] . "</td>\n";
+	if ($include_ordering) {
+		$row .= "<td style='white-space:nowrap;'>";
+		if (!$first_plugin) {
+			$row .= "<a href='" . htmlspecialchars("plugins.php?mode=moveup&id=" . $plugin['directory']) . "' title='Order Before Prevous Plugin' class='linkEditMain'><img style='padding:1px;' border='0' align='absmiddle' src='images/move_up.gif'></a>";
+		}else{
+			$row .= "<a href='#' title='Can NOT Reduce Load Order' class='linkEditMain'><img style='padding:1px;' border='0' align='absmiddle' src='images/view_none.gif'></a>";
+		}
+		if (!$last_plugin) {
+			$row .= "<a href='" . htmlspecialchars("plugins.php?mode=movedown&id=" . $plugin['directory']) . "' title='Order After Next Plugin' class='linkEditMain'><img style='padding:1px;' border='0' align='absmiddle' src='images/move_down.gif'></a>";
+		}else{
+			$row .= "<a href='#' title='Can Increase Load Order' class='linkEditMain'><img style='padding:1px;' border='0' align='absmiddle' src='images/view_none.gif'></a>";
+		}
+		$row .= "</td>\n";
+	}else{
+		$row .= "<td></td>\n";
+	}
+
+	$row .= "<td style='white-space:nowrap;'>" . (strlen(get_request_var_request("filter")) ? eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")", "<span style='background-color: #F8D93D;'>\\1</span>", $plugin["name"]) : $plugin["name"]) . "</td>\n";
+	$row .= "<td style='white-space:nowrap;'>" . ($system_plugin ? "System": ($plugin['status'] < 0 ? "Old PIA":"General")) . "</td>\n";
+	$row .= "<td style='white-space:nowrap;'>" . $status_names[$plugin["status"]] . "</td>\n";
+	$row .= "<td style='white-space:nowrap;'>" . $plugin["author"] . "</td>\n";
+	$row .= "</tr>\n";
+
+	if ($include_ordering) {
+		$first_plugin = false;
+	}
+
+	return $row;
+}
+
+function plugin_actions($plugin) {
+	$link = "<td>";
+	switch ($plugin['status']) {
+		case "-2": // Old PA Not Installed
+			$link .= "<a href='" . htmlspecialchars("plugins.php?mode=installold&id=" . $plugin['directory']) . "' title='Install Old Plugin' class='linkEditMain'><img style='padding:1px;' border='0' align='absmiddle' src='images/install_icon.png'></a>";
+			$link .= "<img style='padding:1px;' border='0' align='absmiddle' src='images/view_none.gif'>";
+			break;
+		case "-1":	// Old PA Currently Active
+			$oldplugins = read_config_option('oldplugins');
+			if (strlen(trim($oldplugins))) {
+				$oldplugins = explode(',', $oldplugins);
+			}else{
+				$oldplugins = array();
+			}
+			if (in_array($plugin['directory'], $oldplugins)) {
+				$link .= "<a href='" . htmlspecialchars("plugins.php?mode=uninstallold&id=" . $plugin['directory']) . "' title='Uninstall Old Plugin' class='linkEditMain'><img style='padding:1px;' border='0' align='absmiddle' src='images/uninstall_icon.gif'></a>";
+			} else {
+				$link .= "<a href='#' title='Please Uninstall from config.php' class='linkEditMain'><img style='padding:1px;' align='absmiddle' border='0' src='images/install_icon_disabled.png'></a>";
+			}
+			$link .= "<img style='padding:1px;' border='0' align='absmiddle' src='images/view_none.gif'>";
+			break;
+		case "0": // Not Installed
+			$link .= "<a href='" . htmlspecialchars("plugins.php?mode=install&id=" . $plugin['directory']) . "' title='Install Plugin' class='linkEditMain'><img style='padding:1px;' border='0' align='absmiddle' src='images/install_icon.png'></a>";
+			$link .= "<img style='padding:1px;' border='0' align='absmiddle' src='images/view_none.gif'>";
+			break;
+		case "1":	// Currently Active
+			$link .= "<a href='" . htmlspecialchars("plugins.php?mode=uninstall&id=" . $plugin['directory']) . "' title='Uninstall Plugin' class='linkEditMain'><img style='padding:1px;' border='0' align='absmiddle' src='images/uninstall_icon.gif'></a>";
+			$link .= "<a href='" . htmlspecialchars("plugins.php?mode=disable&id=" . $plugin['directory']) . "' title='Disable Plugin' class='linkEditMain'><img style='padding:1px;' border='0' align='absmiddle' src='images/disable_icon.png'></a>";
+			break;
+		case "4":	// Installed but not active
+			$link .= "<a href='" . htmlspecialchars("plugins.php?mode=uninstall&id=" . $plugin['directory']) . "' title='Uninstall Plugin' class='linkEditMain'><img style='padding:1px;' border='0' align='absmiddle' src='images/uninstall_icon.gif'></a>";
+			$link .= "<a href='" . htmlspecialchars("plugins.php?mode=enable&id=" . $plugin['directory']) . "' title='Enable Plugin' class='linkEditMain'><img style='padding:1px;' border='0' align='absmiddle' src='images/enable_icon.png'></a>";
+			break;
+		default: // Old PIA
+			$link .= "<a href='#' title='Please Install/Uninstall from config.php' class='linkEditMain'><img style='padding:1px;' align='absmiddle' border='0' src='images/install_icon_disabled.png'></a>";
+			$link .= "<a href='#' title='Enabling from the UI is not supported' class='linkEditMain'><img style='padding:1px;' align='absmiddle' border='0' src='images/enable_icon_disabled.png'></a>";
+			break;
+	}
+	$link .= "</td>";
+
+	return $link;
+}
+
+function is_system_plugin($plugin) {
+	global $plugins_system;
+
+	if (is_array($plugin)) {
+		$plugin = $plugin["directory"];
+	}
+
+	if (!in_array($plugin, $plugins_system)) {
+		return false;
+	}else{
+		return true;
+	}
+}
+
+function get_system_plugins($plugins) {
+	$inst_system_plugins = array();
+
+	if (sizeof($plugins)) {
+		foreach($plugins as $plugin) {
+			if (is_system_plugin($plugin)) {
+				$inst_system_plugins[] = $plugin;
+			}
+		}
+	}
+
+	return $inst_system_plugins;
+}
+
+
diff -ruBbdNa cacti-0.8.7h/poller.php cacti-0.8.7h-pia//poller.php
--- cacti-0.8.7h/poller.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//poller.php	2011-09-25 21:10:07.631945019 -0400
@@ -108,6 +108,8 @@
 	pcntl_signal(SIGINT, "sig_handler");
 }
 
+api_plugin_hook('poller_top');
+
 /* record the start time */
 list($micro,$seconds) = explode(" ", microtime());
 $poller_start         = $seconds + $micro;
@@ -304,6 +306,8 @@
 			$total_procs    = $concurrent_processes;
 		}
 
+		$extra_args = api_plugin_hook_function ('poller_command_args', $extra_args);
+
 		/* Populate each execution file with appropriate information */
 		foreach ($polling_hosts as $item) {
 			if ($host_count == 1) {
@@ -449,7 +453,9 @@
 
 		/* sleep the appripriate amount of time */
 		if ($poller_runs_completed < $poller_runs) {
+			api_plugin_hook('poller_bottom');
 			usleep($sleep_time * 1000000);
+			api_plugin_hook('poller_top');
 		}
 	}else if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_MEDIUM || $debug) {
 		cacti_log("WARNING: Cacti Polling Cycle Exceeded Poller Interval by " . $loop_end-$loop_start-$poller_interval . " seconds", TRUE, "POLLER");
@@ -496,4 +502,6 @@
 	echo "    --debug|-d     Output debug information.  Similar to cacti's DEBUG logging level.\n\n";
 }
 
+api_plugin_hook('poller_bottom');
+
 ?>
diff -ruBbdNa cacti-0.8.7h/user_admin.php cacti-0.8.7h-pia//user_admin.php
--- cacti-0.8.7h/user_admin.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//user_admin.php	2011-09-25 21:10:07.631945019 -0400
@@ -57,9 +57,11 @@
 		break;
 
 	default:
+		if (!api_plugin_hook_function('user_admin_action', get_request_var_request("action"))) {
 		include_once("include/top_header.php");
 		user();
 		include_once("include/bottom_footer.php");
+		}
 		break;
 }
 
@@ -83,6 +85,8 @@
 				/* ==================================================== */
 
 				user_remove($selected_items[$i]);
+
+				api_plugin_hook_function('user_remove', $selected_items[$i]);
 			}
 		}
 
@@ -402,6 +406,7 @@
 		$save["policy_graph_templates"] = form_input_validate(get_request_var_post("policy_graph_templates", get_request_var_post("_policy_graph_templates")), "policy_graph_templates", "", true, 3);
 		$save["realm"] = get_request_var_post("realm", 0);
 		$save["enabled"] = form_input_validate(get_request_var_post("enabled", ""), "enabled", "", true, 3);
+		$save = api_plugin_hook_function('user_admin_setup_sql_save', $save);
 
 		if (!is_error_message()) {
 			$user_id = sql_save($save, "user_auth");
@@ -444,6 +449,8 @@
 					policy_hosts = " . get_request_var_post("policy_hosts") . ",
 					policy_graph_templates = " . get_request_var_post("policy_graph_templates") . "
 					WHERE id = " . get_request_var_post("id"));
+			} else {
+				api_plugin_hook('user_admin_user_save');
 			}
 		}
 	}
@@ -889,6 +896,8 @@
 		$header_label = "[new]";
 	}
 
+	api_plugin_hook_function('user_admin_edit', (isset($user) ? get_request_var("id") : 0));
+
 	html_start_box("<strong>User Management</strong> $header_label", "100%", $colors["header"], "3", "center", "");
 
 	draw_edit_form(array(
@@ -915,6 +924,7 @@
 				<td <?php print ((get_request_var_request("tab") == "graph_settings_edit") ? "bgcolor='silver'" : "bgcolor='#DFDFDF'");?> nowrap='nowrap' width='130' align='center' class='tab'>
 					<span class='textHeader'><a href='<?php print htmlspecialchars("user_admin.php?action=user_edit&tab=graph_settings_edit&id=" . $_GET["id"]);?>'>Graph Settings</a></span>
 				</td>
+				<?php api_plugin_hook('user_admin_tab');?>				
 				<td></td>
 			</tr>
 		</table>
@@ -928,8 +938,10 @@
 	}elseif (get_request_var_request("tab") == "graph_perms_edit") {
 		graph_perms_edit();
 	}else{
+		if (api_plugin_hook_function('user_admin_run_action', get_request_var_request("tab"))) {
 		user_realms_edit();
 	}
+	}
 
 	form_save_button("user_admin.php", "return");
 }
diff -ruBbdNa cacti-0.8.7h/utilities.php cacti-0.8.7h-pia//utilities.php
--- cacti-0.8.7h/utilities.php	2011-09-25 21:04:22.000000000 -0400
+++ cacti-0.8.7h-pia//utilities.php	2011-09-25 21:10:07.632944925 -0400
@@ -123,11 +123,14 @@
 		include_once("./include/bottom_footer.php");
 		break;
 	default:
-		include_once("./include/top_header.php");
+
+		if (!api_plugin_hook_function('utilities_action', $_REQUEST['action'])) {
+			include_once('./include/top_header.php');
 
 		utilities();
 
-		include_once("./include/bottom_footer.php");
+			include_once('./include/bottom_footer.php');
+		}
 		break;
 }
 
@@ -288,6 +291,7 @@
 	print "		<td class='textArea'>Date</td>\n";
 	print "		<td class='textArea'>" . date("r") . "</td>\n";
 	print "</tr>\n";
+	api_plugin_hook_function('custom_version_info');
 	print "<tr bgcolor='#" . $colors["form_alternate2"] . "'>\n";
 	print "		<td class='textArea'>Cacti Version</td>\n";
 	print "		<td class='textArea'>" . $config["cacti_version"] . "</td>\n";
@@ -1661,6 +1665,8 @@
 
 	<?php
 
+	api_plugin_hook('utilities_list');
+
 	html_end_box();
 }