[evolvis-commits] r11764: Patch - [#1786] massmail patch↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 18:24:15 CET 2011


Author: mirabilos
Date: 2011-02-24 18:24:15 +0100 (Thu, 24 Feb 2011)
New Revision: 11764

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/massmail.php
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.cron.d
   trunk/gforge_base/evolvisforge-5.1/gforge/setup
Log:
Patch - [#1786] massmail patch


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/massmail.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/massmail.php	2011-02-24 17:24:13 UTC (rev 11763)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/massmail.php	2011-02-24 17:24:15 UTC (rev 11764)
@@ -147,38 +147,36 @@
 $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);
 }
 
 $sql="UPDATE massmail_queue
-	SET failed_date=0,
-	last_userid='999999999'
-	WHERE id='$mail_id'";
+		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();
 }
+$mess = "massmail $compt mails sent";
+m_exit($mess);
 
-m_exit();
-
-function m_exit() {
+function m_exit($mess = '') {
 	global $err;
 	
 	if (!cron_remove_lock('gforge-massmail')) {
 		$err .= "Could not remove lock file\n";
 	}
-	if (!cron_entry(6,$err)) {
+	if (!cron_entry(6,$mess.$err)) {
 		# rely on crond to report the error
 		echo "cron_entry error: ".db_error()."\n";
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.cron.d
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.cron.d	2011-02-24 17:24:13 UTC (rev 11763)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.cron.d	2011-02-24 17:24:15 UTC (rev 11764)
@@ -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

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/setup
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/setup	2011-02-24 17:24:13 UTC (rev 11763)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/setup	2011-02-24 17:24:15 UTC (rev 11764)
@@ -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



More information about the evolvis-commits mailing list