-diff -Naur cacti-0.8.7e-old/auth_changepassword.php cacti-0.8.7e/auth_changepassword.php
---- cacti-0.8.7e-old/auth_changepassword.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/auth_changepassword.php 2009-11-21 23:06:16.000000000 -0600
+diff -Naur cacti-0.8.7g-old/auth_changepassword.php cacti-0.8.7g/auth_changepassword.php
+--- cacti-0.8.7g-old/auth_changepassword.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/auth_changepassword.php 2010-07-09 18:34:11.000000000 -0400
@@ -59,6 +59,8 @@
header("Location: index.php"); break;
case '3': /* default graph page */
}
}else{
header("Location: graph_view.php");
-diff -Naur cacti-0.8.7e-old/auth_login.php cacti-0.8.7e/auth_login.php
---- cacti-0.8.7e-old/auth_login.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/auth_login.php 2009-11-21 23:06:16.000000000 -0600
-@@ -212,6 +212,8 @@
- header("Location: index.php"); break;
+diff -Naur cacti-0.8.7g-old/auth_login.php cacti-0.8.7g/auth_login.php
+--- cacti-0.8.7g-old/auth_login.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/auth_login.php 2010-07-09 18:34:11.000000000 -0400
+@@ -124,10 +124,12 @@
+ }
+
+ default:
+- /* 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 = '" . $username . "' AND password = '" . md5(get_request_var_post("login_password")) . "' AND realm = 0");
++ 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 = '" . $username . "' AND password = '" . md5(get_request_var_post("login_password")) . "' AND realm = 0");
++ }
+ }
+ }
+ /* end of switch */
+@@ -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{
+- if (isset($_SERVER["HTTP_REFERER"])) {
+- $referer = $_SERVER["HTTP_REFERER"];
+- if (basename($referer) == "logout.php") {
+- $referer = "index.php";
+- }
+- } else if (isset($_SERVER["REQUEST_URI"])) {
+- $referer = $_SERVER["REQUEST_URI"];
+- if (basename($referer) == "logout.php") {
+- $referer = "index.php";
+- }
+- } else {
+- $referer = "index.php";
++ /* 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 = $config['url_path'] . "index.php";
++ }
++ } else if (isset($_SERVER["REQUEST_URI"])) {
++ $referer = $_SERVER["REQUEST_URI"];
++ if (basename($referer) == "logout.php") {
++ $referer = $config['url_path'] . "index.php";
+ }
++ } else {
++ $referer = $config['url_path'] . "index.php";
++ }
++
++ if (substr_count($referer, "plugins")) {
+ header("Location: " . $referer);
++ } elseif (sizeof(db_fetch_assoc("SELECT realm_id FROM user_auth_realm WHERE realm_id = 8 AND user_id = " . $_SESSION["sess_user_id"])) == 0) {
++ header("Location: graph_view.php");
++ } else {
++ header("Location: $referer");
+ }
++
+ 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: 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;
-
-@@ -262,9 +264,17 @@
+ }else{
+@@ -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">
<table 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>
++ <td colspan="2"><center><?php if ($cacti_logo != '') { ?><img src="<?php echo $cacti_logo; ?>" border="0" alt=""><?php } ?></center></td>
</tr>
<?php
-@@ -317,6 +327,7 @@
+@@ -303,22 +326,29 @@
+ <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>
+ <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>
++ </tr>
+ <?php }?>
+ <tr style="height:10px;"><td></td></tr>
+ <tr>
<td><input type="submit" value="Login"></td>
</tr>
</table>
</form>
</body>
</html>
-diff -Naur cacti-0.8.7e-old/data_sources.php cacti-0.8.7e/data_sources.php
---- cacti-0.8.7e-old/data_sources.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/data_sources.php 2009-11-21 23:06:16.000000000 -0600
+diff -Naur cacti-0.8.7g-old/data_sources.php cacti-0.8.7g/data_sources.php
+--- cacti-0.8.7g-old/data_sources.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/data_sources.php 2010-07-09 18:34:11.000000000 -0400
@@ -44,6 +44,8 @@
7 => "Disable"
);
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
-@@ -402,7 +404,10 @@
+@@ -402,6 +404,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;
- }
-@@ -533,7 +538,12 @@
- <p>$ds_list</p>
- </td>
- </tr>\n
-- ";
-+ ";
-+ } 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);
- }
-
- if (!isset($ds_array)) {
-@@ -675,6 +685,8 @@
- input_validate_input_number(get_request_var("id"));
+@@ -545,6 +549,12 @@
+ </tr>\n
+ ";
+ $save_html = "<input type='button' value='Cancel' onClick='window.history.back()'> <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()'> <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";
+@@ -683,6 +693,8 @@
+ input_validate_input_number(get_request_var("host_id"));
/* ==================================================== */
+ api_plugin_hook('data_source_edit_top');
$use_data_template = true;
$host_id = 0;
-@@ -967,8 +979,9 @@
+@@ -975,8 +987,9 @@
form_save_button("data_sources.php");
}
function get_poller_interval($seconds) {
-@@ -1300,6 +1313,7 @@
+@@ -1310,6 +1323,7 @@
$i = 0;
if (sizeof($data_sources) > 0) {
foreach ($data_sources as $data_source) {
$data_template_name = ((empty($data_source["data_template_name"])) ? "<em>None</em>" : $data_source["data_template_name"]);
$data_input_name = ((empty($data_source["data_input_name"])) ? "<em>External</em>" : $data_source["data_input_name"]);
$poller_interval = ((isset($poller_intervals[$data_source["local_data_id"]])) ? $poller_intervals[$data_source["local_data_id"]] : 0);
-@@ -1328,4 +1342,3 @@
- print "</form>\n";
- }
- ?>
--
-diff -Naur cacti-0.8.7e-old/graph_image.php cacti-0.8.7e/graph_image.php
---- cacti-0.8.7e-old/graph_image.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/graph_image.php 2009-11-21 23:06:16.000000000 -0600
+diff -Naur cacti-0.8.7g-old/graph_image.php cacti-0.8.7g/graph_image.php
+--- cacti-0.8.7g-old/graph_image.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/graph_image.php 2010-07-09 18:34:11.000000000 -0400
@@ -44,6 +44,8 @@
/* flush the headers now */
ob_end_clean();
session_write_close();
$graph_data_array = array();
-diff -Naur cacti-0.8.7e-old/graph.php cacti-0.8.7e/graph.php
---- cacti-0.8.7e-old/graph.php 2009-11-21 23:31:26.000000000 -0600
-+++ cacti-0.8.7e/graph.php 2009-11-21 23:06:16.000000000 -0600
-@@ -100,6 +100,7 @@
- <a href='graph.php?action=zoom&local_graph_id=<?php print $_GET["local_graph_id"];?>&rra_id=<?php print $rra["id"];?>&view_type=<?php print $_REQUEST["view_type"];?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
- <a href='graph_xport.php?local_graph_id=<?php print $_GET["local_graph_id"];?>&rra_id=<?php print $rra["id"];?>&view_type=<?php print $_REQUEST["view_type"];?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
- <a href='graph.php?action=properties&local_graph_id=<?php print $_GET["local_graph_id"];?>&rra_id=<?php print $rra["id"];?>&view_type=<?php print $_REQUEST["view_type"];?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a>
-+ <?php api_plugin_hook('graph_buttons', array('hook' => 'view', 'local_graph_id' => $_GET['local_graph_id'], 'rra' => $rra['id'], 'view_type' => $_REQUEST['view_type'])); ?>
- </td>
- </tr>
- <tr>
-@@ -214,6 +215,7 @@
+diff -Naur cacti-0.8.7g-old/graph.php cacti-0.8.7g/graph.php
+--- cacti-0.8.7g-old/graph.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/graph.php 2010-07-09 18:34:11.000000000 -0400
+@@ -32,6 +32,8 @@
+ include_once("./lib/html_tree.php");
+ include_once("./include/top_graph_header.php");
+
++api_plugin_hook_function('graph');
++
+ /* ================= input validation ================= */
+ input_validate_input_regex(get_request_var("rra_id"), "^([0-9]+|all)$");
+ input_validate_input_number(get_request_var("local_graph_id"));
+@@ -94,17 +96,18 @@
+ <table width='1' cellpadding='0'>
+ <tr>
+ <td>
+- <img class='graphimage' id='graph_<?php print $_GET["local_graph_id"] ?>' src='<?php print htmlspecialchars("graph_image.php?action=view&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"]);?>' border='0' alt='<?php print htmlspecialchars($graph_title);?>'>
++ <img class='graphimage' id='graph_<?php print $_GET["local_graph_id"] ?>' src='<?php print htmlspecialchars("graph_image.php?action=view&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"]);?>' border='0' alt='<?php print htmlspecialchars($graph_title);?>'>
+ </td>
+ <td valign='top' style='padding: 3px;' class='noprint'>
+ <a href='<?php print htmlspecialchars("graph.php?action=zoom&local_graph_id=" . $_GET["local_graph_id"]. "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
+ <a href='<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
+ <a href='<?php print htmlspecialchars("graph.php?action=properties&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a>
++ <?php api_plugin_hook('graph_buttons', array('hook' => 'view', 'local_graph_id' => $_GET['local_graph_id'], 'rra' => $rra['id'], 'view_type' => $_REQUEST['view_type'])); ?>
+ </td>
+ </tr>
+ <tr>
+ <td colspan='2' align='center'>
+- <strong><?php print htmlspecialchars($rra["name"]);?></strong>
++ <strong><?php print htmlspecialchars($rra["name"]);?></strong>
+ </td>
+ </tr>
+ </table>
+@@ -215,6 +218,7 @@
<td valign='top' style='padding: 3px;' class='noprint'>
- <a href='
graph.php?action=properties&local_graph_id=<?php print $_GET["local_graph_id"];?>&rra_id=<?php print $_GET["rra_id"];?>&view_type=<?php print $_REQUEST["view_type"];?>&graph_start=<?php print $graph_start;?>&graph_end=<?php print $graph_end;?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a>
- <a href='
graph_xport.php?local_graph_id=<?php print $_GET["local_graph_id"];?>&rra_id=<?php print $_GET["rra_id"];?>&view_type=<?php print $_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>
+ <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>
-@@ -246,6 +248,7 @@
+@@ -247,6 +251,7 @@
<td valign='top' style='padding: 3px;'>
- <a href='
graph.php?action=zoom&local_graph_id=<?php print $_GET["local_graph_id"];?>&rra_id=<?php print $_GET["rra_id"];?>&view_type=<?php print $_REQUEST["view_type"];?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
- <a href='
graph_xport.php?local_graph_id=<?php print $_GET["local_graph_id"];?>&rra_id=<?php print $_GET["rra_id"];?>&view_type=<?php print $_REQUEST["view_type"];?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
+ <a href='
<?php print htmlspecialchars("graph.php?action=zoom&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $_GET["rra_id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
+ <a href='
<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $_GET["rra_id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
+ <?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 -Naur cacti-0.8.7e-old/graphs_new.php cacti-0.8.7e/graphs_new.php
---- cacti-0.8.7e-old/graphs_new.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/graphs_new.php 2009-11-21 23:06:16.000000000 -0600
-@@ -479,7 +479,8 @@
+diff -Naur cacti-0.8.7g-old/graphs_new.php cacti-0.8.7g/graphs_new.php
+--- cacti-0.8.7g-old/graphs_new.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/graphs_new.php 2010-07-09 18:34:11.000000000 -0400
+@@ -511,7 +511,8 @@
</td>
<td nowrap style='white-space: nowrap;' class="textInfo" align="center" valign="top">
- <span style="white-space: nowrap; color: #c16921;">*</span><a href="host.php?action=edit&id=<?php print $_REQUEST["host_id"];?>">Edit this Host</a><br>
-- <span style="white-space: nowrap; color: #c16921;">*</span><a href="host.php?action=edit">Create New Host</a>
-+ <span style="white-space: nowrap; color: #c16921;">*</span><a href="host.php?action=edit">Create New Host</a><br>
+ <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>
++ <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>
-diff -Naur cacti-0.8.7e-old/graphs.php cacti-0.8.7e/graphs.php
---- cacti-0.8.7e-old/graphs.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/graphs.php 2009-11-21 23:06:16.000000000 -0600
+diff -Naur cacti-0.8.7g-old/graphs.php cacti-0.8.7g/graphs.php
+--- cacti-0.8.7g-old/graphs.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/graphs.php 2010-07-09 18:34:11.000000000 -0400
@@ -45,6 +45,8 @@
4 => "Convert to Graph Template"
);
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
-@@ -360,8 +362,10 @@
- input_validate_input_number($selected_items[$i]);
- /* ==================================================== */
+@@ -362,6 +364,8 @@
-- api_resize_graphs($selected_items[$i], $_POST["graph_width"], $_POST["graph_height"]);
-+ api_resize_graphs($selected_items[$i], $_POST['graph_width'], $_POST['graph_height']);
+ api_resize_graphs($selected_items[$i], $_POST["graph_width"], $_POST["graph_height"]);
}
+ } else {
-+ api_plugin_hook_function('graphs_action_execute', $_POST['drp_action']);
++ api_plugin_hook_function('graphs_action_execute', $_POST['drp_action']);
}
header("Location: graphs.php");
-@@ -502,6 +506,11 @@
- </td>
- </tr>\n
- ";
-+ } 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);
- }
+@@ -514,6 +518,12 @@
+ ";
- if (!isset($graph_array)) {
-diff -Naur cacti-0.8.7e-old/host.php cacti-0.8.7e/host.php
---- cacti-0.8.7e-old/host.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/host.php 2009-11-21 23:06:16.000000000 -0600
+ $save_html = "<input type='button' value='Cancel' onClick='window.history.back()'> <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()'> <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";
+diff -Naur cacti-0.8.7g-old/host.php cacti-0.8.7g/host.php
+--- cacti-0.8.7g-old/host.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/host.php 2010-07-09 18:34:11.000000000 -0400
@@ -44,6 +44,8 @@
6 => "Change Availability Options"
);
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
-@@ -309,6 +311,8 @@
+@@ -305,6 +307,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);
}
}
header("Location: host.php");
-@@ -445,6 +449,11 @@
- </tr>\n
- <input type='hidden' name='tree_id' value='" . $matches[1] . "'>\n
- ";
-+ } 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);
- }
-
- if (!isset($host_array)) {
-@@ -533,6 +542,8 @@
-
- display_output_messages();
+@@ -450,6 +454,12 @@
+ <input type='hidden' name='tree_id' value='" . $matches[1] . "'>\n
+ ";
+ $save_html = "<input type='button' value='Cancel' onClick='window.history.back()'> <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()'> <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";
+@@ -532,6 +542,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: " . $host["description"] . "]";
-@@ -643,7 +654,8 @@
- <td class="textInfo" valign="top">
- <span style="color: #c16921;">*</span><a href="graphs_new.php?host_id=<?php print $host["id"];?>">Create Graphs for this Host</a><br>
- <span style="color: #c16921;">*</span><a href="data_sources.php?host_id=<?php print $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="graphs.php?host_id=<?php print $host["id"];?>&graph_rows=30&filter=&template_id=-1&page=1">Graph List</a>
-+ <span style="color: #c16921;">*</span><a href="graphs.php?host_id=<?php print $host["id"];?>&graph_rows=30&filter=&template_id=-1&page=1">Graph List</a><br>
+ $header_label = "[edit: " . htmlspecialchars($host["description"]) . "]";
+@@ -643,6 +655,7 @@
+ <span style="color: #c16921;">*</span><a href="<?php print htmlspecialchars("graphs_new.php?host_id=" . $host["id"]);?>">Create Graphs for this Host</a><br>
+ <span style="color: #c16921;">*</span><a href="<?php print htmlspecialchars("data_sources.php?host_id=" . $host["id"] . "&ds_rows=30&filter=&template_id=-1&method_id=-1&page=1");?>">Data Source List</a><br>
+ <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>
-@@ -1104,6 +1116,8 @@
+@@ -1107,6 +1120,8 @@
}
- form_save_button("host.php");
+ form_save_button("host.php", "return");
+
+ api_plugin_hook('host_edit_bottom');
}
function host() {
-diff -Naur cacti-0.8.7e-old/include/auth.php cacti-0.8.7e/include/auth.php
---- cacti-0.8.7e-old/include/auth.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/include/auth.php 2009-11-21 23:06:16.000000000 -0600
+\ No newline at end of file
+diff -Naur cacti-0.8.7g-old/include/auth.php cacti-0.8.7g/include/auth.php
+--- cacti-0.8.7g-old/include/auth.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/auth.php 2010-07-09 18:34:11.000000000 -0400
@@ -31,6 +31,9 @@
}
if (read_config_option("auth_method") != 0) {
-+ /* handle alternate authentication realms */
++ /* 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"));
-@@ -75,7 +78,7 @@
- <html>
+@@ -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>
-- <link href="include/main.css" rel="stylesheet">
-+ <link href="<?php echo $config['url_path']; ?>include/main.css" rel="stylesheet">
- </style>
+ <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>
-
-@@ -83,7 +86,7 @@
+ <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 height='10'><td></td></tr>
- <tr>
-@@ -91,7 +94,7 @@
- need access to this particular section, please contact the Cacti administrator.</td>
- </tr>
+ <tr style='height:10px;'><td></td></tr>
<tr>
-- <td class='textArea' colspan='2' align='center'>( <a href='' onclick='javascript: history.back();'>Return</a> | <a href='index.php'>Login</a> )</td>
-+ <td class='textArea' colspan='2' align='center'>( <a href='' onclick='javascript: history.back();'>Return</a> | <a href='<?php echo $config['url_path']; ?>index.php'>Login</a> )</td>
- </tr>
- </table>
-
-diff -Naur cacti-0.8.7e-old/include/bottom_footer.php cacti-0.8.7e/include/bottom_footer.php
---- cacti-0.8.7e-old/include/bottom_footer.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/include/bottom_footer.php 2009-11-21 23:06:16.000000000 -0600
+diff -Naur cacti-0.8.7g-old/include/bottom_footer.php cacti-0.8.7g/include/bottom_footer.php
+--- cacti-0.8.7g-old/include/bottom_footer.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/bottom_footer.php 2010-07-09 18:34:11.000000000 -0400
@@ -21,6 +21,10 @@
| http://www.cacti.net/ |
+-------------------------------------------------------------------------+
+if (($oper_mode == OPER_MODE_NATIVE) || ($oper_mode == OPER_MODE_IFRAME_NONAV)) {
+
?>
+ </div>
<br>
- </td>
-@@ -31,6 +35,9 @@
+@@ -32,6 +36,9 @@
</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 -Naur cacti-0.8.7e-old/include/global_arrays.php cacti-0.8.7e/include/global_arrays.php
---- cacti-0.8.7e-old/include/global_arrays.php 2009-11-21 23:31:26.000000000 -0600
-+++ cacti-0.8.7e/include/global_arrays.php 2009-11-21 23:06:16.000000000 -0600
+diff -Naur cacti-0.8.7g-old/include/config.php cacti-0.8.7g/include/config.php
+--- cacti-0.8.7g-old/include/config.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/config.php 2010-07-09 18:34:11.000000000 -0400
+@@ -30,6 +30,17 @@
+ $database_password = "cactiuser";
+ $database_port = "3306";
+
++/* load up old style plugins here */
++$plugins = array();
++//$plugins[] = 'thold';
++
++/*
++ Edit this to point to the default URL of your Cacti install
++ ex: if your cacti install as at http://serverip/cacti/ this
++ would be set to /cacti/
++*/
++$url_path = "/";
++
+ /* Default session name - Session name must contain alpha characters */
+ #$cacti_session_name = "Cacti";
+
+diff -Naur cacti-0.8.7g-old/include/global_arrays.php cacti-0.8.7g/include/global_arrays.php
+--- cacti-0.8.7g-old/include/global_arrays.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/global_arrays.php 2010-07-09 18:34:11.000000000 -0400
@@ -22,6 +22,8 @@
+-------------------------------------------------------------------------+
*/
$messages = array(
1 => array(
"message" => 'Save Successful.',
-@@ -645,4 +647,10 @@
+@@ -654,4 +656,10 @@
GDC_SLASH => "/"
);
+$plugin_architecture = array(
-+ 'version' => '2.6'
++ 'version' => '2.8'
+ );
+
+api_plugin_hook('config_arrays');
+
?>
-diff -Naur cacti-0.8.7e-old/include/global_constants.php cacti-0.8.7e/include/global_constants.php
---- cacti-0.8.7e-old/include/global_constants.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/include/global_constants.php 2009-11-21 23:06:16.000000000 -0600
-@@ -175,4 +175,8 @@
+diff -Naur cacti-0.8.7g-old/include/global_constants.php cacti-0.8.7g/include/global_constants.php
+--- cacti-0.8.7g-old/include/global_constants.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/global_constants.php 2010-07-09 18:34:11.000000000 -0400
+@@ -173,4 +173,8 @@
define("SNMP_CMDPHP", 1);
define("SNMP_WEBUI", 2);
+-?>
+define('OPER_MODE_NATIVE', 0);
+define('OPER_MODE_RESKIN', 1);
+define('OPER_MODE_IFRAME_NONAV', 2);
+
- ?>
-diff -Naur cacti-0.8.7e-old/include/global_form.php cacti-0.8.7e/include/global_form.php
---- cacti-0.8.7e-old/include/global_form.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/include/global_form.php 2009-11-21 23:06:16.000000000 -0600
++?>
+\ No newline at end of file
+diff -Naur cacti-0.8.7g-old/include/global_form.php cacti-0.8.7g/include/global_form.php
+--- cacti-0.8.7g-old/include/global_form.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/global_form.php 2010-07-09 18:34:11.000000000 -0400
@@ -22,8 +22,9 @@
+-------------------------------------------------------------------------+
*/
}
/* file: cdef.php, action: edit */
-@@ -1184,4 +1185,7 @@
+@@ -1190,4 +1191,7 @@
"dropdown_sql" => "select id,name from snmp_query order by name"
)
);
+
+api_plugin_hook('config_form');
+
-diff -Naur cacti-0.8.7e-old/include/global.php cacti-0.8.7e/include/global.php
---- cacti-0.8.7e-old/include/global.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/include/global.php 2009-11-21 23:06:16.000000000 -0600
-@@ -41,6 +41,22 @@
- /* Default session name - Session name must contain alpha characters */
- $cacti_session_name = "Cacti";
+diff -Naur cacti-0.8.7g-old/include/global.php cacti-0.8.7g/include/global.php
+--- cacti-0.8.7g-old/include/global.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/global.php 2010-07-09 18:34:11.000000000 -0400
+@@ -93,6 +93,13 @@
+ /* built-in snmp support */
+ $config["php_snmp_support"] = function_exists("snmpget");
-+$plugins = array();
-+//$plugins[] = 'thold';
-+
-+/* Do not edit this line */
-+$config = array();
-+
-+/*
-+ Edit this to point to the default URL of your Cacti install
-+ ex: if your cacti install as at http://serverip/cacti/ this
-+ would be set to /cacti/
-+*/
-+
-+$config['url_path'] = '/';
-+
-+define('URL_PATH', $config['url_path']);
-+
- /* Include configuration */
- include(dirname(__FILE__) . "/config.php");
-
-@@ -76,7 +92,6 @@
- "structure_rra_paths.php"
- );
-
--$config = array();
- $colors = array();
-
- /* this should be auto-detected, set it manually if needed */
-@@ -180,18 +195,23 @@
- /* display ALL errors */
- error_reporting(E_ALL);
-
-+/* current cacti version */
-+$config["cacti_version"] = "0.8.7c";
++/* set URL path */
++if (! isset($url_path)) {
++ $url_path = "";
++}
++$config['url_path'] = $url_path;
++define('URL_PATH', $url_path);
+
+ /* used for includes */
+ $config["base_path"] = strtr(ereg_replace("(.*)[\\\/]include", "\\1", dirname(__FILE__)), "\\", "/");
+ $config["library_path"] = ereg_replace("(.*[\\\/])include", "\\1lib", dirname(__FILE__));
+@@ -188,15 +195,17 @@
/* include base modules */
include($config["library_path"] . "/adodb/adodb.inc.php");
include($config["library_path"] . "/database.php");
include_once($config["include_path"] . "/global_form.php");
include_once($config["library_path"] . "/html.php");
include_once($config["library_path"] . "/html_form.php");
-@@ -200,6 +220,8 @@
+@@ -205,6 +214,8 @@
include_once($config["library_path"] . "/variables.php");
include_once($config["library_path"] . "/auth.php");
+api_plugin_hook("config_insert");
+
/* current cacti version */
- $config["cacti_version"] = "0.8.7e";
+ $config["cacti_version"] = "0.8.7g";
-diff -Naur cacti-0.8.7e-old/include/global_settings.php cacti-0.8.7e/include/global_settings.php
---- cacti-0.8.7e-old/include/global_settings.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/include/global_settings.php 2009-11-21 23:06:16.000000000 -0600
-@@ -1185,4 +1185,6 @@
+diff -Naur cacti-0.8.7g-old/include/global_settings.php cacti-0.8.7g/include/global_settings.php
+--- cacti-0.8.7g-old/include/global_settings.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/global_settings.php 2010-07-09 18:34:11.000000000 -0400
+@@ -1190,4 +1190,6 @@
)
);
+api_plugin_hook('config_settings');
+
?>
-diff -Naur cacti-0.8.7e-old/include/plugins.php cacti-0.8.7e/include/plugins.php
---- cacti-0.8.7e-old/include/plugins.php 1969-12-31 17:00:00.000000000 -0700
-+++ cacti-0.8.7e/include/plugins.php 2009-11-21 23:06:16.000000000 -0600
-@@ -0,0 +1,36 @@
+diff -Naur cacti-0.8.7g-old/include/plugins.php cacti-0.8.7g/include/plugins.php
+--- cacti-0.8.7g-old/include/plugins.php 1969-12-31 19:00:00.000000000 -0500
++++ cacti-0.8.7g/include/plugins.php 2010-07-09 18:34:11.000000000 -0400
+@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ */
+
-+global $plugin_hooks;
++global $plugin_hooks, $plugins_system;
+$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();
-+ }
-+ }
++ 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();
++ }
++ }
+}
+
+/**
+ * @return mixed $data
+ */
+
++$oldplugins = read_config_option('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);
-+ }
++ foreach ($plugins as $name) {
++ use_plugin($name);
++ }
+}
-+
-+
-+
-diff -Naur cacti-0.8.7e-old/include/top_graph_header.php cacti-0.8.7e/include/top_graph_header.php
---- cacti-0.8.7e-old/include/top_graph_header.php 2009-11-21 23:31:26.000000000 -0600
-+++ cacti-0.8.7e/include/top_graph_header.php 2009-11-21 23:20:04.000000000 -0600
+diff -Naur cacti-0.8.7g-old/include/top_graph_header.php cacti-0.8.7g/include/top_graph_header.php
+--- cacti-0.8.7g-old/include/top_graph_header.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/top_graph_header.php 2010-07-09 18:34:11.000000000 -0400
@@ -25,6 +25,11 @@
$using_guest_account = false;
$show_console_tab = true;
+
/* ================= input validation ================= */
input_validate_input_number(get_request_var_request("local_graph_id"));
- /* ==================================================== */
-@@ -50,41 +55,52 @@
+ input_validate_input_number(get_request_var_request("graph_start"));
+@@ -52,41 +57,53 @@
$_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', 'Cacti');
++$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>
-- <title>Cacti</title>
+- <title><?php echo draw_navigation_text("title");?></title>
+ <title><?php echo $page_title; ?></title>
- <?php if (isset($_SESSION["custom"])) {
- if ($_SESSION["custom"]) {
- 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', read_graph_config_option('page_refresh'));
-+ print "<meta http-equiv=refresh content='" . $refresh . "'>\r\n";
- }
+ <?php
+ if (isset($_SESSION["custom"]) && $_SESSION["custom"] == true) {
+ 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));
++ print "<meta http-equiv=refresh content='" . $refresh . "'>\r\n";
}
?>
-- <link href="include/main.css" rel="stylesheet">
+ <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/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" rel="stylesheet">
++ <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>
+ <?php api_plugin_hook('page_head'); ?>
</head>
--<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+-<body>
+<?php if ($oper_mode == OPER_MODE_NATIVE) {?>
-+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" <?php print api_plugin_hook_function("body_style", "");?>>
++<body <?php print api_plugin_hook_function("body_style", "");?>>
<a name='page_top'></a>
+<?php }else{?>
-+<body leftmargin="15" topmargin="15" marginwidth="15" marginheight="15" <?php print api_plugin_hook_function("body_style", "");?>>
++<body <?php print api_plugin_hook_function("body_style", "");?>>
+<?php }?>
-
- <table width="100%" height="100%" cellspacing="0" cellpadding="0">
++
+ <table style="width:100%;height:100%;" cellspacing="0" cellpadding="0">
+<?php if ($oper_mode == OPER_MODE_NATIVE) { ;?>
- <tr height="25" bgcolor="#a9a9a9" class="noprint">
+ <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;">
+ ?>
</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>';}?> <?php if ((!isset($_SESSION["sess_user_id"])) || ($current_user["show_tree"] == "on")) {?><a href="
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 }?> <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>';}?> <?php if ((!isset($_SESSION["sess_user_id"])) || ($current_user["show_tree"] == "on")) {?><a href="<?php
echo $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 echo $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 echo $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 }?> <br>
+- <?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>';}?> <?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 }?> <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>';}?> <?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 }?> <br>
</td>
</tr>
</table>
-@@ -92,7 +108,7 @@
+@@ -94,7 +111,7 @@
</tr>
- <tr height="2" colspan="2" bgcolor="#183c8f" class="noprint">
+ <tr style="height:2px;" bgcolor="#183c8f" class="noprint">
<td colspan="2">
-- <img src="images/transparent_line.gif" width="170" height="2" border="0"><br>
-+ <img src="<?php echo $config['url_path']; ?>images/transparent_line.gif" width="170" height="2" border="0"><br>
+- <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 height="5" bgcolor="#e9e9e9" class="noprint">
-@@ -104,7 +120,7 @@
+ <tr style="height:5px;" bgcolor="#e9e9e9" class="noprint">
+@@ -106,7 +123,7 @@
</td>
<td align="right">
<?php if ((isset($_SESSION["sess_user_id"])) && ($using_guest_account == false)) { ?>
<?php } ?>
</td>
</tr>
-@@ -112,10 +128,10 @@
+@@ -114,10 +131,10 @@
</td>
</tr>
<tr class="noprint">
-- <td bgcolor="#efefef" colspan="1" height="8" style="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"));?>" height="2" border="0"><br>
-+ <td bgcolor="#efefef" colspan="1" height="8" style="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"));?>" height="2" border="0"><br>
+- <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" height="8" style="background-image: url(images/shadow.gif); background-repeat: repeat-x;">
-+ <td bgcolor="#ffffff" colspan="1" height="8" style="background-image: url(<?php echo $config['url_path']; ?>images/shadow.gif); background-repeat: repeat-x;">
+- <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>
-@@ -140,10 +156,10 @@
- ?>
+@@ -143,6 +160,8 @@
</td>
</tr>
-- <?php }?>
--
-+ <?php }
-+ } ?>
+ <?php }
++ }
++ global $graph_views;
+ load_current_session_value("action", "sess_cacti_graph_action", $graph_views[read_graph_config_option("default_tree_view_mode")]);
+ ?>
<tr>
-- <?php if ((read_graph_config_option("default_tree_view_mode") == "2") && (($_REQUEST["action"] == "tree") || ((isset($_REQUEST["view_type"]) ? $_REQUEST["view_type"] : "") == "tree"))) { ?>
-+ <?php if ((read_graph_config_option("default_tree_view_mode") == "2") && ((isset($_REQUEST["action"]) && $_REQUEST["action"] == "tree") || ((isset($_REQUEST["view_type"]) ? $_REQUEST["view_type"] : "") == "tree"))) { ?>
- <td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>' class='noprint'>
- <table border=0 cellpadding=0 cellspacing=0><tr><td><font size=-2><a style="font-size:7pt;text-decoration:none;color:silver" href="http://www.treemenu.net/" target=_blank></a></font></td></tr></table>
- <?php grow_dhtml_trees(); ?>
-diff -Naur cacti-0.8.7e-old/include/top_header.php cacti-0.8.7e/include/top_header.php
---- cacti-0.8.7e-old/include/top_header.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/include/top_header.php 2009-11-21 23:06:16.000000000 -0600
-@@ -22,37 +22,52 @@
+diff -Naur cacti-0.8.7g-old/include/top_header.php cacti-0.8.7g/include/top_header.php
+--- cacti-0.8.7g-old/include/top_header.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/include/top_header.php 2010-07-09 18:34:11.000000000 -0400
+@@ -22,38 +22,53 @@
+-------------------------------------------------------------------------+
*/
+ return;
+}
+
-+$page_title = api_plugin_hook_function('page_title', 'Cacti');
++$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>
-- <title>Cacti</title>
-- <link href="include/main.css" rel="stylesheet">
+- <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"/>
-- <script type="text/javascript" src="include/layout.js"></script>
+ <title><?php echo $page_title; ?></title>
-+ <link href="<?php echo $config['url_path']; ?>include/main.css" rel="stylesheet">
-+ <link href="<?php echo $config['url_path']; ?>images/favicon.ico" rel="shortcut icon"/>
++ <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>
+ <script type="text/javascript" src="<?php echo $config['url_path']; ?>include/layout.js"></script>
<?php if (isset($refresh)) {
print "<meta http-equiv=refresh content=\"" . $refresh["seconds"] . "; url='" . $refresh["page"] . "'\">";
- }?>
+ }
+ api_plugin_hook('page_head'); ?>
- </style>
</head>
--<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" background="images/left_border.gif">
+-<body style="background-image:url('images/left_border.gif');background-repeat:repeat-y;">
+<?php if ($oper_mode == OPER_MODE_NATIVE) {?>
-+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" <?php print api_plugin_hook_function("body_style", "");?>>
++<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 leftmargin="15" topmargin="15" marginwidth="15" marginheight="15" <?php print api_plugin_hook_function("body_style", "");?>>
++<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 height="1" bgcolor="#a9a9a9">
+ <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;">
</table>
</td>
</tr>
- <tr height="2" bgcolor="#183c8f">
+ <tr style="height:2px;" bgcolor="#183c8f">
<td colspan="3">
-- <img src="images/transparent_line.gif" height="2" border="0"><br>
-+ <img src="<?php echo $config['url_path']; ?>images/transparent_line.gif" height="2" border="0"><br>
+- <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 height="5" bgcolor="#e9e9e9">
-@@ -64,7 +79,7 @@
+ <tr style="height:5px;" bgcolor="#e9e9e9">
+@@ -65,7 +80,7 @@
</td>
<td align="right">
<?php if (read_config_option("auth_method") != 0) { ?>
<?php } ?>
</td>
</tr>
-@@ -72,10 +87,10 @@
+@@ -73,10 +88,10 @@
</td>
</tr>
<tr>
-- <td bgcolor="#f5f5f5" colspan="1" height="8" width="135" style="background-image: url(images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
-- <img src="images/transparent_line.gif" width="135" height="2" border="0"><br>
-- </td>
-- <td colspan="2" height="8" style="background-image: url(images/shadow.gif); background-repeat: repeat-x;" bgcolor="#ffffff">
-+ <td bgcolor="#f5f5f5" colspan="1" height="8" width="135" style="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="135" height="2" border="0"><br>
-+ </td>
-+ <td colspan="2" height="8" style="background-image: url(<?php echo $config['url_path']; ?>images/shadow.gif); background-repeat: repeat-x;" bgcolor="#ffffff">
+- <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>
-@@ -85,9 +100,12 @@
+@@ -86,9 +101,12 @@
<?php draw_menu();?>
</table>
-- <img src="images/transparent_line.gif" width="135" height="5" border="0"><br>
+- <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" width="135" height="5" border="0"><br>
-+ <img src="<?php echo $config['url_path']; ?>images/transparent_line.gif" width="135" height="5" border="0"><br>
+- <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 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" width="135" height="5" border="0"><br>
++ <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();?>
+ <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 -Naur cacti-0.8.7e-old/index.php cacti-0.8.7e/index.php
---- cacti-0.8.7e-old/index.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/index.php 2009-11-21 23:06:16.000000000 -0600
+diff -Naur cacti-0.8.7g-old/index.php cacti-0.8.7g/index.php
+--- cacti-0.8.7g-old/index.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/index.php 2010-07-09 18:34:11.000000000 -0400
@@ -25,6 +25,8 @@
include("./include/auth.php");
include("./include/top_header.php");
include("./include/bottom_footer.php");
?>
-diff -Naur cacti-0.8.7e-old/lib/api_device.php cacti-0.8.7e/lib/api_device.php
---- cacti-0.8.7e-old/lib/api_device.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/lib/api_device.php 2009-11-21 23:06:16.000000000 -0600
+diff -Naur cacti-0.8.7g-old/lib/api_device.php cacti-0.8.7g/lib/api_device.php
+--- cacti-0.8.7g-old/lib/api_device.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/lib/api_device.php 2010-07-09 18:34:11.000000000 -0400
@@ -137,6 +137,8 @@
$save["ping_retries"] = form_input_validate($ping_retries, "ping_retries", "^[0-9]+$", true, 3);
$save["max_oids"] = form_input_validate($max_oids, "max_oids", "^[0-9]+$", true, 3);
$host_id = 0;
if (!is_error_message()) {
-diff -Naur cacti-0.8.7e-old/lib/auth.php cacti-0.8.7e/lib/auth.php
---- cacti-0.8.7e-old/lib/auth.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/lib/auth.php 2009-11-21 23:06:16.000000000 -0600
-@@ -122,6 +122,8 @@
+diff -Naur cacti-0.8.7g-old/lib/auth.php cacti-0.8.7g/lib/auth.php
+--- cacti-0.8.7g-old/lib/auth.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/lib/auth.php 2010-07-09 18:34:11.000000000 -0400
+@@ -121,8 +121,9 @@
}
}
+- return true;
+ api_plugin_hook_function('copy_user', array('template_id' => $template_id, 'new_id' => $new_id));
-+
- return true;
++ return true;
}
-@@ -153,6 +155,7 @@
+
+
+@@ -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);
}
-
-diff -Naur cacti-0.8.7e-old/lib/functions.php cacti-0.8.7e/lib/functions.php
---- cacti-0.8.7e-old/lib/functions.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/lib/functions.php 2009-11-21 23:06:16.000000000 -0600
-@@ -1639,6 +1639,7 @@
- /* draw_navigation_text - determines the top header navigation text for the current page and displays it to
- the browser */
- function draw_navigation_text() {
+ /* user_disable - disable a user account
+diff -Naur cacti-0.8.7g-old/lib/functions.php cacti-0.8.7g/lib/functions.php
+--- cacti-0.8.7g-old/lib/functions.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/lib/functions.php 2010-07-09 18:34:11.000000000 -0400
+@@ -1689,6 +1689,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(
-@@ -1651,8 +1652,8 @@
+@@ -1701,8 +1703,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"),
"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"),
-@@ -1730,6 +1731,8 @@
+@@ -1780,6 +1782,8 @@
"templates_import.php:" => array("title" => "Import Templates", "mapping" => "index.php:", "url" => "templates_import.php", "level" => "1"),
);
$current_page = basename($_SERVER["PHP_SELF"]);
input_validate_input_regex(get_request_var_request("action"), "^([a-zA-Z0-9_-]+)$");
-diff -Naur cacti-0.8.7e-old/lib/html_form.php cacti-0.8.7e/lib/html_form.php
---- cacti-0.8.7e-old/lib/html_form.php 2009-11-21 23:31:26.000000000 -0600
-+++ cacti-0.8.7e/lib/html_form.php 2009-11-21 23:06:16.000000000 -0600
+diff -Naur cacti-0.8.7g-old/lib/html_form.php cacti-0.8.7g/lib/html_form.php
+--- cacti-0.8.7g-old/lib/html_form.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/lib/html_form.php 2010-07-09 18:34:11.000000000 -0400
@@ -722,11 +722,13 @@
on a confirmation form
@arg $cancel_url - the url to go to when the user clicks 'cancel'
-function form_confirm_buttons($action_url, $cancel_url) { ?>
+function form_confirm_buttons($action_url, $cancel_url) {
+ global $config;
-+ ?>
++ ?>
<tr>
<td bgcolor="#E1E1E1">
-- <a href="<?php print $cancel_url;?>"><img src="images/button_cancel.gif" border="0" alt="Cancel" align="absmiddle"></a>
-- <a href="<?php print $action_url . "&confirm=yes";?>"><img src="images/button_delete.gif" border="0" alt="Delete" align="absmiddle"></a>
-+ <a href="<?php print $cancel_url;?>"><img src="<?php print $config['url_path'] ?>images/button_cancel.gif" border="0" alt="Cancel" align="absmiddle"></a>
-+ <a href="<?php print $action_url . "&confirm=yes";?>"><img src="<?php print $config['url_path'] ?>images/button_delete.gif" border="0" alt="Delete" align="absmiddle"></a>
+- <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 }
-@@ -737,6 +739,7 @@
- @arg $force_type - if specified, will force the 'action' button to be either
- 'save' or 'create'. otherwise this field should be properly auto-detected */
- function form_save_button($cancel_url, $force_type = "", $key_field = "id") {
-+ global $config;
- if (empty($force_type)) {
- if (empty($_GET[$key_field])) {
- $img = "button_create.gif";
-@@ -757,8 +760,8 @@
- <tr>
- <td bgcolor="#f5f5f5" align="right">
- <input type='hidden' name='action' value='save'>
-- <a href='<?php print $cancel_url;?>'><img src='images/button_cancel2.gif' alt='Cancel' align='absmiddle' border='0'></a>
-- <input type='image' src='images/<?php print $img;?>' alt='<?php print $alt;?>' align='absmiddle'>
-+ <a href='<?php print $cancel_url;?>'><img src='<?php echo $config['url_path']; ?>images/button_cancel2.gif' alt='Cancel' align='absmiddle' border='0'></a>
-+ <input type='image' src='<?php echo $config['url_path']; ?>images/<?php print $img;?>' alt='<?php print $alt;?>' align='absmiddle'>
- </td>
- </tr>
- </table>
-diff -Naur cacti-0.8.7e-old/lib/html.php cacti-0.8.7e/lib/html.php
---- cacti-0.8.7e-old/lib/html.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/lib/html.php 2009-11-21 23:06:16.000000000 -0600
-@@ -86,6 +86,7 @@
- @arg $extra_url_args - extra arguments to append to the url
- @arg $header - html to use as a header */
- function html_graph_area(&$graph_array, $no_graphs_message = "", $extra_url_args = "", $header = "") {
-+ global $config;
- $i = 0;
- if (sizeof($graph_array) > 0) {
- if ($header != "") {
-@@ -142,14 +143,15 @@
+diff -Naur cacti-0.8.7g-old/lib/html.php cacti-0.8.7g/lib/html.php
+--- cacti-0.8.7g-old/lib/html.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/lib/html.php 2010-07-09 18:34:11.000000000 -0400
+@@ -144,14 +144,15 @@
<table align='center' cellpadding='0'>
<tr>
<td align='center'>
-- <div style="min-height: <?php echo (1.6 * read_config_option("export_default_height")) . "px"?>;"><a href='graph.php?action=view&local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=all'><img class='graphimage' id='graph_<?php print $graph["local_graph_id"] ?>' src='graph_image.php?local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0<?php print (($extra_url_args == "") ? "" : "&$extra_url_args");?>' border='0' alt='<?php print $graph["title_cache"];?>'></a></div>
-+ <div style="min-height: <?php echo (1.6 * read_config_option("export_default_height")) . "px"?>;"><a href='<?php print $config['url_path']; ?>graph.php?action=view&local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=all'><img class='graphimage' id='graph_<?php print $graph["local_graph_id"] ?>' src='<?php print $config['url_path']; ?>graph_image.php?local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0<?php print (($extra_url_args == "") ? "" : "&$extra_url_args");?>' border='0' alt='<?php print $graph["title_cache"];?>'></a></div>
- <?php print (read_graph_config_option("show_graph_title") == "on" ? "<p style='font-size: 10;' align='center'><strong>" . $graph["title_cache"] . "</strong></p>" : "");?>
+- <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='
graph.php?action=zoom&local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $extra_url_args;?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
-- <a href='
graph_xport.php?local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $extra_url_args;?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
-- <a href='
graph.php?action=properties&local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $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='
<?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 $config['url_path']; ?>graph.php?action=zoom&local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $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 $config['url_path']; ?>graph_xport.php?local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $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 $config['url_path']; ?>graph.php?action=properties&local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $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>
++ <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>
-@@ -175,6 +177,7 @@
+@@ -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 = "") {
$i = 0; $k = 0; $j = 0;
$num_graphs = sizeof($graph_array);
-@@ -266,13 +269,14 @@
+@@ -268,14 +270,15 @@
<table align='center' cellpadding='0'>
<tr>
<td align='center'>
-- <a href='graph.php?action=view&rra_id=all&local_graph_id=<?php print $graph["local_graph_id"];?>'><img class='graphimage' id='graph_<?php print $graph["local_graph_id"] ?>' src='graph_image.php?local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&graph_height=<?php print read_graph_config_option("default_height");?>&graph_width=<?php print read_graph_config_option("default_width");?>&graph_nolegend=true<?php print (($extra_url_args == "") ? "" : "&$extra_url_args");?>' border='0' alt='<?php print $graph["title_cache"];?>'></a>
-+ <a href='<?php print $config['url_path']; ?>graph.php?action=view&rra_id=all&local_graph_id=<?php print $graph["local_graph_id"];?>'><img class='graphimage' id='graph_<?php print $graph["local_graph_id"] ?>' src='<?php print $config['url_path']; ?>graph_image.php?local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&graph_height=<?php print read_graph_config_option("default_height");?>&graph_width=<?php print read_graph_config_option("default_width");?>&graph_nolegend=true<?php print (($extra_url_args == "") ? "" : "&$extra_url_args");?>' border='0' alt='<?php print $graph["title_cache"];?>'></a>
- <?php print (read_graph_config_option("show_graph_title") == "on" ? "<p style='font-size: 10;' align='center'><strong>" . $graph["title_cache"] . "</strong></p>" : "");?>
+- <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='graph.php?action=zoom&local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $extra_url_args;?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
-- <a href='graph_xport.php?local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $extra_url_args;?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
-- <a href='graph.php?action=properties&local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $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='<?php print $config['url_path']; ?>graph.php?action=zoom&local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $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 $config['url_path']; ?>graph_xport.php?local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $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 $config['url_path']; ?>graph.php?action=properties&local_graph_id=<?php print $graph["local_graph_id"];?>&rra_id=0&<?php print $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>
+- <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='images/graph_page_top.gif' border='0' alt='Page Top' title='Page Top' style='padding: 3px;'></a><br>
++ <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>
-@@ -704,6 +708,8 @@
+ </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)) {
/* indent sub-items */
if ($i > 0) {
$prepend_string = "--- ";
-@@ -713,7 +719,7 @@
+@@ -715,7 +720,7 @@
/* do not put a line between each sub-item */
if (($i == 0) || ($draw_sub_items == false)) {
}else{
$background = "";
}
-@@ -742,17 +748,18 @@
+@@ -744,17 +749,18 @@
}else{
- if ((isset($user_realms[$current_realm_id])) || (!isset($user_auth_realm_filenames{basename($item_url)}))) {
+ 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' background='images/menu_line.gif'><strong><a href='$item_url'>$item_title</a></strong></td></tr>\n";
-+ print "<tr><td class='textMenuItemSelected' background='" . $config['url_path'] . "images/menu_line.gif'><strong><a href='$item_url'>$item_title</a></strong></td></tr>\n";
+- 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' background='images/menu_line.gif'><a href='$item_url'>$item_title</a></td></tr>\n";
-+ print "<tr><td class='textMenuItem' background='" . $config['url_path'] . "images/menu_line.gif'><a href='$item_url'>$item_title</a></td></tr>\n";
+- 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' background='images/menu_line.gif'></td></tr>\n";
-+ print "<tr><td class='textMenuItem' background='" . $config['url_path'] . "images/menu_line.gif'></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>";
}
-@@ -762,18 +769,19 @@
+@@ -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) {
<table align='center' width='100%'>
<tr>
<td width='1' valign='top'>
-- <img src='images/arrow.gif' alt='' align='absmiddle'>
-+ <img src='<?php echo $config['url_path']; ?>images/arrow.gif' alt='' align='absmiddle'>
+- <img src='images/arrow.gif' alt=''>
++ <img src='<?php echo $config['url_path']; ?>images/arrow.gif' alt='' align='middle'>
</td>
<td align='right'>
Choose an action:
- <?php form_dropdown("drp_action",$actions_array,"","","1","","");?>
- </td>
- <td width='1' align='right'>
-- <input type='image' src='images/button_go.gif' alt='Go'>
-+ <input type='image' src='<?php echo $config['url_path']; ?>images/button_go.gif' alt='Go'>
- </td>
- </tr>
- </table>
-diff -Naur cacti-0.8.7e-old/lib/plugins.php cacti-0.8.7e/lib/plugins.php
---- cacti-0.8.7e-old/lib/plugins.php 1969-12-31 17:00:00.000000000 -0700
-+++ cacti-0.8.7e/lib/plugins.php 2009-11-21 23:06:16.000000000 -0600
-@@ -0,0 +1,380 @@
+diff -Naur cacti-0.8.7g-old/lib/plugins.php cacti-0.8.7g/lib/plugins.php
+--- cacti-0.8.7g-old/lib/plugins.php 1969-12-31 19:00:00.000000000 -0500
++++ cacti-0.8.7g/lib/plugins.php 2010-07-09 18:34:11.000000000 -0400
+@@ -0,0 +1,476 @@
+<?php
+
+
+ * @return mixed $data
+ */
+function api_plugin_hook ($name) {
-+ global $config, $plugin_hooks;
++ global $config, $plugin_hooks, $plugins_system;
+ $data = func_get_args();
+ $ret = '';
+ $p = array();
+
-+ $result = db_fetch_assoc("SELECT name, file, function FROM plugin_hooks WHERE status = 1 AND hook = '$name'", false);
++ $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'];
+}
+
+function api_plugin_hook_function ($name, $parm=NULL) {
-+ global $config, $plugin_hooks;
++ global $config, $plugin_hooks, $plugins_system;
+ $ret = $parm;
+ $p = array();
-+ $result = db_fetch_assoc("SELECT name, file, function FROM plugin_hooks WHERE status = 1 AND hook = '$name'", false);
++ $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) {
+ $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 `" . $table['table'] . "`;");
++ db_execute("DROP TABLE IF EXISTS `" . $table['table'] . "`;");
+ }
+ db_execute("DELETE FROM plugin_db_changes where plugin = '$plugin' AND method ='create'", false);
+ }
+ include_once($config['base_path'] . "/plugins/$plugin/setup.php");
+
+ $exists = db_fetch_assoc("SELECT id FROM plugin_config WHERE directory = '$plugin'", false);
-+ if (!count($exists)) {
++ if (sizeof($exists)) {
+ db_execute("DELETE FROM plugin_config WHERE directory = '$plugin'");
+ }
+
+ if (function_exists($function)){
+ $info = $function();
+ $name = $info['longname'];
-+ $webpage = $info['homepage'];
++ 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("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)) {
+ $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);
++ $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)");
+ }
+
+
+
-diff -Naur cacti-0.8.7e-old/lib/poller.php cacti-0.8.7e/lib/poller.php
---- cacti-0.8.7e-old/lib/poller.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/lib/poller.php 2009-11-21 23:06:16.000000000 -0600
-@@ -326,8 +326,11 @@
+diff -Naur cacti-0.8.7g-old/lib/poller.php cacti-0.8.7g/lib/poller.php
+--- cacti-0.8.7g-old/lib/poller.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/lib/poller.php 2010-07-09 18:34:11.000000000 -0400
+@@ -344,8 +344,11 @@
}
}
}
}
return $rrds_processed;
-diff -Naur cacti-0.8.7e-old/lib/rrd.php cacti-0.8.7e/lib/rrd.php
---- cacti-0.8.7e-old/lib/rrd.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/lib/rrd.php 2009-11-21 23:06:16.000000000 -0600
-@@ -557,6 +557,10 @@
+diff -Naur cacti-0.8.7g-old/lib/rrd.php cacti-0.8.7g/lib/rrd.php
+--- cacti-0.8.7g-old/lib/rrd.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/lib/rrd.php 2010-07-09 18:34:11.000000000 -0400
+@@ -419,6 +419,9 @@
+
+ $data_source_path = get_data_source_path($local_data_id, true);
+
++ /* 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) {
+@@ -539,6 +542,10 @@
}
}
-+ $data = api_plugin_hook_function('rrdtool_function_graph_cache_check', array('local_graph_id' => $local_graph_id,'rra_id' => $rra_id,'rrd_struc' => $rrd_struc,'graph_data_array' => $graph_data_array, 'return' => false));
++ $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
-@@ -1388,6 +1392,13 @@
+@@ -1376,6 +1383,13 @@
}
}
+
/* 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>" . read_config_option("path_rrdtool") . " graph $graph_opts$graph_defs$txt_graph_items</PRE>";
-@@ -1396,13 +1407,19 @@
- rrdtool_execute("graph $graph_opts$graph_defs$txt_graph_items", false, RRDTOOL_OUTPUT_NULL, $rrd_struc);
+ print "<PRE>" . htmlspecialchars(read_config_option("path_rrdtool") . " graph " . $graph_opts . $graph_defs . $txt_graph_items) . "</PRE>";
+@@ -1384,13 +1398,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);
$output_flag = RRDTOOL_OUTPUT_GRAPH_DATA;
}
-- return rrdtool_execute("graph $graph_opts$graph_defs$txt_graph_items", false, $output_flag, $rrd_struc);
-+ $output = rrdtool_execute("graph $graph_opts$graph_defs$txt_graph_items", false, $output_flag, $rrd_struc);
+- 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));
+
}
}
}
-diff -Naur cacti-0.8.7e-old/lib/variables.php cacti-0.8.7e/lib/variables.php
---- cacti-0.8.7e-old/lib/variables.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/lib/variables.php 2009-11-21 23:06:16.000000000 -0600
+diff -Naur cacti-0.8.7g-old/lib/variables.php cacti-0.8.7g/lib/variables.php
+--- cacti-0.8.7g-old/lib/variables.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/lib/variables.php 2010-07-09 18:34:11.000000000 -0400
@@ -183,6 +183,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);
return $string;
}
-diff -Naur cacti-0.8.7e-old/plugins/index.php cacti-0.8.7e/plugins/index.php
---- cacti-0.8.7e-old/plugins/index.php 1969-12-31 17:00:00.000000000 -0700
-+++ cacti-0.8.7e/plugins/index.php 2009-11-21 23:06:16.000000000 -0600
+diff -Naur cacti-0.8.7g-old/plugins/index.php cacti-0.8.7g/plugins/index.php
+--- cacti-0.8.7g-old/plugins/index.php 1969-12-31 19:00:00.000000000 -0500
++++ cacti-0.8.7g/plugins/index.php 2010-07-09 18:34:11.000000000 -0400
@@ -0,0 +1,5 @@
+<?php
+
+header("Location:../index.php");
+
+?>
-diff -Naur cacti-0.8.7e-old/plugins.php cacti-0.8.7e/plugins.php
---- cacti-0.8.7e-old/plugins.php 1969-12-31 17:00:00.000000000 -0700
-+++ cacti-0.8.7e/plugins.php 2009-11-21 23:06:16.000000000 -0600
-@@ -0,0 +1,436 @@
+diff -Naur cacti-0.8.7g-old/plugins.php cacti-0.8.7g/plugins.php
+--- cacti-0.8.7g-old/plugins.php 1969-12-31 19:00:00.000000000 -0500
++++ cacti-0.8.7g/plugins.php 2010-07-09 18:34:11.000000000 -0400
+@@ -0,0 +1,647 @@
+<?php
-+
++/*
++ +-------------------------------------------------------------------------+
++ | Copyright (C) 2004-2010 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);
+
-+$pluginslist = retrieve_plugin_list ();
-+
-+/* tab information */
-+$ptabs = array(
-+ "current" => "Installed",
-+// "uninstalled" => "Uninstalled",
-+// "download" => "Download",
-+// "updates" => "Updates",
++$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'
++);
+
-+$status_names = array(-2 => 'Old Plugin Architecture', -1 => 'Old Plugin Architecture - Running', 0 => 'Not Installed', 1 => 'Active', 2 => 'Awaiting Configuration', 3 => 'Awaiting Upgrade', 4 => 'Installed');
-+
-+
-+/* set the default settings category */
-+if (!isset($_GET["tab"])) {
-+ /* there is no selected tab; select the first one */
-+ $current_tab = array_keys($ptabs);
-+ $current_tab = $current_tab[0];
-+}else{
-+ $current_tab = $_GET["tab"];
-+}
-+
++/* get the comprehensive list of plugins */
++$pluginslist = retrieve_plugin_list();
+
-+// Check to see if we are installing, etc...
-+$modes = array('install', 'uninstall', 'disable', 'enable', 'check');
++/* 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']);
++ $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);
-+ $pluginslist = retrieve_plugin_list ();
++ header("Location: plugins.php");
++ exit;
+ break;
+ case 'uninstall':
-+ if (!in_array($id, $pluginslist))
-+ break;
++ if (!in_array($id, $pluginslist)) break;
+ api_plugin_uninstall($id);
-+ $pluginslist = retrieve_plugin_list ();
++ header("Location: plugins.php");
++ exit;
+ break;
+ case 'disable':
-+ if (!in_array($id, $pluginslist))
-+ break;
-+ api_plugin_disable ($id);
++ 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);
++ if (!in_array($id, $pluginslist)) break;
++ api_plugin_enable($id);
++ header("Location: plugins.php");
++ exit;
+ break;
+ case 'check':
-+ if (!in_array($id, $pluginslist))
-+ break;
++ 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;
+ }
+}
+ return $pluginslist;
+}
+
++include("./include/top_header.php");
+
-+ include("./include/top_header.php");
++update_show_current();
+
-+ /* draw the categories tabs on the top of the page */
-+/*
-+ print "<table class='tabs' width='98%' cellspacing='0' cellpadding='3' align='center'><tr>\n";
-+
-+ if (sizeof($ptabs) > 0) {
-+ foreach (array_keys($ptabs) as $tab_short_name) {
-+ print "<td " . (($tab_short_name == $current_tab) ? "bgcolor='silver'" : "bgcolor='#DFDFDF'") . " nowrap='nowrap' width='" . (strlen($ptabs[$tab_short_name]) * 9) . "' align='center' class='tab'>
-+ <span class='textHeader'><a href='plugins.php?tab=$tab_short_name'>$ptabs[$tab_short_name]</a></span>
-+ </td>\n
-+ <td width='1'></td>\n";
-+ }
-+ }
-+
-+ print "<td></td>\n</tr></table>\n";
-+*/
-+ html_start_box("<strong> Plugin Management</strong>", "98%", $colors["header"], "3", "center", "");
++include("./include/bottom_footer.php");
+
-+ print "<tr><td><table width='100%'>";
+
-+ //update_info_table();
-+
-+ switch ($current_tab) {
-+ case 'current':
-+ update_show_current();
-+ break;
-+ case 'uninstalled':
-+ update_show_uninstalled ();
-+ break;
-+ default:
-+ print '<br><br><br>';
++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');
++ $oldplugins = explode(',', $oldplugins);
++ 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;
++}
+
-+/*
-+ $last_check = read_config_option("plugin_update_last_check");
-+ if ($last_check < 1)
-+ $last_check = 0;
-+
-+ print "<center>Last Scanned : " . ($last_check > 0 ? date("F j, Y g:i:s a", $last_check) : "Never") . "</center>";
-+*/
-+ print "</table></td></tr>";
-+
-+ html_end_box();
-+
-+ include("./include/bottom_footer.php");
++function api_plugin_uninstall_old ($plugin) {
++ global $config;
++ $oldplugins = read_config_option('oldplugins');
++ $oldplugins = explode(',', $oldplugins);
++ 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;
+ $info = update_get_cached_plugin_info();
+
+ $cactinew = update_check_if_newer($cinfo['cacti']['version'], $info['cacti']['version']) ;
-+ if (isset($cinfo['cacti_plugin_arch']['version']))
++ if (isset($cinfo['cacti_plugin_arch']['version'])) {
+ $archnew = update_check_if_newer($cinfo['cacti_plugin_arch']['version'], $info['cacti_plugin_arch']['version']);
-+ else
++ } else {
+ $archnew = 0;
++ }
+
+ if ($cactinew) {
+ $x++;
+ return false;
+}
+
-+function update_show_current () {
-+ global $plugins, $pluginslist, $colors, $plugin_architecture, $config, $status_names;
++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();
+
-+ $cinfo = array();
-+ $cinfo = update_get_plugin_info ();
++ if (isset($_SESSION["plugin_temp_table"])) {
++ $table = $_SESSION["plugin_temp_table"];
++ }else{
++ $table = "plugin_temp_table_" . rand();
++ }
+
-+ sort($pluginslist);
++ while (true) {
++ if (!plugins_temp_table_exists($table)) {
++ $_SESSION["plugin_temp_table"] = $table;
++ db_execute("CREATE TEMPORARY TABLE $table LIKE plugin_config");
++ db_execute("INSERT INTO $table SELECT * FROM plugin_config");
++ break;
++ }else{
++ $table = "plugin_temp_table_" . rand();
++ }
++ }
+
+ $path = $config['base_path'] . '/plugins/';
+ $dh = opendir($path);
+ while (($file = readdir($dh)) !== false) {
-+ if (is_dir("$path/$file")) {
-+ if (file_exists("$path/$file/setup.php") && !in_array($file, $pluginslist)) {
++ if ((is_dir("$path/$file")) && (file_exists("$path/$file/setup.php")) && (!in_array($file, $pluginslist))) {
++ if (!function_exists('plugin_' . $file . '_install')) {
+ 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;
+ } else if (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);
++ 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;
+ }
++ }else{
++ cacti_log("WARNING: Install function already exists for plugin directory '$file'", false);
+ }
+ }
+ }
+ closedir($dh);
+
-+ print "<table width='100%' cellspacing=0 cellpadding=3>";
-+ print "<tr><td width='50%'><table width='100%'>";
-+ html_header(array("Cacti"), 2);
-+ form_alternate_row_color($colors["alternate"],$colors["light"], 0);
-+ print "<td width='50%'><strong>Version:</strong></td><td>" . $config["cacti_version"] . "</td></tr></table>";
-+ print "</td><td>";
-+ if (isset($plugin_architecture['version'])) {
-+ print "<table width='100%'>";
-+ html_header(array("Plugin Architecture"), 2);
-+ form_alternate_row_color($colors["alternate"],$colors["light"], 0);
-+ print "<td width='50%'><strong>Version:</strong></td><td>" . $plugin_architecture['version'] . "</td></tr></table>";
++ 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"));
+ }
-+ print "</td></tr></table>";
+
-+ print "<table width='100%' cellspacing=0 cellpadding=3>";
-+ $x = 0;
++ /* clean up sort_column */
++ if (isset($_REQUEST["sort_column"])) {
++ $_REQUEST["sort_column"] = sanitize_search_string(get_request_var("sort_column"));
++ }
+
-+ sort($pluginslist);
-+ foreach ($pluginslist as $plugin) {
-+ if (isset($cinfo[$plugin])) {
++ /* clean up search string */
++ if (isset($_REQUEST["sort_direction"])) {
++ $_REQUEST["sort_direction"] = sanitize_search_string(get_request_var("sort_direction"));
++ }
+
-+ if ($x == 0) {
-+ print "<tr><td width='50%' valign=top>";
-+ } else {
-+ print "</td><td valign=top>";
-+ }
-+ if (!isset($info[$plugin]['version']))
-+ $info[$plugin]['version'] = '';
++ /* 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;
++ }
+
-+ print "<table width='100%'>";
-+ html_header(array((isset($cinfo[$plugin]['name']) ? $cinfo[$plugin]['name'] : $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>" . (isset($cinfo[$plugin]['version']) ? $cinfo[$plugin]['version'] : "") . (update_check_if_newer($cinfo[$plugin]['version'], $info[$plugin]['version']) ? ' - <font color=red><b>(Update Available!)</strong></font>' : '') . "</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><strong>Status:</strong></td><td>" . $status_names[$cinfo[$plugin]['status']] . "</td>";
-+
-+ if ($cinfo[$plugin]['status'] > -1) {
-+ form_alternate_row_color($colors["alternate"],$colors["light"], 0);
-+
-+ $links = array('install' => 'Install', 'uninstall' => 'Uninstall', 'enable' => 'Enable', 'disable' => 'Disable', 'check' => 'Check');
-+
-+ switch ($cinfo[$plugin]['status']) {
-+ case 0: //Not Installed
-+ $links['install'] = "<a href='plugins.php?mode=install&id=$plugin'><b>Install</b></a>";
-+ break;
-+ case 1: // Currently Active
-+ $links['uninstall'] = "<a href='plugins.php?mode=uninstall&id=$plugin'><b>Uninstall</b></a>";
-+ $links['disable'] = "<a href='plugins.php?mode=disable&id=$plugin'><b>Disable</b></a>";
-+ break;
-+ case 2: // Needs Configuring
-+ $links['check'] = "<a href='plugins.php?mode=check&id=$plugin'><b>Check</b></a>";
-+ break;
-+ case 3: // Needs Upgrade
-+ $links['check'] = "<a href='plugins.php?mode=check&id=$plugin'><b>Check</b></a>";
-+ break;
-+ case 4: // Installed but not active
-+ $links['uninstall'] = "<a href='plugins.php?mode=uninstall&id=$plugin'><b>Uninstall</b></a>";
-+ $links['enable'] = "<a href='plugins.php?mode=enable&id=$plugin'><b>Enable</b></a>";
-+ break;
-+ }
++ /* 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:
++ </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;'>
++ <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", "");
+
-+ print "<td></td><td>";
-+ $c = 1;
-+ foreach ($links as $temp => $link) {
-+ print $link;
-+ if ($c < count($links))
-+ print ' | ';
-+ $c++;
++ /* 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><< "; 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 .= " >></strong>
++ </td>\n
++ </tr>
++ </table>
++ </td>
++ </tr>\n";
++ }
++
++ print $nav;
++
++ $display_text = array(
++ "nosort" => array("Actions", ""),
++ "directory" => array("Name", "ASC"),
++ "id" => array("Load Order", "ASC"),
++ "name" => array("Description", "ASC"),
++ "nosort1" => array("Type", "ASC"),
++ "status" => array("Status", "ASC"),
++ "author" => array("Author", "ASC"),
++ "webpage" => array("Web Page", "ASC"),
++ "version" => array("Version", "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);
+ }
-+ print "</td>";
-+ print "</tr>";
+ }
++ }
+
-+ print "</table>";
-+ if ($x == 1) {
-+ print "</td></tr>";
++ $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;
+ }
-+ $x++;
-+ if ($x > 1) $x = 0;
++ 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++;
+ }
-+ }
-+ if ($x == 1)
-+ print "</td><td></td></tr>";
-+ print "</table>";
-+ html_end_box(TRUE);
-+}
+
++ print $nav;
++ }else{
++ print "<tr><td><em>No Plugins Found</em></td></tr>";
++ }
+
-+function update_show_uninstalled () {
-+ global $pluginslist, $colors, $plugin_architecture, $config, $status_names;
++ html_end_box(false);
+
-+ $cinfo = array();
-+ sort($pluginslist);
++ 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 "<table width='100%' cellspacing=0 cellpadding=3>";
-+ $x = 0;
++ print "</form>\n";
++}
+
-+ $newplugins = array();
-+ $cinfo = array ();
++function format_plugin_row($plugin, $last_plugin, $include_ordering, $system_plugin) {
++ global $status_names;
++ static $first_plugin = true;
+
-+ $path = $config['base_path'] . '/plugins/';
-+ $dh = opendir($path);
-+ while (($file = readdir($dh)) !== false) {
-+ if (is_dir("$path/$file")) {
-+ if (file_exists("$path/$file/setup.php") && !in_array($file, $pluginslist)) {
-+ include_once("$path/$file/setup.php");
-+ if (function_exists('plugin_' . $file . '_install') && function_exists('plugin_' . $file . '_version')) {
-+ $function = 'plugin_' . $file . '_version';
-+ $cinfo[$file] = $function();
-+ $cinfo[$file]['status'] = 0;
-+ $newplugins[] = $file;
-+ }
-+ }
++ $row = plugin_actions($plugin);
++ $row .= "<td><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></td>";
++ 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";
+ }
-+ closedir($dh);
+
-+ if (count($newplugins)) {
-+ foreach ($newplugins as $plugin) {
-+ if (isset($cinfo[$plugin])) {
-+
-+ if ($x == 0) {
-+ print "<tr><td width='50%'>";
-+ } else {
-+ print "</td><td>";
-+ }
-+ if (!isset($info[$plugin]['version']))
-+ $info[$plugin]['version'] = '';
++ $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 .= "<td><a href='" . htmlspecialchars($plugin["webpage"]) . "'>" . htmlspecialchars($plugin["webpage"]) . "</a></td>\n";
++ $row .= "<td>" . $plugin["version"] . "</td>\n";
++ $row .= "</tr>\n";
+
-+ print "<table width='100%'>";
-+ html_header(array((isset($cinfo[$plugin]['name']) ? $cinfo[$plugin]['name'] : $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>" . (isset($cinfo[$plugin]['version']) ? $cinfo[$plugin]['version'] : "") . (update_check_if_newer($cinfo[$plugin]['version'], $info[$plugin]['version']) ? ' - <font color=red><b>(Update Available!)</strong></font>' : '') . "</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]['homepage']) && $cinfo[$plugin]['homepage'] != '' ? "<a href='" . $cinfo[$plugin]['homepage'] . "'>" . $cinfo[$plugin]['homepage'] . "</a>" : "") . "</td>";
-+ form_alternate_row_color($colors["alternate"],$colors["light"], 0);
-+ print "<td><strong>Status:</strong></td><td>" . $status_names[$cinfo[$plugin]['status']] . "</td>";
-+ form_alternate_row_color($colors["alternate"],$colors["light"], 0);
++ if ($include_ordering) {
++ $first_plugin = false;
++ }
+
-+ $links = array('install' => 'Install', 'uninstall' => 'Uninstall', 'enable' => 'Enable', 'disable' => 'Disable', 'check' => 'Check');
++ return $row;
++}
+
-+ switch ($cinfo[$plugin]['status']) {
-+ case 0: //Not Installed
-+ $links['install'] = "<a href='plugins.php?mode=install&id=$plugin&tab=uninstalled'><b>Install</b></a>";
-+ break;
-+ case 1: // Currently Active
-+ $links['uninstall'] = "<a href='plugins.php?mode=uninstall&id=$plugin&tab=uninstalled'><b>Uninstall</b></a>";
-+ $links['disable'] = "<a href='plugins.php?mode=disable&id=$plugin&tab=uninstalled'><b>Disable</b></a>";
-+ break;
-+ case 2: // Needs Configuring
-+ $links['check'] = "<a href='plugins.php?mode=check&id=$plugin&tab=uninstalled'><b>Check</b></a>";
-+ break;
-+ case 3: // Needs Upgrade
-+ $links['check'] = "<a href='plugins.php?mode=check&id=$plugin&tab=uninstalled'><b>Check</b></a>";
-+ break;
-+ case 4: // Installed but not active
-+ $links['enable'] = "<a href='plugins.php?mode=enable&id=$plugin&tab=uninstalled'><b>Enable</b></a>";
-+ break;
++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');
++ $oldplugins = explode(',', $oldplugins);
++ 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>";
+
-+ print "<td></td><td>";
-+ $c = 1;
-+ foreach ($links as $temp => $link) {
-+ print $link;
-+ if ($c < count($links))
-+ print ' | ';
-+ $c++;
-+ }
++ return $link;
++}
+
-+ print "</td>";
-+ print "</tr></table>";
-+ if ($x == 1) {
-+ print "</td></tr>";
-+ }
-+ $x++;
-+ if ($x > 1) $x = 0;
-+ }
++function is_system_plugin($plugin) {
++ global $plugins_system;
++
++ if (is_array($plugin)) {
++ $plugin = $plugin["directory"];
+ }
-+ } else {
-+ print "<center>There are no Uninstalled Plugins</center>";
++
++ if (!in_array($plugin, $plugins_system)) {
++ return false;
++ }else{
++ return true;
+ }
-+ if ($x == 1)
-+ print "</td><td></td></tr>";
-+ print "</table>";
-+ html_end_box(TRUE);
+}
+
-+function update_get_plugin_info () {
-+ $cinfo = array();
-+ $info = db_fetch_assoc("SELECT * from plugin_config");
-+ if (is_array($info)) {
-+ foreach($info as $inf) {
-+ $cinfo[$inf['directory']] = $inf;
-+ $cinfo[$inf['directory']]['changes']='';
++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 $cinfo;
++
++ return $inst_system_plugins;
+}
+
-diff -Naur cacti-0.8.7e-old/poller.php cacti-0.8.7e/poller.php
---- cacti-0.8.7e-old/poller.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/poller.php 2009-11-21 23:06:16.000000000 -0600
-@@ -73,6 +73,8 @@
- }
++
+diff -Naur cacti-0.8.7g-old/poller.php cacti-0.8.7g/poller.php
+--- cacti-0.8.7g-old/poller.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/poller.php 2010-07-09 18:34:11.000000000 -0400
+@@ -108,6 +108,8 @@
+ pcntl_signal(SIGINT, "sig_handler");
}
+api_plugin_hook('poller_top');
/* record the start time */
list($micro,$seconds) = split(" ", microtime());
$poller_start = $seconds + $micro;
-@@ -261,6 +263,8 @@
+@@ -304,6 +306,8 @@
$total_procs = $concurrent_processes;
}
/* Populate each execution file with appropriate information */
foreach ($polling_hosts as $item) {
if ($host_count == 1) {
-@@ -403,9 +407,11 @@
+@@ -446,9 +450,11 @@
/* sleep the appripriate amount of time */
if ($poller_runs_completed < $poller_runs) {
db_connect_real($database_hostname, $database_username, $database_password, $database_default, $database_type, $database_port);
+ api_plugin_hook('poller_top');
}
- }else if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_MEDIUM) {
+ }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");
-@@ -452,4 +458,6 @@
+@@ -495,4 +501,6 @@
echo " --debug|-d Output debug information. Similar to cacti's DEBUG logging level.\n\n";
}
+api_plugin_hook('poller_bottom');
+
?>
-diff -Naur cacti-0.8.7e-old/user_admin.php cacti-0.8.7e/user_admin.php
---- cacti-0.8.7e-old/user_admin.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/user_admin.php 2009-11-21 23:06:16.000000000 -0600
-@@ -72,9 +72,11 @@
+diff -Naur cacti-0.8.7g-old/user_admin.php cacti-0.8.7g/user_admin.php
+--- cacti-0.8.7g-old/user_admin.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/user_admin.php 2010-07-09 18:34:11.000000000 -0400
+@@ -57,9 +57,11 @@
break;
default:
break;
}
-@@ -418,6 +420,7 @@
+@@ -402,6 +404,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);
if (!is_error_message()) {
$user_id = sql_save($save, "user_auth");
-@@ -460,6 +463,8 @@
+@@ -444,6 +447,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"));
}
}
}
-@@ -910,6 +915,8 @@
+@@ -889,6 +894,8 @@
$header_label = "[new]";
}
html_start_box("<strong>User Management</strong> $header_label", "100%", $colors["header"], "3", "center", "");
draw_edit_form(array(
-@@ -936,6 +943,7 @@
- <td <?php print ((get_request_var("action") == "graph_settings_edit") ? "bgcolor='silver'" : "bgcolor='#DFDFDF'");?> nowrap='nowrap' width='130' align='center' class='tab'>
- <span class='textHeader'><a href='user_admin.php?action=graph_settings_edit&id=<?php print $_GET["id"];?>'>Graph Settings</a></span>
- </td>
-+ <?php api_plugin_hook('user_admin_tab');?>
- <td></td>
- </tr>
- </table>
-@@ -949,7 +957,9 @@
- }elseif (get_request_var("action") == "graph_perms_edit") {
- graph_perms_edit();
- }else{
-- user_realms_edit();
-+ if (api_plugin_hook_function('user_admin_run_action', get_request_var_request("action"))) {
-+ user_realms_edit();
-+ }
- }
-
- form_save_button("user_admin.php");
-diff -Naur cacti-0.8.7e-old/utilities.php cacti-0.8.7e/utilities.php
---- cacti-0.8.7e-old/utilities.php 2009-06-28 11:07:11.000000000 -0500
-+++ cacti-0.8.7e/utilities.php 2009-11-21 23:06:16.000000000 -0600
-@@ -129,11 +129,14 @@
+diff -Naur cacti-0.8.7g-old/utilities.php cacti-0.8.7g/utilities.php
+--- cacti-0.8.7g-old/utilities.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g/utilities.php 2010-07-09 18:34:11.000000000 -0400
+@@ -123,11 +123,14 @@
include_once("./include/bottom_footer.php");
break;
default:
break;
}
-@@ -1642,6 +1645,8 @@
+@@ -1644,6 +1647,8 @@
<?php
projects / packages / cacti.git / blobdiff