From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 May 2012 12:31:27 -0400
Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.

---
 server/plugins-available/mailman_plugin.inc.php |  313 ++++++++++++++++++++++++++-------------------------
 1 files changed, 158 insertions(+), 155 deletions(-)

diff --git a/server/plugins-available/mailman_plugin.inc.php b/server/plugins-available/mailman_plugin.inc.php
index 5e13ba3..5a4593a 100644
--- a/server/plugins-available/mailman_plugin.inc.php
+++ b/server/plugins-available/mailman_plugin.inc.php
@@ -1,155 +1,158 @@
-<?php
-
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-class mailman_plugin {
-	
-	var $plugin_name = 'mailman_plugin';
-	var $class_name = 'mailman_plugin';
-	
-	
-	var $mailman_config_dir = '/etc/mailman/';
-	
-	//* This function is called during ispconfig installation to determine
-	//  if a symlink shall be created for this plugin.
-	function onInstall() {
-		global $conf;
-		
-		if($conf['services']['mail'] == true) {
-			return true;
-		} else {
-			return false;
-		}
-		
-	}
-	
-	/*
-	 	This function is called when the plugin is loaded
-	*/
-	
-	function onLoad() {
-		global $app;
-		
-		/*
-		Register for the events
-		*/
-		
-		$app->plugins->registerEvent('mail_mailinglist_insert','mailman_plugin','insert');
-		$app->plugins->registerEvent('mail_mailinglist_update','mailman_plugin','update');
-		$app->plugins->registerEvent('mail_mailinglist_delete','mailman_plugin','delete');
-		
-		
-		
-	}
-	
-	function insert($event_name,$data) {
-		global $app, $conf;
-		
-		$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($conf['init_scripts'] . '/' . 'mailman reload &> /dev/null');
-		
-		$app->db->query("UPDATE mail_mailinglist SET password = '' WHERE mailinglist_id = ".$data["new"]['mailinglist_id']);
-		
-	}
-	
-	// The purpose of this plugin is to rewrite the main.cf file
-	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']);
-		
-	}
-	
-	function delete($event_name,$data) {
-		global $app, $conf;
-		
-		$this->update_config();
-		
-		exec("/usr/lib/mailman/bin/rmlist -a ".$data["old"]["listname"]);
-		
-		exec($conf['init_scripts'] . '/' . 'mailman reload &> /dev/null');
-		
-	}
-	
-	function update_config() {
-		global $app, $conf;
-		
-		copy($this->mailman_config_dir.'mm_cfg.py',$this->mailman_config_dir.'mm_cfg.py');
-		
-		// load the server configuration options
-		$app->uses('getconf');
-		$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
-		
-		// load files
-		$content = file_get_contents($conf["rootpath"]."/conf/mm_cfg.py.master");
-		$old_file = file_get_contents($this->mailman_config_dir."/mm_cfg.py");
-		
-		$old_options = array();
-		$lines = explode("\n", $old_file); 
-		foreach ($lines as $line)
-		{
-			if (strlen($line) && substr($line, 0, 1) != '#')
-			{
-				list($key, $value) = explode("=", $line);
-				if (!empty($value))
-				{
-					$key = rtrim($key);
-					$old_options[$key] = trim($value);
-				}
-			}
-		}
-		
-		// create virtual_domains list
-		$domainAll = $app->db->queryAllRecords("SELECT domain FROM mail_mailinglist GROUP BY domain");
-		$virtual_domains = '';
-		foreach($domainAll as $domain)
-		{
-			if ($domainAll[0]['domain'] == $domain['domain'])
-				$virtual_domains .= "'".$domain['domain']."'";
-			else
-				$virtual_domains .= ", '".$domain['domain']."'";
-		}
-		
-		$content = str_replace('{hostname}', $server_config['hostname'], $content);
-		$content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content);
-		$content = str_replace('{virtual_domains}', $virtual_domains, $content);
-		
-		file_put_contents($this->mailman_config_dir."/mm_cfg.py", $content);
-	}
-
-} // end class
-
-?>
+<?php
+
+/*
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class mailman_plugin {
+	
+	var $plugin_name = 'mailman_plugin';
+	var $class_name = 'mailman_plugin';
+	
+	
+	var $mailman_config_dir = '/etc/mailman/';
+	
+	//* This function is called during ispconfig installation to determine
+	//  if a symlink shall be created for this plugin.
+	function onInstall() {
+		global $conf;
+		
+		if($conf['services']['mail'] == true) {
+			return true;
+		} else {
+			return false;
+		}
+		
+	}
+	
+	/*
+	 	This function is called when the plugin is loaded
+	*/
+	
+	function onLoad() {
+		global $app;
+		
+		/*
+		Register for the events
+		*/
+		
+		$app->plugins->registerEvent('mail_mailinglist_insert','mailman_plugin','insert');
+		$app->plugins->registerEvent('mail_mailinglist_update','mailman_plugin','update');
+		$app->plugins->registerEvent('mail_mailinglist_delete','mailman_plugin','delete');
+		
+		
+		
+	}
+	
+	function insert($event_name,$data) {
+		global $app, $conf;
+		
+		$this->update_config();
+		
+		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 = ".$app->db->quote($data["new"]['mailinglist_id']));
+		
+	}
+	
+	// The purpose of this plugin is to rewrite the main.cf file
+	function update($event_name,$data) {
+		global $app, $conf;
+		
+		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) {
+		global $app, $conf;
+		
+		$this->update_config();
+		
+		exec("/usr/lib/mailman/bin/rmlist -a ".escapeshellcmd($data["old"]["listname"]));
+		
+		exec($conf['init_scripts'] . '/' . 'mailman reload &> /dev/null');
+		
+	}
+	
+	function update_config() {
+		global $app, $conf;
+		
+		copy($this->mailman_config_dir.'mm_cfg.py',$this->mailman_config_dir.'mm_cfg.py');
+		
+		// load the server configuration options
+		$app->uses('getconf');
+		$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
+		
+		// load files
+		if(file_exists($conf["rootpath"]."/conf-custom/mm_cfg.py.master")) {
+			$content = file_get_contents($conf["rootpath"]."/conf-custom/mm_cfg.py.master");
+		} else {
+			$content = file_get_contents($conf["rootpath"]."/conf/mm_cfg.py.master");
+		}
+		$old_file = file_get_contents($this->mailman_config_dir."/mm_cfg.py");
+		
+		$old_options = array();
+		$lines = explode("\n", $old_file); 
+		foreach ($lines as $line)
+		{
+			if (strlen($line) && substr($line, 0, 1) != '#')
+			{
+				list($key, $value) = explode("=", $line);
+				if (!empty($value))
+				{
+					$key = rtrim($key);
+					$old_options[$key] = trim($value);
+				}
+			}
+		}
+		
+		// create virtual_domains list
+		$domainAll = $app->db->queryAllRecords("SELECT domain FROM mail_mailinglist GROUP BY domain");
+		$virtual_domains = '';
+		foreach($domainAll as $domain)
+		{
+			if ($domainAll[0]['domain'] == $domain['domain'])
+				$virtual_domains .= "'".$domain['domain']."'";
+			else
+				$virtual_domains .= ", '".$domain['domain']."'";
+		}
+		
+		$content = str_replace('{hostname}', $server_config['hostname'], $content);
+		$content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content);
+		$content = str_replace('{virtual_domains}', $virtual_domains, $content);
+		
+		file_put_contents($this->mailman_config_dir."/mm_cfg.py", $content);
+	}
+
+} // end class
+
+?>

--
Gitblit v1.9.1