[evolvis-commits] r17082: Merged branch mailman-protect-lists

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Mar 1 02:01:18 CET 2011


Author: mirabilos
Date: 2011-03-01 02:01:18 +0100 (Tue, 01 Mar 2011)
New Revision: 17082

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/mail/MailingList.class.php
Log:
Merged branch mailman-protect-lists

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/mail/MailingList.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/mail/MailingList.class.php	2011-03-01 01:01:14 UTC (rev 17081)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/mail/MailingList.class.php	2011-03-01 01:01:18 UTC (rev 17082)
@@ -377,6 +377,12 @@
 	 *	@return	boolean success;
 	 */
 	function delete($sure,$really_sure) {
+		$mn = $this->getName();
+		$gn = $this->Group->getUnixName();
+		if ($mn == $gn."-commits" || $mn == $gn."-discuss") {
+			$this->setError(_('Sorry, this mailing list is special and must not be deleted.'), ERROR__PERMISSION_DENIED_ERROR);
+			return false;
+		}
 
 		if (!$sure || !$really_sure) {
 			$this->setMissingParamsError(_('Please tick all checkboxes.'));



More information about the evolvis-commits mailing list