Author: grzegorz Date: Tue Dec 4 08:31:43 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- preparing for 0.8.7a
---- Files affected:
SOURCES:
cacti-plugin-0.8.7a.diff (NONE -> 1.1) (NEW), cacti-adodb.patch (NONE ->
1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/cacti-plugin-0.8.7a.diff
diff -u /dev/null SOURCES/cacti-plugin-0.8.7a.diff:1.1
--- /dev/null Tue Dec 4 09:31:43 2007
+++ SOURCES/cacti-plugin-0.8.7a.diff Tue Dec 4 09:31:38 2007
@@ -0,0 +1,1072 @@
+diff -Nuar cacti-0.8.7a-old/auth_changepassword.php
cacti-0.8.7a/auth_changepassword.php
+--- cacti-0.8.7a-old/auth_changepassword.php 2007-11-17 12:11:52.000000000
-0600
++++ cacti-0.8.7a/auth_changepassword.php 2007-11-18 09:38:25.000000000
-0600
+@@ -54,6 +54,8 @@
+ header("Location: index.php"); break;
+ case '3': /* default graph page */
+ header("Location: graph_view.php");
break;
++ default:
++
do_hook_function('login_options_navigate', $user['login_opts']);
+ }
+ }else{
+ header("Location: graph_view.php");
+diff -Nuar cacti-0.8.7a-old/auth_login.php cacti-0.8.7a/auth_login.php
+--- cacti-0.8.7a-old/auth_login.php 2007-11-17 12:11:52.000000000 -0600
++++ cacti-0.8.7a/auth_login.php 2007-11-18 09:38:25.000000000 -0600
+@@ -203,6 +203,8 @@
+ header("Location: index.php"); break;
+ case '3': /* default graph page */
+ header("Location: graph_view.php"); break;
++ default:
++ do_hook_function('login_options_navigate',
$user['login_opts']);
+ }
+ exit;
+
+@@ -253,9 +255,18 @@
+ <body bgcolor="#FFFFFF" onload="document.login.login_username.focus()">
+ <form name="login" method="post" action="<?php print
basename($_SERVER["PHP_SELF"]);?>">
+ <input type="hidden" name="action" value="login">
++<?php
++
++do_hook("login_before");
++
++$cacti_logo = $config['url_path'] . 'images/auth_login.gif';
++$cacti_logo = do_hook_function('cacti_image', $cacti_logo);
++
++?>
+ <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>
++
+ </tr>
+ <?php
+
+@@ -308,6 +319,7 @@
+ <td><input type="submit" value="Login"></td>
+ </tr>
+ </table>
++<?php do_hook('login_after'); ?>
+ </form>
+ </body>
+ </html>
+diff -Nuar cacti-0.8.7a-old/data_sources.php cacti-0.8.7a/data_sources.php
+--- cacti-0.8.7a-old/data_sources.php 2007-11-17 12:11:52.000000000 -0600
++++ cacti-0.8.7a/data_sources.php 2007-11-18 09:38:25.000000000 -0600
+@@ -1142,6 +1142,7 @@
+ $i = 0;
+ if (sizeof($data_sources) > 0) {
+ foreach ($data_sources as $data_source) {
++ $data_source = do_hook_function('data_sources_table',
$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);
+diff -Nuar cacti-0.8.7a-old/graph_image.php cacti-0.8.7a/graph_image.php
+--- cacti-0.8.7a-old/graph_image.php 2007-11-17 12:11:52.000000000 -0600
++++ cacti-0.8.7a/graph_image.php 2007-11-18 09:38:25.000000000 -0600
+@@ -44,6 +44,8 @@
+ /* flush the headers now */
+ ob_end_clean();
+
++do_hook_function('graph_image');
++
+ session_write_close();
+
+ $graph_data_array = array();
+diff -Nuar cacti-0.8.7a-old/graph.php cacti-0.8.7a/graph.php
+--- cacti-0.8.7a-old/graph.php 2007-11-17 12:11:52.000000000 -0600
++++ cacti-0.8.7a/graph.php 2007-11-18 09:39:31.000000000 -0600
+@@ -93,6 +93,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
do_hook('graph_buttons', array('hook' => 'view', 'local_graph_id' =>
$_GET['local_graph_id'], 'rra' => $rra['id'], 'view_type' =>
$_REQUEST['view_type'])); ?>
+ </td>
+ </tr>
+ <tr>
+@@ -207,6 +208,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 $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>
++ <?php do_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>
+@@ -239,6 +241,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>
++ <?php do_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 -Nuar cacti-0.8.7a-old/graphs_new.php cacti-0.8.7a/graphs_new.php
+--- cacti-0.8.7a-old/graphs_new.php 2007-11-17 12:11:52.000000000 -0600
++++ cacti-0.8.7a/graphs_new.php 2007-11-18 09:38:25.000000000 -0600
+@@ -473,7 +473,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>
++ <?php do_hook('graphs_new_top_links'); ?>
+ </td>
+ </tr>
+ </table>
+diff -Nuar cacti-0.8.7a-old/graphs.php cacti-0.8.7a/graphs.php
+--- cacti-0.8.7a-old/graphs.php 2007-11-17 12:11:52.000000000 -0600
++++ cacti-0.8.7a/graphs.php 2007-11-18 09:38:25.000000000 -0600
+@@ -45,6 +45,8 @@
+ 4 => "Convert to Graph Template"
+ );
+
++$graph_actions = do_hook_function('graphs_action_array', $graph_actions);
++
+ /* set default action */
+ if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
+
+@@ -357,8 +359,10 @@
+
input_validate_input_number($selected_items[$i]);
+ /*
==================================================== */
+
+- 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 {
++ do_hook_function('graphs_action_execute',
$_POST['drp_action']);
+ }
+
+ header("Location: graphs.php");
+@@ -499,6 +503,11 @@
+ </td>
+ </tr>\n
+ ";
++ } else {
++ $save['drp_action'] = $_POST['drp_action'];
++ $save['graph_list'] = $graph_list;
++ $save['graph_array'] = $graph_array;
++ do_hook_function('graphs_action_prepare', $save);
+ }
+
+ if (!isset($graph_array)) {
+diff -Nuar cacti-0.8.7a-old/host.php cacti-0.8.7a/host.php
+--- cacti-0.8.7a-old/host.php 2007-11-17 12:11:52.000000000 -0600
++++ cacti-0.8.7a/host.php 2007-11-18 09:38:25.000000000 -0600
+@@ -44,6 +44,8 @@
+ 6 => "Change Availability Options"
+ );
+
++$device_actions = do_hook_function('device_action_array', $device_actions);
++
+ /* set default action */
+ if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
+
+@@ -309,6 +311,8 @@
+
+ api_tree_item_save(0, $_POST["tree_id"],
TREE_ITEM_TYPE_HOST, $_POST["tree_item_id"], "", 0,
read_graph_config_option("default_rra_id"), $selected_items[$i], 1, 1, false);
+ }
++ } else {
++ do_hook_function('device_action_execute',
$_POST['drp_action']);
+ }
+
+ 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());
++ do_hook_function('device_action_prepare', $save);
+ }
+
+ if (!isset($host_array)) {
+diff -Nuar cacti-0.8.7a-old/include/auth.php cacti-0.8.7a/include/auth.php
+--- cacti-0.8.7a-old/include/auth.php 2007-11-17 12:11:52.000000000 -0600
++++ cacti-0.8.7a/include/auth.php 2007-11-18 09:38:25.000000000 -0600
+@@ -75,7 +75,7 @@
+ <html>
+ <head>
+ <title>Cacti</title>
+- <link href="include/main.css" rel="stylesheet">
++ <link href="<?php echo $config['url_path'];
?>include/main.css" rel="stylesheet">
+ </style>
+ </head>
+
+@@ -83,7 +83,7 @@
+
+ <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 +91,7 @@
+ need access to this particular section,
please contact the Cacti administrator.</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 -Nuar cacti-0.8.7a-old/include/global_arrays.php
cacti-0.8.7a/include/global_arrays.php
+--- cacti-0.8.7a-old/include/global_arrays.php 2007-11-17 12:11:52.000000000
-0600
++++ cacti-0.8.7a/include/global_arrays.php 2007-11-18 09:40:22.000000000
-0600
+@@ -22,6 +22,8 @@
+ +-------------------------------------------------------------------------+
+ */
+
++global $menu;
++
+ $messages = array(
+ 1 => array(
+ "message" => 'Save Successful.',
+@@ -595,4 +597,10 @@
+ GDC_SLASH => "/"
+ );
+
++$plugin_architecture = array(
++ 'version' => '1.4'
++ );
++
++do_hook('config_arrays');
++
+ ?>
+diff -Nuar cacti-0.8.7a-old/include/global_form.php
cacti-0.8.7a/include/global_form.php
+--- cacti-0.8.7a-old/include/global_form.php 2007-11-17 12:11:52.000000000
-0600
++++ cacti-0.8.7a/include/global_form.php 2007-11-18 09:38:25.000000000
-0600
+@@ -22,8 +22,9 @@
+ +-------------------------------------------------------------------------+
+ */
+
+-if (!defined("VALID_HOST_FIELDS")) {
+- define("VALID_HOST_FIELDS",
"(hostname|snmp_community|snmp_username|snmp_password|snmp_auth_protocol|snmp_priv_passphrase|snmp_priv_protocol|snmp_context|snmp_version|snmp_port|snmp_timeout)");
++if (!defined('VALID_HOST_FIELDS')) {
++ $string = do_hook_function('valid_host_fields',
'(hostname|snmp_community|snmp_username|snmp_password|snmp_auth_protocol|snmp_priv_passphrase|snmp_priv_protocol|snmp_context|snmp_version|snmp_port|snmp_timeout)');
++ define('VALID_HOST_FIELDS', $string);
+ }
+
+ /* file: cdef.php, action: edit */
+@@ -1153,4 +1154,6 @@
+ )
+ );
+
++do_hook('config_form');
++
+ ?>
+diff -Nuar cacti-0.8.7a-old/include/global.php cacti-0.8.7a/include/global.php
+--- cacti-0.8.7a-old/include/global.php 2007-11-17 12:11:52.000000000
-0600
++++ cacti-0.8.7a/include/global.php 2007-11-18 09:38:25.000000000 -0600
+@@ -41,6 +41,21 @@
+ /* Default session name - Session name must contain alpha characters */
+ $cacti_session_name = "Cacti";
+
++$plugins = array();
++//$plugins[] = 'thold';
++
++/* Do not edit this line */
++$config = array();
++
++/*
++ This is full URL Path to the Cacti installation
++ For example, if your cacti was accessible by http://server/cacti/ you
would user '/cacti/'
++ as the url path. For just http://server/ use '/'
++*/
++
++$config['url_path'] = '/';
++
++
+ /* Include configuration */
+ include(dirname(__FILE__) . "/config.php");
+
+@@ -73,7 +88,6 @@
+ "rebuild_poller_cache.php"
+ );
+
+-$config = array();
+ $colors = array();
+
+ /* this should be auto-detected, set it manually if needed */
+@@ -88,6 +102,13 @@
+ $config["include_path"] = dirname(__FILE__);
+ $config["rra_path"] = $config["base_path"] . '/rra';
+
++define('URL_PATH', $config['url_path']);
++
++/* include the plugin function, we do this before everything else,
++ incase we want to add hooks to change config options */
++
++include_once($config['include_path'] . '/plugins.php');
++
+ /* colors */
+ $colors["dark_outline"] = "454E53";
+ $colors["dark_bar"] = "AEB4B7";
+diff -Nuar cacti-0.8.7a-old/include/global_settings.php
cacti-0.8.7a/include/global_settings.php
+--- cacti-0.8.7a-old/include/global_settings.php 2007-11-17
12:11:52.000000000 -0600
++++ cacti-0.8.7a/include/global_settings.php 2007-11-18 09:38:25.000000000
-0600
+@@ -1083,4 +1083,6 @@
+ )
+ );
+
++do_hook('config_settings');
++
+ ?>
+diff -Nuar cacti-0.8.7a-old/include/plugins.php
cacti-0.8.7a/include/plugins.php
+--- cacti-0.8.7a-old/include/plugins.php 1969-12-31 17:00:00.000000000
-0700
++++ cacti-0.8.7a/include/plugins.php 2007-11-18 09:38:25.000000000 -0600
+@@ -0,0 +1,89 @@
++<?php
++
++/*
++ * Copyright (c) 1999-2005 The SquirrelMail Project Team
(http://squirrelmail.org)
++ * Licensed under the GNU GPL. For full terms see the file COPYING.
++ */
++
++global $plugin_hooks;
++$plugin_hooks = array();
++
++function use_plugin ($name) {
++ global $config;
++ if (file_exists($config['base_path'] . "/plugins/$name/setup.php")) {
++ include_once($config['base_path'] . "/plugins/$name/setup.php");
++ $function = "plugin_init_$name";
++ if (function_exists($function)) {
++ $function();
++ }
++ }
++}
++
++/**
++ * This function executes a hook.
++ * @param string $name Name of hook to fire
++ * @return mixed $data
++ */
++function do_hook ($name) {
++ global $plugin_hooks;
++ $data = func_get_args();
++ $ret = '';
++
++ if (isset($plugin_hooks[$name]) && is_array($plugin_hooks[$name])) {
++ foreach ($plugin_hooks[$name] as $function) {
++ if (function_exists($function)) {
++ $function($data);
++ }
++ }
++ }
++
++ /* Variable-length argument lists have a slight problem when */
++ /* passing values by reference. Pity. This is a workaround. */
++ return $data;
++}
++
++function do_hook_function($name,$parm=NULL) {
++ global $plugin_hooks;
++ $ret = $parm;
++
++ if (isset($plugin_hooks[$name])
++ && is_array($plugin_hooks[$name])) {
++ foreach ($plugin_hooks[$name] as $function) {
++ if (function_exists($function)) {
++ $ret = $function($ret);
++ }
++ }
++ }
++
++ /* Variable-length argument lists have a slight problem when */
++ /* passing values by reference. Pity. This is a workaround. */
++ return $ret;
++}
++
++function api_user_realm_auth ($filename = '') {
++ global $user_realms, $user_auth_realm_filenames, $user_auth_realms;
++ /* list all realms that this user has access to */
++
++ if (!isset($user_realms)) {
++ if (read_config_option('global_auth') == 'on') {
++ $user_realms = db_fetch_assoc('select realm_id from
user_auth_realm where user_id=' . $_SESSION['sess_user_id']);
++ $user_realms = array_rekey($user_realms, 'realm_id',
'realm_id');
++ }else{
++ $user_realms = $user_auth_realms;
++ }
++ }
++
++ if ($filename != '') {
++ if
(isset($user_realms[$user_auth_realm_filenames{basename($filename)}]))
++ return TRUE;
++ }
++ return FALSE;
++}
++
++/* On startup, register all plugins configured for use. */
++if (isset($plugins) && is_array($plugins)) {
++ foreach ($plugins as $name) {
++ use_plugin($name);
++ }
++}
++
+diff -Nuar cacti-0.8.7a-old/include/top_graph_header.php
cacti-0.8.7a/include/top_graph_header.php
+--- cacti-0.8.7a-old/include/top_graph_header.php 2007-11-17
12:11:52.000000000 -0600
++++ cacti-0.8.7a/include/top_graph_header.php 2007-11-18 09:38:25.000000000
-0600
+@@ -92,26 +92,30 @@
+ }
+ }
+
++$page_title = do_hook_function('page_title', 'Cacti');
++
+ ?>
+ <html>
+ <head>
+- <title>Cacti</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='" .
read_graph_config_option("page_refresh") . "'>\r\n";
++ $refresh = do_hook_function('top_graph_refresh',
read_graph_config_option('page_refresh'));
++ print "<meta http-equiv=refresh content='" . $refresh .
"'>\r\n";
+ }
+ }
+ ?>
+- <link href="include/main.css" rel="stylesheet">
+- <link href="images/favicon.ico" rel="shortcut icon"/>
+- <script type="text/javascript" src="include/layout.js"></script>
+- <script type="text/javascript" src="include/treeview/ua.js"></script>
+- <script type="text/javascript"
src="include/treeview/ftiens4.js"></script>
+- <script type="text/javascript"
src="include/jscalendar/calendar.js"></script>
+- <script type="text/javascript"
src="include/jscalendar/lang/calendar-en.js"></script>
+- <script type="text/javascript"
src="include/jscalendar/calendar-setup.js"></script>
++ <link href="<?php echo $config['url_path']; ?>include/main.css"
rel="stylesheet">
++ <link href="<?php echo $config['url_path']; ?>images/favicon.ico"
rel="shortcut icon"/>
++ <script type="text/javascript" src="<?php echo $config['url_path'];
?>include/layout.js"></script>
++ <script type="text/javascript" src="<?php echo $config['url_path'];
?>include/treeview/ua.js"></script>
++ <script type="text/javascript" src="<?php echo $config['url_path'];
?>include/treeview/ftiens4.js"></script>
++ <script type="text/javascript" src="<?php echo $config['url_path'];
?>include/jscalendar/calendar.js"></script>
++ <script type="text/javascript" src="<?php echo $config['url_path'];
?>include/jscalendar/lang/calendar-en.js"></script>
++ <script type="text/javascript" src="<?php echo $config['url_path'];
?>include/jscalendar/calendar-setup.js"></script>
++ <?php do_hook('page_head'); ?>
+ </head>
+
+ <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+@@ -123,13 +127,15 @@
+ <table width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+ <td nowrap>
+- <?php if
($show_console_tab == true) {?><a href="index.php"><img
src="images/tab_console.gif" alt="Console" align="absmiddle"
border="0"></a><?php }?><a href="graph_view.php"><img
src="images/tab_graphs<?php if ((substr(basename($_SERVER["PHP_SELF"]),0,5) ==
"graph") || (basename($_SERVER["PHP_SELF"]) == "graph_settings.php")) { print
"_down"; } print ".gif";?>" alt="Graphs" align="absmiddle" border="0"></a>
++ <?php if
($show_console_tab == true) {?><a href="<?php echo $config['url_path'];
?>index.php"><img src="<?php echo $config['url_path'];
?>images/tab_console.gif" alt="Console" align="absmiddle" border="0"></a><?php
}?><a href="<?php echo $config['url_path']; ?>graph_view.php"><img src="<?php
echo $config['url_path']; ?>images/tab_graphs<?php if
((substr(basename($_SERVER["PHP_SELF"]),0,5) == "graph") ||
(basename($_SERVER["PHP_SELF"]) == "graph_settings.php")) { print "_down"; }
print ".gif";?>" alt="Graphs" align="absmiddle" border="0"></a><?php
++
do_hook('top_graph_header_tabs');
++ ?>
+ </td>
+ <td>
+- <img
src="images/cacti_backdrop2.gif" align="absmiddle">
++ <img src="<?php echo
$config['url_path']; ?>images/cacti_backdrop2.gif" align="absmiddle">
+ </td>
+ <td 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
($_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
($_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 ($_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
($_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 ($_REQU
EST["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 ($_REQUEST["action"] == "preview") { print
"_down"; }?>.gif" border="0" title="Preview View" alt="Preview View"
align="absmiddle"></a><?php }?> <br>
+ </td>
+ </tr>
+ </table>
+@@ -137,7 +143,7 @@
+ </tr>
+ <tr height="2" colspan="2" 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>
+ </td>
+ </tr>
+ <tr height="5" bgcolor="#e9e9e9" class="noprint">
+@@ -149,7 +155,7 @@
+ </td>
+ <td align="right">
+ <?php if
((isset($_SESSION["sess_user_id"])) && ($using_guest_account == false)) { ?>
+- Logged in as <strong><?php
print db_fetch_cell("select username from user_auth where id=" .
$_SESSION["sess_user_id"]);?></strong> (<a href="logout.php">Logout</a>)
++ Logged in as <strong><?php
print db_fetch_cell("select username from user_auth where id=" .
$_SESSION["sess_user_id"]);?></strong> (<a href="<?php echo
$config['url_path']; ?>logout.php">Logout</a>)
+ <?php } ?>
+ </td>
+ </tr>
+@@ -157,10 +163,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 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
read_graph_config_option("default_dual_pane_width");?>" height="2"
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>
+ </tr>
+diff -Nuar cacti-0.8.7a-old/include/top_header.php
cacti-0.8.7a/include/top_header.php
+--- cacti-0.8.7a-old/include/top_header.php 2007-11-17 12:11:52.000000000
-0600
++++ cacti-0.8.7a/include/top_header.php 2007-11-18 09:38:25.000000000
-0600
+@@ -22,21 +22,25 @@
+ +-------------------------------------------------------------------------+
+ */
+
+-global $colors;
++global $colors, $config;
++
++$page_title = do_hook_function('page_title', 'Cacti');
++
+ ?>
+ <html>
+ <head>
+- <title>Cacti</title>
+- <link href="include/main.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"/>
++ <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"] . "'\">";
+- }?>
++ }
++ do_hook('page_head'); ?>
+ </style>
+ </head>
+
+-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"
background="images/left_border.gif">
++<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"
background="<?php echo $config['url_path']; ?>images/left_border.gif">
+
+ <table width="100%" cellspacing="0" cellpadding="0">
+ <tr height="37" bgcolor="#a9a9a9">
+@@ -44,10 +48,11 @@
+ <table width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+ <td valign="bottom">
+- <a href="index.php"><img
src="images/tab_console_down.gif" alt="Console" align="absmiddle"
border="0"></a><a href="graph_view.php"><img src="images/tab_graphs.gif"
alt="Graphs" align="absmiddle" border="0"></a>
+- </td>
++ <a href="<?php echo
$config['url_path']; ?>index.php"><img src="<?php echo $config['url_path'];
?>images/tab_console_down.gif" alt="Console" align="absmiddle"
border="0"></a><a href="<?php echo $config['url_path']; ?>graph_view.php"><img
src="<?php echo $config['url_path']; ?>images/tab_graphs.gif" alt="Graphs"
align="absmiddle" border="0"></a><?php
++ do_hook('top_header_tabs');
++ ?></td>
+ <td align="right">
+- <img
src="images/cacti_backdrop.gif" align="absmiddle">
++ <img src="<?php echo
$config['url_path']; ?>images/cacti_backdrop.gif" align="absmiddle">
+ </td>
+ </tr>
+ </table>
+@@ -55,7 +60,7 @@
+ </tr>
+ <tr height="2" 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>
+ </td>
+ </tr>
+ <tr height="5" bgcolor="#e9e9e9">
+@@ -67,7 +72,7 @@
+ </td>
+ <td align="right">
+ <?php if
(read_config_option("auth_method") != 0) { ?>
+- Logged in as <strong><?php
print db_fetch_cell("select username from user_auth where id=" .
$_SESSION["sess_user_id"]);?></strong> (<a href="logout.php">Logout</a>)
++ Logged in as <strong><?php
print db_fetch_cell("select username from user_auth where id=" .
$_SESSION["sess_user_id"]);?></strong> (<a href="<?php echo
$config['url_path']; ?>logout.php">Logout</a>)
+ <?php } ?>
+ </td>
+ </tr>
+@@ -75,10 +80,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>
+ </tr>
+@@ -88,9 +93,9 @@
+ <?php draw_menu();?>
+ </table>
<<Diff was trimmed, longer than 597 lines>>
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
