Sophie: cacti-0.8.6i-1mdv2007.1 src

cacti-0.8.6i-1mdv2007.1.src.rpm

diff -Naur cacti-0.8.6h/about.php cacti-0.8.6h.fhs/about.php
--- cacti-0.8.6h/about.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/about.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,8 +24,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>", "98%", $colors["header"], "3", "center", "");
 ?>
@@ -100,5 +100,5 @@
 
 <?php
 html_end_box();
-include("./include/bottom_footer.php");
+include("/usr/share/cacti/include/bottom_footer.php");
 ?>
diff -Naur cacti-0.8.6h/auth_changepassword.php cacti-0.8.6h.fhs/auth_changepassword.php
--- cacti-0.8.6h/auth_changepassword.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/auth_changepassword.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,7 +24,7 @@
  +-------------------------------------------------------------------------+
 */
 
-include("./include/config.php");
+include("/etc/cacti.conf");
 
 $user = db_fetch_row("select * from user_auth where id=" . $_SESSION["sess_user_id"]);
 
diff -Naur cacti-0.8.6h/cacti.sql cacti-0.8.6h.fhs/cacti.sql
--- cacti-0.8.6h/cacti.sql	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/cacti.sql	2006-02-27 15:59:50.000000000 +0100
@@ -191,14 +191,14 @@
 
 INSERT INTO data_input VALUES (1,'3eb92bb845b9660a7445cf9740726522','Get SNMP Data','',2);
 INSERT INTO data_input VALUES (2,'bf566c869ac6443b0c75d1c32b5a350e','Get SNMP Data (Indexed)','',3);
-INSERT INTO data_input VALUES (3,'274f4685461170b9eb1b98d22567ab5e','Unix - Get Free Disk Space','<path_cacti>/scripts/diskfree.sh <partition>',1);
-INSERT INTO data_input VALUES (4,'95ed0993eb3095f9920d431ac80f4231','Unix - Get Load Average','perl <path_cacti>/scripts/loadavg_multi.pl',1);
-INSERT INTO data_input VALUES (5,'79a284e136bb6b061c6f96ec219ac448','Unix - Get Logged In Users','perl <path_cacti>/scripts/unix_users.pl <username>',1);
-INSERT INTO data_input VALUES (6,'362e6d4768937c4f899dd21b91ef0ff8','Linux - Get Memory Usage','perl <path_cacti>/scripts/linux_memory.pl <grepstr>',1);
-INSERT INTO data_input VALUES (7,'a637359e0a4287ba43048a5fdf202066','Unix - Get System Processes','perl <path_cacti>/scripts/unix_processes.pl',1);
-INSERT INTO data_input VALUES (8,'47d6bfe8be57a45171afd678920bd399','Unix - Get TCP Connections','perl <path_cacti>/scripts/unix_tcp_connections.pl <grepstr>',1);
-INSERT INTO data_input VALUES (9,'cc948e4de13f32b6aea45abaadd287a3','Unix - Get Web Hits','perl <path_cacti>/scripts/webhits.pl <log_path>',1);
-INSERT INTO data_input VALUES (10,'8bd153aeb06e3ff89efc73f35849a7a0','Unix - Ping Host','perl <path_cacti>/scripts/ping.pl <ip>',1);
+INSERT INTO data_input VALUES (3,'274f4685461170b9eb1b98d22567ab5e','Unix - Get Free Disk Space','/usr/share/cacti/scripts/diskfree.sh <partition>',1);
+INSERT INTO data_input VALUES (4,'95ed0993eb3095f9920d431ac80f4231','Unix - Get Load Average','perl /usr/share/cacti/scripts/loadavg_multi.pl',1);
+INSERT INTO data_input VALUES (5,'79a284e136bb6b061c6f96ec219ac448','Unix - Get Logged In Users','perl /usr/share/cacti/scripts/unix_users.pl <username>',1);
+INSERT INTO data_input VALUES (6,'362e6d4768937c4f899dd21b91ef0ff8','Linux - Get Memory Usage','perl /usr/share/cacti/scripts/linux_memory.pl <grepstr>',1);
+INSERT INTO data_input VALUES (7,'a637359e0a4287ba43048a5fdf202066','Unix - Get System Processes','perl /usr/share/cacti/scripts/unix_processes.pl',1);
+INSERT INTO data_input VALUES (8,'47d6bfe8be57a45171afd678920bd399','Unix - Get TCP Connections','perl /usr/share/cacti/scripts/unix_tcp_connections.pl <grepstr>',1);
+INSERT INTO data_input VALUES (9,'cc948e4de13f32b6aea45abaadd287a3','Unix - Get Web Hits','perl /usr/share/cacti/scripts/webhits.pl <log_path>',1);
+INSERT INTO data_input VALUES (10,'8bd153aeb06e3ff89efc73f35849a7a0','Unix - Ping Host','perl /usr/share/cacti/scripts/ping.pl <ip>',1);
 INSERT INTO data_input VALUES (11,'80e9e4c4191a5da189ae26d0e237f015','Get Script Data (Indexed)','',4);
 INSERT INTO data_input VALUES (12,'332111d8b54ac8ce939af87a7eac0c06','Get Script Server Data (Indexed)','',6);
 
@@ -2234,14 +2234,14 @@
 -- Dumping data for table `snmp_query`
 --
 
-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);
-INSERT INTO snmp_query VALUES (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);
-INSERT INTO snmp_query VALUES (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);
-INSERT INTO snmp_query VALUES (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);
-INSERT INTO snmp_query VALUES (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);
-INSERT INTO snmp_query VALUES (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);
-INSERT INTO snmp_query VALUES (8,'9343eab1f4d88b0e61ffc9d020f35414','<path_cacti>/resource/script_server/host_disk.xml','SNMP - Get Mounted Partitions','Gets a list of partitions using SNMP',0,12);
-INSERT INTO snmp_query VALUES (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);
+INSERT INTO snmp_query VALUES (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);
+INSERT INTO snmp_query VALUES (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);
+INSERT INTO snmp_query VALUES (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);
+INSERT INTO snmp_query VALUES (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);
+INSERT INTO snmp_query VALUES (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);
+INSERT INTO snmp_query VALUES (8,'9343eab1f4d88b0e61ffc9d020f35414','/usr/share/cacti/resource/script_server/host_disk.xml','SNMP - Get Mounted Partitions','Gets a list of partitions using SNMP',0,12);
+INSERT INTO snmp_query VALUES (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);
 
 --
 -- Table structure for table `snmp_query_graph`
diff -Naur cacti-0.8.6h/cdef.php cacti-0.8.6h.fhs/cdef.php
--- cacti-0.8.6h/cdef.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/cdef.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,8 +24,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"] = ""; }
@@ -51,11 +51,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();
@@ -63,18 +63,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;
 }
 
@@ -270,9 +270,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 cacti-0.8.6h/cmd.php cacti-0.8.6h.fhs/cmd.php
--- cacti-0.8.6h/cmd.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/cmd.php	2006-02-27 15:59:50.000000000 +0100
@@ -38,7 +38,7 @@
 
 $no_http_headers = true;
 
-include(dirname(__FILE__) . "/include/config.php");
+include("/etc/cacti.conf");
 include_once($config["base_path"] . "/lib/snmp.php");
 include_once($config["base_path"] . "/lib/poller.php");
 include_once($config["base_path"] . "/lib/rrd.php");
diff -Naur cacti-0.8.6h/color.php cacti-0.8.6h.fhs/color.php
--- cacti-0.8.6h/color.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/color.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,7 +24,7 @@
  +-------------------------------------------------------------------------+
 */
 
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
 
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -40,18 +40,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 cacti-0.8.6h/copy_cacti_user.php cacti-0.8.6h.fhs/copy_cacti_user.php
--- cacti-0.8.6h/copy_cacti_user.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/copy_cacti_user.php	2006-02-27 16:03:58.000000000 +0100
@@ -34,8 +34,8 @@
 
 $no_http_headers = true;
 
-include(dirname(__FILE__) . "/include/config.php");
-include_once($config["base_path"] . "/lib/auth.php");
+include("/etc/cacti.conf");
+include_once("/usr/share/cacti/lib/auth.php");
 
 $template_user = $_SERVER["argv"][1];
 $new_user = $_SERVER["argv"][2];
diff -Naur cacti-0.8.6h/data_input.php cacti-0.8.6h.fhs/data_input.php
--- cacti-0.8.6h/data_input.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/data_input.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,7 +24,7 @@
  +-------------------------------------------------------------------------+
 */
 
-include ("./include/auth.php");
+include ("/usr/share/cacti/include/auth.php");
 
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -40,11 +40,11 @@
 		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 'remove':
 		data_remove();
@@ -52,18 +52,18 @@
 		header("Location: data_input.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;
 }
 
@@ -161,9 +161,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;
 	}
 
@@ -275,9 +275,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 input method <strong>'" . db_fetch_cell("select name from data_input where id=" . $_GET["id"]) . "'</strong>?", "data_input.php", "data_input.php?action=remove&id=" . $_GET["id"]);
-		include("./include/bottom_footer.php");
+		include("/usr/share/cacti/include/bottom_footer.php");
 		exit;
 	}
 
diff -Naur cacti-0.8.6h/data_queries.php cacti-0.8.6h.fhs/data_queries.php
--- cacti-0.8.6h/data_queries.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/data_queries.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,8 +24,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");
 
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -71,11 +71,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();
@@ -83,18 +83,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;
 }
 
@@ -257,9 +257,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;
 	}
 
@@ -521,9 +521,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 <strong>'" . db_fetch_cell("select name from snmp_query where id=" . $_GET["id"]) . "'</strong>?", "data_queries.php", "data_queries.php?action=remove&id=" . $_GET["id"]);
-		include("./include/bottom_footer.php");
+		include("/usr/share/cacti/include/bottom_footer.php");
 		exit;
 	}
 
diff -Naur cacti-0.8.6h/data_sources.php cacti-0.8.6h.fhs/data_sources.php
--- cacti-0.8.6h/data_sources.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/data_sources.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,14 +24,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);
 
@@ -66,11 +66,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();
@@ -78,18 +78,18 @@
 		header ("Location: data_sources.php");
 		break;
 	case 'ds_edit':
-		include_once("./include/top_header.php");
+		include_once("/usr/share/cacti/include/top_header.php");
 
 		ds_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");
 
 		ds();
 
-		include_once("./include/bottom_footer.php");
+		include_once("/usr/share/cacti/include/bottom_footer.php");
 		break;
 }
 
@@ -421,7 +421,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", "");
 
@@ -544,7 +544,7 @@
 
 	html_end_box();
 
-	include_once("./include/bottom_footer.php");
+	include_once("/usr/share/cacti/include/bottom_footer.php");
 }
 
 /* ----------------------------
@@ -975,7 +975,7 @@
 
 	html_start_box("<strong>Data Sources</strong> [host: " . (empty($host["hostname"]) ? "No Host" : $host["hostname"]) . "]", "98%", $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 cacti-0.8.6h/data_templates.php cacti-0.8.6h.fhs/data_templates.php
--- cacti-0.8.6h/data_templates.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/data_templates.php	2006-02-27 16:01:36.000000000 +0100
@@ -24,11 +24,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);
 
@@ -63,18 +63,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;
 }
 
@@ -305,7 +305,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", "");
 
@@ -352,7 +352,7 @@
 
 	html_end_box();
 
-	include_once("./include/bottom_footer.php");
+	include_once("/usr/share/cacti/include/bottom_footer.php");
 }
 
 /* ----------------------------
@@ -624,7 +624,7 @@
 
 	html_start_box("<strong>Data Templates</strong>", "98%", $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 cacti-0.8.6h/docs/INSTALL cacti-0.8.6h.fhs/docs/INSTALL
--- cacti-0.8.6h/docs/INSTALL	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/docs/INSTALL	2006-02-27 15:59:50.000000000 +0100
@@ -19,7 +19,7 @@
  mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
  mysql> flush privileges;
 
-    5. Edit include/config.php and specify the MySQL user, password and
+    5. Edit /etc/cacti.conf and specify the MySQL user, password and
        database for your Cacti configuration.
 
  $database_default = "cacti";
diff -Naur cacti-0.8.6h/docs/UPGRADE cacti-0.8.6h.fhs/docs/UPGRADE
--- cacti-0.8.6h/docs/UPGRADE	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/docs/UPGRADE	2006-02-27 15:59:50.000000000 +0100
@@ -21,7 +21,7 @@
 
  shell> mv cacti-version cacti
 
-    5. Edit include/config.php and specify the MySQL user, password and
+    5. Edit /etc/cacti.conf and specify the MySQL user, password and
        database for your Cacti configuration.
 
  $database_default = "cacti";
diff -Naur cacti-0.8.6h/docs/html/install_unix.html cacti-0.8.6h.fhs/docs/html/install_unix.html
--- cacti-0.8.6h/docs/html/install_unix.html	2006-01-04 04:08:29.000000000 +0100
+++ cacti-0.8.6h.fhs/docs/html/install_unix.html	2006-02-27 15:59:50.000000000 +0100
@@ -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_default = "cacti";
 $database_hostname = "localhost";
diff -Naur cacti-0.8.6h/docs/html/migration_php_scripts_to_script_server.html cacti-0.8.6h.fhs/docs/html/migration_php_scripts_to_script_server.html
--- cacti-0.8.6h/docs/html/migration_php_scripts_to_script_server.html	2006-01-04 04:08:29.000000000 +0100
+++ cacti-0.8.6h.fhs/docs/html/migration_php_scripts_to_script_server.html	2006-02-27 15:59:50.000000000 +0100
@@ -56,7 +56,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)) {
@@ -99,7 +99,7 @@
     <div class="SECT2">
       <h2 class="SECT2"><a name="XML_FILE_CHANGES" id="XML_FILE_CHANGES">XML File Changes</a></h2>
 
-      <p>If you are using a "Script Query" type function, then you must also change your XML file. Please reference the XML files in the <tt class="FILENAME">&lt;path_cacti&gt;/resource/script_server</tt> directory for the specifics related to your required modifications. However, you may also follow the instructions below:</p>
+      <p>If you are using a "Script Query" type function, then you must also change your XML file. Please reference the XML files in the <tt class="FILENAME">/usr/share/cacti/resource/script_server</tt> directory for the specifics related to your required modifications. However, you may also follow the instructions below:</p>
 
       <ol type="1">
         <li>
@@ -137,7 +137,7 @@
         <li>
           <p>Change it's Input Method to "Get Script Server Data" or "Get Script Server Data (Index)" depending on it's type.</p>
 
-          <p>Change the XML file path to point to the new XML file in the <tt class="FILENAME">&lt;path_cacti&gt;/resources/script_server/*.xml</tt> path.</p>
+          <p>Change the XML file path to point to the new XML file in the <tt class="FILENAME">/usr/share/cacti/resources/script_server/*.xml</tt> path.</p>
 
           <p>For all data templates that use the data query you must change their "Data Input Method" accordingly.</p>
         </li>
diff -Naur cacti-0.8.6h/docs/html/upgrade.html cacti-0.8.6h.fhs/docs/html/upgrade.html
--- cacti-0.8.6h/docs/html/upgrade.html	2006-01-04 04:08:29.000000000 +0100
+++ cacti-0.8.6h.fhs/docs/html/upgrade.html	2006-02-27 15:59:50.000000000 +0100
@@ -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_default = "cacti";
 $database_hostname = "localhost";
diff -Naur cacti-0.8.6h/docs/html/upgrade_using_hostmib_data_queries.html cacti-0.8.6h.fhs/docs/html/upgrade_using_hostmib_data_queries.html
--- cacti-0.8.6h/docs/html/upgrade_using_hostmib_data_queries.html	2006-01-04 04:08:29.000000000 +0100
+++ cacti-0.8.6h.fhs/docs/html/upgrade_using_hostmib_data_queries.html	2006-02-27 15:59:50.000000000 +0100
@@ -53,13 +53,13 @@
           <li>
             <p>SNMP - Get Mounted Partitions</p>
 
-            <p><kbd class="USERINPUT">&lt;path_cacti&gt;/resource/script_server/host_disk.xml</kbd></p>
+            <p><kbd class="USERINPUT">/usr/share/cacti/resource/script_server/host_disk.xml</kbd></p>
           </li>
 
           <li>
             <p>SNMP - Get Processor Information</p>
 
-            <p><kbd class="USERINPUT">&lt;path_cacti&gt;/resource/script_server/host_cpu.xml</kbd></p>
+	    <p><kbd class="USERINPUT">/usr/share/cacti//resource/script_server/host_cpu.xml</kbd></p>
           </li>
         </ol>
       </li>
diff -Naur cacti-0.8.6h/docs/text/manual.txt cacti-0.8.6h.fhs/docs/text/manual.txt
--- cacti-0.8.6h/docs/text/manual.txt	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/docs/text/manual.txt	2006-02-27 15:59:50.000000000 +0100
@@ -144,7 +144,7 @@
 mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somep
 assword';
 mysql> flush privileges;
-    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_default = "cacti";
 $database_hostname = "localhost";
@@ -379,7 +379,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 /etc/cacti.conf and specify
        the MySQL user, password, database, and database port for
        your Cacti configuration.
 $database_default = "cacti";
@@ -504,7 +504,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_default = "cacti";
 $database_hostname = "localhost";
@@ -1825,9 +1825,9 @@
        XML path replace "script_query" with "script_server" as
        shown below:
          a. SNMP - Get Mounted Partitions
-            <path_cacti>/resource/script_server/host_disk.xml
+            /usr/share/cacti/resource/script_server/host_disk.xml
          b. SNMP - Get Processor Information
-            <path_cacti>/resource/script_server/host_cpu.xml
+            /usr/share/cacti/resource/script_server/host_cpu.xml
     4. Update Your Data Templates - Goto Data Templates, locate
        the following two data templates and change their data
        input method to "Get Script Server Data (Indexed)".
@@ -1870,7 +1870,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)) {
@@ -1910,15 +1910,15 @@
 
    If you are using a "Script Query" type function, then you must
    also change your XML file. Please reference the XML files in
-   the <path_cacti>/resource/script_server directory for the
+   the /usr/share/cacti/resource/script_server directory for the
    specifics related to your required modifications. However, you
    may also follow the instructions below:
 
     1. Modify the <script_path> tag. Change it from:
-<script_path>|path_php_binary| -q |path_cacti|/scripts/myfucntion.php</
+<script_path>|path_php_binary| -q /usr/share/cacti/scripts/myfucntion.php</
 script_path>
        to simply the following:
-<script_path>|path_cacti|/scripts/ss_myfunction.php</script_path>
+<script_path>/usr/share/cacti/scripts/ss_myfunction.php</script_path>
     2. Add the following two XML tags below the <script_path>
        tag. Replace ss_myfunction with your function name:
 <script_function>ss_myfunction</script_function>
@@ -1935,7 +1935,7 @@
     1. Change it's Input Method to "Get Script Server Data" or
        "Get Script Server Data (Index)" depending on it's type.
        Change the XML file path to point to the new XML file in
-       the <path_cacti>/resources/script_server/*.xml path.
+       the /usr/share/cacti/resources/script_server/*.xml path.
        For all data templates that use the data query you must
        change their "Data Input Method" accordingly.
 
@@ -1954,7 +1954,7 @@
 
     1. Start the script server - You can do this by typing the
        following command:
-shell> php <path_cacti>/script_server.php
+shell> php /usr/share/cacti/script_server.php
        NOTE: Due to a bug in Windows implementation of PHP, you
        must type the full path name to the script_server.php
        file.
diff -Naur cacti-0.8.6h/gprint_presets.php cacti-0.8.6h.fhs/gprint_presets.php
--- cacti-0.8.6h/gprint_presets.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/gprint_presets.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,7 +24,7 @@
  +-------------------------------------------------------------------------+
 */
 
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
 
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -40,18 +40,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;
 }
 
@@ -96,7 +96,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 cacti-0.8.6h/graph.php cacti-0.8.6h.fhs/graph.php
--- cacti-0.8.6h/graph.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/graph.php	2006-02-27 15:59:50.000000000 +0100
@@ -29,10 +29,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("rra_id"), "^([0-9]+|all)$");
@@ -220,7 +220,7 @@
 	</tr>
 	<?php
 
-	include("./include/zoom.js");
+	include("/usr/share/cacti/include/zoom.js");
 
 	break;
 case 'properties':
@@ -257,6 +257,6 @@
 print "</table>";
 print "<br><br>";
 
-include_once("./include/bottom_footer.php");
+include_once("/usr/share/cacti/include/bottom_footer.php");
 
 ?>
diff -Naur cacti-0.8.6h/graph_image.php cacti-0.8.6h.fhs/graph_image.php
--- cacti-0.8.6h/graph_image.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/graph_image.php	2006-02-27 15:59:50.000000000 +0100
@@ -29,8 +29,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 cacti-0.8.6h/graph_templates.php cacti-0.8.6h.fhs/graph_templates.php
--- cacti-0.8.6h/graph_templates.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/graph_templates.php	2006-02-27 16:01:06.000000000 +0100
@@ -24,11 +24,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);
 
@@ -60,25 +60,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;
 }
 
@@ -221,7 +221,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", "");
 
@@ -268,7 +268,7 @@
 
 	html_end_box();
 
-	include_once("./include/bottom_footer.php");
+	include_once("/usr/share/cacti/include/bottom_footer.php");
 }
 
 function item() {
@@ -431,7 +431,7 @@
 
 	html_start_box("<strong>Graph Templates</strong>", "98%", $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 cacti-0.8.6h/graph_templates_inputs.php cacti-0.8.6h.fhs/graph_templates_inputs.php
--- cacti-0.8.6h/graph_templates_inputs.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/graph_templates_inputs.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,8 +24,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"] = ""; }
@@ -41,11 +41,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;
 }
 
@@ -130,9 +130,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 cacti-0.8.6h/graph_templates_items.php cacti-0.8.6h.fhs/graph_templates_items.php
--- cacti-0.8.6h/graph_templates_items.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/graph_templates_items.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,8 +24,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"] = ""; }
@@ -51,18 +51,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 cacti-0.8.6h/graph_view.php cacti-0.8.6h.fhs/graph_view.php
--- cacti-0.8.6h/graph_view.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/graph_view.php	2006-02-27 15:59:50.000000000 +0100
@@ -25,10 +25,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"));
@@ -229,13 +229,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();
 	}
 
@@ -572,6 +572,6 @@
 	break;
 }
 
-include_once("./include/bottom_footer.php");
+include_once("/usr/share/cacti/include/bottom_footer.php");
 
 ?>
diff -Naur cacti-0.8.6h/graphs.php cacti-0.8.6h.fhs/graphs.php
--- cacti-0.8.6h/graphs.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/graphs.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,16 +24,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);
 
@@ -60,18 +60,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();
@@ -79,18 +79,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");
 }
 
 /* -----------------------
@@ -1023,7 +1023,7 @@
 
 	html_start_box("<strong>Graph Management</strong>", "98%", $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 cacti-0.8.6h/graphs_items.php cacti-0.8.6h.fhs/graphs_items.php
--- cacti-0.8.6h/graphs_items.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/graphs_items.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,8 +24,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"] = ""; }
@@ -41,11 +41,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();
@@ -203,7 +203,7 @@
 
 	html_start_box("<strong>Data Sources</strong> [host: " . (empty($host["hostname"]) ? "No Host" : $host["hostname"]) . "]", "98%", $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 cacti-0.8.6h/graphs_new.php cacti-0.8.6h.fhs/graphs_new.php
--- cacti-0.8.6h/graphs_new.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/graphs_new.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,12 +24,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");
 
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -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";
 
@@ -333,7 +333,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");
 }
 
 /* -------------------
diff -Naur cacti-0.8.6h/host.php cacti-0.8.6h.fhs/host.php
--- cacti-0.8.6h/host.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/host.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,15 +24,15 @@
  +-------------------------------------------------------------------------+
 */
 
-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/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/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;
 }
 
@@ -303,7 +303,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();
@@ -407,7 +407,7 @@
 
 	html_end_box();
 
-	include_once("./include/bottom_footer.php");
+	include_once("/usr/share/cacti/include/bottom_footer.php");
 }
 
 /* -------------------
@@ -453,9 +453,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;
 	}
 
@@ -740,7 +740,7 @@
 
 	html_start_box("<strong>Devices</strong>", "98%", $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 cacti-0.8.6h/host_templates.php cacti-0.8.6h.fhs/host_templates.php
--- cacti-0.8.6h/host_templates.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/host_templates.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,8 +24,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");
 
 $host_actions = array(
 	1 => "Delete",
@@ -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 cacti-0.8.6h/include/auth.php cacti-0.8.6h.fhs/include/auth.php
--- cacti-0.8.6h/include/auth.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/include/auth.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,7 +24,7 @@
  +-------------------------------------------------------------------------+
 */
 
-include("./include/config.php");
+include("/etc/cacti.conf");
 
 /* check to see if this is a new installation */
 if (db_fetch_cell("select cacti from version") != $config["cacti_version"]) {
diff -Naur cacti-0.8.6h/include/config.php cacti-0.8.6h.fhs/include/config.php
--- cacti-0.8.6h/include/config.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/include/config.php	2006-02-27 15:59:50.000000000 +0100
@@ -61,9 +61,9 @@
 $config["php_snmp_support"] = function_exists("snmpget");
 
 /* used for includes */
-$config["base_path"] = strtr(ereg_replace("(.*)[\/\\]include", "\\1", dirname(__FILE__)), "\\", "/");
-$config["library_path"] = ereg_replace("(.*[\/\\])include", "\\1lib", dirname(__FILE__));
-$config["include_path"] = dirname(__FILE__);
+$config["base_path"] = '/usr/share/cacti';
+$config["library_path"] = '/usr/share/cacti/lib';
+$config["include_path"] = '/usr/share/cacti/include';
 
 /* colors */
 $colors["dark_outline"] = "454E53";
diff -Naur cacti-0.8.6h/include/config_form.php cacti-0.8.6h.fhs/include/config_form.php
--- cacti-0.8.6h/include/config_form.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/include/config_form.php	2006-02-27 15:59:50.000000000 +0100
@@ -801,7 +801,7 @@
 		"friendly_name" => "XML Path",
 		"description" => "The full path to the XML file containing definitions for this data query.",
 		"value" => "|arg1:xml_path|",
-		"default" => "<path_cacti>/resource/",
+		"default" => "/usr/share/cacti/resource/",
 		"max_length" => "255",
 		),
 	"data_input_id" => array(
diff -Naur cacti-0.8.6h/include/config_settings.php cacti-0.8.6h.fhs/include/config_settings.php
--- cacti-0.8.6h/include/config_settings.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/include/config_settings.php	2006-02-27 15:59:50.000000000 +0100
@@ -98,7 +98,7 @@
 			"friendly_name" => "Cacti Log File Path",
 			"description" => "The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)",
 			"method" => "textbox",
-			"default" => $config["base_path"] . "/log/cacti.log",
+			"default" => "/var/log/cacti/cacti.log",
 			"max_length" => "255"
 			),
 		"pollerpaths_header" => array(
diff -Naur cacti-0.8.6h/index.php cacti-0.8.6h.fhs/index.php
--- cacti-0.8.6h/index.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/index.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,8 +24,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="98%" align="center">
@@ -44,6 +44,6 @@
 </table>
 <?php
 
-include("./include/bottom_footer.php");
+include("/usr/share/cacti/include/bottom_footer.php");
 
 ?>
diff -Naur cacti-0.8.6h/install/0_8_2a_to_0_8_3.php cacti-0.8.6h.fhs/install/0_8_2a_to_0_8_3.php
--- cacti-0.8.6h/install/0_8_2a_to_0_8_3.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/install/0_8_2a_to_0_8_3.php	2006-02-27 15:59:50.000000000 +0100
@@ -25,7 +25,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 cacti-0.8.6h/install/0_8_5a_to_0_8_6.php cacti-0.8.6h.fhs/install/0_8_5a_to_0_8_6.php
--- cacti-0.8.6h/install/0_8_5a_to_0_8_6.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/install/0_8_5a_to_0_8_6.php	2006-02-27 15:59:50.000000000 +0100
@@ -25,10 +25,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 cacti-0.8.6h/install/index.php cacti-0.8.6h.fhs/install/index.php
--- cacti-0.8.6h/install/index.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/install/index.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,7 +24,7 @@
  +-------------------------------------------------------------------------+
 */
 
-include("../include/config.php");
+include("/etc/cacti.conf");
 
 /* allow the upgrade script to run for as long as it needs to */
 ini_set("max_execution_time", "0");
@@ -45,7 +45,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>
@@ -101,7 +101,7 @@
 	}else if (!empty($which_rrdtool)) {
 		$input["path_rrdtool"]["default"] = $which_rrdtool;
 	}else{
-		$input["path_rrdtool"]["default"] = "/usr/local/bin/rrdtool";
+		$input["path_rrdtool"]["default"] = "/usr/bin/rrdtool";
 	}
 }elseif ($config["cacti_server_os"] == "win32") {
 	$which_php = find_best_path("rrdtool.exe");
@@ -151,7 +151,7 @@
 	}else if (!empty($which_snmpwalk)) {
 		$input["path_snmpwalk"]["default"] = $which_snmpwalk;
 	}else{
-		$input["path_snmpwalk"]["default"] = "/usr/local/bin/snmpwalk";
+		$input["path_snmpwalk"]["default"] = "/usr/bin/snmpwalk";
 	}
 }elseif ($config["cacti_server_os"] == "win32") {
 	$which_snmpwalk = find_best_path("snmpwalk.exe");
@@ -176,7 +176,7 @@
 	}else if (!empty($which_snmpget)) {
 		$input["path_snmpget"]["default"] = $which_snmpget;
 	}else{
-		$input["path_snmpget"]["default"] = "/usr/local/bin/snmpget";
+		$input["path_snmpget"]["default"] = "/usr/bin/snmpget";
 	}
 }elseif ($config["cacti_server_os"] == "win32") {
 	$which_snmpget = find_best_path("snmpget.exe");
@@ -246,7 +246,7 @@
 if (config_value_exists("path_cactilog")) {
 	$input["path_cactilog"]["default"] = read_config_option("path_cactilog");
 } else {
-	$input["path_cactilog"]["default"] = $config["base_path"] . "/log/cacti.log";
+	$input["path_cactilog"]["default"] = "/var/log/cacti/cacti.log";
 }
 
 /* SNMP Version */
@@ -306,8 +306,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;
 
@@ -352,41 +352,41 @@
 	/* 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();
 		}
 	}
@@ -471,7 +471,7 @@
 						</p>
 
 						<p>The following information has been determined from Cacti's configuration file.
-						If it is not correct, please edit 'include/config.php' before continuing.</p>
+						If it is not correct, please edit '/etc/cacti.conf' before continuing.</p>
 
 						<p class="code">
 						<?php	print "Database User: $database_username<br>";
diff -Naur cacti-0.8.6h/lib/database.php cacti-0.8.6h.fhs/lib/database.php
--- cacti-0.8.6h/lib/database.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/lib/database.php	2006-02-27 15:59:50.000000000 +0100
@@ -51,7 +51,7 @@
 		usleep(400000);
 	}
 
-	cacti_log("ERROR: Cannot connect to MySQL server on '$host'. Please make sure you have specified a valid MySQL database name in 'include/config.php'.");
+	cacti_log("ERROR: Cannot connect to MySQL server on '$host'. Please make sure you have specified a valid MySQL database name in '/etc/cacti.conf'.");
 
 	return(0);
 }
diff -Naur cacti-0.8.6h/lib/functions.php cacti-0.8.6h.fhs/lib/functions.php
--- cacti-0.8.6h/lib/functions.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/lib/functions.php	2006-02-27 15:59:50.000000000 +0100
@@ -324,7 +324,7 @@
 	/* Log to Logfile */
 	if ((($logdestination == 1) || ($logdestination == 2)) && (read_config_option("log_verbosity") != POLLER_VERBOSITY_NONE)) {
 		if ($logfile == "") {
-			$logfile = $config["base_path"] . "/log/cacti.log";
+			$logfile = "/var/log/cacti/cacti.log";
 		}
 
 		/* echo the data to the log (append) */
@@ -767,7 +767,7 @@
 
 		/* whether to show the "actual" path or the <path_rra> variable name (for edit boxes) */
 		if ($expand_paths == true) {
-			$data_source_path = str_replace("<path_rra>", $config["base_path"] . "/rra", $data_source_path);
+			$data_source_path = str_replace("<path_rra>", "/var/lib/cacti", $data_source_path);
 		}
 
 		return $data_source_path;
diff -Naur cacti-0.8.6h/lib/html_tree.php cacti-0.8.6h.fhs/lib/html_tree.php
--- cacti-0.8.6h/lib/html_tree.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/lib/html_tree.php	2006-02-27 15:59:50.000000000 +0100
@@ -57,7 +57,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>";
 	}
@@ -511,7 +511,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 cacti-0.8.6h/lib/html_validate.php cacti-0.8.6h.fhs/lib/html_validate.php
--- cacti-0.8.6h/lib/html_validate.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/lib/html_validate.php	2006-02-27 15:59:50.000000000 +0100
@@ -55,7 +55,7 @@
 	</table>
 	<?php
 
-	include_once("./include/bottom_footer.php");
+	include_once("/usr/share/cacti/include/bottom_footer.php");
 	exit;
 }
 
diff -Naur cacti-0.8.6h/poller.php cacti-0.8.6h.fhs/poller.php
--- cacti-0.8.6h/poller.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/poller.php	2006-02-27 15:59:50.000000000 +0100
@@ -34,7 +34,7 @@
 $no_http_headers = true;
 
 /* Start Initialization Section */
-include(dirname(__FILE__) . "/include/config.php");
+include("/etc/cacti.conf");
 include_once($config["base_path"] . "/lib/poller.php");
 include_once($config["base_path"] . "/lib/data_query.php");
 include_once($config["base_path"] . "/lib/graph_export.php");
diff -Naur cacti-0.8.6h/poller_commands.php cacti-0.8.6h.fhs/poller_commands.php
--- cacti-0.8.6h/poller_commands.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/poller_commands.php	2006-02-27 15:59:50.000000000 +0100
@@ -35,7 +35,7 @@
 $no_http_headers = true;
 
 /* Start Initialization Section */
-include(dirname(__FILE__) . "/include/config.php");
+include("/etc/cacti.conf");
 include_once($config["base_path"] . "/lib/poller.php");
 include_once($config["base_path"] . "/lib/data_query.php");
 include_once($config["base_path"] . "/lib/rrd.php");
diff -Naur cacti-0.8.6h/poller_export.php cacti-0.8.6h.fhs/poller_export.php
--- cacti-0.8.6h/poller_export.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/poller_export.php	2006-02-27 15:59:50.000000000 +0100
@@ -33,7 +33,7 @@
 $no_http_headers = true;
 
 /* Start Initialization Section */
-include(dirname(__FILE__) . "/include/config.php");
+include("/etc/cacti.conf");
 include_once($config["base_path"] . "/lib/poller.php");
 include_once($config["base_path"] . "/lib/graph_export.php");
 include_once($config["base_path"] . "/lib/rrd.php");
diff -Naur cacti-0.8.6h/rebuild_poller_cache.php cacti-0.8.6h.fhs/rebuild_poller_cache.php
--- cacti-0.8.6h/rebuild_poller_cache.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/rebuild_poller_cache.php	2006-02-27 16:00:31.000000000 +0100
@@ -31,8 +31,8 @@
 
 $no_http_headers = true;
 
-include(dirname(__FILE__) . "/include/config.php");
-include_once("./lib/utility.php");
+include("/etc/cacti.conf");
+include_once("/usr/share/cacti/lib/utility.php");
 
 /* process calling arguments */
 $parms = $_SERVER["argv"];
diff -Naur cacti-0.8.6h/resource/script_queries/host_cpu.xml cacti-0.8.6h.fhs/resource/script_queries/host_cpu.xml
--- cacti-0.8.6h/resource/script_queries/host_cpu.xml	2006-01-04 04:08:29.000000000 +0100
+++ cacti-0.8.6h.fhs/resource/script_queries/host_cpu.xml	2006-02-27 15:59:50.000000000 +0100
@@ -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 cacti-0.8.6h/resource/script_queries/host_disk.xml cacti-0.8.6h.fhs/resource/script_queries/host_disk.xml
--- cacti-0.8.6h/resource/script_queries/host_disk.xml	2006-01-04 04:08:29.000000000 +0100
+++ cacti-0.8.6h.fhs/resource/script_queries/host_disk.xml	2006-02-27 15:59:50.000000000 +0100
@@ -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 cacti-0.8.6h/resource/script_queries/unix_disk.xml cacti-0.8.6h.fhs/resource/script_queries/unix_disk.xml
--- cacti-0.8.6h/resource/script_queries/unix_disk.xml	2006-01-04 04:08:29.000000000 +0100
+++ cacti-0.8.6h.fhs/resource/script_queries/unix_disk.xml	2006-02-27 15:59:50.000000000 +0100
@@ -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 cacti-0.8.6h/resource/script_server/host_cpu.xml cacti-0.8.6h.fhs/resource/script_server/host_cpu.xml
--- cacti-0.8.6h/resource/script_server/host_cpu.xml	2006-01-04 04:08:29.000000000 +0100
+++ cacti-0.8.6h.fhs/resource/script_server/host_cpu.xml	2006-02-27 15:59:50.000000000 +0100
@@ -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|:MD5::[None]</arg_prepend>
diff -Naur cacti-0.8.6h/resource/script_server/host_disk.xml cacti-0.8.6h.fhs/resource/script_server/host_disk.xml
--- cacti-0.8.6h/resource/script_server/host_disk.xml	2006-01-04 04:08:29.000000000 +0100
+++ cacti-0.8.6h.fhs/resource/script_server/host_disk.xml	2006-02-27 15:59:50.000000000 +0100
@@ -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|:MD5::[None]</arg_prepend>
diff -Naur cacti-0.8.6h/rra.php cacti-0.8.6h.fhs/rra.php
--- cacti-0.8.6h/rra.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/rra.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,7 +24,7 @@
  +-------------------------------------------------------------------------+
 */
 
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
 
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -40,18 +40,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;
 }
 
@@ -110,7 +110,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 cacti-0.8.6h/script_server.pl cacti-0.8.6h.fhs/script_server.pl
--- cacti-0.8.6h/script_server.pl	2006-01-04 04:08:29.000000000 +0100
+++ cacti-0.8.6h.fhs/script_server.pl	2006-02-27 15:59:50.000000000 +0100
@@ -1,4 +1,4 @@
-chdir("./scripts");
+chdir("/usr/share/cacti/scripts");
 $loaded = 0;
 while ($file = <*.pl>) {
 	next if $file eq $0;
diff -Naur cacti-0.8.6h/scripts/query_host_cpu.php cacti-0.8.6h.fhs/scripts/query_host_cpu.php
--- cacti-0.8.6h/scripts/query_host_cpu.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/scripts/query_host_cpu.php	2006-02-27 15:59:50.000000000 +0100
@@ -1,7 +1,7 @@
 <?php
 
 $no_http_headers = true;
-include(dirname(__FILE__) . "/../include/config.php");
+include("/etc/cacti.conf");
 include(dirname(__FILE__) . "/../lib/snmp.php");
 
 $oids = array(
diff -Naur cacti-0.8.6h/scripts/query_host_partitions.php cacti-0.8.6h.fhs/scripts/query_host_partitions.php
--- cacti-0.8.6h/scripts/query_host_partitions.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/scripts/query_host_partitions.php	2006-02-27 15:59:50.000000000 +0100
@@ -1,7 +1,7 @@
 <?php
 
 $no_http_headers = true;
-include(dirname(__FILE__) . "/../include/config.php");
+include("/etc/cacti.conf");
 include(dirname(__FILE__) . "/../lib/snmp.php");
 
 $oids = array(
diff -Naur cacti-0.8.6h/scripts/sql.php cacti-0.8.6h.fhs/scripts/sql.php
--- cacti-0.8.6h/scripts/sql.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/scripts/sql.php	2006-02-27 15:59:50.000000000 +0100
@@ -1,7 +1,7 @@
 <?
 
 $no_http_headers = true;
-include(dirname(__FILE__) . "/../include/config.php");
+include("/etc/cacti.conf");
 
 if ($database_password == "") {
 	$sql = `mysqladmin -h $database_hostname -u $database_username status | awk '{print $6 }'`;
diff -Naur cacti-0.8.6h/scripts/ss_host_cpu.php cacti-0.8.6h.fhs/scripts/ss_host_cpu.php
--- cacti-0.8.6h/scripts/ss_host_cpu.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/scripts/ss_host_cpu.php	2006-02-27 15:59:50.000000000 +0100
@@ -7,7 +7,7 @@
 include_once(dirname(__FILE__) . "/../lib/snmp.php");
 
 if (!isset($called_by_script_server)) {
-	include_once(dirname(__FILE__) . "/../include/config.php");
+	include_once("/etc/cacti.conf");
 
 	array_shift($_SERVER["argv"]);
 
diff -Naur cacti-0.8.6h/scripts/ss_host_disk.php cacti-0.8.6h.fhs/scripts/ss_host_disk.php
--- cacti-0.8.6h/scripts/ss_host_disk.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/scripts/ss_host_disk.php	2006-02-27 15:59:50.000000000 +0100
@@ -7,7 +7,7 @@
 include_once(dirname(__FILE__) . "/../lib/snmp.php");
 
 if (!isset($called_by_script_server)) {
-	include_once(dirname(__FILE__) . "/../include/config.php");
+	include_once("/etc/cacti.conf");
 
 	array_shift($_SERVER["argv"]);
 
diff -Naur cacti-0.8.6h/scripts/ss_sql.php cacti-0.8.6h.fhs/scripts/ss_sql.php
--- cacti-0.8.6h/scripts/ss_sql.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/scripts/ss_sql.php	2006-02-27 15:59:50.000000000 +0100
@@ -6,7 +6,7 @@
 error_reporting(E_ALL);
 
 if (!isset($called_by_script_server)) {
-	include_once(dirname(__FILE__) . "/../include/config.php");
+	include_once("/etc/cacti.conf");
 
 	print call_user_func("ss_sql");
 }
diff -Naur cacti-0.8.6h/settings.php cacti-0.8.6h.fhs/settings.php
--- cacti-0.8.6h/settings.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/settings.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,7 +24,7 @@
  +-------------------------------------------------------------------------+
 */
 
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
 
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -51,7 +51,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"])) {
@@ -112,7 +112,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 cacti-0.8.6h/templates_export.php cacti-0.8.6h.fhs/templates_export.php
--- cacti-0.8.6h/templates_export.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/templates_export.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,8 +24,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"] = ""; }
@@ -59,11 +59,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;
 }
 
@@ -78,9 +78,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='98%' 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 cacti-0.8.6h/templates_import.php cacti-0.8.6h.fhs/templates_import.php
--- cacti-0.8.6h/templates_import.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/templates_import.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,8 +24,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"] = ""; }
@@ -36,11 +36,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 cacti-0.8.6h/tree.php cacti-0.8.6h.fhs/tree.php
--- cacti-0.8.6h/tree.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/tree.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,10 +24,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');
 
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -48,11 +48,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();
@@ -65,18 +65,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;
 }
 
@@ -337,9 +337,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;
 	}
 
@@ -361,9 +361,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 cacti-0.8.6h/user_admin.php cacti-0.8.6h.fhs/user_admin.php
--- cacti-0.8.6h/user_admin.php	2006-01-04 04:08:30.000000000 +0100
+++ cacti-0.8.6h.fhs/user_admin.php	2006-02-27 15:59:50.000000000 +0100
@@ -24,7 +24,7 @@
  +-------------------------------------------------------------------------+
 */
 
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
 
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -44,39 +44,39 @@
 			header("Location: user_admin.php");
 		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;
 }
 
@@ -641,9 +641,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 user <strong>'" . db_fetch_cell("select username from user_auth where id=" . $_GET["id"]) . "'</strong>?", "user_admin.php", "user_admin.php?action=user_remove&id=" . $_GET["id"]);
-		include("./include/bottom_footer.php");
+		include("/usr/share/cacti/include/bottom_footer.php");
 		exit;
 	}
 
Index: cacti-0.8.6i/graph_settings.php
===================================================================
--- cacti-0.8.6i/graph_settings.php
+++ cacti-0.8.6i/graph_settings.php	2006-10-19 20:08:21.000000000 +0200
@@ -25,7 +25,7 @@
 */
 
 $guest_account = true;
-include("./include/auth.php");
+include("/usr/share/cacti/include/auth.php");
 
 /* set default action */
 if (!isset($_REQUEST["action"])) { $_REQUEST["action"] = ""; }
@@ -39,12 +39,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;
 }
 
@@ -90,7 +90,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;
 	}
 
Index: cacti-0.8.6i/script_server.php
===================================================================
--- cacti-0.8.6i/script_server.php
+++ cacti-0.8.6i/script_server.php	2006-10-19 20:10:21.000000000 +0200
@@ -41,7 +41,7 @@
 
 /* used for includes */
 error_reporting(0);
-include_once(dirname(__FILE__) . "/include/config.php");
+include_once("/etc/cacti.conf");
 
 /* Record the calling environment */
 if ($_SERVER["argc"] >= 2) {
Index: cacti-0.8.6i/utilities.php
===================================================================
--- cacti-0.8.6i/utilities.php
+++ cacti-0.8.6i/utilities.php	2006-10-19 20:18:41.000000000 +0200
@@ -24,8 +24,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", "");
 
@@ -64,8 +64,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");
@@ -80,21 +80,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();
@@ -104,29 +104,29 @@
 		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;
 	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;
 }
 
@@ -342,7 +342,7 @@
 	$logfile = read_config_option("path_cactilog");
 
 	if ($logfile == "") {
-		$logfile = "./log/rrd.log";
+		$logfile = "/var/log/cacti/rrd.log";
 	}
 
 	/* helps determine output color */
@@ -385,7 +385,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");
 
 	html_start_box("<strong>Log File Filters</strong>", "98%", $colors["header"], "3", "center", "");
 
@@ -527,7 +527,7 @@
 
 	html_end_box();
 
-	include_once("./include/bottom_footer.php");
+	include_once("/usr/share/cacti/include/bottom_footer.php");
 }
 
 function utilities_clear_logfile() {
@@ -538,12 +538,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>", "98%", $colors["header"], "1", "center", "");