From cdd6a8c1f21de91a8084be08afc3383b3f8cd37e Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Wed, 5 Jul 2006 23:26:52 +0000
Subject: [PATCH] add the dot (".") to the possible characters of a listname
 (Closes: #28) add "text" to the description of the address file upload field
 (Closes: #29)

---
 TODO              | 6 ++++++
 changelog         | 1 +
 ezmlm-web.cgi     | 6 +++---
 share/lang/de.hdf | 2 +-
 share/lang/en.hdf | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/TODO b/TODO
index 45c1e6f..346829c 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,9 @@
+clearsilver-Infos updaten
+
+charset support for idx <= 5.0
+
+suppress success message, if no new subscriber addresses were selected for adding
+
 Maximale Anzahl von Mailinglisten definieren?
 	- wird wohl von qmailadmin in der .qmailadmin-limits-Datei festgelegt
 
diff --git a/changelog b/changelog
index f1fea3a..33639d3 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,7 @@ Version 3.2 - 04/14/02006
  * handling of empty settings for ezmlm-idx 5.0 fixed (closes #21)
  * script for creating binary suid wrappers added
  * bug in MySQL support fixed
+ * treatment of the special character "dot" in listname fixed
 
 Version 3.1.4 - 03/26/02006
  * new setting: DOTQMAIL_DIR (useful for multi domain vpopmail setups)
diff --git a/ezmlm-web.cgi b/ezmlm-web.cgi
index 8866c75..696234c 100755
--- a/ezmlm-web.cgi
+++ b/ezmlm-web.cgi
@@ -32,7 +32,7 @@ use English;
 $UID = $EUID;
 $GID = $EGID;
 
-$VERSION = '3.2';
+my $VERSION = '3.2';
 
 my $q = new CGI;
 $q->import_names('Q');
@@ -1040,7 +1040,7 @@ sub untaint {
 	# special stuff
 
 	# check the list name
-	if (($q->param('list') =~ /[^\w-]/) && ($q->param('action') !~ /^list_create_(do|ask)$/)) {
+	if (($q->param('list') =~ /[^\w\.-]/) && ($q->param('action') !~ /^list_create_(do|ask)$/)) {
 		$warning = 'InvalidListName' if ($warning eq '');
 		$q->param(-name=>'list', -values=>'');
 	}
@@ -1216,7 +1216,7 @@ sub create_list {
 	# Some taint checking ...
 	$qmail = $1 if $q->param('inlocal') =~ /(?:$USER-)?([^\<\>\\\/\s]+)$/;
 	$listname = $q->param('list');
-	if ($listname =~ m/[^\w\._\-]/) {
+	if ($listname =~ m/[^\w\.-]/) {
 		$warning = 'InvalidListName';
 		return (1==0);
    	}
diff --git a/share/lang/de.hdf b/share/lang/de.hdf
index bac1193..f418dc2 100644
--- a/share/lang/de.hdf
+++ b/share/lang/de.hdf
@@ -221,7 +221,7 @@ Lang {
 		MessageSize.Unit = Bytes
 		NoFiles	= Es befinden sich keine Dateien im Text-Verzeichnis der Mailingliste.
 		AddSubscriberAddress	= Füge eine neue Mailadresse hinzu:
-		AddSubscriberFile	= Importiere eine Datei, die Mailadressen enthält:
+		AddSubscriberFile	= Importiere eine Textdatei, die Mailadressen enthält:
 		SuggestDefaultPath	= Es wird empfohlen, das Standard-Verzeichnis zu verwenden. Andernfalls kannst du die ModeratorInnen-Liste nicht mit ezmlm-web verwalten.
 		FooterText		= eine Web-Oberfläche für
 		NoListsAvailable	= Es sind keine passenden Listen vorhanden.
diff --git a/share/lang/en.hdf b/share/lang/en.hdf
index d765d18..005ce61 100644
--- a/share/lang/en.hdf
+++ b/share/lang/en.hdf
@@ -220,7 +220,7 @@ Lang {
 		MessageSize.Unit = bytes
 		NoFiles	= There are no files in the text directory of the mailinglist.
 		AddSubscriberAddress	= Add a new mail address:
-		AddSubscriberFile	= Upload a file containing mail addresses to be added:
+		AddSubscriberFile	= Upload a text file containing mail addresses to be added:
 		SuggestDefaultPath	= It is recommended to use the default path for the moderation database. Otherwise you cannot manage the moderators' list with ezmlm-web.
 		FooterText		= a web interface for
 		NoListsAvailable	= I could not find any accessible list for you.