1 |
jpp |
1.1 |
--- ezmlm-web-3.3.1/ezmlm-web.cgi.smeintegration 2013-10-20 15:32:06.000000000 -0400 |
2 |
|
|
+++ ezmlm-web-3.3.1/ezmlm-web.cgi 2016-04-18 23:06:22.084000000 -0400 |
3 |
|
|
@@ -402,39 +402,39 @@ |
4 |
|
|
$pagename = 'list_select'; |
5 |
|
|
$error = 'ParameterMissing'; |
6 |
|
|
} |
7 |
|
|
-} elsif ($action eq 'list_delete_ask') { |
8 |
|
|
- # Confirm list removal |
9 |
|
|
- if ($list) { |
10 |
|
|
- $pagename = 'list_delete'; |
11 |
|
|
- } else { |
12 |
|
|
- $pagename = 'list_select'; |
13 |
|
|
- $error = 'ParameterMissing'; |
14 |
|
|
- } |
15 |
|
|
-} elsif ($action eq 'list_delete_do') { |
16 |
|
|
- # User really wants to delete a list ... |
17 |
|
|
- if ($list) { |
18 |
|
|
- $success = 'DeleteList' if (&delete_list($list)); |
19 |
|
|
- $list = undef; |
20 |
|
|
- } else { |
21 |
|
|
- $error = 'ParameterMissing'; |
22 |
|
|
- } |
23 |
|
|
- $pagename = 'list_select'; |
24 |
|
|
-} elsif ($action eq 'list_create_ask') { |
25 |
|
|
- # User wants to create a list ... |
26 |
|
|
- $pagename = 'list_create'; |
27 |
|
|
-} elsif ($action eq 'list_create_do') { |
28 |
|
|
- # create the new list |
29 |
|
|
- # Message if list creation is unsuccessful ... |
30 |
|
|
- if (defined($q->param('new_list'))) { |
31 |
|
|
- if ($list = &create_list($q->param('new_list'))) { |
32 |
|
|
- $success = 'CreateList'; |
33 |
|
|
- $pagename = 'subscribers'; |
34 |
|
|
- } else { |
35 |
|
|
- $pagename = 'list_create'; |
36 |
|
|
- } |
37 |
|
|
- } else { |
38 |
|
|
- $error = 'ParameterMissing'; |
39 |
|
|
- } |
40 |
|
|
+#} elsif ($action eq 'list_delete_ask') { |
41 |
|
|
+# # Confirm list removal |
42 |
|
|
+# if ($list) { |
43 |
|
|
+# $pagename = 'list_delete'; |
44 |
|
|
+# } else { |
45 |
|
|
+# $pagename = 'list_select'; |
46 |
|
|
+# $error = 'ParameterMissing'; |
47 |
|
|
+# } |
48 |
|
|
+#} elsif ($action eq 'list_delete_do') { |
49 |
|
|
+# # User really wants to delete a list ... |
50 |
|
|
+# if ($list) { |
51 |
|
|
+# $success = 'DeleteList' if (&delete_list($list)); |
52 |
|
|
+# $list = undef; |
53 |
|
|
+# } else { |
54 |
|
|
+# $error = 'ParameterMissing'; |
55 |
|
|
+# } |
56 |
|
|
+# $pagename = 'list_select'; |
57 |
|
|
+#} elsif ($action eq 'list_create_ask') { |
58 |
|
|
+# # User wants to create a list ... |
59 |
|
|
+# $pagename = 'list_create'; |
60 |
|
|
+#} elsif ($action eq 'list_create_do') { |
61 |
|
|
+# # create the new list |
62 |
|
|
+# # Message if list creation is unsuccessful ... |
63 |
|
|
+# if (defined($q->param('new_list'))) { |
64 |
|
|
+# if ($list = &create_list($q->param('new_list'))) { |
65 |
|
|
+# $success = 'CreateList'; |
66 |
|
|
+# $pagename = 'subscribers'; |
67 |
|
|
+# } else { |
68 |
|
|
+# $pagename = 'list_create'; |
69 |
|
|
+# } |
70 |
|
|
+# } else { |
71 |
|
|
+# $error = 'ParameterMissing'; |
72 |
|
|
+# } |
73 |
|
|
} elsif (($action eq 'config_ask') || ($action eq 'config_do')) { |
74 |
|
|
# User wants to see/change the configuration ... |
75 |
|
|
my $subset = $q->param('config_subset'); |
76 |
|
|
@@ -1891,6 +1891,9 @@ |
77 |
|
|
# ------------------------------------------------------------------------ |
78 |
|
|
|
79 |
|
|
sub create_list { |
80 |
|
|
+ # SME process |
81 |
|
|
+ warn "Please use SME Server panel to create new list"; |
82 |
|
|
+ return undef; |
83 |
|
|
# Create a list according to user selections ... |
84 |
|
|
my $listname = shift; |
85 |
|
|
my ($qmail, $options, $i); |
86 |
|
|
--- ezmlm-web-3.3.1/template/nav.cs.smeintegration 2013-10-20 15:32:06.000000000 -0400 |
87 |
|
|
+++ ezmlm-web-3.3.1/template/nav.cs 2016-04-18 23:29:05.790000000 -0400 |
88 |
|
|
@@ -12,13 +12,13 @@ |
89 |
|
|
<?cs /if ?> |
90 |
|
|
<?cs if:(subcount(Data.Lists) > 0) && (UI.Navigation.ListSelect == 1) ?> |
91 |
|
|
<li><a <?cs if:(Data.Action == "list_select") ?> class="nav_active"<?cs /if ?> |
92 |
|
|
- href="<?cs call:link("action","list_select","","","","") ?>" |
93 |
|
|
+ href="/server-manager/cgi-bin/mailinglists" |
94 |
|
|
title="<?cs var:html_escape(Lang.Menue.ListSelect) ?>"><?cs var:html_escape(Lang.Menue.ListSelect) ?></a> |
95 |
|
|
</li> |
96 |
|
|
<?cs /if ?> |
97 |
|
|
<?cs if:Data.Permissions.Create && (UI.Navigation.ListCreate == 1) ?> |
98 |
|
|
<li><a <?cs if:(Data.Action == "list_create") ?> class="nav_active"<?cs /if ?> |
99 |
|
|
- href="<?cs call:link("action","list_create_ask","","","","") ?>" |
100 |
|
|
+ href="/server-manager/cgi-bin/mailinglists?state=create" |
101 |
|
|
title="<?cs var:html_escape(Lang.Menue.ListCreate) ?>"><?cs var:html_escape(Lang.Menue.ListCreate) ?></a> |
102 |
|
|
</li> |
103 |
|
|
<?cs /if ?> |
104 |
|
|
@@ -181,7 +181,7 @@ |
105 |
|
|
var:html_escape(Lang.Menue.SubscribeLog) ?></a></li><?cs /if ?> |
106 |
|
|
<?cs if:UI.Navigation.ListDelete == 1 |
107 |
|
|
?><li><a <?cs if:(Data.Action == "list_delete") ?> class="nav_active"<?cs /if ?> |
108 |
|
|
- href="<?cs call:link("list",Data.List.Name,"action","list_delete_ask","","") ?>" |
109 |
|
|
+ href="/server-manager/cgi-bin/mailinglists?state=delete&list=<?cs var:html_escape(Data.List.Name) ?>" |
110 |
|
|
title="<?cs var:html_escape(Lang.Menue.ListDelete) ?>"><?cs |
111 |
|
|
var:html_escape(Lang.Menue.ListDelete) ?></a></li><?cs /if ?> |
112 |
|
|
|