diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/about.php cacti-0.8.7b-fhs/about.php
--- cacti-0.8.7b/about.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/about.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,8 +22,8 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include("./include/top_header.php");
+include("/usr/share/cacti/include/auth.php");
+include("/usr/share/cacti/include/top_header.php");
html_start_box("<strong>About Cacti</strong>", "100%", $colors["header"], "3", "center", "");
?>
@@ -104,5 +104,5 @@
<?php
html_end_box();
-include("./include/bottom_footer.php");
+include("/usr/share/cacti/include/bottom_footer.php");
?>
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/auth_changepassword.php cacti-0.8.7b-fhs/auth_changepassword.php
--- cacti-0.8.7b/auth_changepassword.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/auth_changepassword.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,7 +22,7 @@
+-------------------------------------------------------------------------+
*/
-include("./include/global.php");
+include("/usr/share/cacti/include/global.php");
$user = db_fetch_row("select * from user_auth where id=" . $_SESSION["sess_user_id"]);
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/cacti.sql cacti-0.8.7b-fhs/cacti.sql
--- cacti-0.8.7b/cacti.sql 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/cacti.sql 2008-05-24 15:54:47.000000000 +0200
@@ -97,7 +97,7 @@
LOCK TABLES `data_input` WRITE;
/*!40000 ALTER TABLE `data_input` DISABLE KEYS */;
-INSERT INTO `data_input` VALUES (1,'3eb92bb845b9660a7445cf9740726522','Get SNMP Data','',2),(2,'bf566c869ac6443b0c75d1c32b5a350e','Get SNMP Data (Indexed)','',3),(3,'274f4685461170b9eb1b98d22567ab5e','Unix - Get Free Disk Space','<path_cacti>/scripts/diskfree.sh <partition>',1),(4,'95ed0993eb3095f9920d431ac80f4231','Unix - Get Load Average','perl <path_cacti>/scripts/loadavg_multi.pl',1),(5,'79a284e136bb6b061c6f96ec219ac448','Unix - Get Logged In Users','perl <path_cacti>/scripts/unix_users.pl <username>',1),(6,'362e6d4768937c4f899dd21b91ef0ff8','Linux - Get Memory Usage','perl <path_cacti>/scripts/linux_memory.pl <grepstr>',1),(7,'a637359e0a4287ba43048a5fdf202066','Unix - Get System Processes','perl <path_cacti>/scripts/unix_processes.pl',1),(8,'47d6bfe8be57a45171afd678920bd399','Unix - Get TCP Connections','perl <path_cacti>/scripts/unix_tcp_connections.pl <grepstr>',1),(9,'cc948e4de13f32b6aea45abaadd287a3','Unix - Get Web Hits','perl <path_cacti>/scripts/webhits.pl <log_path>',1),(10,'8bd153aeb06e3ff89efc73f35849a7a0','Unix - Ping Host','perl <path_cacti>/scripts/ping.pl <ip>',1),(11,'80e9e4c4191a5da189ae26d0e237f015','Get Script Data (Indexed)','',4),(12,'332111d8b54ac8ce939af87a7eac0c06','Get Script Server Data (Indexed)','',6);
+INSERT INTO `data_input` VALUES (1,'3eb92bb845b9660a7445cf9740726522','Get SNMP Data','',2),(2,'bf566c869ac6443b0c75d1c32b5a350e','Get SNMP Data (Indexed)','',3),(3,'274f4685461170b9eb1b98d22567ab5e','Unix - Get Free Disk Space','/usr/share/cacti/scripts/diskfree.sh <partition>',1),(4,'95ed0993eb3095f9920d431ac80f4231','Unix - Get Load Average','perl /usr/share/cacti/scripts/loadavg_multi.pl',1),(5,'79a284e136bb6b061c6f96ec219ac448','Unix - Get Logged In Users','perl /usr/share/cacti/scripts/unix_users.pl <username>',1),(6,'362e6d4768937c4f899dd21b91ef0ff8','Linux - Get Memory Usage','perl /usr/share/cacti/scripts/linux_memory.pl <grepstr>',1),(7,'a637359e0a4287ba43048a5fdf202066','Unix - Get System Processes','perl /usr/share/cacti/scripts/unix_processes.pl',1),(8,'47d6bfe8be57a45171afd678920bd399','Unix - Get TCP Connections','perl /usr/share/cacti/scripts/unix_tcp_connections.pl <grepstr>',1),(9,'cc948e4de13f32b6aea45abaadd287a3','Unix - Get Web Hits','perl /usr/share/cacti/scripts/webhits.pl <log_path>',1),(10,'8bd153aeb06e3ff89efc73f35849a7a0','Unix - Ping Host','perl /usr/share/cacti/scripts/ping.pl <ip>',1),(11,'80e9e4c4191a5da189ae26d0e237f015','Get Script Data (Indexed)','',4),(12,'332111d8b54ac8ce939af87a7eac0c06','Get Script Server Data (Indexed)','',6);
/*!40000 ALTER TABLE `data_input` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1055,7 +1055,7 @@
LOCK TABLES `snmp_query` WRITE;
/*!40000 ALTER TABLE `snmp_query` DISABLE KEYS */;
-INSERT INTO `snmp_query` VALUES (1,'d75e406fdeca4fcef45b8be3a9a63cbc','<path_cacti>/resource/snmp_queries/interface.xml','SNMP - Interface Statistics','Queries a host for a list of monitorable interfaces',0,2),(2,'3c1b27d94ad208a0090f293deadde753','<path_cacti>/resource/snmp_queries/net-snmp_disk.xml','ucd/net - Get Monitored Partitions','Retrieves a list of monitored partitions/disks from a net-snmp enabled host.',0,2),(3,'59aab7b0feddc7860002ed9303085ba5','<path_cacti>/resource/snmp_queries/kbridge.xml','Karlnet - Wireless Bridge Statistics','Gets information about the wireless connectivity of each station from a Karlnet bridge.',0,2),(4,'ad06f46e22e991cb47c95c7233cfaee8','<path_cacti>/resource/snmp_queries/netware_disk.xml','Netware - Get Available Volumes','Retrieves a list of volumes from a Netware server.',0,2),(6,'8ffa36c1864124b38bcda2ae9bd61f46','<path_cacti>/resource/script_queries/unix_disk.xml','Unix - Get Mounted Partitions','Queries a list of mounted partitions on a unix-based host with the',0,11),(7,'30ec734bc0ae81a3d995be82c73f46c1','<path_cacti>/resource/snmp_queries/netware_cpu.xml','Netware - Get Processor Information','Gets information about running processors in a Netware server',0,2),(8,'9343eab1f4d88b0e61ffc9d020f35414','<path_cacti>/resource/script_server/host_disk.xml','SNMP - Get Mounted Partitions','Gets a list of partitions using SNMP',0,12),(9,'0d1ab53fe37487a5d0b9e1d3ee8c1d0d','<path_cacti>/resource/script_server/host_cpu.xml','SNMP - Get Processor Information','Gets usage for each processor in the system using the host MIB.',0,12);
+INSERT INTO `snmp_query` VALUES (1,'d75e406fdeca4fcef45b8be3a9a63cbc','/usr/share/cacti/resource/snmp_queries/interface.xml','SNMP - Interface Statistics','Queries a host for a list of monitorable interfaces',0,2),(2,'3c1b27d94ad208a0090f293deadde753','/usr/share/cacti/resource/snmp_queries/net-snmp_disk.xml','ucd/net - Get Monitored Partitions','Retrieves a list of monitored partitions/disks from a net-snmp enabled host.',0,2),(3,'59aab7b0feddc7860002ed9303085ba5','/usr/share/cacti/resource/snmp_queries/kbridge.xml','Karlnet - Wireless Bridge Statistics','Gets information about the wireless connectivity of each station from a Karlnet bridge.',0,2),(4,'ad06f46e22e991cb47c95c7233cfaee8','/usr/share/cacti/resource/snmp_queries/netware_disk.xml','Netware - Get Available Volumes','Retrieves a list of volumes from a Netware server.',0,2),(6,'8ffa36c1864124b38bcda2ae9bd61f46','/usr/share/cacti/resource/script_queries/unix_disk.xml','Unix - Get Mounted Partitions','Queries a list of mounted partitions on a unix-based host with the',0,11),(7,'30ec734bc0ae81a3d995be82c73f46c1','/usr/share/cacti/resource/snmp_queries/netware_cpu.xml','Netware - Get Processor Information','Gets information about running processors in a Netware server',0,2),(8,'9343eab1f4d88b0e61ffc9d020f35414','/usr/share/cacti/resource/script_server/host_disk.xml','SNMP - Get Mounted Partitions','Gets a list of partitions using SNMP',0,12),(9,'0d1ab53fe37487a5d0b9e1d3ee8c1d0d','/usr/share/cacti/resource/script_server/host_cpu.xml','SNMP - Get Processor Information','Gets usage for each processor in the system using the host MIB.',0,12);
/*!40000 ALTER TABLE `snmp_query` ENABLE KEYS */;
UNLOCK TABLES;
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/cdef.php cacti-0.8.7b-fhs/cdef.php
--- cacti-0.8.7b/cdef.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/cdef.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,8 +22,8 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/cdef.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/cdef.php");
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -49,11 +49,11 @@
header("Location: cdef.php?action=edit&id=" . $_GET["cdef_id"]);
break;
case 'item_edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
item_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'remove':
cdef_remove();
@@ -61,18 +61,18 @@
header ("Location: cdef.php");
break;
case 'edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
cdef_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
cdef();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -268,9 +268,9 @@
/* ==================================================== */
if ((read_config_option("remove_verification") == "on") && (!isset($_GET["confirm"]))) {
- include("./include/top_header.php");
+ include("/usr/share/cacti/include/top_header.php");
form_confirm("Are You Sure?", "Are you sure you want to delete the CDEF <strong>'" . db_fetch_cell("select name from cdef where id=" . $_GET["id"]) . "'</strong>?", "cdef.php", "cdef.php?action=remove&id=" . $_GET["id"]);
- include("./include/bottom_footer.php");
+ include("/usr/share/cacti/include/bottom_footer.php");
exit;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/color.php cacti-0.8.7b-fhs/color.php
--- cacti-0.8.7b/color.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/color.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,7 +22,7 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -38,18 +38,18 @@
header ("Location: color.php");
break;
case 'edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
color_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
color();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/data_input.php cacti-0.8.7b-fhs/data_input.php
--- cacti-0.8.7b/data_input.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/data_input.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,7 +22,7 @@
+-------------------------------------------------------------------------+
*/
-include ("./include/auth.php");
+include ("/usr/share/cacti/include/auth.php");
define("MAX_DISPLAY_PAGES", 21);
@@ -48,25 +48,25 @@
header("Location: data_input.php?action=edit&id=" . $_GET["data_input_id"]);
break;
case 'field_edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
field_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
data_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
data();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -189,7 +189,7 @@
$i++;
}
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
html_start_box("<strong>" . $di_actions{$_POST["drp_action"]} . "</strong>", "60%", $colors["header_panel"], "3", "center", "");
@@ -243,9 +243,9 @@
/* ==================================================== */
if ((read_config_option("remove_verification") == "on") && (!isset($_GET["confirm"]))) {
- include("./include/top_header.php");
+ include("/usr/share/cacti/include/top_header.php");
form_confirm("Are You Sure?", "Are you sure you want to delete the field <strong>'" . db_fetch_cell("select name from data_input_fields where id=" . $_GET["id"]) . "'</strong>?", "data_input.php?action=edit&id=" . $_GET["data_input_id"], "data_input.php?action=field_remove&id=" . $_GET["id"] . "&data_input_id=" . $_GET["data_input_id"]);
- include("./include/bottom_footer.php");
+ include("/usr/share/cacti/include/bottom_footer.php");
exit;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/data_queries.php cacti-0.8.7b-fhs/data_queries.php
--- cacti-0.8.7b/data_queries.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/data_queries.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,8 +22,8 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/data_query.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/data_query.php");
define("MAX_DISPLAY_PAGES", 21);
@@ -79,11 +79,11 @@
header("Location: data_queries.php?action=edit&id=" . $_GET["snmp_query_id"]);
break;
case 'item_edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
data_query_item_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'remove':
data_query_remove();
@@ -91,18 +91,18 @@
header ("Location: data_queries.php");
break;
case 'edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
data_query_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
data_query();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -344,9 +344,9 @@
/* ==================================================== */
if ((read_config_option("remove_verification") == "on") && (!isset($_GET["confirm"]))) {
- include("./include/top_header.php");
+ include("/usr/share/cacti/include/top_header.php");
form_confirm("Are You Sure?", "Are you sure you want to delete the Data Query Graph <strong>'" . db_fetch_cell("select name from snmp_query_graph where id=" . $_GET["id"]) . "'</strong>?", "data_queries.php?action=edit&id=" . $_GET["snmp_query_id"], "data_queries.php?action=item_remove&id=" . $_GET["id"] . "&snmp_query_id=" . $_GET["snmp_query_id"]);
- include("./include/bottom_footer.php");
+ include("/usr/share/cacti/include/bottom_footer.php");
exit;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/data_sources.php cacti-0.8.7b-fhs/data_sources.php
--- cacti-0.8.7b/data_sources.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/data_sources.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,14 +22,14 @@
+-------------------------------------------------------------------------+
*/
-include ("./include/auth.php");
-include_once("./lib/utility.php");
-include_once("./lib/api_graph.php");
-include_once("./lib/api_data_source.php");
-include_once("./lib/template.php");
-include_once("./lib/html_form_template.php");
-include_once("./lib/rrd.php");
-include_once("./lib/data_query.php");
+include ("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/utility.php");
+include_once("/usr/share/cacti/lib/api_graph.php");
+include_once("/usr/share/cacti/lib/api_data_source.php");
+include_once("/usr/share/cacti/lib/template.php");
+include_once("/usr/share/cacti/lib/html_form_template.php");
+include_once("/usr/share/cacti/lib/rrd.php");
+include_once("/usr/share/cacti/lib/data_query.php");
define("MAX_DISPLAY_PAGES", 21);
@@ -64,11 +64,11 @@
break;
case 'data_edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
data_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'ds_remove':
ds_remove();
@@ -80,11 +80,11 @@
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
ds();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -416,7 +416,7 @@
$i++;
}
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
html_start_box("<strong>" . $ds_actions{$_POST["drp_action"]} . "</strong>", "60%", $colors["header_panel"], "3", "center", "");
@@ -539,7 +539,7 @@
html_end_box();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
}
/* ----------------------------
@@ -1041,7 +1041,7 @@
html_start_box("<strong>Data Sources</strong> [host: " . (empty($host["hostname"]) ? "No Host" : $host["hostname"]) . "]", "100%", $colors["header"], "3", "center", "data_sources.php?action=ds_edit&host_id=" . $_REQUEST["host_id"]);
- include("./include/html/inc_data_source_filter_table.php");
+ include("/usr/share/cacti/include/html/inc_data_source_filter_table.php");
html_end_box();
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/data_templates.php cacti-0.8.7b-fhs/data_templates.php
--- cacti-0.8.7b/data_templates.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/data_templates.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,11 +22,11 @@
+-------------------------------------------------------------------------+
*/
-include ("./include/auth.php");
-include_once("./lib/tree.php");
-include_once("./lib/html_tree.php");
-include_once("./lib/utility.php");
-include_once("./lib/template.php");
+include ("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/tree.php");
+include_once("/usr/share/cacti/lib/html_tree.php");
+include_once("/usr/share/cacti/lib/utility.php");
+include_once("/usr/share/cacti/lib/template.php");
define("MAX_DISPLAY_PAGES", 21);
@@ -61,18 +61,18 @@
header("Location: data_templates.php");
break;
case 'template_edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
template_edit();
- include_once ("./include/bottom_footer.php");
+ include_once ("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
template();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -312,7 +312,7 @@
$i++;
}
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
html_start_box("<strong>" . $ds_actions{$_POST["drp_action"]} . "</strong>", "60%", $colors["header_panel"], "3", "center", "");
@@ -359,7 +359,7 @@
html_end_box();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
}
/* ----------------------------
@@ -648,7 +648,7 @@
html_start_box("<strong>Data Templates</strong>", "100%", $colors["header"], "3", "center", "data_templates.php?action=template_edit");
- include("./include/html/inc_data_template_filter_table.php");
+ include("/usr/share/cacti/include/html/inc_data_template_filter_table.php");
html_end_box();
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/docs/html/install_windows.html cacti-0.8.7b-fhs/docs/html/install_windows.html
--- cacti-0.8.7b/docs/html/install_windows.html 2008-02-12 01:57:45.000000000 +0100
+++ cacti-0.8.7b-fhs/docs/html/install_windows.html 2008-05-24 15:54:47.000000000 +0200
@@ -350,7 +350,7 @@
<ol type="1">
<li>
- <p>Edit <tt class="FILENAME">cacti_web_root/cacti/include/config.php</tt> and specify the MySQL user, password, database, and database port for your Cacti configuration.</p>
+ <p>Edit <tt class="FILENAME">cacti_web_root/cacti//etc/cacti.conf</tt> and specify the MySQL user, password, database, and database port for your Cacti configuration.</p>
<pre class="SCREEN">
<kbd class="USERINPUT">$database_default = "cacti";
$database_hostname = "localhost";
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/docs/html/migration_php_scripts_to_script_server.html cacti-0.8.7b-fhs/docs/html/migration_php_scripts_to_script_server.html
--- cacti-0.8.7b/docs/html/migration_php_scripts_to_script_server.html 2008-02-12 01:57:45.000000000 +0100
+++ cacti-0.8.7b-fhs/docs/html/migration_php_scripts_to_script_server.html 2008-05-24 15:54:47.000000000 +0200
@@ -56,8 +56,8 @@
/* display No errors */
error_reporting(E_ERROR);
-include_once(dirname(__FILE__) . "/../include/config.php");
-include_once(dirname(__FILE__) . "/../lib/snmp.php");
+include_once("/etc/cacti.conf");
+include_once("/usr/share/cacti/lib/snmp.php");
if (!isset($called_by_script_server)) {
array_shift($_SERVER["argv"]);
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/docs/html/unix_configure_cacti.html cacti-0.8.7b-fhs/docs/html/unix_configure_cacti.html
--- cacti-0.8.7b/docs/html/unix_configure_cacti.html 2008-02-12 01:57:45.000000000 +0100
+++ cacti-0.8.7b-fhs/docs/html/unix_configure_cacti.html 2008-05-24 15:54:47.000000000 +0200
@@ -67,7 +67,7 @@
</li>
<li>
- <p>Edit <tt class="FILENAME">include/config.php</tt> and specify the database type, name, host, user and password for your Cacti configuration.</p>
+ <p>Edit <tt class="FILENAME">/etc/cacti.conf</tt> and specify the database type, name, host, user and password for your Cacti configuration.</p>
<pre class="SCREEN">
<kbd class="USERINPUT">$database_type = "mysql";
$database_default = "cacti";
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/docs/html/upgrade.html cacti-0.8.7b-fhs/docs/html/upgrade.html
--- cacti-0.8.7b/docs/html/upgrade.html 2008-02-12 01:57:45.000000000 +0100
+++ cacti-0.8.7b-fhs/docs/html/upgrade.html 2008-05-24 15:54:47.000000000 +0200
@@ -67,7 +67,7 @@
</li>
<li>
- <p>Edit <tt class="FILENAME">include/config.php</tt> and specify the MySQL user, password and database for your Cacti configuration.</p>
+ <p>Edit <tt class="FILENAME">/etc/cacti.conf</tt> and specify the MySQL user, password and database for your Cacti configuration.</p>
<pre class="SCREEN">
<kbd class="USERINPUT">$database_type = "mysql";
$database_default = "cacti";
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/docs/text/manual.txt cacti-0.8.7b-fhs/docs/text/manual.txt
--- cacti-0.8.7b/docs/text/manual.txt 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/docs/text/manual.txt 2008-05-24 15:54:47.000000000 +0200
@@ -272,7 +272,7 @@
mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepa
ssword';
mysql> flush privileges;
- 5. Edit include/config.php and specify the database type,
+ 5. Edit /etc/cacti.conf and specify the database type,
name, host, user and password for your Cacti configuration.
$database_type = "mysql";
$database_default = "cacti";
@@ -580,7 +580,7 @@
all the DLL files and sh.exe from the c:\cacti directory.
Configure Cacti
- 1. Edit cacti_web_root/cacti/include/config.php and specify
+ 1. Edit cacti_web_root/cacti//etc/cacti.conf and specify
the MySQL user, password, database, and database port for
your Cacti configuration.
$database_default = "cacti";
@@ -703,7 +703,7 @@
shell> tar xzvf cacti-version.tar.gz
4. Rename the new Cacti directory to match the old one.
shell> mv cacti-version cacti
- 5. Edit include/config.php and specify the MySQL user,
+ 5. Edit /etc/cacti.conf and specify the MySQL user,
password and database for your Cacti configuration.
$database_type = "mysql";
$database_default = "cacti";
@@ -2792,7 +2792,7 @@
/* display No errors */
error_reporting(E_ERROR);
-include_once(dirname(__FILE__) . "/../include/config.php");
+include_once(dirname(__FILE__) . "/..//etc/cacti.conf");
include_once(dirname(__FILE__) . "/../lib/snmp.php");
if (!isset($called_by_script_server)) {
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/gprint_presets.php cacti-0.8.7b-fhs/gprint_presets.php
--- cacti-0.8.7b/gprint_presets.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/gprint_presets.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,7 +22,7 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -38,18 +38,18 @@
header("Location: gprint_presets.php");
break;
case 'edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
gprint_presets_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
gprint_presets();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -94,7 +94,7 @@
/* ==================================================== */
if ((read_config_option("remove_verification") == "on") && (!isset($_GET["confirm"]))) {
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
form_confirm("Are You Sure?", "Are you sure you want to delete the GPRINT preset <strong>'" . db_fetch_cell("select name from graph_templates_gprint where id=" . $_GET["id"]) . "'</strong>? This could affect every graph that uses this preset, make sure you know what you are doing first!", "gprint_presets.php", "gprint_presets.php?action=remove&id=" . $_GET["id"]);
exit;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/graph_image.php cacti-0.8.7b-fhs/graph_image.php
--- cacti-0.8.7b/graph_image.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/graph_image.php 2008-05-24 15:54:47.000000000 +0200
@@ -27,8 +27,8 @@
$guest_account = true;
-include("./include/auth.php");
-include_once("./lib/rrd.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/rrd.php");
/* ================= input validation ================= */
input_validate_input_number(get_request_var("graph_start"));
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/graph.php cacti-0.8.7b-fhs/graph.php
--- cacti-0.8.7b/graph.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/graph.php 2008-05-24 15:54:47.000000000 +0200
@@ -27,10 +27,10 @@
if (!isset($_REQUEST["view_type"])) { $_REQUEST["view_type"] = ""; }
$guest_account = true;
-include("./include/auth.php");
-include("./lib/rrd.php");
-include("./lib/html_tree.php");
-include("./include/top_graph_header.php");
+include("/usr/share/cacti/include/auth.php");
+include("/usr/share/cacti/lib/rrd.php");
+include("/usr/share/cacti/lib/html_tree.php");
+include("/usr/share/cacti/include/top_graph_header.php");
/* ================= input validation ================= */
input_validate_input_regex(get_request_var_request("rra_id"), "^([0-9]+|all)$");
@@ -224,7 +224,7 @@
</tr>
<?php
- include("./include/zoom.js");
+ include("/usr/share/cacti/include/zoom.js");
break;
case 'properties':
@@ -262,6 +262,6 @@
print "</table>";
print "<br><br>";
-include_once("./include/bottom_footer.php");
+include_once("/usr/share/cacti/include/bottom_footer.php");
?>
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/graph_settings.php cacti-0.8.7b-fhs/graph_settings.php
--- cacti-0.8.7b/graph_settings.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/graph_settings.php 2008-05-24 15:54:47.000000000 +0200
@@ -23,7 +23,7 @@
*/
$guest_account = true;
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -37,12 +37,12 @@
// We must exempt ourselves from the page refresh, or else the settings page could update while the user is making changes
$_SESSION['custom'] = 1;
- include_once("./include/top_graph_header.php");
+ include("/usr/share/cacti/include/auth.php");
unset($_SESSION['custom']);
settings();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -88,7 +88,7 @@
/* Find out whether this user has right here */
if($current_user["graph_settings"] == "") {
print "<strong><font size='+1' color='#FF0000'>YOU DO NOT HAVE RIGHTS TO CHANGE GRAPH SETTINGS</font></strong>";
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
exit;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/graphs_items.php cacti-0.8.7b-fhs/graphs_items.php
--- cacti-0.8.7b/graphs_items.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/graphs_items.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,8 +22,8 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/utility.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/utility.php");
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -39,11 +39,11 @@
header("Location: graphs.php?action=graph_edit&id=" . $_GET["local_graph_id"]);
break;
case 'item_edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
item_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'item_movedown':
item_movedown();
@@ -209,7 +209,7 @@
html_start_box("<strong>Data Sources</strong> [host: " . (empty($host["hostname"]) ? "No Host" : $host["hostname"]) . "]", "100%", $colors["header"], "3", "center", "");
- include("./include/html/inc_graph_items_filter_table.php");
+ include("/usr/share/cacti/include/html/inc_graph_items_filter_table.php");
html_end_box();
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/graphs_new.php cacti-0.8.7b-fhs/graphs_new.php
--- cacti-0.8.7b/graphs_new.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/graphs_new.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,12 +22,12 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/data_query.php");
-include_once("./lib/utility.php");
-include_once("./lib/sort.php");
-include_once("./lib/html_form_template.php");
-include_once("./lib/template.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/data_query.php");
+include_once("/usr/share/cacti/lib/utility.php");
+include_once("/usr/share/cacti/lib/sort.php");
+include_once("/usr/share/cacti/lib/html_form_template.php");
+include_once("/usr/share/cacti/lib/template.php");
define("MAX_DISPLAY_PAGES", 21);
@@ -45,11 +45,11 @@
header("Location: graphs_new.php?host_id=" . $_GET["host_id"]);
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
graphs();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -220,7 +220,7 @@
fields are actually drawn */
ob_start();
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
print "<form method='post' action='graphs_new.php'>\n";
@@ -334,7 +334,7 @@
form_save_button("graphs_new.php?host_id=$host_id");
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
}
function check_changed($request, $session) {
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/graphs.php cacti-0.8.7b-fhs/graphs.php
--- cacti-0.8.7b/graphs.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/graphs.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,16 +22,16 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/utility.php");
-include_once("./lib/api_graph.php");
-include_once("./lib/api_tree.php");
-include_once("./lib/api_data_source.php");
-include_once("./lib/template.php");
-include_once("./lib/html_tree.php");
-include_once("./lib/html_form_template.php");
-include_once("./lib/rrd.php");
-include_once("./lib/data_query.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/utility.php");
+include_once("/usr/share/cacti/lib/api_graph.php");
+include_once("/usr/share/cacti/lib/api_tree.php");
+include_once("/usr/share/cacti/lib/api_data_source.php");
+include_once("/usr/share/cacti/lib/template.php");
+include_once("/usr/share/cacti/lib/html_tree.php");
+include_once("/usr/share/cacti/lib/html_form_template.php");
+include_once("/usr/share/cacti/lib/rrd.php");
+include_once("/usr/share/cacti/lib/data_query.php");
define("MAX_DISPLAY_PAGES", 21);
@@ -58,18 +58,18 @@
break;
case 'graph_diff':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
graph_diff();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'item':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
item();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'graph_remove':
graph_remove();
@@ -77,18 +77,18 @@
header("Location: graphs.php");
break;
case 'graph_edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
graph_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
graph();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -382,7 +382,7 @@
$i++;
}
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
/* add a list of tree names to the actions dropdown */
add_tree_names_to_actions_array();
@@ -521,7 +521,7 @@
html_end_box();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
}
/* -----------------------
@@ -1097,7 +1097,7 @@
html_start_box("<strong>Graph Management</strong>", "100%", $colors["header"], "3", "center", "graphs.php?action=graph_edit&host_id=" . $_REQUEST["host_id"]);
- include("./include/html/inc_graph_filter_table.php");
+ include("/usr/share/cacti/include/html/inc_graph_filter_table.php");
html_end_box();
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/graph_templates_inputs.php cacti-0.8.7b-fhs/graph_templates_inputs.php
--- cacti-0.8.7b/graph_templates_inputs.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/graph_templates_inputs.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,8 +22,8 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/template.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/template.php");
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -39,11 +39,11 @@
header("Location: graph_templates.php?action=template_edit&id=" . $_GET["graph_template_id"]);
break;
case 'input_edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
input_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -128,9 +128,9 @@
/* ==================================================== */
if ((read_config_option("remove_verification") == "on") && (!isset($_GET["confirm"]))) {
- include("./include/top_header.php");
+ include("/usr/share/cacti/include/top_header.php");
form_confirm("Are You Sure?", "Are you sure you want to delete the input item <strong>'" . db_fetch_cell("select name from graph_template_input where id=" . $_GET["id"]) . "'</strong>? NOTE: Deleting this item will NOT affect graphs that use this template.", "graph_templates.php?action=template_edit&id=" . $_GET["graph_template_id"], "graph_templates_inputs.php?action=input_remove&id=" . $_GET["id"] . "&graph_template_id=" . $_GET["graph_template_id"]);
- include("./include/bottom_footer.php");
+ include("/usr/share/cacti/include/bottom_footer.php");
exit;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/graph_templates_items.php cacti-0.8.7b-fhs/graph_templates_items.php
--- cacti-0.8.7b/graph_templates_items.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/graph_templates_items.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,8 +22,8 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/template.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/template.php");
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -49,18 +49,18 @@
header("Location: graph_templates.php?action=template_edit&id=" . $_GET["graph_template_id"]);
break;
case 'item_edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
item_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'item':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
item();
- include_once ("./include/bottom_footer.php");
+ include_once ("/usr/share/cacti/include/bottom_footer.php");
break;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/graph_templates.php cacti-0.8.7b-fhs/graph_templates.php
--- cacti-0.8.7b/graph_templates.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/graph_templates.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,11 +22,11 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/utility.php");
-include_once("./lib/template.php");
-include_once("./lib/tree.php");
-include_once("./lib/html_tree.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/utility.php");
+include_once("/usr/share/cacti/lib/template.php");
+include_once("/usr/share/cacti/lib/tree.php");
+include_once("/usr/share/cacti/lib/html_tree.php");
define("MAX_DISPLAY_PAGES", 21);
@@ -58,25 +58,25 @@
header("Location: graph_templates.php?action=template_edit&id=" . $_GET["graph_template_id"]);
break;
case 'input_edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
input_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'template_edit':
- include_once ("./include/top_header.php");
+ include_once ("/usr/share/cacti/include/top_header.php");
template_edit();
- include_once ("./include/bottom_footer.php");
+ include_once ("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
template();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -223,7 +223,7 @@
$i++;
}
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
html_start_box("<strong>" . $graph_actions{$_POST["drp_action"]} . "</strong>", "60%", $colors["header_panel"], "3", "center", "");
@@ -270,7 +270,7 @@
html_end_box();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
}
function item() {
@@ -483,7 +483,7 @@
html_start_box("<strong>Graph Templates</strong>", "100%", $colors["header"], "3", "center", "graph_templates.php?action=template_edit");
- include("./include/html/inc_graph_template_filter_table.php");
+ include("/usr/share/cacti/include/html/inc_graph_template_filter_table.php");
html_end_box();
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/graph_view.php cacti-0.8.7b-fhs/graph_view.php
--- cacti-0.8.7b/graph_view.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/graph_view.php 2008-05-24 15:54:47.000000000 +0200
@@ -23,10 +23,10 @@
*/
$guest_account = true;
-include("./include/auth.php");
-include("./lib/html_tree.php");
-include("./include/html/inc_timespan_settings.php");
-include("./include/top_graph_header.php");
+include("/usr/share/cacti/include/auth.php");
+include("/usr/share/cacti/lib/html_tree.php");
+include("/usr/share/cacti/include/html/inc_timespan_settings.php");
+include("/usr/share/cacti/include/top_graph_header.php");
/* ================= input validation ================= */
input_validate_input_number(get_request_var("branch_id"));
@@ -256,13 +256,13 @@
/* include graph view filter selector */
html_graph_start_box(3, true);
- include("./include/html/inc_graph_view_filter_table.php");
+ include("/usr/share/cacti/include/html/inc_graph_view_filter_table.php");
html_graph_end_box();
/* include time span selector */
if (read_graph_config_option("timespan_sel") == "on") {
html_graph_start_box(3, true);
- include("./include/html/inc_timespan_selector.php");
+ include("/usr/share/cacti/include/html/inc_timespan_selector.php");
html_graph_end_box();
}
@@ -676,6 +676,6 @@
break;
}
-include_once("./include/bottom_footer.php");
+include_once("/usr/share/cacti/include/bottom_footer.php");
?>
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/host.php cacti-0.8.7b-fhs/host.php
--- cacti-0.8.7b/host.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/host.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,16 +22,16 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/utility.php");
-include_once("./lib/api_data_source.php");
-include_once("./lib/api_tree.php");
-include_once("./lib/html_tree.php");
-include_once("./lib/api_graph.php");
-include_once("./lib/snmp.php");
-include_once("./lib/ping.php");
-include_once("./lib/data_query.php");
-include_once("./lib/api_device.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/utility.php");
+include_once("/usr/share/cacti/lib/api_data_source.php");
+include_once("/usr/share/cacti/lib/api_tree.php");
+include_once("/usr/share/cacti/lib/html_tree.php");
+include_once("/usr/share/cacti/lib/api_graph.php");
+include_once("/usr/share/cacti/lib/snmp.php");
+include_once("/usr/share/cacti/lib/ping.php");
+include_once("/usr/share/cacti/lib/data_query.php");
+include_once("/usr/share/cacti/lib/api_device.php");
define("MAX_DISPLAY_PAGES", 21);
@@ -77,18 +77,18 @@
header("Location: host.php?action=edit&id=" . $_GET["host_id"] . "&display_dq_details=true");
break;
case 'edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
host_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
host();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -332,7 +332,7 @@
$i++;
}
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
/* add a list of tree names to the actions dropdown */
add_tree_names_to_actions_array();
@@ -467,7 +467,7 @@
html_end_box();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
}
/* -------------------
@@ -513,9 +513,9 @@
/* ==================================================== */
if ((read_config_option("remove_verification") == "on") && (!isset($_GET["confirm"]))) {
- include("./include/top_header.php");
+ include("/usr/share/cacti/include/top_header.php");
form_confirm("Are You Sure?", "Are you sure you want to delete the host <strong>'" . db_fetch_cell("select description from host where id=" . $_GET["id"]) . "'</strong>?", "host.php", "host.php?action=remove&id=" . $_GET["id"]);
- include("./include/bottom_footer.php");
+ include("/usr/share/cacti/include/bottom_footer.php");
exit;
}
@@ -1165,7 +1165,7 @@
html_start_box("<strong>Devices</strong>", "100%", $colors["header"], "3", "center", "host.php?action=edit&host_template_id=" . $_REQUEST["host_template_id"] . "&host_status=" . $_REQUEST["host_status"]);
- include("./include/html/inc_device_filter_table.php");
+ include("/usr/share/cacti/include/html/inc_device_filter_table.php");
html_end_box();
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/host_templates.php cacti-0.8.7b-fhs/host_templates.php
--- cacti-0.8.7b/host_templates.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/host_templates.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,8 +22,8 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/utility.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/utility.php");
define("MAX_DISPLAY_PAGES", 21);
@@ -55,18 +55,18 @@
header("Location: host_templates.php?action=edit&id=" . $_GET["host_template_id"]);
break;
case 'edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
template_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
template();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -157,7 +157,7 @@
$i++;
}
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
html_start_box("<strong>" . $host_actions{$_POST["drp_action"]} . "</strong>", "60%", $colors["header_panel"], "3", "center", "");
@@ -204,7 +204,7 @@
html_end_box();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
}
/* ---------------------
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/include/auth.php cacti-0.8.7b-fhs/include/auth.php
--- cacti-0.8.7b/include/auth.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/include/auth.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,7 +22,7 @@
+-------------------------------------------------------------------------+
*/
-include("./include/global.php");
+include("/usr/share/cacti/include/global.php");
/* check to see if this is a new installation */
if (db_fetch_cell("select cacti from version") != $config["cacti_version"]) {
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/include/config.php cacti-0.8.7b-fhs/include/config.php
--- cacti-0.8.7b/include/config.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/include/config.php 2008-05-24 15:54:47.000000000 +0200
@@ -33,4 +33,7 @@
/* Default session name - Session name must contain alpha characters */
#$cacti_session_name = "Cacti";
+/* Full URL Path to the Cacti installation */
+$config['url_path'] = '/cacti/';
+
?>
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/include/global.php cacti-0.8.7b-fhs/include/global.php
--- cacti-0.8.7b/include/global.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/include/global.php 2008-05-24 15:54:47.000000000 +0200
@@ -42,10 +42,10 @@
$cacti_session_name = "Cacti";
/* Include configuration */
-include(dirname(__FILE__) . "/config.php");
+include("/etc/cacti.conf");
if (isset($config["cacti_version"])) {
- die("Invalid include/config.php file detected.");
+ die("Invalid /etc/cacti.conf file detected.");
exit;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/include/html/inc_timespan_settings.php cacti-0.8.7b-fhs/include/html/inc_timespan_settings.php
--- cacti-0.8.7b/include/html/inc_timespan_settings.php 2008-02-12 01:57:46.000000000 +0100
+++ cacti-0.8.7b-fhs/include/html/inc_timespan_settings.php 2008-05-24 16:04:39.000000000 +0200
@@ -37,7 +37,7 @@
$_REQUEST["date2"] = sanitize_search_string(get_request_var("date2"));
}
-include_once("./lib/time.php");
+include_once("/usr/share/cacti/lib/time.php");
/* initialize the timespan array */
$timespan = array();
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/index.php cacti-0.8.7b-fhs/index.php
--- cacti-0.8.7b/index.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/index.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,8 +22,8 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include("./include/top_header.php");
+include("/usr/share/cacti/include/auth.php");
+include("/usr/share/cacti/include/top_header.php");
?>
<table width="100%" align="center">
@@ -46,6 +46,6 @@
<?php
-include("./include/bottom_footer.php");
+include("/usr/share/cacti/include/bottom_footer.php");
?>
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/install/0_8_2a_to_0_8_3.php cacti-0.8.7b-fhs/install/0_8_2a_to_0_8_3.php
--- cacti-0.8.7b/install/0_8_2a_to_0_8_3.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/install/0_8_2a_to_0_8_3.php 2008-05-24 15:54:47.000000000 +0200
@@ -23,7 +23,7 @@
*/
function upgrade_to_0_8_3() {
- include("../lib/template.php");
+ include("/usr/share/cacti/lib/template.php");
db_install_execute("0.8.3", "ALTER TABLE `user_auth` CHANGE `graph_policy` `policy_graphs` TINYINT( 1 ) UNSIGNED DEFAULT '1' NOT NULL;");
db_install_execute("0.8.3", "ALTER TABLE `user_auth` ADD `policy_trees` TINYINT( 1 ) UNSIGNED DEFAULT '1' NOT NULL, ADD `policy_hosts` TINYINT( 1 ) UNSIGNED DEFAULT '1' NOT NULL, ADD `policy_graph_templates` TINYINT( 1 ) UNSIGNED DEFAULT '1' NOT NULL;");
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/install/0_8_5a_to_0_8_6.php cacti-0.8.7b-fhs/install/0_8_5a_to_0_8_6.php
--- cacti-0.8.7b/install/0_8_5a_to_0_8_6.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/install/0_8_5a_to_0_8_6.php 2008-05-24 15:54:47.000000000 +0200
@@ -23,10 +23,10 @@
*/
function upgrade_to_0_8_6() {
- include("../lib/data_query.php");
- include("../lib/tree.php");
- include("../lib/import.php");
- include("../lib/poller.php");
+ include("/usr/share/cacti/lib/data_query.php");
+ include("/usr/share/cacti/lib/tree.php");
+ include("/usr/share/cacti/lib/import.php");
+ include("/usr/share/cacti/lib/poller.php");
db_install_execute("0.8.6", "DROP TABLE `snmp_query_field`;");
db_install_execute("0.8.6", "DROP TABLE `data_input_data_cache`;");
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/install/index.php cacti-0.8.7b-fhs/install/index.php
--- cacti-0.8.7b/install/index.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/install/index.php 2008-05-24 15:55:01.000000000 +0200
@@ -22,7 +22,7 @@
+-------------------------------------------------------------------------+
*/
-include("../include/global.php");
+include("/usr/share/cacti/include/global.php");
/* allow the upgrade script to run for as long as it needs to */
ini_set("max_execution_time", "0");
@@ -43,7 +43,7 @@
print " <p style='font-family: Verdana, Arial; font-size: 16px; font-weight: bold; color: red;'>Error</p>
<p style='font-family: Verdana, Arial; font-size: 12px;'>You are attempting to install cacti " . $config["cacti_version"] . "
onto a 0.6.x database. To continue, you must create a new database, import 'cacti.sql' into it, and
- update 'include/config.php' to point to the new database.</p>";
+ update '/etc/cacti.conf' to point to the new database.</p>";
exit;
}elseif (empty($old_cacti_version)) {
print " <p style='font-family: Verdana, Arial; font-size: 16px; font-weight: bold; color: red;'>Error</p>
@@ -304,8 +304,8 @@
}
if ($_REQUEST["step"] == "4") {
- include_once("../lib/data_query.php");
- include_once("../lib/utility.php");
+ include_once("/usr/share/cacti/lib/data_query.php");
+ include_once("/usr/share/cacti/lib/utility.php");
$i = 0;
@@ -350,53 +350,53 @@
/* loop from the old version to the current, performing updates for each version in between */
for ($i=($old_version_index+1); $i<count($cacti_versions); $i++) {
if ($cacti_versions[$i] == "0.8.1") {
- include ("0_8_to_0_8_1.php");
+ include ("/usr/share/cacti/upgrade/0_8_to_0_8_1.php");
upgrade_to_0_8_1();
}elseif ($cacti_versions[$i] == "0.8.2") {
- include ("0_8_1_to_0_8_2.php");
+ include ("/usr/share/cacti/upgrade/0_8_1_to_0_8_2.php");
upgrade_to_0_8_2();
}elseif ($cacti_versions[$i] == "0.8.2a") {
- include ("0_8_2_to_0_8_2a.php");
+ include ("/usr/share/cacti/upgrade/0_8_2_to_0_8_2a.php");
upgrade_to_0_8_2a();
}elseif ($cacti_versions[$i] == "0.8.3") {
- include ("0_8_2a_to_0_8_3.php");
- include_once("../lib/utility.php");
+ include ("/usr/share/cacti/upgrade/0_8_2a_to_0_8_3.php");
+ include_once("/usr/share/cacti/lib/utility.php");
upgrade_to_0_8_3();
}elseif ($cacti_versions[$i] == "0.8.4") {
- include ("0_8_3_to_0_8_4.php");
+ include ("/usr/share/cacti/upgrade/0_8_3_to_0_8_4.php");
upgrade_to_0_8_4();
}elseif ($cacti_versions[$i] == "0.8.5") {
- include ("0_8_4_to_0_8_5.php");
+ include ("/usr/share/cacti/upgrade/0_8_4_to_0_8_5.php");
upgrade_to_0_8_5();
}elseif ($cacti_versions[$i] == "0.8.6") {
- include ("0_8_5a_to_0_8_6.php");
+ include ("/usr/share/cacti/upgrade/0_8_5a_to_0_8_6.php");
upgrade_to_0_8_6();
}elseif ($cacti_versions[$i] == "0.8.6a") {
- include ("0_8_6_to_0_8_6a.php");
+ include ("/usr/share/cacti/upgrade/0_8_6_to_0_8_6a.php");
upgrade_to_0_8_6a();
}elseif ($cacti_versions[$i] == "0.8.6d") {
- include ("0_8_6c_to_0_8_6d.php");
+ include ("/usr/share/cacti/upgrade/0_8_6c_to_0_8_6d.php");
upgrade_to_0_8_6d();
}elseif ($cacti_versions[$i] == "0.8.6e") {
- include ("0_8_6d_to_0_8_6e.php");
+ include ("/usr/share/cacti/upgrade/0_8_6d_to_0_8_6e.php");
upgrade_to_0_8_6e();
}elseif ($cacti_versions[$i] == "0.8.6g") {
- include ("0_8_6f_to_0_8_6g.php");
+ include ("/usr/share/cacti/upgrade/0_8_6f_to_0_8_6g.php");
upgrade_to_0_8_6g();
}elseif ($cacti_versions[$i] == "0.8.6h") {
- include ("0_8_6g_to_0_8_6h.php");
+ include ("/usr/share/cacti/upgrade/0_8_6g_to_0_8_6h.php");
upgrade_to_0_8_6h();
}elseif ($cacti_versions[$i] == "0.8.6i") {
- include ("0_8_6h_to_0_8_6i.php");
+ include ("/usr/share/cacti/upgrade/0_8_6h_to_0_8_6i.php");
upgrade_to_0_8_6i();
}elseif ($cacti_versions[$i] == "0.8.7") {
- include ("0_8_6j_to_0_8_7.php");
+ include ("/usr/share/cacti/upgrade/0_8_6j_to_0_8_7.php");
upgrade_to_0_8_7();
}elseif ($cacti_versions[$i] == "0.8.7a") {
- include ("0_8_7_to_0_8_7a.php");
+ include ("/usr/share/cacti/upgrade/0_8_7_to_0_8_7a.php");
upgrade_to_0_8_7a();
}elseif ($cacti_versions[$i] == "0.8.7b") {
- include ("0_8_7a_to_0_8_7b.php");
+ include ("/usr/share/cacti/upgrade/0_8_7a_to_0_8_7b.php");
upgrade_to_0_8_7b();
}
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/lib/database.php cacti-0.8.7b-fhs/lib/database.php
--- cacti-0.8.7b/lib/database.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/lib/database.php 2008-05-24 15:54:47.000000000 +0200
@@ -49,7 +49,7 @@
usleep(40000);
}
- die("FATAL: Cannot connect to MySQL server on '$host'. Please make sure you have specified a valid MySQL database name in 'include/config.php'\n");
+ die("FATAL: Cannot connect to MySQL server on '$host'. Please make sure you have specified a valid MySQL database name in '/etc/cacti.conf'\n");
return(0);
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/lib/html_tree.php cacti-0.8.7b-fhs/lib/html_tree.php
--- cacti-0.8.7b/lib/html_tree.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/lib/html_tree.php 2008-05-24 15:54:47.000000000 +0200
@@ -55,7 +55,7 @@
/* include time span selector */
if (read_graph_config_option("timespan_sel") == "on") {
html_graph_start_box(3, false);
- include("./include/html/inc_timespan_selector.php");
+ include("/usr/share/cacti/include/html/inc_timespan_selector.php");
html_graph_end_box();
print "<br>";
}
@@ -642,7 +642,7 @@
/* include time span selector */
if (read_graph_config_option("timespan_sel") == "on") {
html_graph_start_box(3, false);
- include("./include/html/inc_timespan_selector.php");
+ include("/usr/share/cacti/include/html/inc_timespan_selector.php");
html_graph_end_box();
print "<br>";
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/lib/html_validate.php cacti-0.8.7b-fhs/lib/html_validate.php
--- cacti-0.8.7b/lib/html_validate.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/lib/html_validate.php 2008-05-24 15:54:47.000000000 +0200
@@ -53,7 +53,7 @@
</table>
<?php
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
exit;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/resource/script_queries/host_cpu.xml cacti-0.8.7b-fhs/resource/script_queries/host_cpu.xml
--- cacti-0.8.7b/resource/script_queries/host_cpu.xml 2008-02-12 01:57:46.000000000 +0100
+++ cacti-0.8.7b-fhs/resource/script_queries/host_cpu.xml 2008-05-24 15:54:47.000000000 +0200
@@ -1,6 +1,6 @@
<interface>
<name>Get Host MIB CPU's</name>
- <script_path>|path_php_binary| -q |path_cacti|/scripts/query_host_cpu.php</script_path>
+ <script_path>|path_php_binary| -q /usr/share/cacti/scripts/query_host_cpu.php</script_path>
<arg_prepend>|host_hostname| |host_snmp_community| |host_snmp_version|</arg_prepend>
<arg_index>index</arg_index>
<arg_query>query</arg_query>
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/resource/script_queries/host_disk.xml cacti-0.8.7b-fhs/resource/script_queries/host_disk.xml
--- cacti-0.8.7b/resource/script_queries/host_disk.xml 2008-02-12 01:57:46.000000000 +0100
+++ cacti-0.8.7b-fhs/resource/script_queries/host_disk.xml 2008-05-24 15:54:47.000000000 +0200
@@ -1,6 +1,6 @@
<interface>
<name>Get Host MIB Partitions</name>
- <script_path>|path_php_binary| -q |path_cacti|/scripts/query_host_partitions.php</script_path>
+ <script_path>|path_php_binary| -q /usr/share/cacti/scripts/query_host_partitions.php</script_path>
<arg_prepend>|host_hostname| |host_snmp_community| |host_snmp_version|</arg_prepend>
<arg_index>index</arg_index>
<arg_query>query</arg_query>
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/resource/script_queries/unix_disk.xml cacti-0.8.7b-fhs/resource/script_queries/unix_disk.xml
--- cacti-0.8.7b/resource/script_queries/unix_disk.xml 2008-02-12 01:57:46.000000000 +0100
+++ cacti-0.8.7b-fhs/resource/script_queries/unix_disk.xml 2008-05-24 15:54:47.000000000 +0200
@@ -1,7 +1,7 @@
<interface>
<name>Get Unix Mounted Partitions</name>
<description>Queries a list of mounted partitions on a unix-based host with the 'df' command.</description>
- <script_path>perl |path_cacti|/scripts/query_unix_partitions.pl</script_path>
+ <script_path>perl /usr/share/cacti/scripts/query_unix_partitions.pl</script_path>
<arg_index>index</arg_index>
<arg_query>query</arg_query>
<arg_get>get</arg_get>
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/resource/script_server/host_cpu.xml cacti-0.8.7b-fhs/resource/script_server/host_cpu.xml
--- cacti-0.8.7b/resource/script_server/host_cpu.xml 2008-02-12 01:57:46.000000000 +0100
+++ cacti-0.8.7b-fhs/resource/script_server/host_cpu.xml 2008-05-24 15:54:47.000000000 +0200
@@ -1,6 +1,6 @@
<interface>
<name>Get Host MIB CPU's</name>
- <script_path>|path_cacti|/scripts/ss_host_cpu.php</script_path>
+ <script_path>/usr/share/cacti/scripts/ss_host_cpu.php</script_path>
<script_function>ss_host_cpu</script_function>
<script_server>php</script_server>
<arg_prepend>|host_hostname| |host_id| |host_snmp_version|:|host_snmp_port|:|host_snmp_timeout|:|host_snmp_community|:|host_snmp_username|:|host_snmp_password|:|host_snmp_auth_protocol|:|host_snmp_priv_passphrase|:|host_snmp_priv_protocol|:|host_snmp_context|</arg_prepend>
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/resource/script_server/host_disk.xml cacti-0.8.7b-fhs/resource/script_server/host_disk.xml
--- cacti-0.8.7b/resource/script_server/host_disk.xml 2008-02-12 01:57:46.000000000 +0100
+++ cacti-0.8.7b-fhs/resource/script_server/host_disk.xml 2008-05-24 15:54:47.000000000 +0200
@@ -1,6 +1,6 @@
<interface>
<name>Get Host MIB Partitions</name>
- <script_path>|path_cacti|/scripts/ss_host_disk.php</script_path>
+ <script_path>/usr/share/cacti/scripts/ss_host_disk.php</script_path>
<script_function>ss_host_disk</script_function>
<script_server>php</script_server>
<arg_prepend>|host_hostname| |host_id| |host_snmp_version|:|host_snmp_port|:|host_snmp_timeout|:|host_snmp_community|:|host_snmp_username|:|host_snmp_password|:|host_snmp_auth_protocol|:|host_snmp_priv_passphrase|:|host_snmp_priv_protocol|:|host_snmp_context|</arg_prepend>
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/rra.php cacti-0.8.7b-fhs/rra.php
--- cacti-0.8.7b/rra.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/rra.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,7 +22,7 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -38,18 +38,18 @@
header("Location: rra.php");
break;
case 'edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
rra_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
rra();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -108,7 +108,7 @@
/* ==================================================== */
if ((read_config_option("remove_verification") == "on") && (!isset($_GET["confirm"]))) {
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
form_confirm("Are You Sure?", "Are you sure you want to delete the round robin archive <strong>'" . db_fetch_cell("select name from rra where id=" . $_GET["id"]) . "'</strong>?", "rra.php", "rra.php?action=remove&id=" . $_GET["id"]);
exit;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/script_server.pl cacti-0.8.7b-fhs/script_server.pl
--- cacti-0.8.7b/script_server.pl 2008-02-12 01:57:46.000000000 +0100
+++ cacti-0.8.7b-fhs/script_server.pl 2008-05-24 15:54:47.000000000 +0200
@@ -1,4 +1,4 @@
-chdir("./scripts");
+chdir("/usr/share/cacti/scripts");
$loaded = 0;
while ($file = <*.pl>) {
next if $file eq $0;
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/settings.php cacti-0.8.7b-fhs/settings.php
--- cacti-0.8.7b/settings.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/settings.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,7 +22,7 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -56,7 +56,7 @@
header("Location: settings.php?tab=" . $_POST["tab"]);
break;
default:
- include("./include/top_header.php");
+ include("/usr/share/cacti/include/top_header.php");
/* set the default settings category */
if (!isset($_GET["tab"])) {
@@ -117,7 +117,7 @@
form_save_button("settings.php?tab=$current_tab", "save");
- include("./include/bottom_footer.php");
+ include("/usr/share/cacti/include/bottom_footer.php");
break;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/templates_export.php cacti-0.8.7b-fhs/templates_export.php
--- cacti-0.8.7b/templates_export.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/templates_export.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,8 +22,8 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/export.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/export.php");
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -57,11 +57,11 @@
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
export();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -76,9 +76,9 @@
$xml_data = get_item_xml($_POST["export_type"], $_POST["export_item_id"], (((isset($_POST["include_deps"]) ? $_POST["include_deps"] : "") == "") ? false : true));
if ($_POST["output_format"] == "1") {
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
print "<table width='100%' align='center'><tr><td><pre>" . htmlspecialchars($xml_data) . "</pre></td></tr></table>";
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
}elseif ($_POST["output_format"] == "2") {
header("Content-type: application/xml");
print $xml_data;
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/templates_import.php cacti-0.8.7b-fhs/templates_import.php
--- cacti-0.8.7b/templates_import.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/templates_import.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,8 +22,8 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/import.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/import.php");
/* set default action */
if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -34,11 +34,11 @@
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
import();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/tree.php cacti-0.8.7b-fhs/tree.php
--- cacti-0.8.7b/tree.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/tree.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,10 +22,10 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once('./lib/api_tree.php');
-include_once('./lib/tree.php');
-include_once('./lib/html_tree.php');
+include("/usr/share/cacti/include/auth.php");
+include_once('/usr/share/cacti/lib/api_tree.php');
+include_once('/usr/share/cacti/lib/tree.php');
+include_once('/usr/share/cacti/lib/html_tree.php');
input_validate_input_number(get_request_var('tree_id'));
input_validate_input_number(get_request_var('leaf_id'));
@@ -51,11 +51,11 @@
header("Location: tree.php?action=edit&id=" . $_GET["tree_id"]);
break;
case 'item_edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
item_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'item_remove':
item_remove();
@@ -68,18 +68,18 @@
header("Location: tree.php");
break;
case 'edit':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
tree_edit();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
tree();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -330,9 +330,9 @@
$text = "Are you sure you want to delete the host item <strong>'" . db_fetch_cell("select CONCAT_WS('',description,' (',hostname,')') as hostname from host where id=" . $graph_tree_item["host_id"]) . "'</strong>?";
}
- include("./include/top_header.php");
+ include("/usr/share/cacti/include/top_header.php");
form_confirm("Are You Sure?", $text, "tree.php?action=edit&id=" . $_GET["tree_id"], "tree.php?action=item_remove&id=" . $_GET["id"] . "&tree_id=" . $_GET["tree_id"]);
- include("./include/bottom_footer.php");
+ include("/usr/share/cacti/include/bottom_footer.php");
exit;
}
@@ -354,9 +354,9 @@
/* ==================================================== */
if ((read_config_option("remove_verification") == "on") && (!isset($_GET["confirm"]))) {
- include("./include/top_header.php");
+ include("/usr/share/cacti/include/top_header.php");
form_confirm("Are You Sure?", "Are you sure you want to delete the tree <strong>'" . db_fetch_cell("select name from graph_tree where id=" . $_GET["id"]) . "'</strong>?", "tree.php", "tree.php?action=remove&id=" . $_GET["id"]);
- include("./include/bottom_footer.php");
+ include("/usr/share/cacti/include/bottom_footer.php");
exit;
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/user_admin.php cacti-0.8.7b-fhs/user_admin.php
--- cacti-0.8.7b/user_admin.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/user_admin.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,7 +22,7 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
define("MAX_DISPLAY_PAGES", 21);
@@ -48,33 +48,33 @@
break;
case 'user_realms_edit':
- include_once("include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
user_edit();
- include_once("include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'graph_settings_edit':
- include_once("include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
user_edit();
- include_once("include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'graph_perms_edit':
- include_once("include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
user_edit();
- include_once("include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'user_edit':
- include_once("include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
user_edit();
- include_once("include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
user();
- include_once("include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -195,7 +195,7 @@
$i++;
}
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
html_start_box("<strong>" . $user_actions[get_request_var_post("drp_action")] . "</strong>", "60%", $colors["header_panel"], "3", "center", "");
@@ -306,7 +306,7 @@
html_end_box();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
}
diff -Naur --exclude '*~' --exclude '*.orig' cacti-0.8.7b/utilities.php cacti-0.8.7b-fhs/utilities.php
--- cacti-0.8.7b/utilities.php 2008-02-12 01:57:48.000000000 +0100
+++ cacti-0.8.7b-fhs/utilities.php 2008-05-24 15:54:47.000000000 +0200
@@ -22,8 +22,8 @@
+-------------------------------------------------------------------------+
*/
-include("./include/auth.php");
-include_once("./lib/utility.php");
+include("/usr/share/cacti/include/auth.php");
+include_once("/usr/share/cacti/lib/utility.php");
load_current_session_value("page_referrer", "page_referrer", "");
@@ -62,8 +62,8 @@
switch ($_REQUEST["action"]) {
case 'clear_poller_cache':
- include_once("./include/top_header.php");
-
+ include_once("/usr/share/cacti/include/top_header.php");
+
/* obtain timeout settings */
$max_execution = ini_get("max_execution_time");
$max_memory = ini_get("memory_limit");
@@ -78,21 +78,21 @@
utilities_view_poller_cache();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'view_snmp_cache':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
utilities_view_snmp_cache();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'view_poller_cache':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
utilities_view_poller_cache();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'view_logfile':
utilities_view_logfile();
@@ -102,38 +102,38 @@
utilities_clear_logfile();
utilities_view_logfile();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'view_user_log':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
utilities_view_user_log();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'clear_user_log':
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
utilities_clear_user_log();
utilities_view_user_log();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
case 'view_tech':
$php_info = utilities_php_modules();
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
utilities_view_tech($php_info);
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
default:
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
utilities();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
break;
}
@@ -695,7 +695,7 @@
$logfile = read_config_option("path_cactilog");
if ($logfile == "") {
- $logfile = "./log/rrd.log";
+ $logfile = "/var/log/cacti/rrd.log";
}
/* helps determine output color */
@@ -733,7 +733,7 @@
$refresh["seconds"] = $_REQUEST["refresh"];
$refresh["page"] = "utilities.php?action=view_logfile";
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
?>
<script type="text/javascript">
@@ -851,7 +851,7 @@
html_end_box();
- include_once("./include/bottom_footer.php");
+ include_once("/usr/share/cacti/include/bottom_footer.php");
}
function utilities_clear_logfile() {
@@ -862,12 +862,12 @@
$refresh["seconds"] = $_REQUEST["refresh"];
$refresh["page"] = "utilities.php?action=view_logfile";
- include_once("./include/top_header.php");
+ include_once("/usr/share/cacti/include/top_header.php");
$logfile = read_config_option("path_cactilog");
if ($logfile == "") {
- $logfile = "./log/cacti.log";
+ $logfile = "/var/log/cacti.log";
}
html_start_box("<strong>Clear Cacti Log File</strong>", "100%", $colors["header"], "1", "center", "");
