maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- minor fixes in admin_tickets (display of name)

Browse Source 
- fixes of undefined mailer-class if admin-mail is invalid
This commit is contained in:
Michael Kaufmann (d00p)
2010-05-02 07:46:20 +00:00
parent a6408bf398
commit d8b0221c91
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
admin_tickets.php
View File

@@ -102,11 +102,11 @@ if($page == 'tickets'
if($_cid != $row['customerid']) if($_cid != $row['customerid'])
{ {
$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 . '"'); WHERE `customerid` = "' . (int)$cid . '"');
if(isset($usr['loginname'])) { if(isset($usr['loginname'])) {
$customer = getCorrectFullUserDetails($usr); $customer = getCorrectFullUserDetails($usr) . ' (' . $usr['loginname'] . ')';
//$customer = $usr['firstname'] . " " . $usr['name'] . " (" . $usr['loginname'] . ")"; //$customer = $usr['firstname'] . " " . $usr['name'] . " (" . $usr['loginname'] . ")";
} else { } else {
$customer = $lng['ticket']['nonexistingcustomer']; $customer = $lng['ticket']['nonexistingcustomer'];
@@ -220,8 +220,7 @@ if($page == 'tickets'
while($row_customer = $db->fetch_array($result_customers)) while($row_customer = $db->fetch_array($result_customers))
{ {
$customer = getCorrectFullUserDetails($row_customer); $customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
$customers.= makeoption($customer, $row_customer['customerid']);
} }
$priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']); $priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']);
@@ -634,14 +633,15 @@ elseif($page == 'archive'
if($_cid != $ticket['customerid']) if($_cid != $ticket['customerid'])
{ {
$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 . '"'); WHERE `customerid` = "' . (int)$cid . '"');
if(isset($usr['loginname'])) { if(isset($usr['loginname'])) {
$customer = getCorrectFullUserDetails($usr); $customer = getCorrectFullUserDetails($usr) . ' (' . $usr['loginname'] . ')';
} else { } else {
$customer = $lng['ticket']['nonexistingcustomer']; $customer = $lng['ticket']['nonexistingcustomer'];
} }
eval("\$tickets.=\"" . getTemplate("ticket/tickets_customer") . "\";"); eval("\$tickets.=\"" . getTemplate("ticket/tickets_customer") . "\";");
} }
@@ -718,19 +718,11 @@ elseif($page == 'archive'
} }
$customers = makeoption($lng['ticket']['nocustomer'], '-1', '-1'); $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']) while($row_customer = $db->fetch_array($result_customers))
&& $result['customerid'] != '')
{ {
$result2 = $db->query('SELECT `customerid`, `loginname`, `firstname`, `name` $customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
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']);
}
} }
eval("echo \"" . getTemplate("ticket/archive") . "\";"); eval("echo \"" . getTemplate("ticket/archive") . "\";");

2
lib/init.php
View File

@@ -414,9 +414,9 @@ if($page == '')
/** /**
* Initialize the mailingsystem * Initialize the mailingsystem
*/ */
$mail = new PHPMailer();
if(PHPMailer::ValidateAddress($settings['panel']['adminmail']) !== false) if(PHPMailer::ValidateAddress($settings['panel']['adminmail']) !== false)
{ {
$mail = new PHPMailer();
// set return-to address and custom sender-name, see #76 // set return-to address and custom sender-name, see #76
$mail->SetFrom($settings['panel']['adminmail'], $settings['panel']['adminmail_defname']); $mail->SetFrom($settings['panel']['adminmail'], $settings['panel']['adminmail_defname']);
if ($settings['panel']['adminmail_return'] != '') { if ($settings['panel']['adminmail_return'] != '') {