113 lines
4.0 KiB
Diff
113 lines
4.0 KiB
Diff
--- ezmlm-web-3.3.1/ezmlm-web.cgi.smeintegration 2013-10-20 15:32:06.000000000 -0400
|
|
+++ ezmlm-web-3.3.1/ezmlm-web.cgi 2016-04-18 23:06:22.084000000 -0400
|
|
@@ -402,39 +402,39 @@
|
|
$pagename = 'list_select';
|
|
$error = 'ParameterMissing';
|
|
}
|
|
-} elsif ($action eq 'list_delete_ask') {
|
|
- # Confirm list removal
|
|
- if ($list) {
|
|
- $pagename = 'list_delete';
|
|
- } else {
|
|
- $pagename = 'list_select';
|
|
- $error = 'ParameterMissing';
|
|
- }
|
|
-} elsif ($action eq 'list_delete_do') {
|
|
- # User really wants to delete a list ...
|
|
- if ($list) {
|
|
- $success = 'DeleteList' if (&delete_list($list));
|
|
- $list = undef;
|
|
- } else {
|
|
- $error = 'ParameterMissing';
|
|
- }
|
|
- $pagename = 'list_select';
|
|
-} elsif ($action eq 'list_create_ask') {
|
|
- # User wants to create a list ...
|
|
- $pagename = 'list_create';
|
|
-} elsif ($action eq 'list_create_do') {
|
|
- # create the new list
|
|
- # Message if list creation is unsuccessful ...
|
|
- if (defined($q->param('new_list'))) {
|
|
- if ($list = &create_list($q->param('new_list'))) {
|
|
- $success = 'CreateList';
|
|
- $pagename = 'subscribers';
|
|
- } else {
|
|
- $pagename = 'list_create';
|
|
- }
|
|
- } else {
|
|
- $error = 'ParameterMissing';
|
|
- }
|
|
+#} elsif ($action eq 'list_delete_ask') {
|
|
+# # Confirm list removal
|
|
+# if ($list) {
|
|
+# $pagename = 'list_delete';
|
|
+# } else {
|
|
+# $pagename = 'list_select';
|
|
+# $error = 'ParameterMissing';
|
|
+# }
|
|
+#} elsif ($action eq 'list_delete_do') {
|
|
+# # User really wants to delete a list ...
|
|
+# if ($list) {
|
|
+# $success = 'DeleteList' if (&delete_list($list));
|
|
+# $list = undef;
|
|
+# } else {
|
|
+# $error = 'ParameterMissing';
|
|
+# }
|
|
+# $pagename = 'list_select';
|
|
+#} elsif ($action eq 'list_create_ask') {
|
|
+# # User wants to create a list ...
|
|
+# $pagename = 'list_create';
|
|
+#} elsif ($action eq 'list_create_do') {
|
|
+# # create the new list
|
|
+# # Message if list creation is unsuccessful ...
|
|
+# if (defined($q->param('new_list'))) {
|
|
+# if ($list = &create_list($q->param('new_list'))) {
|
|
+# $success = 'CreateList';
|
|
+# $pagename = 'subscribers';
|
|
+# } else {
|
|
+# $pagename = 'list_create';
|
|
+# }
|
|
+# } else {
|
|
+# $error = 'ParameterMissing';
|
|
+# }
|
|
} elsif (($action eq 'config_ask') || ($action eq 'config_do')) {
|
|
# User wants to see/change the configuration ...
|
|
my $subset = $q->param('config_subset');
|
|
@@ -1891,6 +1891,9 @@
|
|
# ------------------------------------------------------------------------
|
|
|
|
sub create_list {
|
|
+ # SME process
|
|
+ warn "Please use SME Server panel to create new list";
|
|
+ return undef;
|
|
# Create a list according to user selections ...
|
|
my $listname = shift;
|
|
my ($qmail, $options, $i);
|
|
--- ezmlm-web-3.3.1/template/nav.cs.smeintegration 2013-10-20 15:32:06.000000000 -0400
|
|
+++ ezmlm-web-3.3.1/template/nav.cs 2016-04-18 23:29:05.790000000 -0400
|
|
@@ -12,13 +12,13 @@
|
|
<?cs /if ?>
|
|
<?cs if:(subcount(Data.Lists) > 0) && (UI.Navigation.ListSelect == 1) ?>
|
|
<li><a <?cs if:(Data.Action == "list_select") ?> class="nav_active"<?cs /if ?>
|
|
- href="<?cs call:link("action","list_select","","","","") ?>"
|
|
+ href="/server-manager/cgi-bin/mailinglists"
|
|
title="<?cs var:html_escape(Lang.Menue.ListSelect) ?>"><?cs var:html_escape(Lang.Menue.ListSelect) ?></a>
|
|
</li>
|
|
<?cs /if ?>
|
|
<?cs if:Data.Permissions.Create && (UI.Navigation.ListCreate == 1) ?>
|
|
<li><a <?cs if:(Data.Action == "list_create") ?> class="nav_active"<?cs /if ?>
|
|
- href="<?cs call:link("action","list_create_ask","","","","") ?>"
|
|
+ href="/server-manager/cgi-bin/mailinglists?state=create"
|
|
title="<?cs var:html_escape(Lang.Menue.ListCreate) ?>"><?cs var:html_escape(Lang.Menue.ListCreate) ?></a>
|
|
</li>
|
|
<?cs /if ?>
|
|
@@ -181,7 +181,7 @@
|
|
var:html_escape(Lang.Menue.SubscribeLog) ?></a></li><?cs /if ?>
|
|
<?cs if:UI.Navigation.ListDelete == 1
|
|
?><li><a <?cs if:(Data.Action == "list_delete") ?> class="nav_active"<?cs /if ?>
|
|
- href="<?cs call:link("list",Data.List.Name,"action","list_delete_ask","","") ?>"
|
|
+ href="/server-manager/cgi-bin/mailinglists?state=delete&list=<?cs var:html_escape(Data.List.Name) ?>"
|
|
title="<?cs var:html_escape(Lang.Menue.ListDelete) ?>"><?cs
|
|
var:html_escape(Lang.Menue.ListDelete) ?></a></li><?cs /if ?>
|
|
|