[evolvis-commits] r16250: Removed duplicated code
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Mar 1 01:05:05 CET 2011
Author: mirabilos
Date: 2011-03-01 01:05:05 +0100 (Tue, 01 Mar 2011)
New Revision: 16250
Modified:
trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/mailing_lists_create.php
Log:
Removed duplicated code
Modified: trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/mailing_lists_create.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/mailing_lists_create.php 2011-03-01 00:05:02 UTC (rev 16249)
+++ trunk/gforge_base/evolvisforge-5.1/src/cronjobs/mail/mailing_lists_create.php 2011-03-01 00:05:05 UTC (rev 16250)
@@ -78,16 +78,6 @@
break;
}
- $listname = trim($listname);
- if (!$listname) {
- $err .= "Empty name for a mailing list in 'mail_group_list' table\n";
- break;
- }
- if (!preg_match('/^[a-z0-9\-_\.]*$/', $listname) || $listname == '.' || $listname == '..') {
- $err .= 'Invalid List Name: ' . $listname;
- break;
- }
-
// Here we assume that the privatize_list.py script is located in the same dir as this script
$script_dir = dirname(__FILE__);
$privatize_cmd = escapeshellcmd(forge_get_config('mailman_path').'/bin/config_list -i '.$script_dir.'/privatize_list.py '.$listname);
@@ -181,16 +171,6 @@
break;
}
-
- $deleted_mail_list = trim($deleted_mail_list);
- if (!$deleted_mail_list) {
- $err .= "Empty name for a mailing list in 'deleted_mailing_lists' table\n";
- break;
- }
- if (!preg_match('/^[a-z0-9\-_\.]*$/', $deleted_mail_list) || $deleted_mail_list == '.' || $deleted_mail_list == '..') {
- $err .= 'Invalid List Name: ' . $deleted_mail_list;
- break;
- }
exec(forge_get_config('mailman_path')."/bin/rmlist -a $deleted_mail_list", $output);
$success = false;
foreach ($output as $line) {
More information about the evolvis-commits
mailing list