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

--- /poller.php~	2008-10-05 16:54:15.000000000 +0300
+++ /poller.php	2008-10-05 16:57:05.946911539 +0300
@@ -181,7 +181,9 @@
 	$last_host           = 0;
 
 	/* update web paths for the poller */
-	db_execute("REPLACE INTO settings (name,value) VALUES ('path_webroot','" . addslashes(($config["cacti_server_os"] == "win32") ? strtr(strtolower(substr(dirname(__FILE__), 0, 1)) . substr(dirname(__FILE__), 1),"\\", "/") : dirname(__FILE__)) . "')");
+//	$path_webroot = ($config["cacti_server_os"] == "win32") ? strtr(strtolower(substr(dirname(__FILE__), 0, 1)) . substr(dirname(__FILE__), 1),"\\", "/") : dirname(__FILE__);
+	$path_webroot = $config['base_path'];
+	db_execute("REPLACE INTO settings (name,value) VALUES ('path_webroot','" .  addslashes($path_webroot) . "')");
 
 	/* obtain some defaults from the database */
 	$poller      = read_config_option("poller_type");
Commit	Line	Data
30aaaddb ER	1	--- /poller.php~ 2008-10-05 16:54:15.000000000 +0300
	2	+++ /poller.php 2008-10-05 16:57:05.946911539 +0300
	3	@@ -181,7 +181,9 @@
	4	$last_host = 0;
	5
	6	/* update web paths for the poller */
55cf0435	7	- db_execute("REPLACE INTO settings (name,value) VALUES ('path_webroot','" . addslashes(($config["cacti_server_os"] == "win32") ? strtr(strtolower(substr(dirname(__FILE__), 0, 1)) . substr(dirname(__FILE__), 1),"\\", "/") : dirname(__FILE__)) . "')");
30aaaddb ER	8	+// $path_webroot = ($config["cacti_server_os"] == "win32") ? strtr(strtolower(substr(dirname(__FILE__), 0, 1)) . substr(dirname(__FILE__), 1),"\\", "/") : dirname(__FILE__);
30aaaddb ER	9	+ $path_webroot = $config['base_path'];
55cf0435	10	+ db_execute("REPLACE INTO settings (name,value) VALUES ('path_webroot','" . addslashes($path_webroot) . "')");
30aaaddb ER	11
	12	/* obtain some defaults from the database */
	13	$poller = read_config_option("poller_type");