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

- correct display of username in ticket-system, thanks to arnoldB

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-05-01 14:54:09 +00:00
parent 433c8669f4
commit a6408bf398
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
admin_tickets.php
View File

@@ -106,7 +106,8 @@ if($page == 'tickets'
WHERE `customerid` = "' . (int)$cid . '"'); WHERE `customerid` = "' . (int)$cid . '"');
if(isset($usr['loginname'])) { if(isset($usr['loginname'])) {
$customer = $usr['firstname'] . " " . $usr['name'] . " (" . $usr['loginname'] . ")"; $customer = getCorrectFullUserDetails($usr);
//$customer = $usr['firstname'] . " " . $usr['name'] . " (" . $usr['loginname'] . ")";
} else { } else {
$customer = $lng['ticket']['nonexistingcustomer']; $customer = $lng['ticket']['nonexistingcustomer'];
} }
@@ -219,22 +220,8 @@ if($page == 'tickets'
while($row_customer = $db->fetch_array($result_customers)) while($row_customer = $db->fetch_array($result_customers))
{ {
if($row_customer['company'] == '') $customer = getCorrectFullUserDetails($row_customer);
{ $customers.= makeoption($customer, $row_customer['customerid']);
$customers.= makeoption($row_customer['name'] . ', ' . $row_customer['firstname'] . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
}
else
{
if($row_customer['name'] != ''
&& $row_customer['firstname'] != '')
{
$customers.= makeoption($row_customer['name'] . ', ' . $row_customer['firstname'] . ' | ' . $row_customer['company'] . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
}
else
{
$customers.= makeoption($row_customer['company'] . ' (' . $row_customer['loginname'] . ')', $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']);
@@ -651,7 +638,7 @@ elseif($page == 'archive'
WHERE `customerid` = "' . (int)$cid . '"'); WHERE `customerid` = "' . (int)$cid . '"');
if(isset($usr['loginname'])) { if(isset($usr['loginname'])) {
$customer = $usr['firstname'] . " " . $usr['name'] . " (" . $usr['loginname'] . ")"; $customer = getCorrectFullUserDetails($usr);
} else { } else {
$customer = $lng['ticket']['nonexistingcustomer']; $customer = $lng['ticket']['nonexistingcustomer'];
} }
@@ -741,7 +728,8 @@ elseif($page == 'archive'
while($row = $db->fetch_array($result2)) while($row = $db->fetch_array($result2))
{ {
$customers.= makeoption($row['name'] . ', ' . $row['firstname'] . ' (' . $row['loginname'] . ')', $row['customerid']); $customer = getCorrectFullUserDetails($row);
$customers.= makeoption($customer, $row['customerid']);
} }
} }