diff -r ca8ddad585ef contrib/web/php-admin/conf/config.php --- a/contrib/web/php-admin/conf/config.php Mon Oct 04 10:18:15 2010 +1100 +++ b/contrib/web/php-admin/conf/config.php Tue Oct 05 22:06:54 2010 +1100 @@ -1,6 +1,7 @@ diff -r ca8ddad585ef contrib/web/php-admin/htdocs/edit.php --- a/contrib/web/php-admin/htdocs/edit.php Mon Oct 04 10:18:15 2010 +1100 +++ b/contrib/web/php-admin/htdocs/edit.php Tue Oct 05 22:06:54 2010 +1100 @@ -26,8 +26,8 @@ * IN THE SOFTWARE. */ -require("../conf/config.php"); -require("class.rFastTemplate.php"); +require(dirname(dirname(__FILE__))."/conf/config.php"); +require(dirname(__FILE__)."/class.rFastTemplate.php"); function mlmmj_boolean($name, $nicename, $text) { @@ -117,10 +117,7 @@ $tpl->assign(array("LIST" =>htmlentities($list))); -$handle = fopen("$templatedir/../conf/tunables.pl", "r"); -$tunables = fread($handle, filesize("$templatedir/../conf/tunables.pl")); -fclose($handle); - +$tunables = file_get_contents($confdir.'/tunables.pl'); eval($tunables); $tpl->parse("MAIN","main"); diff -r ca8ddad585ef contrib/web/php-admin/htdocs/index.php --- a/contrib/web/php-admin/htdocs/index.php Mon Oct 04 10:18:15 2010 +1100 +++ b/contrib/web/php-admin/htdocs/index.php Tue Oct 05 22:06:54 2010 +1100 @@ -26,8 +26,8 @@ * IN THE SOFTWARE. */ -require("class.rFastTemplate.php"); -require("../conf/config.php"); +require(dirname(dirname(__FILE__))."/conf/config.php"); +require(dirname(__FILE__)."/class.rFastTemplate.php"); $tpl = new rFastTemplate($templatedir); diff -r ca8ddad585ef contrib/web/php-admin/htdocs/save.php --- a/contrib/web/php-admin/htdocs/save.php Mon Oct 04 10:18:15 2010 +1100 +++ b/contrib/web/php-admin/htdocs/save.php Tue Oct 05 22:06:54 2010 +1100 @@ -26,8 +26,8 @@ * IN THE SOFTWARE. */ -require("../conf/config.php"); -require("class.rFastTemplate.php"); +require(dirname(dirname(__FILE__))."/conf/config.php"); +require(dirname(__FILE__)."/class.rFastTemplate.php"); function mlmmj_boolean($name, $nicename, $text) { @@ -93,10 +93,7 @@ $tpl->define(array("main" => "save.html")); $tpl->assign(array("LIST" => htmlentities($list))); -$handle = fopen("$templatedir/../conf/tunables.pl", "r"); -$tunables = fread($handle, filesize("$templatedir/../conf/tunables.pl")); -fclose($handle); - +$tunables = file_get_contents($confdir.'/tunables.pl'); eval($tunables); $tpl->parse("MAIN","main");