[Cs-project-svn_notify] SF.net SVN: cs-project: [625] trunk/lib/helpdeskClass.php

[<cra...@us...>]

Revision: 625
          http://cs-project.svn.sourceforge.net/cs-project/?rev=625&view=rev
Author:   crazedsanity
Date:     2007-11-15 09:02:49 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
Standardization of notice messages.

/lib/helpdeskClass.php:
	* remark():
		-- don't send the alert unless the constant HELPDESK_ISSUE_ANNOUNCE_EMAIL 
		appears to be set/valid.
	* create_record():
		-- set subject line when creating normal emails
		-- send alert with given subject line (prepending "[ALERT] ").

Modified Paths:
--------------
    trunk/lib/helpdeskClass.php

Modified: trunk/lib/helpdeskClass.php
===================================================================
--- trunk/lib/helpdeskClass.php	2007-11-15 16:09:20 UTC (rev 624)
+++ trunk/lib/helpdeskClass.php	2007-11-15 17:02:49 UTC (rev 625)
@@ -205,7 +205,7 @@
 			$details = 'Sent notification(s) of for [helpdesk_id='. $helpdeskId .'] remark to: '. $sendEmailRes;
 			$this->logsObj->log_by_class($details, 'information', NULL, $this->recordTypeId, $helpdeskId);
 			
-			if($isSolution) {
+			if($isSolution && strlen(constant('HELPDESK_ISSUE_ANNOUNCE_EMAIL'))) {
 				$subject = '[ALERT] Helpdesk Issue #'. $helpdeskId .' was SOLVED';
 				if(strlen($_SESSION['login_username'])) {
 					$subject .= ' by '. $_SESSION['login_username'];
@@ -326,24 +326,22 @@
 			
 			$normalEmailExtra = NULL;
 			$emailAddressList = $linkObj->get_record_email_list($newRecord);
+			
 			if((strlen($_SESSION['login_email'])) && ($_SESSION['login_email'] != $parseArr['email'])) {
-				send_email(
-					$emailAddressList, 
-					"Helpdesk Issue #$retval Created [for ".$parseArr['email']  ."]", 
-					$emailTemplate, 
-					$parseArr
-				);
+				$subject = "Created Helpdesk Issue #$retval Created [for ".$parseArr['email']  ."] -- ". $parseArr['name'];
+				send_email($emailAddressList, $subject, $emailTemplate, $parseArr);
 				$normalEmailExtra = " [registered by ". $_SESSION['login_loginname'] .": uid=". $_SESSION['login_id'] ."]";
 			}
 			else {
-				send_email(
-					$emailAddressList, 
-					"Helpdesk Issue #$retval Created". $normalEmailExtra, 
-					$emailTemplate, 
-					$parseArr
-				);
+				$subject = "Created Helpdesk Issue #$retval Created". $normalEmailExtra ." -- ". $parseArr['name'];
+				send_email($emailAddressList, $subject, $emailTemplate, $parseArr);
 			}
 			
+			if(strlen(constant('HELPDESK_ISSUE_ANNOUNCE_EMAIL'))) {
+				//send the alert!!!
+				send_email(HELPDESK_ISSUE_ANNOUNCE_EMAIL, '[ALERT] '. $subject, $emailTemplate, $parseArr);
+			}
+			
 			//log that it was created.
 			$details = "Helpdesk Issue #". $retval ." ([helpdesk_id=". $retval ."]) Created by (". $dataArr['email'] ."): ". $dataArr['name'];
 			$this->logsObj->log_by_class($details, 'create');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.