|
@@ -561,14 +561,19 @@ if ($action == "view_ticketlist") {
|
|
|
// Ref
|
|
|
if (!empty($arrayfields['t.ref']['checked'])) {
|
|
|
print '<td class="nowraponall">';
|
|
|
+ print '<a rel="nofollow" href="javascript:viewticket(\''.dol_escape_js($obj->track_id).'\',\''.dol_escape_js($_SESSION['email_customer']).'\');">';
|
|
|
+ print img_picto('', 'ticket', 'class="paddingrightonly"');
|
|
|
print $obj->ref;
|
|
|
+ print '</a>';
|
|
|
print '</td>';
|
|
|
}
|
|
|
|
|
|
// Subject
|
|
|
if (!empty($arrayfields['t.subject']['checked'])) {
|
|
|
print '<td>';
|
|
|
- print '<a rel="nofollow" href="javascript:viewticket(\''.$obj->track_id.'\',\''.$_SESSION['email_customer'].'\');">'.$obj->subject.'</a>';
|
|
|
+ print '<a rel="nofollow" href="javascript:viewticket(\''.dol_escape_js($obj->track_id).'\',\''.dol_escape_js($_SESSION['email_customer']).'\');">';
|
|
|
+ print $obj->subject;
|
|
|
+ print '</a>';
|
|
|
print '</td>';
|
|
|
}
|
|
|
|
|
@@ -602,13 +607,14 @@ if ($action == "view_ticketlist") {
|
|
|
|
|
|
// Message author
|
|
|
if (!empty($arrayfields['t.fk_user_create']['checked'])) {
|
|
|
- print '<td>';
|
|
|
+ print '<td title="'.dol_escape_htmltag($obj->origin_email).'">';
|
|
|
if ($obj->fk_user_create > 0) {
|
|
|
$user_create->firstname = (!empty($obj->user_create_firstname) ? $obj->user_create_firstname : '');
|
|
|
$user_create->name = (!empty($obj->user_create_lastname) ? $obj->user_create_lastname : '');
|
|
|
$user_create->id = (!empty($obj->fk_user_create) ? $obj->fk_user_create : '');
|
|
|
print $user_create->getFullName($langs);
|
|
|
} else {
|
|
|
+ print img_picto('', 'email', 'class="paddingrightonly"');
|
|
|
print $langs->trans('Email');
|
|
|
}
|
|
|
print '</td>';
|
|
@@ -617,10 +623,11 @@ if ($action == "view_ticketlist") {
|
|
|
// Assigned author
|
|
|
if (!empty($arrayfields['t.fk_user_assign']['checked'])) {
|
|
|
print '<td>';
|
|
|
- if ($obj->fk_user_assig > 0) {
|
|
|
+ if ($obj->fk_user_assign > 0) {
|
|
|
$user_assign->firstname = (!empty($obj->user_assign_firstname) ? $obj->user_assign_firstname : '');
|
|
|
$user_assign->lastname = (!empty($obj->user_assign_lastname) ? $obj->user_assign_lastname : '');
|
|
|
$user_assign->id = (!empty($obj->fk_user_assign) ? $obj->fk_user_assign : '');
|
|
|
+ print img_picto('', 'user', 'class="paddingrightonly"');
|
|
|
print $user_assign->getFullName($langs);
|
|
|
}
|
|
|
print '</td>';
|