[Gforge-devel] [#1786] massmail patch

[Federico]

https://gforge.org/tracker/index.php?func=detail&aid=1786&group_id=1&atid=106
applied patch to head 4.6


diff -Naur gforge-n7/debian/gforge-db-postgresql.cron.dgforge-fb-patch/debian/gforge-
db-postgresql.cron.d
--- gforge-n7/debian/gforge-db-postgresql.cron.d    2005-03-03 09:52:
59.000000000 +0100
+++ gforge-fb-patch/debian/gforge-db-postgresql.cron.d    2005-11-28 11:20:
16.527027504 +0100
@@ -33,7 +33,7 @@
 45 0 * * * gforge [ -x /usr/lib/gforge/bin/db_stats_agg.php ] &&
/usr/lib/gforge/bin/db_stats_agg.php -d
include_path=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www/include >
/dev/null 2>&1

 # Hourly sending of mass e-mailings
-48 * * * * gforge [ -x /usr/lib/gforge/bin/massmail.php ] &&
/usr/lib/gforge/bin/massmail.php -d
include_path=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www/include >
/dev/null 2>&1
+48 * * * * root [ -x /usr/lib/gforge/bin/massmail.php ] &&
/usr/lib/gforge/bin/massmail.php -d
include_path=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www/include >
/dev/null 2>&1

 # Weekly db vacuum
 50 2 * * Mon gforge [ -x /usr/lib/gforge/bin/vacuum.php ] &&
/usr/lib/gforge/bin/vacuum.php -d
include_path=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www/include >
/dev/null 2>&1

diff -Naur gforge-n7/setup gforge-fb-patch/setup
--- gforge-n7/setup    2005-11-08 21:37:56.000000000 +0100
+++ gforge-fb-patch/setup    2005-11-28 11:22:31.527504312 +0100
@@ -123,6 +123,8 @@
     DEFAULTsys_apache_user=$(findapacheowner)
     DEFAULTsys_apache_group=$(findapacheowner)
     DEFAULTsys_forum_return_domain=$DEFAULTdomain_name
+    # added for massmail error 11/2005 fabio bertagnin transiciel
+    DEFAULTsys_sendmail_path=/usr/sbin/sendmail
     #
     # TODO
     #usr_lib_gforge=$GFGDIR

diff -Naur gforge_cvs/cronjobs/massmail.php gforge_aec/cronjobs/massmail.php
--- gforge_new/cronjobs/massmail.php    2005-12-12 14:31:22.000000000 +0100
+++ gforge_aec/cronjobs/massmail.php    2005-12-06 17:18:14.000000000 +0100
@@ -33,6 +33,8 @@
 require ('squal_pre.php');
 require ('common/include/cron_utils.php');

+// print_debug ("start massmail.php");
+
 if (!cron_create_lock('gforge-massmail')) {
     $err = "Massmail already running...exiting";
     cron_entry(6,$err);
@@ -145,36 +147,51 @@
 $body = db_result($mail_res, 0, 'message');

 // Actual mailing loop
+$compt = 0;
 while ($row =& db_fetch_array($users_res)) {
-
+    $compt++;
     util_send_message($row['email'],$subj,$body."\r\n".sprintf(
$tail,$row['confirm_hash'] ),'noreply@'.$sys_default_domain );
-//echo "$row[email],$subj,$body.\r\n".sprintf( $tail,$row['confirm_hash']
).",'noreply@'.$sys_default_domain";
-
-//echo "\n".$row['email'].$row['user_id'];

     $last_userid = $row['user_id'];

     sleep($SLEEP);
 }

+// ajout info dans les logs
+$mess = "massmail $compt mails sent";
+
+
+/*
+// orig dans les sources gforge
+// modifié pour plus de clarté
+// fabio bertagnin transiciel 25 nov 2005
 $sql="UPDATE massmail_queue
     SET failed_date=0,
     last_userid='999999999'
     WHERE id='$mail_id'";
+*/

+$sql="UPDATE massmail_queue
+        SET failed_date=0,
+        last_userid='$last_userid',
+        finished_date='".time()."'
+        WHERE id='$mail_id'";
+
+
 db_query($sql);

 if (db_error()) {
     $err .= $sql.db_error();
 }

-m_exit();
+m_exit($mess);

-function m_exit() {
+function m_exit($mess = "") {
+    $err = "";
     if (!cron_remove_lock('gforge-massmail')) {
-        $err .= "Could not remove lock file\n";
+        $err .= " Could not remove lock file\n";
     }
-    cron_entry(6,$err);
+    cron_entry(6,$mess.$err);
     exit;
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://svr1.gforge.org/pipermail/gforge-devel/attachments/20060612/a0d25071/attachment.html