$NetBSD: patch-install_index.php,v 1.2 2014/01/08 20:51:28 tron Exp $ - Find utilites in PREFIX first. - Fix-up hard coded user and path (documentaion only). - Make log directory configurable by package variable - Fix vulnerability reported in SA54531. Patch taken from here: http://svn.cacti.net/viewvc?view=rev&revision=7420 --- install/index.php.orig 2013-08-07 03:31:19.000000000 +0100 +++ install/index.php 2014-01-08 20:26:33.000000000 +0000 @@ -96,7 +96,7 @@ if ($config["cacti_server_os"] == "win32") { $search_paths = array("c:/usr/bin", "c:/cacti", "c:/rrdtool", "c:/spine", "c:/php", "c:/progra~1/php", "c:/net-snmp/bin", "c:/progra~1/net-snmp/bin", "d:/usr/bin", "d:/net-snmp/bin", "d:/progra~1/net-snmp/bin", "d:/cacti", "d:/rrdtool", "d:/spine", "d:/php", "d:/progra~1/php"); }else{ - $search_paths = array("/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/local/bin", "/usr/local/sbin"); + $search_paths = array("@PREFIX@/bin", "@PREFIX@/sbin", "/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/local/bin", "/usr/local/sbin"); } for ($i=0; $i 0) { + $step = intval($_REQUEST["step"]); + if ($step == "1") { + $step = "2"; + } elseif (($step == "2") && ($_REQUEST["install_type"] == "1")) { + $step = "3"; + } elseif (($step == "2") && ($_REQUEST["install_type"] == "3")) { + $step = "8"; + } elseif (($step == "8") && ($old_version_index <= array_search("0.8.5a", $cacti_versions))) { + $step = "9"; + } elseif ($step == "8") { + $step = "3"; + } elseif ($step == "9") { + $step = "3"; + } elseif ($step == "3") { + $step = "4"; } +} else { + $step = 1; } -if ($_REQUEST["step"] == "4") { +if ($step == "4") { include_once("../lib/data_query.php"); include_once("../lib/utility.php"); @@ -366,7 +367,7 @@ header ("Location: ../index.php"); exit; -}elseif (($_REQUEST["step"] == "8") && ($_REQUEST["install_type"] == "3")) { +}elseif (($step == "8") && ($_REQUEST["install_type"] == "3")) { /* if the version is not found, die */ if (!is_int($old_version_index)) { print "

Error

@@ -505,7 +506,7 @@ - +

Thanks for taking the time to download and install cacti, the complete graphing solution for your network. Before you can start making cool graphs, there are a few @@ -530,7 +531,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

- +

Please select the type of installation

@@ -551,7 +552,7 @@ print "Server Operating System Type: " . $config["cacti_server_os"] . "
"; ?>

- +

Make sure all of these values are correct before continuing.

- +

Upgrade results:

@@ -659,7 +660,7 @@ print $upgrade_results; ?> - +

Important Upgrade Notice

@@ -667,13 +668,13 @@

See the sample crontab entry below with the change made in red. Your crontab line will look slightly different based upon your setup.

-

*/5 * * * * cactiuser php /var/www/html/cacti/poller.php > /dev/null 2>&1

+

*/5 * * * * @CACTI_USER@ php @CACTIDIR@poller.php > /dev/null 2>&1

Once you have made this change, please click Next to continue.

-

finishnext.gif" alt="FinishNext">

+

finishnext.gif" alt="FinishNext">

@@ -681,7 +682,7 @@ -"> +