[phpBT-dev] CVS: phpbt bug.php,1.104,1.105

[Jirka P. <fi...@us...>]

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

Modified Files:
	bug.php 
Log Message:
Replaced original mail function with qp_mail and did some cleanup. It's tested by me only, so feel free to test it.


Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- bug.php	8 May 2002 12:57:18 -0000	1.104
+++ bug.php	16 May 2002 11:01:02 -0000	1.105
@@ -239,32 +239,29 @@
 
   // Collect the CCs
   if ($ccs = $db->getCol(sprintf($QUERY['bug-cc-list'], $buginfo['bug_id']))) {
-		$maillist = array_merge($maillist, $ccs);
-	}
+    $maillist = array_merge($maillist, $ccs);
+  }
 
   // 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
-    		));
-
-    	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\nContent-Type: text/plain; charset=%s\nContent-Transfer-Encoding: 8bit\n", ADMIN_EMAIL, ADMIN_EMAIL,
-        	ADMIN_EMAIL, $STRING['lang_charset']));
-  	}
-	}
+  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));
+    }
+  }
 }
 
 function update_bug($bugid = 0) {