diff --git a/support.admin.inc b/support.admin.inc index d88572a..1f2a45b 100644 --- a/support.admin.inc +++ b/support.admin.inc @@ -553,7 +553,7 @@ function support_admin_settings_validate($form, &$form_state) { form_set_error('support_autoassign_ticket', t('Invalid %field user, %username is not a valid user.', array('%field' => t('auto-assign'), '%username' => $form_state['values']['support_autoassign_ticket']))); } else if (!user_access('administer support', $account)) { - form_set_error('support_autoassign_ticket', t('Invalid %field user, %username does not have %admin permission.', array('%field' => t('auto-assign'), '%username' => $account->name, '%admin' => t('administer support')))); + form_set_error('support_autoassign_ticket', t('Invalid %field user, %username does not have %admin permission.', array('%field' => t('auto-assign'), '%username' => theme('username', array('account' => $account)), '%admin' => t('administer support')))); } } } diff --git a/support.module b/support.module index c49c45b..58ce16a 100644 --- a/support.module +++ b/support.module @@ -514,7 +514,7 @@ function support_autocomplete_autosubscribe($clid, $string = '') { foreach ($result as $account) { $a = $account->name; - $matches[$prefix . $a] = check_plain($account->name); + $matches[$prefix . $a] = check_plain(theme('username', array('account' => $account))); } } @@ -846,7 +846,7 @@ function support_user_view($account, $view_mode, $langcode) { if (variable_get('support_display_user_links', TRUE)) { if ($view_mode == 'full' && ((user_access('create tickets', $account) && $user->uid == $account->uid) || user_access('administer support'))) { $items = array(); - $items[] = l(t('View recent tickets'), "support/user/$account->uid", array('attributes' => array('title' => t("Read @username's latest tickets.", array('@username' => check_plain($account->name)))))); + $items[] = theme('username', array('account' => $account)); $items[] = l(t('Create new ticket'), 'node/add/support-ticket'); $account->content['summary']['support'] = array( '#type' => 'user_profile_item', @@ -976,7 +976,7 @@ function support_node_validate($node, $form, &$form_state) { $valid = _support_validate_assigned_user($notify, $client); if (!$valid) { $account = user_load($notify); - form_set_error("notify-$notify", t('Unable to subscribe user, %user does not have permission to view this ticket.', array('%user' => $account->name))); + form_set_error("notify-$notify", t('Unable to subscribe user, %user does not have permission to view this ticket.', array('%user' => theme('username', array('account' => $account))))); } } } @@ -1565,11 +1565,11 @@ function support_mail_tokens($account, $language, $nid, $comment, $suppress) { } // TODO Please change this theme call to use an associative array for the $variables parameter. $tokens = array( - '!username' => $account->name, - '!client_name' => $client->name, + '!username' => theme('username', array('account' => $account)), + '!client_name' => theme('username', array('account' => $client)), '!client_path' => $client->path, '!key' => '[' . variable_get('support_key', 'tkt') . ":$nid]", - '!update_username' => isset($update_account->name) ? $update_account->name : '', + '!update_username' => isset($update_account->name) ? theme('username', array('account' => $update_account)) : '', '!update_realname' => theme('username', array('account' => $user)), '!site' => variable_get('site_name', 'Drupal'), '!uri' => $base_url, @@ -2752,7 +2752,7 @@ function _support_status_form_attach(&$form, &$form_state, $node) { if (isset($node->assigned)) { if (is_numeric($node->assigned)) { $account = user_load($node->assigned); - $assigned = $account->name; + $assigned = theme('username', array('account' => $account)); } else { $assigned = $node->assigned; @@ -2811,12 +2811,12 @@ function _support_assigned($assigned, $node, $limit = 9999) { // To return a single user object, wrap "user_load_multiple" with "array_shift" or equivalent. // Example: array_shift(user_load_multiple(array(), $assigned)) $account = user_load($assigned); - $available["$assigned-$node->nid"][$account->uid] = $account->name; + $available["$assigned-$node->nid"][$account->uid] = theme('username', array('account' => $account)); $counter++; } // can always re-assign ticket to self - $available["$assigned-$node->nid"][$user->uid] = $user->name; + $available["$assigned-$node->nid"][$user->uid] = strip_tags(theme('username', array('account' => $user))); $counter++; if (isset($node->client) && is_numeric($node->client) && (user_access('administer support') || user_access('can assign tickets to any user'))) { @@ -2864,7 +2864,7 @@ function _support_assigned($assigned, $node, $limit = 9999) { // load users and allow them to be assigned foreach ($accounts as $uid) { $account = user_load($uid); - $available["$assigned-$node->nid"][$account->uid] = $account->name; + $available["$assigned-$node->nid"][$account->uid] = strip_tags(theme('username', array('account' => $account))); } } // sort by name @@ -2931,7 +2931,7 @@ function _support_subscribe_form_attach(&$form, &$form_state, $node) { $accounts = array(); foreach ($result as $a) { $account = user_load($a->uid); - $accounts[] = $account->name; + $accounts[] = theme('username', array('account' => $account)); } if (!empty($accounts)) { $default = implode(', ', $accounts); @@ -3363,7 +3363,7 @@ function support_page_form($form, &$form_state, $client = NULL, $state = NULL) { $form['id'][$ticket->nid] = array('#markup' => l($ticket->nid, "node/$ticket->nid", array('attributes' => array('class' => array('ticket-id'))))); $form['title'][$ticket->nid] = array('#markup' => l(_support_truncate($ticket->title), "node/$ticket->nid", array('attributes' => array('class' => array('ticket-title'))))); $form['updated'][$ticket->nid] = array('#markup' => format_date($ticket->last_updated, 'short', array('attributes' => array('class' => array('ticket-updated'))))); - $form['reported'][$ticket->nid] = array('#markup' => l(_support_truncate($account->name, 24), "user/$account->uid", array('attributes' => array('class' => array('ticket-reported'))))); + $form['reported'][$ticket->nid] = array('#markup' => theme('username', array('account' => $account, 'attributes' => array('class' => array('ticket-reported')))));//l(_support_truncate($account->name, 24), "user/$account->uid", array())); // Assigned to if ((user_access('edit multiple tickets') && user_access('can assign tickets to any user')) || user_access('administer support')) { $node = node_load($ticket->nid); @@ -3372,7 +3372,7 @@ function support_page_form($form, &$form_state, $client = NULL, $state = NULL) { if (isset($ticket->assigned)) { if (is_numeric($ticket->assigned)) { $account = user_load($ticket->assigned); - $assigned = $account->name; + $assigned = theme('username', array('account' => $account)); } else { $assigned = $ticket->assigned; diff --git a/support.user.inc b/support.user.inc index 6782a54..494c72d 100644 --- a/support.user.inc +++ b/support.user.inc @@ -142,11 +142,11 @@ function support_page_user($user, $assigned = FALSE, $state = NULL) { 'class' => array('ticket-updated'), ), array( - 'data' => l(_support_truncate($account->name, 24), "user/$account->uid"), + 'data' => theme('username', array('account' => $account)), 'class' => array('ticket-reported'), ), array( - 'data' => l(_support_truncate($assigned->name, 24), "user/$assigned->uid"), + 'data' => theme('username', array('account' => $assigned)), 'class' => array('ticket-assigned'), ), array( diff --git a/support_overview/support_overview.module b/support_overview/support_overview.module index 886496e..589f706 100644 --- a/support_overview/support_overview.module +++ b/support_overview/support_overview.module @@ -251,7 +251,7 @@ function support_overview_summary() { $rows[$current_row][] = "
" . t('not assigned') . '
'; } else { - $rows[$current_row][] = "
" . l($account->name, "support/$account->uid/assigned") . '
'; + $rows[$current_row][] = "
" . theme('username', array('account' => $account, 'link_path' => "support/$account->uid/assigned")) . '
'; } $rows[$current_row][] = t('!total !latest !oldest', array('!total' => "$total", '!latest' => "
$latest_update
", '!oldest' => "
$oldest_update
")); @@ -439,7 +439,7 @@ function support_overview_user($type, &$edit, &$account) { if ($type == 'view' && ((user_access('create tickets', $account) && $user->uid == $account->uid) || user_access('administer support'))) { - $items = array(l(t('Overview'), "support/overview/user/$account->uid", array('attributes' => array('title' => t("View overview of @username's tickets.", array('@username' => check_plain($account->name))))))); + $items = array(l(t('Overview'), "support/overview/user/$account->uid", array('attributes' => array('title' => t("View overview of @username's tickets.", array('@username' => check_plain(theme('username', array('account' => $account))))))))); $account->content['summary']['support']['#value'] .= theme('item_list', array('items' => $items)); } } @@ -457,11 +457,11 @@ function support_overview_page_user($account, $all = FALSE, $page = TRUE) { drupal_set_title(t('My ticket overview')); } else { - drupal_set_title(t("@username's ticket overview", array('@username' => $account->name))); + drupal_set_title(t("@username's ticket overview", array('@username' => theme('username', array('account' => $account))))); } $breadcrumb = array(); $breadcrumb[] = l(t('Home'), NULL); - $breadcrumb[] = l($account->name, "user/$account->uid"); + $breadcrumb[] = theme('username', array('account' => $account)); drupal_set_breadcrumb($breadcrumb); } @@ -584,7 +584,7 @@ function support_overview_page_users($all = FALSE) { foreach ($result as $row) { $uid = $row->assigned; $account = user_load($uid); - $output .= "

" . check_plain($account->name) . '

'; + $output .= '

' . theme('username', array('account' => $account, 'link_path' => "support/overview/user/$uid")) . '

'; $output .= support_overview_page_user($account, $all, FALSE); } $output .= '
' . l($all ? t('selected clients') : t('all clients'), $all ? "support/overview/user" : "support/overview/user/all") . '
';