Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
lolo888
ISPConfig 3
Commits
5378e9cc
Commit
5378e9cc
authored
Sep 26, 2011
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved mailman plugin and fixed errors in mailman installer.
parent
906f08e6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
13 deletions
+12
-13
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+4
-4
server/plugins-available/mailman_plugin.inc.php
server/plugins-available/mailman_plugin.inc.php
+8
-9
No files found.
install/lib/installer_base.lib.php
View file @
5378e9cc
...
...
@@ -671,10 +671,10 @@ class installer_base {
//* Create the mailman files
exec
(
'mkdir -p /var/lib/mailman/data'
);
touch
(
'/var/lib/mailman/data/aliases'
);
exec
(
'post
map
/var/lib/mailman/data/aliases'
);
touch
(
'/var/lib/mailman/data/virtual-mailman'
);
exec
(
'post
map
/var/lib/mailman/data/virtual-mailman'
);
if
(
!
is_file
(
'/var/lib/mailman/data/aliases'
))
touch
(
'/var/lib/mailman/data/aliases'
);
exec
(
'post
alias
/var/lib/mailman/data/aliases'
);
if
(
!
is_file
(
'/var/lib/mailman/data/virtual-mailman'
))
touch
(
'/var/lib/mailman/data/virtual-mailman'
);
exec
(
'post
alias
/var/lib/mailman/data/virtual-mailman'
);
//* Make a backup copy of the main.cf file
copy
(
$config_dir
.
'/main.cf'
,
$config_dir
.
'/main.cf~'
);
...
...
server/plugins-available/mailman_plugin.inc.php
View file @
5378e9cc
...
...
@@ -73,11 +73,11 @@ class mailman_plugin {
$this
->
update_config
();
exec
(
"/usr/lib/mailman/bin/newlist -u "
.
$data
[
"new"
][
"domain"
]
.
" -e "
.
$data
[
"new"
][
"domain"
]
.
" "
.
$data
[
"new"
][
"listname"
]
.
" "
.
$data
[
"new"
][
"email"
]
.
" "
.
$data
[
"new"
][
"password"
]
.
""
);
exec
(
"/usr/lib/mailman/bin/newlist -u "
.
escapeshellcmd
(
$data
[
"new"
][
"domain"
]
)
.
" -e "
.
escapeshellcmd
(
$data
[
"new"
][
"domain"
]
)
.
" "
.
escapeshellcmd
(
$data
[
"new"
][
"listname"
]
)
.
" "
.
escapeshellcmd
(
$data
[
"new"
][
"email"
]
)
.
" "
.
escapeshellcmd
(
$data
[
"new"
][
"password"
]
)
.
""
);
exec
(
$conf
[
'init_scripts'
]
.
'/'
.
'mailman reload &> /dev/null'
);
$app
->
db
->
query
(
"UPDATE mail_mailinglist SET password = '' WHERE mailinglist_id = "
.
$data
[
"new"
][
'mailinglist_id'
]);
$app
->
db
->
query
(
"UPDATE mail_mailinglist SET password = '' WHERE mailinglist_id = "
.
$
app
->
db
->
quote
(
$
data
[
"new"
][
'mailinglist_id'
])
)
;
}
...
...
@@ -85,12 +85,11 @@ class mailman_plugin {
function
update
(
$event_name
,
$data
)
{
global
$app
,
$conf
;
exec
(
"/usr/lib/mailman/bin/change_pw -l "
.
$data
[
"new"
][
"listname"
]
.
" -p "
.
$data
[
"new"
][
"password"
]
.
""
);
exec
(
$conf
[
'init_scripts'
]
.
'/'
.
'mailman reload &> /dev/null'
);
$app
->
db
->
query
(
"UPDATE mail_mailinglist SET password = '' WHERE mailinglist_id = "
.
$data
[
"new"
][
'mailinglist_id'
]);
if
(
$data
[
"new"
][
"password"
]
!=
$data
[
"old"
][
"password"
]
&&
$data
[
"new"
][
"password"
]
!=
''
)
{
exec
(
"/usr/lib/mailman/bin/change_pw -l "
.
escapeshellcmd
(
$data
[
"new"
][
"listname"
])
.
" -p "
.
escapeshellcmd
(
$data
[
"new"
][
"password"
])
.
""
);
exec
(
$conf
[
'init_scripts'
]
.
'/'
.
'mailman reload &> /dev/null'
);
$app
->
db
->
query
(
"UPDATE mail_mailinglist SET password = '' WHERE mailinglist_id = "
.
$app
->
db
->
quote
(
$data
[
"new"
][
'mailinglist_id'
]));
}
}
function
delete
(
$event_name
,
$data
)
{
...
...
@@ -98,7 +97,7 @@ class mailman_plugin {
$this
->
update_config
();
exec
(
"/usr/lib/mailman/bin/rmlist -a "
.
$data
[
"old"
][
"listname"
]);
exec
(
"/usr/lib/mailman/bin/rmlist -a "
.
escapeshellcmd
(
$data
[
"old"
][
"listname"
])
)
;
exec
(
$conf
[
'init_scripts'
]
.
'/'
.
'mailman reload &> /dev/null'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment