[phpBT-dev] CVS: phpbt bug.php,1.121,1.122

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv19128

Modified Files:
	bug.php 
Log Message:
Allow users to suppress the update email when changing a bug.

Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- bug.php	22 Oct 2002 20:34:48 -0000	1.121
+++ bug.php	22 Oct 2002 21:13:16 -0000	1.122
@@ -119,7 +119,7 @@
 ///
 /// Send the email about changes to the bug and log the changes in the DB
 function do_changedfields($userid, &$buginfo, $cf = array(), $comments = '') {
-	global $db, $t, $u, $select, $now, $STRING, $QUERY;
+	global $db, $t, $u, $select, $now, $STRING, $QUERY, $_pv;
 
 	// It's a new bug if the changedfields array is empty and there are no comments
 	$newbug = (!count($cf) and !$comments);
@@ -220,6 +220,8 @@
 		}
 	}
 
+	if (!empty($_pv['suppress_email'])) return; // Don't send email if silent update requested.
+
 	// Reporter never changes
 	$reporter = $db->getOne('select email from '.TBL_AUTH_USER.
 		" u, ".TBL_USER_PREF." p where u.user_id = {$buginfo['created_by']} ".
@@ -291,21 +293,21 @@
 	// Later add a watcher (such as QA person) check here
 	if (count($maillist)) {
 		if ($toemail = delimit_list(', ',$maillist)) {
-		    $t->assign(array(
-			'bugid' => $buginfo['bug_id'],
-			'bugurl' => INSTALL_URL."/bug.php?op=show&bugid={$buginfo['bug_id']}",
-			'priority' => $select['priority'][(!empty($cf['priority']) ? $cf['priority'] : $buginfo['priority'])],
-			'priority_stat' => !empty($cf['priority']) ? '!' : ' ',
-			'reporter' => $reporter,
-			'reporter_stat' => $reporterstat,
-			'assignedto' => $assignedto,
-			'assignedto_stat' => $assignedtostat
-		    ));
-
-		    qp_mail($toemail,"[Bug {$buginfo['bug_id']}] ".($newbug ? 'New' : 'Changed').' - '.
-			stripslashes((!empty($cf['title']) ? $cf['title'] : $buginfo['title'])),
-			$t->fetch($template),
-			sprintf("From: %s\nReply-To: %s\nErrors-To: %s", ADMIN_EMAIL, ADMIN_EMAIL, ADMIN_EMAIL));
+			$t->assign(array(
+				'bugid' => $buginfo['bug_id'],
+				'bugurl' => INSTALL_URL."/bug.php?op=show&bugid={$buginfo['bug_id']}",
+				'priority' => $select['priority'][(!empty($cf['priority']) ? $cf['priority'] : $buginfo['priority'])],
+				'priority_stat' => !empty($cf['priority']) ? '!' : ' ',
+				'reporter' => $reporter,
+				'reporter_stat' => $reporterstat,
+				'assignedto' => $assignedto,
+				'assignedto_stat' => $assignedtostat
+				));
+
+			qp_mail($toemail,"[Bug {$buginfo['bug_id']}] ".($newbug ? 'New' : 'Changed').' - '.
+				stripslashes((!empty($cf['title']) ? $cf['title'] : $buginfo['title'])),
+				$t->fetch($template),
+				sprintf("From: %s\nReply-To: %s\nErrors-To: %s", ADMIN_EMAIL, ADMIN_EMAIL, ADMIN_EMAIL));
 		}
 	}
 }