From 40ba41497b08cc4c2556611652ed24fd462908fb Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Tue, 17 Aug 2010 06:02:31 +0000
Subject: [PATCH] - added 'company' and 'salutation' to some templates, fixes
 #376

---
 lib/classes/ticket/class.ticket.php           | 4 +++-
 templates/admin/templates/templates_add_2.tpl | 8 ++++++++
 templates/admin/templates/templates_edit.tpl  | 8 ++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/classes/ticket/class.ticket.php b/lib/classes/ticket/class.ticket.php
index 0e012139..5d984508 100644
--- a/lib/classes/ticket/class.ticket.php
+++ b/lib/classes/ticket/class.ticket.php
@@ -255,12 +255,14 @@ class ticket
 		{
 			// Get e-mail message for customer
 
-			$usr = $this->db->query_first('SELECT `name`, `firstname`, `email`
+			$usr = $this->db->query_first('SELECT `name`, `firstname`, `company`, `email`
                                FROM `' . TABLE_PANEL_CUSTOMERS . '` 
                                WHERE `customerid` = "' . (int)$customerid . '"');
 			$replace_arr = array(
 				'FIRSTNAME' => $usr['firstname'],
 				'NAME' => $usr['name'],
+				'COMPANY' => $usr['company'],
+				'SALUTATION' => getCorrectUserSalutation($usr),
 				'SUBJECT' => $this->Get('subject', true)
 			);
 		}
diff --git a/templates/admin/templates/templates_add_2.tpl b/templates/admin/templates/templates_add_2.tpl
index a55bad44..221574af 100644
--- a/templates/admin/templates/templates_add_2.tpl
+++ b/templates/admin/templates/templates_add_2.tpl
@@ -98,6 +98,10 @@ $header
 				<td class="field_name_border_left"><i>{SUBJECT}</i>:</td>
 				<td class="field_name">{$lng['admin']['templates']['SUBJECT']}</td>
 			</tr>
+			<tr>
+				<td class="field_name_border_left"><i>{SALUTATION}</i>:</td>
+				<td class="field_name">{$lng['admin']['templates']['SALUTATION']}</td>
+			</tr>
 			<tr>
 				<td class="field_name_border_left"><i>{FIRSTNAME}</i>:</td>
 				<td class="field_name">{$lng['admin']['templates']['FIRSTNAME']}</td>
@@ -106,6 +110,10 @@ $header
 				<td class="field_name_border_left"><i>{NAME}</i>:</td>
 				<td class="field_name">{$lng['admin']['templates']['NAME']}</td>
 			</tr>
+			<tr>
+				<td class="field_name_border_left"><i>{COMPANY}</i>:</td>
+				<td class="field_name">{$lng['admin']['templates']['COMPANY']}</td>
+			</tr>
 			<tr>
 				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['newdatabase']}</b></td>
 			</tr>
diff --git a/templates/admin/templates/templates_edit.tpl b/templates/admin/templates/templates_edit.tpl
index cb694945..2bcad44c 100644
--- a/templates/admin/templates/templates_edit.tpl
+++ b/templates/admin/templates/templates_edit.tpl
@@ -100,6 +100,10 @@ $header
 				<td class="field_name_border_left"><i>{SUBJECT}</i>:</td>
 				<td class="field_name">{$lng['admin']['templates']['SUBJECT']}</td>
 			</tr>
+			<tr>
+				<td class="field_name_border_left"><i>{SALUTATION}</i>:</td>
+				<td class="field_name">{$lng['admin']['templates']['SALUTATION']}</td>
+			</tr>
 			<tr>
 				<td class="field_name_border_left"><i>{FIRSTNAME}</i>:</td>
 				<td class="field_name">{$lng['admin']['templates']['FIRSTNAME']}</td>
@@ -108,6 +112,10 @@ $header
 				<td class="field_name_border_left"><i>{NAME}</i>:</td>
 				<td class="field_name">{$lng['admin']['templates']['NAME']}</td>
 			</tr>
+			<tr>
+				<td class="field_name_border_left"><i>{COMPANY}</i>:</td>
+				<td class="field_name">{$lng['admin']['templates']['COMPANY']}</td>
+			</tr>
 			<tr>
 				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['newdatabase']}</b></td>
 			</tr>