From 1f5946bb1d3bbefc7ae623ce19177f20ea7e2d29 Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Fri, 23 Dec 2005 12:37:33 +0000
Subject: [PATCH] search order for ezmlmwebrc changed css hint added to UPGARDE
 bug in subscribers form fixed list creation does not ask for options anymore
 create list with special characters - fixed

---
 ezmlm-web-3.0/UPGRADING               |  9 +++-
 ezmlm-web-3.0/ezmlm-web.cgi           |  6 +--
 ezmlm-web-3.0/template/list_create.cs | 14 ++----
 ezmlm-web-3.0/template/subscribers.cs | 67 +++++++++++++++------------
 4 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/ezmlm-web-3.0/UPGRADING b/ezmlm-web-3.0/UPGRADING
index e03c08d..a0a51d7 100644
--- a/ezmlm-web-3.0/UPGRADING
+++ b/ezmlm-web-3.0/UPGRADING
@@ -5,15 +5,22 @@ This file contains some useful hints for upgrading from a previous version of ez
 UPGRADING ezmlm-web 2.3 to ezmlm-web 3.0
 
 1) install clearsilver (see INSTALL for details)
+
 2) copy the "template" directory somewhere (see INSTALL again)
+
 3) set "TEMPLATE_DIR" in your ezmlmwebrc file to this directory
+
 4) maybe you want to define "MAIL_DOMAIN" in your ezmlmwebrc
 
+5) search order for ezmlmwebrc changed
+from	HOME->SYSTEM->CGI_DIR
+to	HOME->CGI_DIR->SYSTEM
+
 ------------------------------------------------------------------------------
 
 UPGRADING ezmlm-web 2.2 to ezmlm-web 2.3
 
-there are no known issues
+1) set location of css file in ezmlmwebrc
 
 ------------------------------------------------------------------------------
 
diff --git a/ezmlm-web-3.0/ezmlm-web.cgi b/ezmlm-web-3.0/ezmlm-web.cgi
index 9c2a84a..f9a741f 100755
--- a/ezmlm-web-3.0/ezmlm-web.cgi
+++ b/ezmlm-web-3.0/ezmlm-web.cgi
@@ -91,10 +91,10 @@ if(defined($opt_C)) {
    require "$1"; # Command Line
 } elsif(-e "$HOME_DIR/.ezmlmwebrc") {
    require "$HOME_DIR/.ezmlmwebrc"; # User
-} elsif(-e "/etc/ezmlm/ezmlmwebrc") {
-   require "/etc/ezmlm/ezmlmwebrc"; # System
 } elsif(-e "./ezmlmwebrc") {
    require "./ezmlmwebrc"; # Install
+} elsif(-e "/etc/ezmlm/ezmlmwebrc") {
+   require "/etc/ezmlm/ezmlmwebrc"; # System
 } else {
    die "Unable to read config file";
 }
@@ -651,7 +651,7 @@ sub untaint {
 	# special stuff
 
 	# check the list name
-	if (($q->param('list') =~ /[^\w-]/) && ($q->param('list') !~ /^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=>'');
 	}
diff --git a/ezmlm-web-3.0/template/list_create.cs b/ezmlm-web-3.0/template/list_create.cs
index 1110530..ec7e25d 100644
--- a/ezmlm-web-3.0/template/list_create.cs
+++ b/ezmlm-web-3.0/template/list_create.cs
@@ -15,19 +15,11 @@
 				value="<?cs var:html_escape(Data.UserName)
 				?>"> @ <input type="text" name="inhost" size="30" value="<?cs
 				var:html_escape(Data.HostName) ?>"></li>
-			<li><?cs var:html_escape(Lang.Misc.ListOptions) ?>:
-			<ul>
 
-				<li><?cs call:checkbox("p") ?></li>
-				<li><?cs call:checkbox("a") ?></li>
-				<li><?cs call:checkbox("u") ?></li>
-				<li><?cs call:checkbox("d") ?></li>
+			<?cs if:Data.Modules.MySQL ?>
+			<!-- Allow creation of mysql table if the module allows it -->
+				<li><?cs call:setting("6") ?></li><?cs /if ?>
 
-				<?cs if:Data.Modules.MySQL ?>
-				<!-- Allow creation of mysql table if the module allows it -->
-					<li><?cs call:setting("6") ?></li><?cs /if ?>
-
-			</ul>
 
 			<?cs if:Data.WebUser.show ?>
 				<li><label for="webusers"><?cs var:html_escape(Lang.Misc.AllowedToEdit) ?>:</label>
diff --git a/ezmlm-web-3.0/template/subscribers.cs b/ezmlm-web-3.0/template/subscribers.cs
index f49c08c..53fda7a 100644
--- a/ezmlm-web-3.0/template/subscribers.cs
+++ b/ezmlm-web-3.0/template/subscribers.cs
@@ -74,36 +74,41 @@
 			<?cs /if ?>
 		</legend>
 
-	<!-- this form has to be "multipart/form-data" to make file upload work -->
-	<form method="post" action="<?cs var:ScriptName ?>" enctype="multipart/form-data">
-	    <input type="hidden" name="list" value="<?cs var:Data.List.Name ?>" />
-	    <?cs if:Data.List.PartType ?>
-		    <input type="hidden" name="part" value="<?cs var:Data.List.PartType ?>" />
-	    <?cs /if ?>
+	<table class="subscribers"><tr>
+	<?cs if:subcount(Data.List.Subscribers) > 0 ?>
+		<td><form method="post" action="<?cs var:ScriptName ?>" enctype="application/x-www-form-urlencoded">
+			<input type="hidden" name="list" value="<?cs var:Data.List.Name ?>" />
+			<?cs if:Data.List.PartType ?>
+				<input type="hidden" name="part" value="<?cs var:Data.List.PartType ?>" />
+			<?cs /if ?>
 
-		<table class="subscribers"><tr>
-		<?cs if:subcount(Data.List.Subscribers) > 0 ?>
-			<td><ul>
-			<!-- scrollbox for list's subscribers -->
-			<!-- Keep selection box a reasonable size - suggested by Sebastian Andersson -->
-				<?cs if:subcount(Data.List.Subscribers) > 15 ?>
-					<?cs set:Data.ScrollSize = 15 ?>
-				  <?cs else ?>
-					<?cs set:Data.ScrollSize = subcount(Data.List.Subscribers) ?>
-				<?cs /if ?>
-				<li><select name="mailaddress_del"
-						size="<?cs var:Data.ScrollSize ?>" multiple="multiple">
-					<?cs each:item = Data.List.Subscribers ?>
-						<option><?cs var:item ?></option>
-					<?cs /each ?>
-				</select></li>
-				<li><?cs var:subcount(Data.List.Subscribers) ?> <?cs var:html_escape(Lang.Misc.Subscribers) ?></li>
-				<li><input type="hidden" name="action" value="address_del" />
-				<button type="submit" name="send" value="do"><?cs var:html_escape(Lang.Buttons.DeleteAddress) ?></button></li>
-			</ul></td>
+			<ul>
+				<!-- scrollbox for list's subscribers -->
+				<!-- Keep selection box a reasonable size - suggested by Sebastian Andersson -->
+					<?cs if:subcount(Data.List.Subscribers) > 15 ?>
+						<?cs set:Data.ScrollSize = 15 ?>
+					  <?cs else ?>
+						<?cs set:Data.ScrollSize = subcount(Data.List.Subscribers) ?>
+					<?cs /if ?>
+					<li><select name="mailaddress_del"
+							size="<?cs var:Data.ScrollSize ?>" multiple="multiple">
+						<?cs each:item = Data.List.Subscribers ?>
+							<option><?cs var:item ?></option>
+						<?cs /each ?>
+					</select></li>
+					<li><?cs var:subcount(Data.List.Subscribers) ?> <?cs var:html_escape(Lang.Misc.Subscribers) ?></li>
+					<li><input type="hidden" name="action" value="address_del" />
+					<button type="submit" name="send" value="do"><?cs var:html_escape(Lang.Buttons.DeleteAddress) ?></button></li>
+		</ul></form></td>
+	<?cs /if ?>
+
+	<td><td><form method="post" action="<?cs var:ScriptName ?>" enctype="multipart/form-data">
+		<!-- this form has to be "multipart/form-data" to make file upload work -->
+		<input type="hidden" name="list" value="<?cs var:Data.List.Name ?>" />
+		<?cs if:Data.List.PartType ?>
+			<input type="hidden" name="part" value="<?cs var:Data.List.PartType ?>" />
 		<?cs /if ?>
-
-		<td><ul>
+		<ul>
 
 			<li><?cs var:html_escape(Lang.Misc.AddSubscriberAddress) ?>
 				<ul><li><input type="text" name="mailaddress_add" size="40" /></li>
@@ -117,9 +122,11 @@
 
 			<li><input type="hidden" name="action" value="address_add" />
 			<button type="submit" name="send" value="do"><?cs var:html_escape(Lang.Buttons.AddAddress) ?></button></li>
-		</ul></td></tr></table>
+		</ul>
+		</form>
+	</td></tr>
+	</table>
 
-	</form>
 	</fieldset>
 
 <?cs /if ?>