From 1e1ba8bfd9b31d28db508dca0f0623468f6699eb Mon Sep 17 00:00:00 2001 From: Ben Schmidt Date: Wed, 6 Oct 2010 10:35:04 +1100 Subject: [PATCH] Better techniques for locating support files in php-admin - existing installations will need to have their conf/config.php altered to set the variable $confdir --- ChangeLog | 3 +++ contrib/web/php-admin/README | 20 +++++++++++--------- contrib/web/php-admin/conf/config.php | 3 ++- contrib/web/php-admin/htdocs/edit.php | 9 +++------ contrib/web/php-admin/htdocs/index.php | 4 ++-- contrib/web/php-admin/htdocs/save.php | 9 +++------ 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9dabd5c..fc431cb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ + o Better techniques for locating support files in php-admin -- existing + installations will need to have their conf/config.php altered to set + the variable $confdir o Remove .sh from mlmmj-make-ml.sh; symlink original name o Correct spelling of 'receive' and 'voodoo' throughout the code and documentation, making mlmmj-recieve a symlink to mlmmj-receive (Chris Webb) diff --git a/contrib/web/php-admin/README b/contrib/web/php-admin/README index 855076e3..ade2b6f5 100644 --- a/contrib/web/php-admin/README +++ b/contrib/web/php-admin/README @@ -7,25 +7,27 @@ To use this web-interface you have to: don't want the webinterface in the root of your website it is recommended to make an alias in your web server configuration in order to keep the conf directory at the same level as the htdocs directory and still outside - webscope. + webscope. If you want to keep it somewhere else, you will need to modify + the first line of code in index.php, edit.php and save.php. -2) Change the permissions of the listdir/control directories of any list you +2) If your lists are stored somewhere other than /var/spool/mlmmj, edit + conf/config.php to reflect this. + +3) Change the permissions of the listdir/control directories of any list you want to control using the web-interface, so the web server can write in it: # chown -R wwwrun /var/spool/mlmmj/mlmmj-test/control/ - -3) If the web server does not run as the same user the mailserver writes as +4) If the web server does not run as the same user the mailserver writes as you need to create a group (eg. mlmmj) and add both users to it. The subscribers.d directory then needs to be writable by that group: # chgrp -R mlmmj /var/spool/mlmmj/mlmmj-test/subscribers.d/ # chmod -R g+w /var/spool/mlmmj/mlmmj-test/subscribers.d/ -To enable access control on Apache you have to: - -3) Rename dot.htaccess to .htaccess and edit the path inside the file to point - to a htpasswd file somewhere outside the webscope. +5) To enable access control on Apache you have to rename dot.htaccess to + .htaccess and edit the path inside the file to point to a htpasswd file + somewhere outside the webscope. If you don't have one already, you can create one like this @@ -33,4 +35,4 @@ To enable access control on Apache you have to: It will then ask you for a password for the given username. -4) That is it, you are ready to use the interface. +6) That is it, you are ready to use the interface. diff --git a/contrib/web/php-admin/conf/config.php b/contrib/web/php-admin/conf/config.php index eba5ad2d..10ca6525 100644 --- a/contrib/web/php-admin/conf/config.php +++ b/contrib/web/php-admin/conf/config.php @@ -1,6 +1,7 @@ diff --git a/contrib/web/php-admin/htdocs/edit.php b/contrib/web/php-admin/htdocs/edit.php index eb4d3709..c9faf53b 100644 --- a/contrib/web/php-admin/htdocs/edit.php +++ b/contrib/web/php-admin/htdocs/edit.php @@ -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->define(array("main" => "edit.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"); diff --git a/contrib/web/php-admin/htdocs/index.php b/contrib/web/php-admin/htdocs/index.php index b49e3ad4..8970bb4b 100644 --- a/contrib/web/php-admin/htdocs/index.php +++ b/contrib/web/php-admin/htdocs/index.php @@ -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 --git a/contrib/web/php-admin/htdocs/save.php b/contrib/web/php-admin/htdocs/save.php index 27b01da6..fcc6466d 100644 --- a/contrib/web/php-admin/htdocs/save.php +++ b/contrib/web/php-admin/htdocs/save.php @@ -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 @@ die("non-existent list"); $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"); -- 2.47.3