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
This commit is contained in:
lars 2005-12-23 12:37:33 +00:00
parent 286c9c2cf9
commit 1f5946bb1d
4 changed files with 51 additions and 45 deletions

View file

@ -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 UPGRADING ezmlm-web 2.3 to ezmlm-web 3.0
1) install clearsilver (see INSTALL for details) 1) install clearsilver (see INSTALL for details)
2) copy the "template" directory somewhere (see INSTALL again) 2) copy the "template" directory somewhere (see INSTALL again)
3) set "TEMPLATE_DIR" in your ezmlmwebrc file to this directory 3) set "TEMPLATE_DIR" in your ezmlmwebrc file to this directory
4) maybe you want to define "MAIL_DOMAIN" in your ezmlmwebrc 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 UPGRADING ezmlm-web 2.2 to ezmlm-web 2.3
there are no known issues 1) set location of css file in ezmlmwebrc
------------------------------------------------------------------------------ ------------------------------------------------------------------------------

View file

@ -91,10 +91,10 @@ if(defined($opt_C)) {
require "$1"; # Command Line require "$1"; # Command Line
} elsif(-e "$HOME_DIR/.ezmlmwebrc") { } elsif(-e "$HOME_DIR/.ezmlmwebrc") {
require "$HOME_DIR/.ezmlmwebrc"; # User require "$HOME_DIR/.ezmlmwebrc"; # User
} elsif(-e "/etc/ezmlm/ezmlmwebrc") {
require "/etc/ezmlm/ezmlmwebrc"; # System
} elsif(-e "./ezmlmwebrc") { } elsif(-e "./ezmlmwebrc") {
require "./ezmlmwebrc"; # Install require "./ezmlmwebrc"; # Install
} elsif(-e "/etc/ezmlm/ezmlmwebrc") {
require "/etc/ezmlm/ezmlmwebrc"; # System
} else { } else {
die "Unable to read config file"; die "Unable to read config file";
} }
@ -651,7 +651,7 @@ sub untaint {
# special stuff # special stuff
# check the list name # 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 ''); $warning = 'InvalidListName' if ($warning eq '');
$q->param(-name=>'list', -values=>''); $q->param(-name=>'list', -values=>'');
} }

View file

@ -15,19 +15,11 @@
value="<?cs var:html_escape(Data.UserName) value="<?cs var:html_escape(Data.UserName)
?>"> @ <input type="text" name="inhost" size="30" value="<?cs ?>"> @ <input type="text" name="inhost" size="30" value="<?cs
var:html_escape(Data.HostName) ?>"></li> 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 ?> <?cs if:Data.Modules.MySQL ?>
<!-- Allow creation of mysql table if the module allows it --> <!-- Allow creation of mysql table if the module allows it -->
<li><?cs call:setting("6") ?></li><?cs /if ?> <li><?cs call:setting("6") ?></li><?cs /if ?>
</ul>
<?cs if:Data.WebUser.show ?> <?cs if:Data.WebUser.show ?>
<li><label for="webusers"><?cs var:html_escape(Lang.Misc.AllowedToEdit) ?>:</label> <li><label for="webusers"><?cs var:html_escape(Lang.Misc.AllowedToEdit) ?>:</label>

View file

@ -74,16 +74,15 @@
<?cs /if ?> <?cs /if ?>
</legend> </legend>
<!-- this form has to be "multipart/form-data" to make file upload work --> <table class="subscribers"><tr>
<form method="post" action="<?cs var:ScriptName ?>" enctype="multipart/form-data"> <?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 ?>" /> <input type="hidden" name="list" value="<?cs var:Data.List.Name ?>" />
<?cs if:Data.List.PartType ?> <?cs if:Data.List.PartType ?>
<input type="hidden" name="part" value="<?cs var:Data.List.PartType ?>" /> <input type="hidden" name="part" value="<?cs var:Data.List.PartType ?>" />
<?cs /if ?> <?cs /if ?>
<table class="subscribers"><tr> <ul>
<?cs if:subcount(Data.List.Subscribers) > 0 ?>
<td><ul>
<!-- scrollbox for list's subscribers --> <!-- scrollbox for list's subscribers -->
<!-- Keep selection box a reasonable size - suggested by Sebastian Andersson --> <!-- Keep selection box a reasonable size - suggested by Sebastian Andersson -->
<?cs if:subcount(Data.List.Subscribers) > 15 ?> <?cs if:subcount(Data.List.Subscribers) > 15 ?>
@ -100,10 +99,16 @@
<li><?cs var:subcount(Data.List.Subscribers) ?> <?cs var:html_escape(Lang.Misc.Subscribers) ?></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" /> <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> <button type="submit" name="send" value="do"><?cs var:html_escape(Lang.Buttons.DeleteAddress) ?></button></li>
</ul></td> </ul></form></td>
<?cs /if ?> <?cs /if ?>
<td><ul> <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 ?>
<ul>
<li><?cs var:html_escape(Lang.Misc.AddSubscriberAddress) ?> <li><?cs var:html_escape(Lang.Misc.AddSubscriberAddress) ?>
<ul><li><input type="text" name="mailaddress_add" size="40" /></li> <ul><li><input type="text" name="mailaddress_add" size="40" /></li>
@ -117,9 +122,11 @@
<li><input type="hidden" name="action" value="address_add" /> <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> <button type="submit" name="send" value="do"><?cs var:html_escape(Lang.Buttons.AddAddress) ?></button></li>
</ul></td></tr></table> </ul>
</form> </form>
</td></tr>
</table>
</fieldset> </fieldset>
<?cs /if ?> <?cs /if ?>