From 5378e9cc37448f5780a452b1d1f989701e8fefed Mon Sep 17 00:00:00 2001 From: tbrehm Date: Mon, 26 Sep 2011 10:05:09 +0000 Subject: [PATCH] Improved mailman plugin and fixed errors in mailman installer. --- install/lib/installer_base.lib.php | 8 ++++---- server/plugins-available/mailman_plugin.inc.php | 17 ++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index bad15d4603..917dd0df26 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -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('postmap /var/lib/mailman/data/aliases'); - touch('/var/lib/mailman/data/virtual-mailman'); - exec('postmap /var/lib/mailman/data/virtual-mailman'); + if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases'); + exec('postalias /var/lib/mailman/data/aliases'); + if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman'); + exec('postalias /var/lib/mailman/data/virtual-mailman'); //* Make a backup copy of the main.cf file copy($config_dir.'/main.cf', $config_dir.'/main.cf~'); diff --git a/server/plugins-available/mailman_plugin.inc.php b/server/plugins-available/mailman_plugin.inc.php index 823bf85d5e..fd2fa7a592 100644 --- a/server/plugins-available/mailman_plugin.inc.php +++ b/server/plugins-available/mailman_plugin.inc.php @@ -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'); -- GitLab