cs-project-svn_notify Mailing List for CS-Project (Page 7)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 891
          http://cs-project.svn.sourceforge.net/cs-project/?rev=891&view=rev
Author:   crazedsanity
Date:     2008-05-12 15:18:42 -0700 (Mon, 12 May 2008)

Log Message:
-----------
Fix email notices (#159).

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

Added Paths:
-----------
    trunk/1.2/templates/email/helpdesk.tmpl

Removed Paths:
-------------
    trunk/1.2/templates/email/helpdesk-new.tmpl
    trunk/1.2/templates/email/helpdesk-remark.tmpl

Modified: trunk/1.2/lib/helpdeskClass.php
===================================================================

--- trunk/1.2/lib/helpdeskClass.php	2008-05-12 20:49:31 UTC (rev 890)
+++ trunk/1.2/lib/helpdeskClass.php	2008-05-12 22:18:42 UTC (rev 891)
@@ -173,7 +173,7 @@
 		if($retval > 0) {
 			//send the submitter an email		
 			$newRemarks = $remark;
-			$emailTemplate = html_file_to_string("email/helpdesk-remark.tmpl");
+			$emailTemplate = html_file_to_string("email/helpdesk.tmpl");
 			$linkAction = "view";
 			
 			if($useRespondLink) {
@@ -198,7 +198,7 @@
 			
 			//okay, now send the email.  The function "send_email()" should be ensuring that all values in
 			//	the recipients array are valid, and there's no dups.
-			$subject = "Update to Helpdesk Issue #". $helpdeskId ." -- ". $tmp['name'];
+			$subject = "Helpdesk Issue #". $helpdeskId ." -- ". $tmp['name'];
 			$sendEmailRes = send_email($recipientsArr, $subject, $emailTemplate, $parseArr);
 			
 			//log who we sent the emails to.
@@ -341,19 +341,19 @@
 			//got good data... get the note_id.
 			
 			//now send 'em an email about it.
-			$emailTemplate = html_file_to_string("email/helpdesk-new.tmpl");
+			$emailTemplate = html_file_to_string("email/helpdesk.tmpl");
 			$parseArr = $this->get_record($retval);
 			
 			$normalEmailExtra = NULL;
 			$emailAddressList = $linkObj->get_record_email_list($newRecord);
 			
 			if((strlen($_SESSION['login_email'])) && ($_SESSION['login_email'] != $parseArr['email'])) {
-				$subject = "Created Helpdesk Issue #$retval Created [for ".$parseArr['email']  ."] -- ". $parseArr['name'];
+				$subject = "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 {
-				$subject = "Created Helpdesk Issue #$retval Created". $normalEmailExtra ." -- ". $parseArr['name'];
+				$subject = "Helpdesk Issue #$retval Created -- ". $parseArr['name'];
 				send_email($emailAddressList, $subject, $emailTemplate, $parseArr);
 			}
 			

Deleted: trunk/1.2/templates/email/helpdesk-new.tmpl
===================================================================
--- trunk/1.2/templates/email/helpdesk-new.tmpl	2008-05-12 20:49:31 UTC (rev 890)
+++ trunk/1.2/templates/email/helpdesk-new.tmpl	2008-05-12 22:18:42 UTC (rev 891)
@@ -1,49 +0,0 @@
-<html>
-<body>
-
-<font color="red"><b>DO NOT REPLY TO THIS EMAIL!</b></font>  Please 
-utilize the link provided at the bottom of this message to view 
-and/or reply to it.  Thank you.<BR><BR>
-
-A new helpdesk issue has been submitted!  Please review the details below<br>
-for more details.  You will be sent an email when the issue is resolved,<br>
-along with any updates along the way (if you submitted it or add remarks).
-
-<table border="1" cellpadding="2" cellspacing="0">
-<tr>
-	<th>Issue Number:</th>
-	<td><pre>{public_id}</pre></td>
-</tr>
-<tr>
-	<th>Name of Issue:</th>
-	<td><pre>{name}</pre></td>
-</tr>
-<tr>
-	<th>Submitted by:</th>
-	<td>{email}</td>
-</tr>
-<tr>
-	<th>Contents:</th>
-	<td><pre>{subject}</pre></td>
-</tr>
-<tr>
-	<th>Date of Submission:</th>
-	<td>{start_date}</td>
-</tr>
-<tr>
-	<th>Issue Category:</th>
-	<td>{tag_list}</td>
-</tr>
-<tr>
-	<td colspan="2" align="center">Click the link to view online: 
-		[<a href="http://{project_url}/extern/helpdesk/view?ID={public_id}">view</a>]</td>
-</tr>
-</table>
-
-Generated by: {PROJ_NAME} v{VERSION_STRING}
-
-<hr>
-$Id$
-
-</body>
-</html>
\ No newline at end of file

Deleted: trunk/1.2/templates/email/helpdesk-remark.tmpl
===================================================================
--- trunk/1.2/templates/email/helpdesk-remark.tmpl	2008-05-12 20:49:31 UTC (rev 890)
+++ trunk/1.2/templates/email/helpdesk-remark.tmpl	2008-05-12 22:18:42 UTC (rev 891)
@@ -1,57 +0,0 @@
-<html>
-<body>
-
-<font color="red"><b>DO NOT REPLY TO THIS EMAIL!</b></font>  Please 
-utilize the link provided at the bottom of this message to view 
-and/or reply to it.  Thank you.<BR><BR>
-
-<table border="1" cellpadding="2" cellspacing="0">
-<tr>
-	<th>Issue Number:</th>
-	<td>{public_id}</td>
-</tr>
-<tr>
-	<th>Name of Issue:</th>
-	<td><pre>[helpdesk_id={public_id}]</pre></td>
-</tr>
-<tr>
-	<th>Submitted by:</th>
-	<td>{email}</td>
-</tr>
-<tr>
-	<th>Contents:</th>
-	<td><pre>{subject}</pre></td>
-</tr>
-<tr>
-	<th>Date of Submission:</th>
-	<td>{start_date}</td>
-</tr>
-<tr>
-	<th>Issue Category:</th>
-	<td>{tag_list}</td>
-</tr>
-<tr>
-	<th>Assigned To:</th>
-	<td>{assigned}</td>
-</tr>
-<tr>
-	<th>Priority:</th>
-	<td>{priority}</td>
-</tr>
-<tr>
-	<th>New Remark:</th>
-	<td><pre>{newRemark}</pre></td>
-</tr>
-<tr>
-	<td align="center" colspan="2">Click the link to view/respond online: 
-		[<a href="http://{project_url}/extern/helpdesk/view?myLinkAction={linkAction}&ID={public_id}{linkExtra}">{linkAction}</a>]</td>
-</tr>
-</table>
-
-Generated by: {PROJ_NAME} v{VERSION_STRING}
-
-<hr>
-$Id$
-
-</body>
-</html>
\ No newline at end of file

Copied: trunk/1.2/templates/email/helpdesk.tmpl (from rev 888, trunk/1.2/templates/email/helpdesk-remark.tmpl)
===================================================================
--- trunk/1.2/templates/email/helpdesk.tmpl	                        (rev 0)
+++ trunk/1.2/templates/email/helpdesk.tmpl	2008-05-12 22:18:42 UTC (rev 891)
@@ -0,0 +1,57 @@
+<html>
+<body>
+
+<font color="red"><b>DO NOT REPLY TO THIS EMAIL!</b></font>  Please 
+utilize the link provided at the bottom of this message to view 
+and/or reply to it.  Thank you.<BR><BR>
+
+<table border="1" cellpadding="2" cellspacing="0">
+<tr>
+	<th>Issue Number:</th>
+	<td>{public_id}</td>
+</tr>
+<tr>
+	<th>Name of Issue:</th>
+	<td><pre>[helpdesk_id={public_id}]</pre></td>
+</tr>
+<tr>
+	<th>Submitted by:</th>
+	<td>{email}</td>
+</tr>
+<tr>
+	<th>Contents:</th>
+	<td><pre>{subject}</pre></td>
+</tr>
+<tr>
+	<th>Date of Submission:</th>
+	<td>{start_date}</td>
+</tr>
+<tr>
+	<th>Issue Category:</th>
+	<td>{tag_list}</td>
+</tr>
+<tr>
+	<th>Assigned To:</th>
+	<td>{assigned}</td>
+</tr>
+<tr>
+	<th>Priority:</th>
+	<td>{priority}</td>
+</tr>
+<tr>
+	<th>New Remark:</th>
+	<td><pre>{newRemark}</pre></td>
+</tr>
+<tr>
+	<td align="center" colspan="2">Click the link to view/respond online: 
+		[<a href="http://{project_url}/extern/helpdesk/view?myLinkAction={linkAction}&ID={public_id}{linkExtra}">{linkAction}</a>]</td>
+</tr>
+</table>
+
+Generated by: {PROJ_NAME} v{VERSION_STRING}
+
+<hr>
+$Id$
+
+</body>
+</html>
\ No newline at end of file


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




2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (65)	Dec (47)
2008	Jan (34)	Feb (82)	Mar (21)	Apr (12)	May (16)	Jun	Jul (6)	Aug (8)	Sep	Oct	Nov	Dec
2009	Jan (1)	Feb (52)	Mar	Apr	May	Jun	Jul (9)	Aug (5)	Sep (12)	Oct (11)	Nov (4)	Dec (15)
2010	Jan	Feb	Mar (6)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec (9)
2012	Jan (2)	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep (1)	Oct	Nov	Dec

cs-project-svn_notify Mailing List for CS-Project (Page 7)

cs-project-svn_notify — Subversion commit notifications