From d8b0221c91e58acb95c0b8bbf5f5c76e21c21e27 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Sun, 2 May 2010 07:46:20 +0000
Subject: [PATCH] - minor fixes in admin_tickets (display of name) - fixes of
 undefined mailer-class if admin-mail is invalid

---
 admin_tickets.php | 26 +++++++++-----------------
 lib/init.php      |  4 ++--
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/admin_tickets.php b/admin_tickets.php
index db70f150..bd5fcda6 100644
--- a/admin_tickets.php
+++ b/admin_tickets.php
@@ -102,11 +102,11 @@ if($page == 'tickets'
 					if($_cid != $row['customerid'])
 					{
 						$cid = $row['customerid'];
-						$usr = $db->query_first('SELECT `firstname`, `name`, `loginname` FROM `' . TABLE_PANEL_CUSTOMERS . '`
+						$usr = $db->query_first('SELECT `firstname`, `name`, `company`, `loginname` FROM `' . TABLE_PANEL_CUSTOMERS . '`
                                      WHERE `customerid` = "' . (int)$cid . '"');
 						
 						if(isset($usr['loginname'])) {
-							$customer = getCorrectFullUserDetails($usr);
+							$customer = getCorrectFullUserDetails($usr) . ' (' . $usr['loginname'] . ')';
 							//$customer = $usr['firstname'] . " " . $usr['name'] . " (" . $usr['loginname'] . ")";
 						} else {
 							$customer = $lng['ticket']['nonexistingcustomer'];
@@ -220,8 +220,7 @@ if($page == 'tickets'
 
 				while($row_customer = $db->fetch_array($result_customers))
 				{
-					$customer = getCorrectFullUserDetails($row_customer);
-					$customers.= makeoption($customer, $row_customer['customerid']);
+					$customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
 				}
 
 				$priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']);
@@ -634,14 +633,15 @@ elseif($page == 'archive'
 						if($_cid != $ticket['customerid'])
 						{
 							$cid = $ticket['customerid'];
-							$usr = $db->query_first('SELECT `firstname`, `name`, `loginname` FROM `' . TABLE_PANEL_CUSTOMERS . '`
+							$usr = $db->query_first('SELECT `firstname`, `name`, `company`, `loginname` FROM `' . TABLE_PANEL_CUSTOMERS . '`
                                        WHERE `customerid` = "' . (int)$cid . '"');
 							
 							if(isset($usr['loginname'])) {
-								$customer = getCorrectFullUserDetails($usr);
+								$customer = getCorrectFullUserDetails($usr) . ' (' . $usr['loginname'] . ')';
 							} else {
 								$customer = $lng['ticket']['nonexistingcustomer'];
 							}
+							
 							eval("\$tickets.=\"" . getTemplate("ticket/tickets_customer") . "\";");
 						}
 
@@ -718,19 +718,11 @@ elseif($page == 'archive'
 			}
 
 			$customers = makeoption($lng['ticket']['nocustomer'], '-1', '-1');
-			$result = $db->query_first('SELECT `customerid` FROM `' . TABLE_PANEL_CUSTOMERS . '` ' . ($userinfo['customers_see_all'] ? '' : ' WHERE `adminid` = "' . (int)$userinfo['adminid'] . '" ') . 'ORDER BY `name` ASC');
+			$result_customers = $db->query("SELECT `customerid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_CUSTOMERS . "` " . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "' ") . " ORDER BY `name` ASC");
 
-			if(isset($result['customerid'])
-			   && $result['customerid'] != '')
+			while($row_customer = $db->fetch_array($result_customers))
 			{
-				$result2 = $db->query('SELECT `customerid`, `loginname`, `firstname`, `name`
-  									          FROM `' . TABLE_PANEL_CUSTOMERS . '` ' . ($userinfo['customers_see_all'] ? '' : ' WHERE `adminid` = "' . (int)$userinfo['adminid'] . '" ') . ' ORDER BY `name` ASC');
-
-				while($row = $db->fetch_array($result2))
-				{
-					$customer = getCorrectFullUserDetails($row);
-					$customers.= makeoption($customer, $row['customerid']);
-				}
+				$customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
 			}
 
 			eval("echo \"" . getTemplate("ticket/archive") . "\";");
diff --git a/lib/init.php b/lib/init.php
index ad111fab..ade4f2c6 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -414,9 +414,9 @@ if($page == '')
 /**
  * Initialize the mailingsystem
  */
+$mail = new PHPMailer();
 if(PHPMailer::ValidateAddress($settings['panel']['adminmail']) !== false)
-{
-	$mail = new PHPMailer();
+{	
 	// set return-to address and custom sender-name, see #76
 	$mail->SetFrom($settings['panel']['adminmail'], $settings['panel']['adminmail_defname']);
 	if ($settings['panel']['adminmail_return'] != '') {