From 325ef9927e961083d5923948fa0d38e6bae34a3d Mon Sep 17 00:00:00 2001
From: io <>
Date: Sat, 22 Jan 2005 14:05:09 +0000
Subject: [PATCH] if the new option "$WEBUSERS_FILE" is not defined, then use
 former default ($LIST_DIR/webusers) for compatibility

---
 ezmlm-web-ng/ezmlm-web-2.1-ng/UPGRADING     | 21 +++++++++++++++++++++
 ezmlm-web-ng/ezmlm-web-2.1-ng/ezmlm-web.cgi |  7 ++++++-
 ezmlm-web-ng/ezmlm-web-2.1-ng/ezmlmwebrc    |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/ezmlm-web-ng/ezmlm-web-2.1-ng/UPGRADING b/ezmlm-web-ng/ezmlm-web-2.1-ng/UPGRADING
index 03e20fc..d1c87c3 100644
--- a/ezmlm-web-ng/ezmlm-web-2.1-ng/UPGRADING
+++ b/ezmlm-web-ng/ezmlm-web-2.1-ng/UPGRADING
@@ -1,5 +1,26 @@
 $Id: UPGRADING,v 1.1 2000/09/25 19:24:20 guy Exp $
 
+UPGRADING ezmlm-web 2.1 to ezmlm-web 2.2
+
+1) Creating of new lists is now controlled by a line in the webusers file instead
+of a commandline switch for ezmlm-web.cgi.
+
+necessary changes:
+ - optional: remove switch "-c" when calling ezmlm-web.cgi (take a look at index.c)
+ - required: add a line like "ALLOW_CREATE: john, myra" to the webusers file - otherwise no one is allowed to create lists
+
+2) The location of the webusers file is now defined in ezmlmwebrc. (default: $LIST_DIR/webusers)
+
+necessary changes:
+ - optional: add a line like "$WEBUSERS_FILE = /home/ml/webusers" to ezmlmwebrc
+
+3) A german translation is available.
+
+ - optional: include "lang/de.pm" in ezmlmwebrc (there you can also remove the english definitions)
+	     or copy the new ezmlmwebrc :)
+
+------------------------------------------------------------------------------
+
 UPGRADING ezmlm-web 2.0 to ezmlm-web 2.1
 
 There are no major changes that need to be made in order to upgrade. All
diff --git a/ezmlm-web-ng/ezmlm-web-2.1-ng/ezmlm-web.cgi b/ezmlm-web-ng/ezmlm-web-2.1-ng/ezmlm-web.cgi
index 22b7d5e..97e7d66 100755
--- a/ezmlm-web-ng/ezmlm-web-2.1-ng/ezmlm-web.cgi
+++ b/ezmlm-web-ng/ezmlm-web-2.1-ng/ezmlm-web.cgi
@@ -89,6 +89,11 @@ if(defined($opt_d)) {
    $LIST_DIR = $1 if ($opt_d =~ /^([-\@\w.\/]+)$/);
 }
 
+# If WEBUSERS_FILE is not defined in ezmlmwebrc (as before version 2.2), then use former default value for compatibility
+if (!defined($WEBUSERS_FILE)) {
+   $WEBUSERS_FILE = $LIST_DIR . '/webusers'
+}
+
 # Work out default domain name from qmail (for David Summers)
 my($DEFAULT_HOST);
 open (GETHOST, "<$QMAIL_BASE/me") || open (GETHOST, "<$QMAIL_BASE/defaultdomain") || die "Unable to read $QMAIL_BASE/me: $!";
@@ -743,7 +748,7 @@ sub list_config {
    print '<p><big><strong>', $LANGUAGE{'headeradd'}, ':</big></strong> <img src="', $HELP_ICON_URL, '" title="', $HELPER{'headeradd'}, '"><br>', $q->textarea(-name=>'headeradd', -default=>$headeradd, -rows=>5, -columns=>70);
    print '<p><big><strong>', $LANGUAGE{'mimeremove'}, ':</big></strong> <img src="', $HELP_ICON_URL, '" title="', $HELPER{'mimeremove'}, '"><br>', $q->textarea(-name=>'mimeremove', -default=>$mimeremove, -rows=>5, -columns=>70) if defined($mimeremove);
    
-   if(open(WEBUSER, "<$$WEBUSERS_FILE")) {
+   if(open(WEBUSER, "<$WEBUSERS_FILE")) {
       my($webusers);
       while(<WEBUSER>) {
          last if (($webusers) = m{^$listname\s*\:\s*(.+)$});
diff --git a/ezmlm-web-ng/ezmlm-web-2.1-ng/ezmlmwebrc b/ezmlm-web-ng/ezmlm-web-2.1-ng/ezmlmwebrc
index 1133237..777fb6b 100644
--- a/ezmlm-web-ng/ezmlm-web-2.1-ng/ezmlmwebrc
+++ b/ezmlm-web-ng/ezmlm-web-2.1-ng/ezmlmwebrc
@@ -14,6 +14,7 @@
 $LIST_DIR = "$HOME_DIR/lists";
 
 # Where is the webusers file for access-permissions
+# defaults to "$LIST_DIR/webusers"
 $WEBUSERS_FILE = "$LIST_DIR/webusers";
 
 # Safe list deletion?