[Gforge-commits] gforge/cronjobs/mail mailing_lists_create.php, 1.10, 1.11

[gsmet]

Update of /cvsroot/gforge/gforge/cronjobs/mail
In directory db.perdue.net:/tmp/cvs-serv19933

Modified Files:
        mailing_lists_create.php 
Log Message:
fixed bugs


Index: mailing_lists_create.php
===================================================================
RCS file: /cvsroot/gforge/gforge/cronjobs/mail/mailing_lists_create.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mailing_lists_create.php    31 Mar 2004 17:11:01 -0000      1.10
+++ mailing_lists_create.php    9 Jul 2004 17:45:19 -0000       1.11
@@ -41,7 +41,6 @@
         mail_group_list.group_list_id 
        FROM mail_group_list,users
         WHERE mail_group_list.list_admin=users.user_id
-        AND mail_group_list.status = ".MAIL__MAILING_LIST_IS_REQUESTED."
         ");
 $err .= db_error();
 
@@ -60,16 +59,15 @@
        $listpassword = db_result($res,$i,'password');
        $grouplistid = db_result($res,$i,'group_list_id');
 
-       if (! in_array($listname,$mailing_lists)) {
+       if (! in_array($listname,$mailing_lists) && db_result($res,$i,'status') 
== MAIL__MAILING_LIST_IS_REQUESTED) {
                $err .= "Creating Mailing List: $listname\n";
-               $lcreate_cmd = MAILMAN_DIR."bin/newlist -q $listname $email 
$listpassword";
+               $lcreate_cmd = MAILMAN_DIR."bin/newlist -q address@hidden 
$email $listpassword";
                $err .= "Command to be executed is $lcreate_cmd\n";
                $fp = popen($lcreate_cmd,"r");
                pclose($fp);
+               $mailingListIds[] = $grouplistid;
        }
        
-       $mailingListIds[] = $grouplistid;
-
        $list_str =
 $listname.':              "|'.MAILMAN_DIR.'mail/mailman post 
'.$listname.'"'."\n"
 .$listname.'-admin:        "|'.MAILMAN_DIR.'mail/mailman admin 
'.$listname.'"'."\n"
@@ -106,7 +104,9 @@
 }
 
 // Update status
-db_query('UPDATE mail_group_list set status='.MAIL__MAILING_LIST_IS_CREATED.' 
where group_list_id IN('.implode(',', $mailingListIds).')');
+if(!empty($mailingListIds)) {
+       db_query('UPDATE mail_group_list set 
status='.MAIL__MAILING_LIST_IS_CREATED.' where group_list_id IN('.implode(',', 
$mailingListIds).')');
+}
 
 fclose($h1);