' . t('Each support ticket can only be assigned to one client. !create one or more clients, then !assign allowing users to access these tickets. Users can only create tickets for clients they have permission to access. If working with multiple clients you will need to !define for each to prevent one client from viewing the tickets of another client.', array('!create' => l(t('Create'), 'admin/support/clients/add'), '!assign' => l(t('assign permissions'), 'admin/user/permissions', array('fragment' => 'module-support')), '!define' => l(t('define roles'), 'admin/user/roles'))) . '
';
+ case 'admin/config/support/clients':
+ $output = '' . t('Each support ticket can only be assigned to one client.!create one or more clients, then!assign allowing users to access these tickets. Users can only create tickets for clients they have permission to access. If working with multiple clients you will need to!define for each to prevent one client from viewing the tickets of another client.', array('!create' => l(t('Create'), 'admin/config/support/clients/add'), '!assign' => l(t('assign permissions'), 'admin/people/permissions', array('fragment' => 'module-support')), '!define' => l(t('define roles'), 'admin/people/permissions/roles'))) . '
';
break;
- case 'admin/support/clients/add':
- case 'admin/support/clients/%/edit':
- $output = '' . t("Each support ticket must be assigned to one client. Support can be configured so one client can't view another client's tickets.") . '
';
- $output .= '' . t('If you would like users to be able to create and update tickets via email, you will require a dedicated email address for each client. This email address is used to send and receive update notifications. A cronjob automatically downloads emails sent to this address and converts them into tickets and ticket updates. The message_id of each email is tracked, allowing support to properly associate replies with existing tickets.') . '
';
+ case 'admin/config/support/clients/add':
+ case 'admin/config/support/clients/%/edit':
+ $output = '' . t("Each support ticket must be assigned to one client. Support can be configured so one client can't view another client's tickets.") . '
';
+ $output .= '' . t('If you would like users to be able to create and update tickets via email, you will require a dedicated email address for each client. This email address is used to send and receive update notifications. A cronjob automatically downloads emails sent to this address and converts them into tickets and ticket updates. The message_id of each email is tracked, allowing support to properly associate replies with existing tickets.') . '
';
break;
- case 'admin/support/settings':
+ case 'admin/config/support/settings':
$output = '' . t('Global settings for the support module.') . '
';
break;
default:
@@ -412,15 +411,12 @@ function support_unsubscribe_user($node, $account, $key) {
if (is_object($node) && is_object($account)) {
$lock = md5($account->uid . $node->nid);
if ($key == $lock) {
- // TODO Please review the conversion of this statement to the D7 database API syntax.
- /* db_query('UPDATE {support_assigned} SET active = 0 WHERE uid = %d AND nid = %d', $account->uid, $node->nid) */
- db_update('support_assigned')
- ->fields(array(
+ db_update('support_assigned')->fields(array(
'active' => 0,
))
- ->condition('uid', $account->uid)
- ->condition('nid', $node->nid)
- ->execute();
+ ->condition('uid', $account->uid)
+ ->condition('nid', $node->nid)
+ ->execute();
drupal_set_message(t('%email has been unsubscribed from ticket %ticket.', array('%email' => check_plain($account->mail), '%ticket' => check_plain($node->title))));
}
else {
@@ -431,14 +427,11 @@ function support_unsubscribe_user($node, $account, $key) {
else if (is_object($account)) {
$lock = md5($account->uid);
if ($key == $lock) {
- // TODO Please review the conversion of this statement to the D7 database API syntax.
- /* db_query('UPDATE {support_assigned} SET active = 0 WHERE uid = %d', $account->uid) */
- db_update('support_assigned')
- ->fields(array(
+ db_update('support_assigned')->fields(array(
'active' => 0,
))
- ->condition('uid', $account->uid)
- ->execute();
+ ->condition('uid', $account->uid)
+ ->execute();
drupal_set_message(t('%email has been unsubscribed from all tickets.', array('%email' => check_plain($account->mail))));
}
else {
@@ -492,7 +485,11 @@ function support_client_load($id, $integer = TRUE) {
function support_ticket_load($nid) {
static $tickets = array();
if (!isset($tickets[$nid])) {
- $ticket = db_query('SELECT * FROM {support_ticket} WHERE nid = :nid', array(':nid' => $nid));
+ $ticket = db_select('support_ticket', 't')
+ ->condition('nid', $nid)
+ ->fields('t')
+ ->execute()
+ ->fetchObject();
drupal_alter('support_ticket_load', $ticket);
$tickets[$nid] = $ticket;
}
@@ -504,8 +501,7 @@ function support_ticket_load($nid) {
*/
function support_access_user_tickets($account = array()) {
global $user;
- if (user_access('administer support') || user_access('edit any ticket') ||
- (user_access('create tickets') && $account->uid == $user->uid)) {
+ if (user_access('administer support') || user_access('edit any ticket') || (user_access('create tickets') && $account->uid == $user->uid)) {
return TRUE;
}
return FALSE;
@@ -517,7 +513,7 @@ function support_access_user_tickets($account = array()) {
function _support_domains($client, $global) {
$domains = array();
$string = "$client, $global";
- $raw = explode(',', $string);
+ $raw = explode(', ', $string);
foreach ($raw as $domain) {
if ($domain) {
$domains[] = check_plain(trim($domain));
@@ -539,8 +535,7 @@ function support_account_load($from, $ticket, $subject, $client) {
// Example: array_shift(user_load_multiple(array(), $uid))
return user_load($uid);
}
- else if ($client->user_creation == 2 ||
- ($client->user_creation == 0 && variable_get('support_autocreate_users', TRUE) == FALSE)) {
+ else if ($client->user_creation == 2 || ($client->user_creation == 0 && variable_get('support_autocreate_users', TRUE) == FALSE)) {
// User does not exist and the setting to allow automatic creation is
// disabled. Send notification to user.
watchdog('support', 'An autocreation of a user from the e-mail address: !from was denied. The client recieving the request was: !client', array('!from' => utf8_encode($from), '!client' => $client->name));
@@ -622,7 +617,7 @@ function support_permission() {
'description' => t('Can prevent notification email from being sent.'),
),
'can subscribe other users to notifications' => array(
- 'title'=> t('Can subscribe other users to notifications'),
+ 'title' => t('Can subscribe other users to notifications'),
'description' => t('Can subscribe and unsubscribe other users to email notifications.'),
),
'download mail via support/fetch' => array(
@@ -668,22 +663,20 @@ function support_permission() {
}
/**
- * Implementation of hook_user().
+ * Implementation of hook_user_view().
*/
-function support_user($type, &$edit, &$account) {
+function support_user_view($account, $view_mode, $langcode) {
global $user;
if (variable_get('support_display_user_links', TRUE)) {
- if ($type == 'view' &&
- ((user_access('create tickets', $account) && $user->uid == $account->uid)
- || user_access('administer support'))) {
+ 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[] = l(t('Create new ticket'), 'node/add/support-ticket');
$account->content['summary']['support'] = array(
'#type' => 'user_profile_item',
'#title' => t('Tickets'),
- '#value' => theme('item_list', array('items' => $items)),
- '#attributes' => array('class' => 'support'),
+ '#markup' => theme('item_list', array('items' => $items)),
+ '#attributes' => array('class' => array('support')),
);
}
}
@@ -692,22 +685,14 @@ function support_user($type, &$edit, &$account) {
/**
* Implementation of hook_form().
*/
-function support_form(&$node) {
+function support_form($node, $form_state) {
$type = node_type_get_type($node);
- $form['title'] = array(
- '#type' => 'textfield',
- '#title' => check_plain($type->title_label),
- '#required' => TRUE,
- '#default_value' => !empty($node->title) ? $node->title : NULL,
- '#weight' => -5,
- );
+ $form = node_content_form($node, $form_state);
$reference = array();
$form = array_merge($form, support_status_form($reference, $node, ''));
- $form['body_field'] = node_body_field($node, $type->body_label, $type->min_word_count);
-
if (isset($node->nid) && $node->nid) {
$form['ticket'] = array(
'#type' => 'fieldset',
@@ -722,180 +707,280 @@ function support_form(&$node) {
'#maxlength' => 12,
'#size' => 8,
'#description' => t('Optionally specify another ticket id to move this ticket and all of its updates. When moved, this ticket and all of its updates will become updates to the specified ticket and this ticket will be removed. This action can not be undone.'),
- '#access' => (user_access('administer support') || user_access('move ticket')),
+ '#access' => (user_access('administer support') || user_access('move ticket')),
);
}
$form = array_merge($form, support_subscribe_form($reference, $node, ''));
return $form;
-
}
/**
- * Implementation of hook_nodeapi().
+ * Implementation of hook_node_view().
*/
-function support_nodeapi(&$node, $op, $teaser, $page) {
+function support_node_view($node, $view_mode, $langcode) {
global $user;
if ($node->type == 'support_ticket') {
- $autocomplete = 'subscribed-users';
- switch ($op) {
- case 'view':
- // viewing a ticket
- drupal_add_css(drupal_get_path('module', 'support') . '/support-tickets.css');
- $breadcrumb = array();
- $breadcrumb[] = l(t('Home'), NULL);
- $breadcrumb[] = l(t('Support tickets'), 'support');
- if (is_numeric($node->client)) {
- $_SESSION['support_client'] = $node->client;
- $client = support_client_load($node->client);
- if (!empty($client->parent)) {
- $parent = support_client_load($client->parent);
- $breadcrumb[] = l(check_plain($parent->name), "support/$parent->path");
- $breadcrumb[] = l(check_plain($client->name), "support/$parent->path/$client->path");
- }
- else {
- $breadcrumb[] = l(check_plain($client->name), "support/$client->path");
- }
- }
- drupal_set_breadcrumb($breadcrumb);
- break;
- case 'load':
- return db_query('SELECT message_id, state, priority, client, assigned FROM {support_ticket} WHERE nid = :nid', array(':nid' => $node->nid));
- case 'validate':
- $client = db_query('SELECT name FROM {support_client} WHERE clid = :clid', array(':clid' => $node->client))->fetchField();
- if (!isset($node->client) || $node->client == 0) {
- form_set_error('client', t('You must select a client'));
- }
- if (isset($node->assigned) && !is_numeric($node->assigned)) {
- $assigned = db_query("SELECT uid FROM {users} WHERE name = :name", array(':name' => $node->assigned))->fetchField();
- if ($node->assigned && !$assigned) {
- form_set_error('assigned', t('You must specify a valid user.'));
- }
- else if ($assigned) {
- $valid = _support_validate_assigned_user($assigned, $client);
- if (!$valid) {
- form_set_error('assigned', t('You must specify a user that has permission to view this ticket.'));
- }
- }
- }
- if (isset($node->move) && is_numeric($node->move) && $node->move) {
- $destination = node_load($node->move);
- if (!is_object($destination) || !$destination->nid) {
- form_set_error('move', t('Destination node does not exist.'));
- }
+ // viewing a ticket
+ drupal_add_css(drupal_get_path('module', 'support') . '/support-tickets.css');
+ $breadcrumb = array();
+ $breadcrumb[] = l(t('Home'), NULL);
+ $breadcrumb[] = l(t('Support tickets'), 'support');
+ if (is_numeric($node->client)) {
+ $_SESSION['support_client'] = $node->client;
+ $client = support_client_load($node->client);
+ if (!empty($client->parent)) {
+ $parent = support_client_load($client->parent);
+ $breadcrumb[] = l(check_plain($parent->name), "support/$parent->path");
+ $breadcrumb[] = l(check_plain($client->name), "support/$parent->path/$client->path");
+ }
+ else {
+ $breadcrumb[] = l(check_plain($client->name), "support/$client->path");
+ }
+ }
+ drupal_set_breadcrumb($breadcrumb);
+ }
+}
+
+/**
+ * Implementation of hook_node_load().
+ */
+function support_node_load($nodes, $types) {
+ $result = db_query('SELECT nid, message_id, state, priority, client, assigned FROM {support_ticket} WHERE nid IN(:nids)', array(':nids' => array_keys($nodes)));
+ foreach ($result as $record) {
+ if ($nodes[$record->nid]->type == 'support_ticket') {
+ $nodes[$record->nid]->message_id = $record->message_id;
+ $nodes[$record->nid]->state = $record->state;
+ $nodes[$record->nid]->priority = $record->priority;
+ $nodes[$record->nid]->client = $record->client;
+ $nodes[$record->nid]->assigned = $record->assigned;
+ }
+ }
+}
+
+/**
+ * Implementation of hook_node_validate().
+ */
+function support_node_validate($node, $form, &$form_state) {
+ if ($node->type == 'support_ticket') {
+ $client = db_query('SELECT name FROM {support_client} WHERE clid = :clid', array(':clid' => $node->client))->fetchField();
+ if (!isset($node->client) || $node->client == 0) {
+ form_set_error('client', t('You must select a client'));
+ }
+ if (isset($node->assigned) && !is_numeric($node->assigned)) {
+ $assigned = db_query("SELECT uid FROM {users} WHERE name = :name", array(':name' => $node->assigned))->fetchField();
+ if ($node->assigned && !$assigned) {
+ form_set_error('assigned', t('You must specify a valid user.'));
+ }
+ else if ($assigned) {
+ $valid = _support_validate_assigned_user($assigned, $client);
+ if (!$valid) {
+ form_set_error('assigned', t('You must specify a user that has permission to view this ticket.'));
}
- // check for users subscribed during ticket creation (checkboxes)
- if (isset($node->notifications) && !empty($node->notifications)) {
- $notifications = explode(',', $node->notifications);
- foreach ($notifications as $notify) {
- $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)));
- }
- }
+ }
+ }
+ if (isset($node->move) && is_numeric($node->move) && $node->move) {
+ $destination = node_load($node->move);
+ if (!is_object($destination) || !$destination->nid) {
+ form_set_error('move', t('Destination node does not exist.'));
+ }
+ }
+ // check for users subscribed during ticket creation (checkboxes)
+ if (isset($node->notifications) && !empty($node->notifications)) {
+ $notifications = explode(',', $node->notifications);
+ foreach ($notifications as $notify) {
+ $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)));
}
- // check for users subscribed during ticket creation (autocomplete)
- else if (!empty($node->$autocomplete)) {
- $notifications = explode(',', $node->$autocomplete);
- foreach ($notifications as $notify) {
- $account = array_shift(user_load_multiple(array(), array('name' => trim($notify))));
- if (empty($account) || (!user_access("access $client tickets", $account) && !user_access('administer support', $account))) {
- form_set_error('subscribed-users', t('Unable to subscribe user, %user does not have permission to view this ticket.', array('%user' => $notify)));
- }
- }
+ }
+ }
+ // check for users subscribed during ticket creation (autocomplete)
+ else if (!empty($node->$autocomplete)) {
+ $notifications = explode(',', $node->$autocomplete);
+ foreach ($notifications as $notify) {
+ $account = array_shift(user_load_multiple(array(), array('name' => trim($notify))));
+ if (empty($account) || (!user_access("access $client tickets", $account) && !user_access('administer support', $account))) {
+ form_set_error('subscribed_users', t('Unable to subscribe user, %user does not have permission to view this ticket.', array('%user' => $notify)));
}
- break;
+ }
+ }
+ }
+}
- case 'insert':
- case 'update':
- if (isset($node->move) && is_numeric($node->move) && $node->move) {
- $destination = node_load($node->move);
- _support_node_move($node, $destination);
- }
- if (isset($node->assigned) && !is_numeric($node->assigned)) {
- $assigned = db_query("SELECT uid FROM {users} WHERE name = :name", array(':name' => $node->assigned))->fetchField();
- if ($assigned) {
- $node->assigned = $assigned;
- }
- else {
- $node->assigned = 0;
- }
- }
- // TODO Please review the conversion of this statement to the D7 database API syntax.
- /* db_query("UPDATE {support_ticket} SET message_id = '%s', state = %d, priority = %d, client = %d, assigned = %d WHERE nid = %d", isset($node->message_id) ? $node->message_id : '', $node->state, $node->priority, $node->client, $node->assigned, $node->nid) */
- db_update('support_ticket')
- ->fields(array(
- 'message_id' => isset($node->message_id) ? $node->message_id : '',
- 'state' => $node->state,
- 'priority' => $node->priority,
- 'client' => $node->client,
- 'assigned' => $node->assigned,
- ))
+/**
+ * Common code for inserting or updating a support ticket
+ */
+function _support_node_insert_update($node) {
+ if (isset($node->move) && is_numeric($node->move) && $node->move) {
+ $destination = node_load($node->move);
+ _support_node_move($node, $destination);
+ }
+ if (isset($node->assigned) && !is_numeric($node->assigned)) {
+ $assigned = db_query("SELECT uid FROM {users} WHERE name = :name", array(':name' => $node->assigned))->fetchField();
+ if ($assigned) {
+ $node->assigned = $assigned;
+ }
+ else {
+ $node->assigned = 0;
+ }
+ }
+ $update = db_update('support_ticket')->fields(array(
+ 'message_id' => isset($node->message_id) ? $node->message_id : '',
+ 'state' => $node->state,
+ 'priority' => $node->priority,
+ 'client' => $node->client,
+ 'assigned' => $node->assigned,
+ ))
->condition('nid', $node->nid)
->execute();
- if (!db_affected_rows()) {
- @db_query("INSERT INTO {support_ticket} (nid, message_id, state, priority, client, assigned) VALUES(%d, '%s', %d, %d, %d, %d)", $node->nid, isset($node->message_id) ? $node->message_id : '', $node->state, $node->priority, $node->client, $node->assigned);
- }
+ if ($update == 0) {
+ db_insert('support_ticket')->fields(array(
+ 'nid' => $node->nid,
+ 'message_id' => isset($node->message_id) ? $node->message_id : '',
+ 'state' => $node->state,
+ 'priority' => $node->priority,
+ 'client' => $node->client,
+ 'assigned' => $node->assigned
+ ))
+ ->execute();
+ }
- if (isset($node->notifications) && !empty($node->notifications)) {
- $notifications = explode(',', $node->notifications);
- foreach ($notifications as $notify) {
- $enabled = "notify-$notify";
- support_subscribe_user($node->nid, $notify, $node->$enabled);
- }
- }
- else if (isset($node->$autocomplete)) {
- $notifications = explode(',', $node->$autocomplete);
- foreach ($notifications as $notify) {
- $account = array_shift(user_load_multiple(array(), array('name' => trim($notify))));
- if (!empty($account)) {
- support_subscribe_user($node->nid, $account->uid, TRUE);
- }
- }
- }
+ if (isset($node->notifications) && !empty($node->notifications)) {
+ $notifications = explode(',', $node->notifications);
+ foreach ($notifications as $notify) {
+ $enabled = "notify-$notify";
+ support_subscribe_user($node->nid, $notify, $node->$enabled);
+ }
+ }
+ else if (isset($node->$autocomplete)) {
+ $notifications = explode(',', $node->$autocomplete);
+ foreach ($notifications as $notify) {
+ $account = array_shift(user_load_multiple(array(), array('name' => trim($notify))));
+ if (!empty($account)) {
+ support_subscribe_user($node->nid, $account->uid, TRUE);
+ }
+ }
+ }
+}
- if ($op == 'insert') {
- // auto-subscribe ticket creator
- if (variable_get('support_autosubscribe_creator', FALSE) || isset($node->created_by_email)) {
- support_subscribe_user($node->nid, $node->uid);
- }
- else {
- support_subscribe_user($node->nid, $node->uid, $node->notification);
- }
- // auto-subscribe assigned user
- if ($node->assigned || isset($node->created_by_email) || !user_access('can subscribe other users to notifications')) {
- support_subscribe_user($node->nid, $node->assigned);
- }
- // auto-subscribe configured users
- if (variable_get('support_autosubscribe_force', FALSE) ||
- isset($node->created_by_email) ||
- !user_access('can subscribe other users to notifications')) {
- _support_autosubscribe($node->nid, $node->client);
- }
- // generate notification emails
- support_notification(array(), $node->nid, 'ticket_new', isset($node->suppress) ? $node->suppress : FALSE);
- }
- cache_clear_all();
- break;
- case 'delete':
- // TODO Please review the conversion of this statement to the D7 database API syntax.
- /* db_query('DELETE FROM {support_ticket} WHERE nid = %d', $node->nid) */
- db_delete('support_ticket')
- ->condition('nid', $node->nid)
- ->execute();
- break;
+/**
+ * Implementation of hook_node_insert().
+ */
+function support_node_insert($node) {
+ if ($node->type == 'support_ticket') {
+ _support_node_insert_update($node);
+
+ // auto-subscribe ticket creator
+ if (variable_get('support_autosubscribe_creator', FALSE) || isset($node->created_by_email)) {
+ support_subscribe_user($node->nid, $node->uid);
+ }
+ else {
+ support_subscribe_user($node->nid, $node->uid, $node->notification);
+ }
+ // auto-subscribe assigned user
+ if ($node->assigned || isset($node->created_by_email) || !user_access('can subscribe other users to notifications')) {
+ support_subscribe_user($node->nid, $node->assigned);
}
+ // auto-subscribe configured users
+ if (variable_get('support_autosubscribe_force', FALSE) || isset($node->created_by_email) || !user_access('can subscribe other users to notifications')) {
+ _support_autosubscribe($node->nid, $node->client);
+ }
+ // generate notification emails
+ support_notification(array(), $node->nid, 'ticket_new', isset($node->suppress) ? $node->suppress : FALSE);
+
+ cache_clear_all();
}
}
/**
- * Implementation of hook_comment().
+ * Implementation of hook_node_update().
*/
-function support_comment(&$comment, $op) {
- global $user;
+function support_node_update($node) {
+ if ($node->type == 'support_ticket') {
+ _support_node_insert_update($node);
+ cache_clear_all();
+ }
+}
+
+/**
+ * Implementation of hook_node_delete().
+ */
+function support_node_delete($node) {
+ if ($node->type == 'support_ticket') {
+ db_delete('support_ticket')->condition('nid', $node->nid)->execute();
+ }
+}
+function _support_comment_insert_update($comment) {
+ if (isset($comment->assigned) && !is_numeric($comment->assigned)) {
+ $assigned = db_query("SELECT uid FROM {users} WHERE name = :name", array(':name' => $comment->assigned))->fetchField();
+ if ($assigned) {
+ $comment->assigned = $assigned;
+ }
+ else {
+ $comment->assigned = 0;
+ }
+ }
+ $update = db_update('support_ticket_comment')->fields(array(
+ 'message_id' => isset($comment->message_id) ? $comment->message_id : '',
+ 'state' => $comment->state,
+ 'priority' => $comment->priority,
+ 'client' => $comment->client,
+ 'assigned' => $comment->assigned,
+ ))
+ ->condition('cid', $comment->cid)
+ ->execute();
+ if ($update == 0) {
+ db_insert('support_ticket_comment')->fields(array(
+ 'cid' => $comment->cid,
+ 'message_id' => isset($comment->message_id) ? $comment->message_id : '',
+ 'state' => $comment->state,
+ 'priority' => $comment->priority,
+ 'client' => $comment->client,
+ 'assigned' => $comment->assigned
+ ))
+ ->execute();
+ // The first update to a ticket is not preserved in the database.
+ // Store it in an array allowing other modules to dectect/respond to
+ // ticket changes.
+ $comment->previous = new stdClass();
+ $comment->previous->state = $comment->state;
+ $comment->previous->priority = $comment->priority;
+ $comment->previous->client = $comment->client;
+ $comment->previous->assigned = $comment->assigned;
+ }
+ _support_comment_update_node($comment->nid);
+}
+
+function _support_comment_insert_update2($comment) {
+ // if admin, can update who is assigned to the ticket
+ if (user_access('administer support') && (!isset($comment->support_email) || !$comment->support_email)) {
+ if (isset($comment->subscribed_users) && !empty($comment->subscribed_users)) {
+ $array = drupal_explode_tags($comment->subscribed_users);
+ foreach ($array as $name) {
+ $uid = db_query("SELECT uid FROM {users} WHERE name = :name", array(':name' => $name))->fetchField();
+ $notify = "notify_$uid";
+ $comment->$notify = 1;
+ }
+ }
+ $available = _support_assigned(0, $node);
+ foreach ($available as $uid => $name) {
+ if (!$uid || $user->uid == $uid) {
+ continue;
+ }
+ $notify = "notify_$uid";
+ support_subscribe_user($node->nid, $uid, $comment->$notify);
+ }
+ }
+}
+
+/**
+ * Implementation of hook_comment_insert().
+ */
+function support_comment_insert($comment) {
if (is_array($comment)) {
$node = node_load($comment['nid']);
}
@@ -903,135 +988,141 @@ function support_comment(&$comment, $op) {
$node = node_load($comment->nid);
}
if ($node->type == 'support_ticket') {
- switch ($op) {
- case 'view':
- support_comment_view($comment);
- break;
- case 'validate':
- if (isset($comment['assigned']) && !is_numeric($comment['assigned'])) {
- $assigned = db_query("SELECT uid FROM {users} WHERE name = :name", array(':name' => $comment['assigned']))->fetchField();
- if ($node->assigned && !$assigned) {
- form_set_error('assigned', t('You must specify a valid user.'));
- }
- else if ($assigned) {
- $client = db_query('SELECT name FROM {support_client} WHERE clid = :clid', array(':clid' => $node->client))->fetchField();
- $valid = _support_validate_assigned_user($assigned, $client);
- if (!$valid) {
- form_set_error('assigned', t('You must specify a user that has permission to view this ticket.'));
- }
- }
- }
- break;
- case 'insert':
- case 'update':
- if (isset($comment['assigned']) && !is_numeric($comment['assigned'])) {
- $assigned = db_query("SELECT uid FROM {users} WHERE name = :name", array(':name' => $comment['assigned']))->fetchField();
- if ($assigned) {
- $comment['assigned'] = $assigned;
- }
- else {
- $comment['assigned'] = 0;
- }
- }
- // TODO Please review the conversion of this statement to the D7 database API syntax.
- /* db_query("UPDATE {support_ticket_comment} SET message_id = '%s', state = %d, priority = %d, client = %d, assigned = %d WHERE cid = %d", isset($comment['message_id']) ? $comment['message_id'] : '', $comment['state'], $comment['priority'], $comment['client'], $comment['assigned'], $comment['cid']) */
- db_update('support_ticket_comment')
- ->fields(array(
- 'message_id' => isset($comment['message_id']) ? $comment['message_id'] : '',
- 'state' => $comment['state'],
- 'priority' => $comment['priority'],
- 'client' => $comment['client'],
- 'assigned' => $comment['assigned'],
- ))
- ->condition('cid', $comment['cid'])
- ->execute();
- if (!db_affected_rows()) {
- @db_query("INSERT INTO {support_ticket_comment} (cid, message_id, state, priority, client, assigned) VALUES(%d, '%s', %d, %d, %d, %d)", $comment['cid'], isset($comment['message_id']) ? $comment['message_id'] : '', $comment['state'], $comment['priority'], $comment['client'], $comment['assigned']);
- // The first update to a ticket is not preserved in the database.
- // Store it in an array allowing other modules to dectect/respond to
- // ticket changes.
- $comment['previous'] = new stdClass();
- $comment['previous']->state = $node->state;
- $comment['previous']->priority = $node->priority;
- $comment['previous']->client = $node->client;
- $comment['previous']->assigned = $node->assigned;
- }
- _support_comment_update_node($comment['nid']);
- if ($op == 'insert') {
- // auto-subscribe ticket-comment creator
- if (variable_get('support_autosubscribe_creator', FALSE)) {
- support_subscribe_user($comment['nid'], $comment['uid']);
- }
- else {
- support_subscribe_user($comment['nid'], $comment['uid'], $comment['notification']);
- }
- // force auto-subscribe configured users
- if (variable_get('support_autosubscribe_force', FALSE)) {
- _support_autosubscribe($comment['nid'], $comment['client']);
- }
- // auto-subscribe assigned user
- if ($comment['assigned']) {
- support_subscribe_user($comment['nid'], $comment['assigned']);
- }
- // generate notification emails
- support_notification($comment, $comment['nid'], 'ticket_comment_new', isset($comment['suppress']) ? $comment['suppress'] : FALSE);
- }
- // if admin, can update who is assigned to the ticket
- if (user_access('administer support') && (!isset($comment['support_email']) || !$comment['support_email'])) {
- if (isset($comment['subscribed-users']) &&
- !empty($comment['subscribed-users'])) {
- $array = drupal_explode_tags($comment['subscribed-users']);
- foreach ($array as $name) {
- $uid = db_query("SELECT uid FROM {users} WHERE name = :name", array(':name' => $name))->fetchField();
- $comment["notify-$uid"] = 1;
- }
- }
- $available = _support_assigned(0, $node);
- foreach ($available as $uid => $name) {
- if (!$uid || $user->uid == $uid) {
- continue;
- }
- support_subscribe_user($node->nid, $uid, $comment["notify-$uid"]);
- }
- }
- break;
- case 'delete':
- // TODO Please review the conversion of this statement to the D7 database API syntax.
- /* db_query('DELETE FROM {support_ticket_comment} WHERE cid = %d', $comment->cid) */
- db_delete('support_ticket_comment')
- ->condition('cid', $comment->cid)
- ->execute();
- _support_comment_update_node($comment->nid);
+ _support_comment_insert_update($comment);
+
+ // auto-subscribe ticket-comment creator
+ if (variable_get('support_autosubscribe_creator', FALSE)) {
+ support_subscribe_user($comment->nid, $comment->uid);
+ }
+ else {
+ support_subscribe_user($comment->nid, $comment->uid, $comment->notification);
}
+ // force auto-subscribe configured users
+ if (variable_get('support_autosubscribe_force', FALSE)) {
+ _support_autosubscribe($comment->nid, $comment->client);
+ }
+ // auto-subscribe assigned user
+ if ($comment->assigned) {
+ support_subscribe_user($comment->nid, $comment->assigned);
+ }
+ // generate notification emails
+ support_notification($comment, $comment->nid, 'ticket_comment_new', isset($comment->suppress) ? $comment->suppress : FALSE);
+
+ _support_comment_insert_update2($comment);
}
}
/**
- * Display state, priority and client when viewing comments for support nodes.
+ * Implementation of hook_comment_insert().
*/
-function support_comment_view(&$comment) {
- static $state = 0;
- static $priority = 0;
- static $client = 0;
- static $assigned = 0;
- $current = db_query('SELECT state, priority, client, assigned FROM {support_ticket_comment} WHERE cid = :cid', array(':cid' => $comment->cid));
- if (!empty($current) && $assigned != $current->assigned) {
- $previous_account = user_load($assigned);
- $current_account = user_load($current->assigned);
- $comment->comment = '' . t('Assigned') . ': ' . ($previous_account->name ? $previous_account->name : '' . t('unassigned') . '') . ' -> ' . ($current_account->name ? $current_account->name : '' . t('unassigned') . '') . "
\n" . $comment->comment;
- $assigned = $current->assigned;
+function support_comment_update($comment) {
+ if (is_array($comment)) {
+ $node = node_load($comment['nid']);
}
- if (!empty($current) && $client != $current->client) {
- $comment->comment = '' . t('Client') . ': ' . _support_client($client) . ' -> ' . _support_client($current->client) . "
\n" . $comment->comment;
- $client = $current->client;
+ else {
+ $node = node_load($comment->nid);
}
- if (!empty($current) && $state != $current->state) {
- $comment->comment = '' . t('State') . ': ' . _support_state($state) . ' -> ' . _support_state($current->state) . "
\n" . $comment->comment;
- $state = $current->state;
+ if ($node->type == 'support_ticket') {
+ _support_comment_insert_update($comment);
+ _support_comment_insert_update2($comment);
}
- if (!empty($current) && $priority != $current->priority) {
- $comment->comment = '' . t('Priority') . ': ' . _support_priorities($priority) . ' -> ' . _support_priorities($current->priority) . "
\n" . $comment->comment;
- $priority = $current->priority;
+}
+
+/**
+ * Implementation of hook_comment_insert().
+ */
+function support_comment_delete($comment) {
+ if (is_array($comment)) {
+ $node = node_load($comment['nid']);
+ }
+ else {
+ $node = node_load($comment->nid);
+ }
+ if ($node->type == 'support_ticket') {
+ // TODO Please review the conversion of this statement to the D7 database API syntax.
+ /* db_query('DELETE FROM {support_ticket_comment} WHERE cid = %d', $comment->cid) */
+ db_delete('support_ticket_comment')
+ ->condition('cid', $comment->cid)
+ ->execute();
+ _support_comment_update_node($comment->nid);
+ }
+}
+
+/**
+ * Implementation of hook_comment_validate().
+ */
+function support_comment_validate($comment) {
+ if (is_array($comment)) {
+ $node = node_load($comment['nid']);
+ }
+ else {
+ $node = node_load($comment->nid);
+ }
+ if ($node->type == 'support_ticket') {
+ if (isset($comment->assigned) && !is_numeric($comment->assigned)) {
+ $assigned = db_query("SELECT uid FROM {
+ users
+ } WHERE name = :name", array(':name' => $comment->assigned))->fetchField();
+ if ($node->assigned && !$assigned) {
+ form_set_error('assigned', t('You must specify a valid user.'));
+ }
+ else if ($assigned) {
+ $client = db_query('SELECT name FROM {support_client} WHERE clid = :clid', array(':clid' => $node->client))->fetchField();
+ $valid = _support_validate_assigned_user($assigned, $client);
+ if (!$valid) {
+ form_set_error('assigned', t('You must specify a user that has permission to view this ticket.'));
+ }
+ }
+ }
+ }
+}
+
+/**
+ * Implementation of hook_comment_view().
+ */
+function support_comment_view($comment, $view_mode, $langcode) {
+ if ($comment->node_type == 'comment_node_support_ticket') {
+ static $state = 0;
+ static $priority = 0;
+ static $client = 0;
+ static $assigned = 0;
+
+ drupal_add_css(drupal_get_path('module', 'support') . '/support-tickets.css');
+
+ $query = db_select('support_ticket_comment', 'c')
+ ->fields('c')
+ ->condition('c.cid', $comment->cid);
+
+ $current = $query->execute()->fetchObject();
+
+ if (!empty($current) && $assigned != $current->assigned) {
+ $previous_account = user_load($assigned);
+ $current_account = user_load($current->assigned);
+ $comment->content['support']['assigned'] = array(
+ '#markup' => '' . t('Assigned') . ': ' . ($previous_account->name ? $previous_account->name : '' . t('unassigned') . '') . ' -> ' . ($current_account->name ? $current_account->name : '' . t('unassigned') . '') . '
'
+ );
+ $assigned = $current->assigned;
+ }
+ if (!empty($current) && $client != $current->client) {
+ $comment->content['support']['client'] = array(
+ '#markup' => '' . t('Client') . ': ' . _support_client($client) . ' -> ' . _support_client($current->client) . '
'
+ );
+ $client = $current->client;
+ }
+ if (!empty($current) && $state != $current->state) {
+ $comment->content['support']['state'] = array(
+ '#markup' => '' . t('State') . ': ' . _support_state($state) . ' -> ' . _support_state($current->state) . '
'
+ );
+ $state = $current->state;
+ }
+ if (!empty($current) && $priority != $current->priority) {
+ $comment->content['support']['priority'] = array(
+ '#markup' => '' . t('Priority') . ': ' . _support_priorities($priority) . ' -> ' . _support_priorities($current->priority) . '
'
+ );
+ $priority = $current->priority;
+ }
+ if (array_key_exists('support', $comment->content))
+ $comment->content['support']['#weight'] = -1;
}
}
@@ -1061,7 +1152,7 @@ function support_mail($key, &$message, $params) {
$cid = $params['cid'];
$references = array();
while ($cid) {
- $cid = db_query('SELECT pid FROM {comments} WHERE cid = :cid', array(':cid' => $cid))->fetchField();
+ $cid = db_query('SELECT pid FROM {comment} WHERE cid = :cid', array(':cid' => $cid))->fetchField();
// The last one will be cid 0.
$references[] = _support_generate_message_id($params['nid'], $cid);
}
@@ -1093,16 +1184,13 @@ function _support_node_move($node, $destination) {
}
// Move the ticket, making it an update on another ticket.
- $max = db_query('SELECT MAX(thread) FROM {comments} WHERE nid = :nid', array(':nid' => $destination->nid))->fetchField();
+ $max = db_query('SELECT MAX(thread) FROM {comment} WHERE nid = :nid', array(':nid' => $destination->nid))->fetchField();
// Strip the "/" from the end of the thread.
$max = rtrim($max, '/');
// Finally, build the thread field for this new comment.
$thread = int2vancode(vancode2int($max) + 1) . '/';
$account = user_load($node->uid);
- // TODO Please review the conversion of this statement to the D7 database API syntax.
- /* db_query("INSERT INTO {comments} (nid, pid, uid, subject, comment, format, hostname, timestamp, status, thread, name, mail, homepage) VALUES (%d, %d, %d, '%s', '%s', %d, '%s', %d, %d, '%s', '%s', '%s', '%s')", $destination->nid, 0, $node->uid, $node->title, $node->body, 1, ip_address(), $node->changed, 0, $thread, $account->name, $account->mail, $account->homepage) */
- $id = db_insert('comments')
- ->fields(array(
+ $id = db_insert('comment')->fields(array(
'nid' => $destination->nid,
'pid' => 0,
'uid' => $node->uid,
@@ -1143,40 +1231,36 @@ function _support_node_move($node, $destination) {
$result = db_query('SELECT fid, description, list, weight FROM {upload} WHERE nid = :nid', array(':nid' => $node->nid));
foreach ($result as $upload) {
// TODO Please convert this statement to the D7 database API syntax.
- /* db_query("INSERT INTO {comment_upload} (fid, nid, cid, description, list, weight) VALUES(%d, %d, %d, '%s', %d, %d)", $upload->fid, $destination->nid, $comment['cid'], $upload->description, $upload->list, $upload->weight) */
+ /* db_query("INSERT INTO {
+ comment_upload
+ } (fid, nid, cid, description, list, weight) VALUES(%d, %d, %d, '%s', %d, %d)", $upload->fid, $destination->nid, $comment['cid'], $upload->description, $upload->list, $upload->weight) */
NULL;
}
// TODO Please review the conversion of this statement to the D7 database API syntax.
/* db_query('DELETE FROM {upload} WHERE nid = %d', $node->nid) */
db_delete('upload')
- ->condition('nid', $node->nid)
- ->execute();
+ ->condition('nid', $node->nid)
+ ->execute();
}
else {
// transfer attachments to new node
- // TODO Please review the conversion of this statement to the D7 database API syntax.
- /* db_query('UPDATE {upload} SET nid = %d WHERE nid = %d', $destination->nid, $node->nid) */
- db_update('upload')
- ->fields(array(
+ db_update('upload')->fields(array(
'nid' => $destination->nid,
))
- ->condition('nid', $node->nid)
- ->execute();
+ ->condition('nid', $node->nid)
+ ->execute();
}
}
// add an entry to the watchdog log
- watchdog('content', 'Comment: added %subject.', array('%subject' => $comment['subject']), WATCHDOG_NOTICE, l(t('view'), 'node/' . $comment['nid'], array('fragment' => 'comment-' . $comment['cid'])));
+ watchdog('content', 'Comment: added %subject.', array('%subject' => $comment->subject), WATCHDOG_NOTICE, l(t('view'), 'node/' . $comment->nid, array('fragment' => 'comment-' . $comment->cid)));
- $result = db_query('SELECT cid, uid, subject, comment, format, hostname, timestamp, timestamp, status, thread, name, mail, homepage FROM {comments} WHERE nid = :nid', array(':nid' => $node->nid));
+ $result = db_query('SELECT cid, uid, subject, comment, format, hostname, timestamp, timestamp, status, thread, name, mail, homepage FROM {comment} WHERE nid = :nid', array(':nid' => $node->nid));
foreach ($result as $update) {
$oldcid = $update['cid'];
$max = rtrim($thread, '/');
$thread = int2vancode(vancode2int($max) + 1) . '/';
- // TODO Please review the conversion of this statement to the D7 database API syntax.
- /* db_query("INSERT INTO {comments} (nid, pid, uid, subject, comment, format, hostname, timestamp, status, thread, name, mail, homepage) VALUES (%d, %d, %d, '%s', '%s', %d, '%s', %d, %d, '%s', '%s', '%s', '%s')", $destination->nid, 0, $update['uid'], $update['subject'], $update['comment'], $update['format'], $update['hostname'], $update['timestamp'], $update['status'], $thread, $update['name'], $update['mail'], $update['homepage']) */
- $id = db_insert('comments')
- ->fields(array(
+ $id = db_insert('comment')->fields(array(
'nid' => $destination->nid,
'pid' => 0,
'uid' => $update['uid'],
@@ -1191,7 +1275,7 @@ function _support_node_move($node, $destination) {
'mail' => $update['mail'],
'homepage' => $update['homepage'],
))
- ->execute();
+ ->execute();
// Tell the other modules a new comment has been submitted.
$update['cid'] = db_last_insert_id('comments', 'cid');
$update['nid'] = $destination->nid;
@@ -1207,16 +1291,13 @@ function _support_node_move($node, $destination) {
// transfer attachments to new comment
if (module_exists('comment_upload')) {
- // TODO Please review the conversion of this statement to the D7 database API syntax.
- /* db_query('UPDATE {comment_upload} SET nid = %d, cid = %d WHERE nid = %d AND cid = %d', $destination->nid, $update['cid'], $node->nid, $oldcid) */
- db_update('comment_upload')
- ->fields(array(
+ db_update('comment_upload')->fields(array(
'nid' => $destination->nid,
'cid' => $update['cid'],
))
- ->condition('nid', $node->nid)
- ->condition('cid', $oldcid)
- ->execute();
+ ->condition('nid', $node->nid)
+ ->condition('cid', $oldcid)
+ ->execute();
}
}
_comment_update_node_statistics($comment['nid']);
@@ -1259,12 +1340,11 @@ function support_mail_tokens($account, $language, $nid, $comment, $suppress) {
$client = support_client_load($node->client);
$ticket_unsubscribe_key = md5($account->uid . $node->nid);
$all_unsubscribe_key = md5($account->uid);
- $previous_comment = db_query_range('SELECT cid FROM {comments} WHERE nid = :nid ORDER BY cid DESC', array(':nid' => $nid))->fetchField();
+ $previous_comment = db_query_range('SELECT cid FROM {comment} WHERE nid = :nid ORDER BY cid DESC', array(':nid' => $nid))->fetchField();
if ($previous_comment) {
$previous = db_query('SELECT * FROM {support_ticket_comment} WHERE cid = :cid', array(':cid' => $previous_comment));
}
// TODO Please change this theme call to use an associative array for the $variables parameter.
- // TODO Please change this theme call to use an associative array for the $variables parameter.
$tokens = array(
'!username' => $account->name,
'!client_name' => $client->name,
@@ -1311,7 +1391,7 @@ function _support_mail_list_attachments($node, $comment) {
$attachments[] = url($file['filepath'], array('absolute' => TRUE, 'alias' => variable_get('support_use_aliased_urls', TRUE)));
}
}
- return (!empty($attachments) ? "',
@@ -1978,26 +2052,32 @@ function support_search_form_submit($form, &$form_state) {
/**
* Imeplementation of hook_db_rewrite_sql().
* Optionally remove support tickets from content search.
+ *
+ * TODO
+ * Migrate to D7 the body of the function
+ *
*/
-function support_db_rewrite_sql($query, $primary_table, $primary_field, $args) {
- global $user;
- if (variable_get('support_remove_tickets', TRUE) && $query == '' && $primary_table == 'n' && $primary_field = 'nid' && empty($args)) {
+function support_query_alter(QueryAlterableInterface $query) {
+ /*
+ global $user;
+ if (variable_get('support_remove_tickets', TRUE) && $query == '' && $primary_table == 'n' && $primary_field = 'nid' && empty($args)) {
return array('where' => " n.type != 'support_ticket'");
- }
- if ($primary_table == 'n' AND $primary_field == 'nid' && !strpos($query, '{support_ticket}')) {
+ }
+ if ($primary_table == 'n' AND $primary_field == 'nid' && !strpos($query, '{support_ticket}')) {
$clients = support_search_available_clients();
if (!empty($clients)) {
- if (!user_access('view other users tickets') && !user_access('administer support')) {
- return array('join' => ' LEFT JOIN {support_ticket} st ON n.nid = st.nid', 'where' => ' ((st.client IN (' . implode(',', $clients) . ') AND n.uid = ' . $user->uid . ') OR st.client IS NULL)');
- }
- else {
- return array('join' => ' LEFT JOIN {support_ticket} st ON n.nid = st.nid', 'where' => ' (st.client IN (' . implode(',', $clients) . ') OR st.client IS NULL)');
- }
+ if (!user_access('view other users tickets') && !user_access('administer support')) {
+ return array('join' => ' LEFT JOIN {support_ticket} st ON n.nid = st.nid', 'where' => ' ((st.client IN (' . implode(',', $clients) . ') AND n.uid = ' . $user->uid . ') OR st.client IS NULL)');
}
else {
- return array('where' => " n.type != 'support_ticket'");
+ return array('join' => ' LEFT JOIN {support_ticket} st ON n.nid = st.nid', 'where' => ' (st.client IN (' . implode(',', $clients) . ') OR st.client IS NULL)');
}
- }
+ }
+ else {
+ return array('where' => " n.type != 'support_ticket'");
+ }
+ }
+ */
}
/**
@@ -2017,176 +2097,131 @@ function support_search_available_clients() {
return $clids;
}
-/**
- * Implementation of hook _search.
+/* TODO
+ * Finish migration to D7 api
+ * I dont understand or find doc about $conditions on how it works...
+ *
*/
-function support_search($op = 'search', $keys = NULL, $skip_access_check = FALSE) {
- global $user;
-
- switch ($op) {
- case 'name':
- if ($skip_access_check || support_access_clients()) {
- return t('Tickets');
- }
- break;
-
- case 'search':
- // Build matching conditions
- $join = 'INNER JOIN {node} n ON n.nid = i.sid';
- $conditions = "n.status = 1 AND n.type = 'support_ticket'";
- $arguments = array();
-
- // clients
- if ($client = search_query_extract($keys, 'client')) {
- $clients = array();
- foreach (explode(',', $client) as $c) {
- $clients[] = "jt.client = %d";
- $arguments[] = $c;
- }
- $conditions .= ' AND (' . implode(' OR ', $clients) . ')';
- $keys = search_query_insert($keys, 'client');
- }
- // states
- if ($state = search_query_extract($keys, 'state')) {
- $states = array();
- foreach (explode(',', $state) as $s) {
- $states[] = "jt.state = %d";
- $arguments[] = $s;
- }
- $conditions .= ' AND (' . implode(' OR ', $states) . ')';
- $keys = search_query_insert($keys, 'state');
- }
- // priorities
- if ($priority = search_query_extract($keys, 'priority')) {
- $priorities = array();
- foreach (explode(',', $priority) as $p) {
- $priorities[] = "jt.priority = %d";
- $arguments[] = $p;
- }
- $conditions .= ' AND (' . implode(' OR ', $priorities) . ')';
- $keys = search_query_insert($keys, 'priority');
- }
-
- $keys = search_query_insert($keys, 'type');
- $clients = support_search_available_clients();
- if (!empty($clients)) {
- $join .= " LEFT JOIN {support_ticket} jt ON n.nid = jt.nid";
- $conditions .= ' AND jt.client IN (' . implode(',', support_search_available_clients()) . ')';
- }
- else {
- // User can not access any tickets
- $conditions .= " AND n.type != 'support_ticket'";
- }
- if (!user_access('view other users tickets') && !user_access('administer support') && !user_access('edit any ticket') && !user_access('delete any ticket')) {
- $conditions .= " AND n.uid = $user->uid";
- }
-
- // Build ranking expression (we try to map each parameter to a uniform
- // distribution in the range 0..1).
- // Tickets are nodes, so use the same ranking.
- $ranking = array();
- $arguments2 = array();
- $join2 = '';
- // Used to avoid joining on node_comment_statistics twice
- $stats_join = FALSE;
- $total = 0;
- if ($weight = (int) variable_get('node_rank_relevance', 5)) {
- // Average relevance values hover around 0.15
- $ranking[] = '%d * i.relevance';
- $arguments2[] = $weight;
- $total += $weight;
- }
- if ($weight = (int) variable_get('node_rank_recent', 5)) {
- // Exponential decay with half-life of 6 months, starting at last indexed node
- $ranking[] = '%d * POW(2, (GREATEST(MAX(n.created), MAX(n.changed), MAX(c.last_comment_timestamp)) - %d) * 6.43e-8)';
- $arguments2[] = $weight;
- $arguments2[] = (int) variable_get('node_cron_last', 0);
- $join2 .= ' LEFT JOIN {node_comment_statistics} c ON c.nid = i.sid';
- $stats_join = TRUE;
- $total += $weight;
- }
- if (module_exists('comment') && $weight = (int) variable_get('node_rank_comments', 5)) {
- // Inverse law that maps the highest reply count on the site to 1 and 0 to 0.
- $scale = variable_get('node_cron_comments_scale', 0.0);
- $ranking[] = '%d * (2.0 - 2.0 / (1.0 + MAX(c.comment_count) * %f))';
- $arguments2[] = $weight;
- $arguments2[] = $scale;
- if (!$stats_join) {
- $join2 .= ' LEFT JOIN {node_comment_statistics} c ON c.nid = i.sid';
- }
- $total += $weight;
- }
- if (module_exists('statistics') && variable_get('statistics_count_content_views', 0) &&
- $weight = (int) variable_get('node_rank_views', 5)) {
- // Inverse law that maps the highest view count on the site to 1 and 0 to 0.
- $scale = variable_get('node_cron_views_scale', 0.0);
- $ranking[] = '%d * (2.0 - 2.0 / (1.0 + MAX(nc.totalcount) * %f))';
- $arguments2[] = $weight;
- $arguments2[] = $scale;
- $join2 .= ' LEFT JOIN {node_counter} nc ON nc.nid = i.sid';
- $total += $weight;
- }
-
- // When all search factors are disabled (ie they have a weight of zero),
- // the default score is based only on keyword relevance and there is no need to
- // adjust the score of each item.
- if ($total == 0) {
- $select2 = 'i.relevance AS score';
- $total = 1;
- }
- else {
- $select2 = implode(' + ', $ranking) . ' AS score';
- }
-
- // Do search.
- $find = do_search($keys, 'node', $join, $conditions, $arguments, $select2, $join2, $arguments2);
- // Load results.
- $results = array();
- foreach ($find as $item) {
- // Build the node body.
- $node = node_load($item->sid);
- $node->build_mode = NODE_BUILD_SEARCH_RESULT;
- $node = node_build_content($node, FALSE, FALSE);
- $node->body = drupal_render($node->content);
+function support_search_execute($keys, $conditions) {
+ $arguments = array();
- // Fetch comments for snippet.
- $node->body .= module_invoke('comment', 'nodeapi', $node, 'update index');
- // Fetch terms for snippet.
- $node->body .= module_invoke('taxonomy', 'nodeapi', $node, 'update index');
+ // clients
+ if ($client = search_expression_extract($keys, 'client')) {
+ $clients = array();
+ foreach (explode(',', $client) as $c) {
+ $clients[] = "jt.client = %d";
+ $arguments[] = $c;
+ }
+ $conditions .= ' AND (' . implode(' OR ', $clients) . ')';
+ $keys = search_expression_insert($keys, 'client');
+ }
+ // states
+ if ($state = search_expression_extract($keys, 'state')) {
+ $states = array();
+ foreach (explode(',', $state) as $s) {
+ $states[] = "jt.state = %d";
+ $arguments[] = $s;
+ }
+ $conditions .= ' AND (' . implode(' OR ', $states) . ')';
+ $keys = search_expression_insert($keys, 'state');
+ }
+ // priorities
+ if ($priority = search_expression_extract($keys, 'priority')) {
+ $priorities = array();
+ foreach (explode(',', $priority) as $p) {
+ $priorities[] = "jt.priority = %d";
+ $arguments[] = $p;
+ }
+ $conditions .= ' AND (' . implode(' OR ', $priorities) . ')';
+ $keys = search_expression_insert($keys, 'priority');
+ }
- $extra = module_invoke_all('node_search_result', $node);
- if (!is_array($extra)) {
- $extra = array();
- }
- if (sizeof($clients) > 1) {
- $title = _support_client($node->client) . ': ' . $node->title;
- }
- else {
- $title = $node->title;
- }
- // change 'comments' to 'follow ups' for support tickets
- foreach ($extra as $key => $value) {
- $trans = array(' comments' => ' follow ups');
- $extra[$key] = strtr($value, $trans);
- }
- $extra[] = _support_state($node->state);
- $extra[] = _support_priorities($node->priority);
- $clients = support_search_available_clients();
- $results[] = array(
- 'link' => url('node/' . $item->sid, array('absolute' => TRUE)),
- 'type' => check_plain(node_type_get_name($node)),
- 'title' => $title,
- 'user' => theme('username', array('account' => $node)),
- 'date' => $node->changed,
- 'node' => $node,
- 'extra' => $extra,
- 'score' => $item->score / $total,
- 'snippet' => search_excerpt($keys, $node->body),
- );
- }
- return $results;
+ $keys = search_expression_insert($keys, 'type');
+ $clients = support_search_available_clients();
+ if (!empty($clients)) {
+ $join .= " LEFT JOIN {support_ticket} jt ON n.nid = jt.nid";
+ $conditions .= ' AND jt.client IN (' . implode(',', support_search_available_clients()) . ')';
+ }
+ else {
+ // User can not access any tickets
+ $conditions .= " AND n.type != 'support_ticket'";
+ }
+ if (!user_access('view other users tickets') && !user_access('administer support') && !user_access('edit any ticket') && !user_access('delete any ticket')) {
+ $conditions .= " AND n.uid = $user->uid";
+ }
+
+ $query = db_select('search_index', 'i')->extend('SearchQuery')->extend('PagerDefault');
+ $query->join('node', 'n', 'n.nid = i.sid');
+ $query
+ ->condition('n.status', 1)
+ ->condition('n.type', 'support_ticket')
+ ->addTag('node_access')
+ ->searchExpression($keys, 'node');
+
+ // Add the ranking expressions.
+ _node_rankings($query);
+
+ // Add additional modifiers here...
+ $find = $query
+ ->limit(10)
+ ->execute();
+
+ // Load results.
+ $results = array();
+ foreach ($find as $item) {
+ // Build the node body.
+ $node = node_load($item->sid);
+ $node->build_mode = NODE_BUILD_SEARCH_RESULT;
+ $node = node_build_content($node, FALSE, FALSE);
+ $node->body = drupal_render($node->content);
+
+ // Fetch comments for snippet.
+ $node->body .= module_invoke('comment', 'nodeapi', $node, 'update index');
+ // Fetch terms for snippet.
+ $node->body .= module_invoke('taxonomy', 'nodeapi', $node, 'update index');
+
+ $extra = module_invoke_all('node_search_result', $node);
+ if (!is_array($extra)) {
+ $extra = array();
+ }
+ if (sizeof($clients) > 1) {
+ $title = _support_client($node->client) . ': ' . $node->title;
+ }
+ else {
+ $title = $node->title;
+ }
+ // change 'comments' to 'follow ups' for support tickets
+ foreach ($extra as $key => $value) {
+ $trans = array(' comments' => ' follow ups');
+ $extra[$key] = strtr($value, $trans);
+ }
+ $extra[] = _support_state($node->state);
+ $extra[] = _support_priorities($node->priority);
+ $clients = support_search_available_clients();
+ $results[] = array(
+ 'link' => url('node/' . $item->sid, array('absolute' => TRUE)),
+ 'type' => check_plain(node_type_get_name($node)),
+ 'title' => $title,
+ 'user' => theme('username', array('account' => $node)),
+ 'date' => $node->changed,
+ 'node' => $node,
+ 'extra' => $extra,
+ 'score' => $item->score / $total,
+ 'snippet' => search_excerpt($keys, $node->body),
+ );
}
+ return $results;
+}
+
+/**
+ * Implementation of hook _search_info().
+ */
+function support_search_info() {
+ return array(
+ 'title' => 'Tickets',
+ 'path' => 'support',
+ );
}
/**
@@ -2210,14 +2245,13 @@ function support_status_form(&$form_state, $edit, $title) {
$node = $edit;
}
$autoassign = _support_autoassign(_support_current_client(), $user->uid);
- if ($autoassign && !isset($node->assigned) &&
- (!isset($node->nid) || !$node->nid)) {
+ if ($autoassign && !isset($node->assigned) && (!isset($node->nid) || !$node->nid)) {
// This ticket is being created, and this module is configured to
// auto-assign new tickets.
$node->assigned = $autoassign;
}
if ($cid) {
- $comment = db_query('SELECT state, priority FROM {support_ticket_comment} WHERE cid = :cid', array(':cid' => $cid));
+ $comment = db_query('SELECT state, priority FROM {support_ticket_comment} WHERE cid = :cid', array(':cid' => $cid))->execute()->fetchObject();
if ($comment->state && $comment->priority) {
$node->state = $comment->state;
$node->priority = $comment->priority;
@@ -2228,7 +2262,8 @@ function support_status_form(&$form_state, $edit, $title) {
user_access('can select client') ||
user_access('can assign tickets to self') ||
user_access('can assign tickets to any user') ||
- user_access('administer support') || user_access('can administer state')) {
+ user_access('administer support') ||
+ user_access('can administer state')) {
$form['support'] = array(
'#type' => 'fieldset',
'#prefix' => '
',
@@ -2244,7 +2279,7 @@ function support_status_form(&$form_state, $edit, $title) {
}
if (!user_access('can select state') &&
!user_access('administer support') &&
- !user_access('can administer state')) {
+ !user_access('can administer state')) {
$form['support']['state'] = array(
'#type' => 'hidden',
'#value' => $default,
@@ -2264,11 +2299,11 @@ function support_status_form(&$form_state, $edit, $title) {
'#default_value' => $default,
);
}
- if (!user_access('can select priority') &&
- !user_access('administer support')) {
+ $priority = isset($node->priority) ? $node->priority : _support_priority_default();
+ if (!user_access('can select priority') && !user_access('administer support')) {
$form['support']['priority'] = array(
'#type' => 'hidden',
- '#value' => $node->priority ? $node->priority : _support_priority_default(),
+ '#value' => $priority,
);
}
else {
@@ -2277,7 +2312,7 @@ function support_status_form(&$form_state, $edit, $title) {
'#prefix' => ' ',
'#title' => t('Priority'),
'#options' => _support_priorities(),
- '#default_value' => isset($node->priority) ? $node->priority : _support_priority_default(),
+ '#default_value' => $priority,
);
}
$clients = _support_available_clients();
@@ -2286,7 +2321,7 @@ function support_status_form(&$form_state, $edit, $title) {
$node->client = key($clients);
}
else {
- if (is_numeric($_SESSION['support_client'])) {
+ if (isset($_SESSION['support_client']) && is_numeric($_SESSION['support_client'])) {
$node->client = $_SESSION['support_client'];
}
else if (!user_access('can select client')) {
@@ -2297,13 +2332,17 @@ function support_status_form(&$form_state, $edit, $title) {
}
}
}
- $clients = array(0 => '- select client -') + $clients;
- if ((sizeof($clients) == 1) ||
- (!user_access('can select client') &&
- !user_access('administer support'))) {
+ if (is_array($clients))
+ $clients = array(0 => '- select client -') + $clients;
+ else
+ $clients = array(0 => '- select client -');
+
+ $client = isset($node->client) && is_numeric($node->client) ? $node->client : 0;
+
+ if ((sizeof($clients) == 1) || (!user_access('can select client') && !user_access('administer support'))) {
$form['support']['client'] = array(
'#type' => 'hidden',
- '#value' => is_numeric($node->client) ? $node->client : 0,
+ '#value' => $client,
);
}
else {
@@ -2313,15 +2352,15 @@ function support_status_form(&$form_state, $edit, $title) {
'#prefix' => ' ',
'#title' => t('Client'),
'#options' => $clients,
- '#default_value' => is_numeric($node->client) ? $node->client : 0,
+ '#default_value' => $client,
);
}
- if (!user_access('can assign tickets to self') &&
- !user_access('can assign tickets to any user') &&
- !user_access('administer support')) {
+
+ if (!user_access('can assign tickets to self') && !user_access('can assign tickets to any user') && !user_access('administer support')) {
+ $assigned = isset($node->assigned) ? $node->assigned : 0;
$form['support']['assigned'] = array(
'#type' => 'hidden',
- '#value' => $node->assigned ? $node->assigned : 0,
+ '#value' => $assigned,
);
}
else {
@@ -2349,12 +2388,13 @@ function support_status_form(&$form_state, $edit, $title) {
);
}
else {
+ $assigned = isset($node->assigned) ? $node->assigned : 0;
$form['support']['assigned'] = array(
'#type' => 'select',
'#prefix' => ' ',
'#title' => t('Assigned'),
'#options' => $options,
- '#default_value' => isset($node->assigned) ? $node->assigned : 0,
+ '#default_value' => $assigned,
);
}
}
@@ -2392,12 +2432,12 @@ function _support_assigned($assigned, $node, $limit = 9999) {
$available["$assigned-$node->nid"][$user->uid] = $user->name;
$counter++;
- if (is_numeric($node->client) && (user_access('administer support') || user_access('can assign tickets to any user'))) {
+ if (isset($node->client) && is_numeric($node->client) && (user_access('administer support') || user_access('can assign tickets to any user'))) {
$roles = array();
$client = db_query('SELECT name FROM {support_client} WHERE clid = :clid', array(':clid' => $node->client))->fetchField();
// retrieve all roles giving permission to access current tickets
// TODO Please convert this statement to the D7 database API syntax.
- $result = db_query("SELECT rid FROM {permission} WHERE perm LIKE '%%%s%%' OR perm LIKE '%%%s%%'", $client, 'administer support');
+ $result = db_query("SELECT rid FROM {role_permission} WHERE permission LIKE :clike OR permission LIKE :plike", array(':clike' => '%' . $client . '%', ':plike' => '%administer support%'));
foreach ($result as $role) {
$roles[$role->rid] = $role->rid;
}
@@ -2410,7 +2450,7 @@ function _support_assigned($assigned, $node, $limit = 9999) {
$result = db_query('SELECT uid FROM {users} WHERE status = :status', array(':status' => 1));
}
else {
- $result = db_query('SELECT r.uid FROM {users_roles} r LEFT JOIN {users} u ON r.uid = u.uid WHERE r.rid = :r.rid AND u.status = :u.status', array(':r.rid' => $rid, ':u.status' => 1));
+ $result = db_query('SELECT r.uid FROM {users_roles} r LEFT JOIN {users} u ON r.uid = u.uid WHERE r.rid = :rrid AND u.status = :ustatus', array(':rrid' => $rid, ':ustatus' => 1));
}
foreach ($result as $account) {
$accounts[$account->uid] = $account->uid;
@@ -2437,7 +2477,7 @@ function _support_assigned($assigned, $node, $limit = 9999) {
// can only unassign tickets if assigned to self, or have admin permissions
// (always put this at the top of the array)
if (!$assigned || $assigned == $user->uid ||
- user_access('can assign tickets to any user') || user_access('administer support')) {
+ user_access('can assign tickets to any user') || user_access('administer support')) {
$available["$assigned-$node->nid"] = array(0 => ' - ' . t('not assigned') . ' -') + $available["$assigned-$node->nid"];
}
}
@@ -2513,7 +2553,7 @@ function support_subscribe_form(&$form_state, $edit, $title) {
else {
$default = '';
}
- $form['subscribe']['subscribed']['subscribed-users'] = array(
+ $form['subscribe']['subscribed']['subscribed_users'] = array(
'#type' => 'textfield',
'#autocomplete_path' => 'support/autocomplete/autosubscribe/' . $node->client,
'#default_value' => $default,
@@ -2634,7 +2674,7 @@ function _support_states($all = TRUE, $sid = NULL, $account = NULL) {
function _support_state_default() {
static $default = NULL;
if (!$default) {
- $default = db_query_range('SELECT sid FROM {support_states} WHERE isdefault = :isdefault ORDER BY weight ASC', array(':isdefault' => 1))->fetchField();
+ $default = db_query_range('SELECT sid FROM {support_states} WHERE isdefault = :isdefault ORDER BY weight ASC', 0, 1, array(':isdefault' => 1))->fetchField();
}
return $default;
}
@@ -2645,7 +2685,7 @@ function _support_state_default() {
function _support_state_secondary() {
static $secondary = NULL;
if (!$secondary) {
- $secondary = db_query_range('SELECT sid FROM {support_states} WHERE phase2 = :phase2 ORDER BY weight ASC', array(':phase2' => 1))->fetchField();
+ $secondary = db_query_range('SELECT sid FROM {support_states} WHERE phase2 = :phase2 ORDER BY weight ASC', 0, 1, array(':phase2' => 1))->fetchField();
}
return $secondary;
}
@@ -2680,7 +2720,7 @@ function _support_priorities($pid = NULL) {
function _support_priority_default() {
static $default = NULL;
if (!$default) {
- $default = db_query_range('SELECT pid FROM {support_priority} WHERE isdefault = :isdefault', array(':isdefault' => 1))->fetchField();
+ $default = db_query_range('SELECT pid FROM {support_priority} WHERE isdefault = :isdefault', 0, 1, array(':isdefault' => 1))->fetchField();
}
return $default;
}
@@ -2689,8 +2729,15 @@ function _support_priority_default() {
* Helper function to determine if a user has support tickets already.
*/
function _support_ticket_exists($account) {
- // TODO Please convert this statement to the D7 database API syntax.
- return (bool) db_query_range(db_rewrite_sql("SELECT 1 FROM {node} n WHERE n.type = 'support_ticket' AND n.uid = %d AND n.status = 1"), $account->uid)->fetchField();
+ $result = db_select('node', 'n')
+ ->fields('n', array('nid', 'created'))
+ ->condition('type', 'support_ticket')
+ ->condition('status', 1)
+ ->condition('uid', $account->uid)
+ ->addTag('node_access')
+ ->execute()
+ ->fetchField();
+ return (bool) $result;
}
/**
@@ -2721,13 +2768,13 @@ function _support_available_clients($account = NULL) {
$clients = _support_clients_load();
if (is_array($clients) && !empty($clients)) {
foreach ($clients as $clid => $name) {
- if (user_access('administer support', $account) || user_access("access $name tickets", $account)) {
+ if (user_access('administer support', $account) || user_access("access $name tickets", $account) || user_access('create tickets', $account)) {
$valid[$account->uid][$clid] = $name;
}
}
}
else {
- drupal_set_message(t('There are no support clients configured/enabled.'), 'error');
+ drupal_set_message(t('There are no support clients configured/enabled.'), 'error', FALSE);
}
}
return isset($valid[$account->uid]) ? $valid[$account->uid] : NULL;
@@ -2824,8 +2871,7 @@ function support_page_form($form, &$form_state, $client = NULL, $state = NULL) {
$state = _support_get_state($state);
$form['post-ticket'] = array(
- '#type' => 'markup',
- '#value' => l(t('Post new support ticket'), 'node/add/support-ticket'),
+ '#markup' => l(t('Post new support ticket'), 'node/add/support-ticket'),
);
// TODO Please change this theme call to use an associative array for the $variables parameter.
$checkboxes = user_access('edit multiple tickets') || user_access('administer support') ? theme('table_select_header_cell') : array();
@@ -2869,26 +2915,37 @@ function support_page_form($form, &$form_state, $client = NULL, $state = NULL) {
),
);
- if ($state == -2) {
- $my_open = " AND t.assigned = $user->uid";
- }
- else {
- $my_open = "";
+ $query = db_select('node', 'n')->extend('PagerDefault');
+ $query->leftjoin('support_ticket', 't', 't.nid = n.nid');
+ $query->join('node_comment_statistics', 's', 's.nid = n.nid');
+ $query->join('users', 'u', 'u.uid = n.uid');
+ $query->leftjoin('comment', 'c', 'c.nid = n.nid');
+ $query->condition(db_or()
+ ->condition('c.status', COMMENT_PUBLISHED)
+ ->isNull('c.status'))
+ ->condition('n.status', NODE_PUBLISHED)
+ ->condition('n.type', 'support_ticket')
+ ->condition('t.client', $client);
+
+ if (!user_access('view other users tickets') && !user_access('administer support') && !user_access('edit any ticket') && !user_access('delete any ticket')) {
+ $query->condition('n.uid', $user->uid);
}
+ if ($state == -2)
+ $query->condition('t.assigned', $user->uid);
+
if ($state < 0) {
- $state = 'AND t.state NOT IN (' . implode(', ', _support_get_state(SUPPORT_STATE_CLOSED)) . ')';
+ $states = _support_get_state(SUPPORT_STATE_CLOSED);
+ $query->condition('t.state', $states, 'NOT IN');
}
- else {
- $state = $state ? "AND t.state = $state" : '';
+ else if ($state) {
+ $query->condition('t.state', $state);
}
- $sql = "SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count, t.state, t.priority, t.assigned FROM {node} n LEFT JOIN {support_ticket} t ON n.nid = t.nid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid WHERE (c.status = " . COMMENT_PUBLISHED . " OR c.status IS NULL) AND n.status = 1 AND n.type = 'support_ticket' AND client = $client $state $my_open";
- if (!user_access('view other users tickets') && !user_access('administer support') && !user_access('edit any ticket') && !user_access('delete any ticket')) {
- $sql .= " AND n.uid = $user->uid";
- }
- $sql = db_rewrite_sql($sql);
- $sql .= tablesort_sql($form['header']['#value']);
+ /* TODO
+ $query->orderBy($form['header']['#value']);
+ */
+
switch (variable_get('support_secondary_sort_order', 0)) {
case 0:
$order = 'ASC';
@@ -2899,21 +2956,27 @@ function support_page_form($form, &$form_state, $client = NULL, $state = NULL) {
}
switch (variable_get('support_secondary_sort_tickets', 0)) {
case 1:
- $sql .= ", last_updated $order";
+ $query->orderBy('last_updated', $order);
break;
case 2:
- $sql .= ", n.nid $order";
+ $query->orderBy('n.nid', $order);
break;
case 3:
- $sql .= ", t.state $order";
+ $query->orderBy('t.state', $order);
break;
case 4:
- $sql .= ", t.priority $order";
+ $query->orderBy('t.priority', $order);
break;
}
- $sql_count = "SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) LEFT JOIN {support_ticket} t ON n.nid = t.nid WHERE n.status = 1 AND client = $client $state $my_open";
- $sql_count = db_rewrite_sql($sql_count);
- $result = pager_query($sql, 50, 0, $sql_count);
+
+ $query->fields('n', array('nid', 'title', 'type', 'changed', 'uid'))
+ ->fields('u', array('name'))
+ ->fields('s', array('comment_count'))
+ ->fields('t', array('client', ' state', 'priority', 'assigned'))
+ ->addExpression('GREATEST(n.changed, s.last_comment_timestamp)', 'last_updated');
+
+ $result = $query->execute();
+
$rows = array();
foreach ($result as $ticket) {
drupal_alter('support_page_list_ticket', $ticket);
@@ -2925,10 +2988,10 @@ function support_page_form($form, &$form_state, $client = NULL, $state = NULL) {
$comments .= ' (' . l(format_plural($new, '1 new', '@count new'), "node/$ticket->nid", array('query' => comment_new_page_count($node->comment_count, $new, $node), 'fragment' => 'new')) . ')';
}
$tickets[$ticket->nid] = '';
- $form['id'][$ticket->nid] = array('#value' => l($ticket->nid, "node/$ticket->nid", array('attributes' => array('class' => 'ticket-id'))));
- $form['title'][$ticket->nid] = array('#value' => l(_support_truncate($ticket->title), "node/$ticket->nid", array('attributes' => array('class' => 'ticket-title'))));
- $form['updated'][$ticket->nid] = array('#value' => format_date($ticket->last_updated, 'short', array('attributes' => array('class' => 'ticket-updated'))));
- $form['reported'][$ticket->nid] = array('#value' => l(_support_truncate($account->name, 24), "user/$account->uid", array('attributes' => array('class' => 'ticket-reported'))));
+ $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')))));
// 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);
@@ -2951,7 +3014,7 @@ function support_page_form($form, &$form_state, $client = NULL, $state = NULL) {
'#autocomplete_path' => 'support/autocomplete/assigned/' . $ticket->client,
'#default_value' => $assigned,
'#size' => '15',
- '#attributes' => array('class' => 'ticket-assigned'),
+ '#attributes' => array('class' => array('ticket-assigned')),
);
}
else {
@@ -2959,13 +3022,13 @@ function support_page_form($form, &$form_state, $client = NULL, $state = NULL) {
'#type' => 'select',
'#options' => $options,
'#default_value' => isset($ticket->assigned) ? $ticket->assigned : 0,
- '#attributes' => array('class' => 'ticket-assigned'),
+ '#attributes' => array('class' => array('ticket-assigned')),
);
}
}
else {
$form['assigned']["assigned-$ticket->nid"] = array(
- '#value' => l(_support_truncate($assigned->name, 24), "user/$assigned->uid", array('attributes' => array('class' => 'ticket-assigned'))),
+ '#markup' => l(_support_truncate($assigned->name, 24), "user/$assigned->uid", array('attributes' => array('class' => array('ticket-assigned')))),
);
}
// State
@@ -2975,13 +3038,13 @@ function support_page_form($form, &$form_state, $client = NULL, $state = NULL) {
'#type' => 'select',
'#options' => $states,
'#default_value' => $ticket->state,
- '#attributes' => array('class' => 'ticket-state'),
+ '#attributes' => array('class' => array('ticket-state')),
);
}
else {
$form['state']["state-$ticket->nid"] = array(
- '#value' => _support_state($ticket->state),
- '#attributes' => array('class' => 'ticket-state'),
+ '#markup' => _support_state($ticket->state),
+ '#attributes' => array('class' => array('ticket-state')),
);
}
// Priority
@@ -2990,21 +3053,21 @@ function support_page_form($form, &$form_state, $client = NULL, $state = NULL) {
'#type' => 'select',
'#options' => _support_priorities(),
'#default_value' => $ticket->priority,
- '#attributes' => array('class' => 'ticket-priority'),
+ '#attributes' => array('class' => array('ticket-priority')),
);
}
else {
$form['priority']["priority-$ticket->nid"] = array(
- '#value' => _support_priorities($ticket->priority),
- '#attributes' => array('class' => 'ticket-priority'),
+ '#markup' => _support_priorities($ticket->priority),
+ '#attributes' => array('class' => array('ticket-priority')),
);
}
$form['updates'][$ticket->nid] = array(
- '#value' => $comments,
- '#attributes' => array('class' => "state-$ticket->state priority-$ticket->priority"),
+ '#markup' => $comments,
+ '#attributes' => array('class' => array("state-$ticket->state", "priority-$ticket->priority")),
);
$form['class'][$ticket->nid] = array(
- '#value' => "state-$ticket->state priority-$ticket->priority",
+ '#value' => array("state-$ticket->state", "priority-$ticket->priority"),
);
}
$form['tickets'] = array(
@@ -3031,7 +3094,7 @@ function support_page_form($form, &$form_state, $client = NULL, $state = NULL) {
'#value' => t('Update ticket'),
);
}
- $form['pager'] = array('#value' => theme('pager', array('tags' => NULL, 'element' => 0)));
+ $form['pager'] = array('#markup' => theme('pager', array('tags' => NULL, 'element' => 0)));
return $form;
}
@@ -3073,8 +3136,8 @@ function support_page_form_submit($form, &$form_state) {
/**
* Theme function for ticket list
*/
-function theme_support_page_form($form) {
- // TODO: Should this theme support_page_form be declared in hook_theme()?
+function theme_support_page_form($variables) {
+ $form = $variables['form'];
drupal_add_css(drupal_get_path('module', 'support') . '/support-tickets.css');
$output = drupal_render($form['post-ticket']);
if (isset($form['title']) && is_array($form['title'])) {
@@ -3098,20 +3161,20 @@ function theme_support_page_form($form) {
}
else {
$rows[] = array(array(
- 'data' => t('No tickets available.'),
- 'colspan' => '9',
- ));
+ 'data' => t('No tickets available.'),
+ 'colspan' => '9',
+ ));
}
- if ($form['pager']['#value']) {
+ if ($form['pager']['#markup']) {
$output .= drupal_render($form['pager']);
}
- $output .= theme('table', array('header' => $form['header']['#value'], 'rows' => $rows, 'attributes' => array('class' => 'support')));
+ $output .= theme('table', array('header' => $form['header']['#value'], 'rows' => $rows, 'attributes' => array('class' => array('support'))));
$output .= drupal_render($form['update']);
$output .= drupal_render($form['suppress']);
$output .= drupal_render($form['submit']);
- $output .= drupal_render($form);
+ $output .= drupal_render_children($form);
return $output;
}
@@ -3136,7 +3199,7 @@ function support_client_fetch($client, $manual = TRUE) {
if (!isset($client->integrate_email) || $client->integrate_email != TRUE) {
if ($manual) {
drupal_set_message(t('Client not integrated with email, unable to fetch mail for !client.', array('!client' => $client->name)));
- drupal_goto('admin/support/clients');
+ drupal_goto('admin/config/support/clients');
}
return;
}
@@ -3205,7 +3268,7 @@ function support_client_fetch($client, $manual = TRUE) {
}
}
if ($manual) {
- drupal_goto('admin/support/clients');
+ drupal_goto('admin/config/support/clients');
}
else {
return (-1);
@@ -3264,7 +3327,7 @@ function support_client_fetch($client, $manual = TRUE) {
if ($manual) {
drupal_set_message(t('Downloaded !count', array('!count' => format_plural($messages_downloaded, '1 message', '@count messages'))));
- drupal_goto('admin/support/clients');
+ drupal_goto('admin/config/support/clients');
}
}
@@ -3321,7 +3384,7 @@ function _support_identify_ticket(&$client, &$message) {
// Reply was to followup.
else {
// Check message id against our records.
- if (db_query('SELECT 1 FROM {comments} c INNER JOIN {support_ticket_comment} t ON c.cid = t.cid WHERE c.cid = :c.cid AND c.nid = :c.nid AND t.client = :t.client', array(':c.cid' => $cid, ':c.nid' => $nid, ':t.client' => $client->clid))->fetchField()) {
+ if (db_query('SELECT 1 FROM {comment} c INNER JOIN {support_ticket_comment} t ON c.cid = t.cid WHERE c.cid = :c.cid AND c.nid = :c.nid AND t.client = :t.client', array(':c.cid' => $cid, ':c.nid' => $nid, ':t.client' => $client->clid))->fetchField()) {
$message['nid'] = $nid;
return TRUE;
}
@@ -3336,7 +3399,7 @@ function _support_identify_ticket(&$client, &$message) {
}
// D) Check for reply to an incoming message that created a followup.
- $nid = db_query("SELECT c.nid FROM {support_ticket_comment} j INNER JOIN {comments} c ON j.cid = c.cid WHERE j.message_id = :j.message_id", array(':j.message_id' => $message_id))->fetchField();
+ $nid = db_query("SELECT c.nid FROM {support_ticket_comment} j INNER JOIN {comment} c ON j.cid = c.cid WHERE j.message_id = :j.message_id", array(':j.message_id' => $message_id))->fetchField();
if (isset($nid) && is_numeric($nid)) {
$message['nid'] = $nid;
return TRUE;
@@ -3387,7 +3450,9 @@ function _support_access_tickets() {
function _support_autoassign($clid, $uid = 0) {
static $autoassign = array();
if (!isset($autoassign[$clid])) {
- $name = db_query('SELECT autoassign FROM {support_client} WHERE clid = :clid', array(':clid' => $clid))->fetchField();
+ $name = null;
+ if (isset($clid))
+ $name = db_query('SELECT autoassign FROM {support_client} WHERE clid = :clid', array(':clid' => $clid))->fetchField();
switch ($name) {
case '':
$autoassign[$clid] = 0;
@@ -3431,11 +3496,12 @@ function _support_autoassign($clid, $uid = 0) {
*/
function _support_current_client() {
$clients = _support_available_clients();
+ $client = null;
if (sizeof($clients) == 1) {
$client = key($clients);
}
else {
- if (is_numeric($_SESSION['support_client'])) {
+ if (isset($_SESSION['support_client']) && is_numeric($_SESSION['support_client'])) {
$client = $_SESSION['support_client'];
}
else if (!user_access('can select client')) {
@@ -3468,5 +3534,6 @@ function _support_enabled($clid, $uid) {
*/
function _support_autosubscribe_access() {
return (user_access('administer support') ||
- user_access('can subscribe other users to notifications'));
+ user_access('can subscribe other users to notifications'));
}
+
diff --git a/support.user.inc b/support.user.inc
index 80f67b7..8cd4e92 100644
--- a/support.user.inc
+++ b/support.user.inc
@@ -22,7 +22,7 @@ function support_page_user($user, $assigned = FALSE, $state = NULL) {
array(
'data' => t('Id'),
'field' => 'n.nid',
- 'class' => 'id',
+ 'class' => array('id'),
),
array(
'data' => t('Ticket'),
@@ -51,13 +51,6 @@ function support_page_user($user, $assigned = FALSE, $state = NULL) {
),
);
- if ($state < 0) {
- $state = 'AND t.state NOT IN (' . implode(', ', _support_get_state(SUPPORT_STATE_CLOSED)) . ')';
- }
- else {
- $state = $state ? "AND t.state = $state" : '';
- }
-
if (_support_access_tickets() > 1) {
$header[] = array(
'data' => t('Client'),
@@ -66,16 +59,36 @@ function support_page_user($user, $assigned = FALSE, $state = NULL) {
}
$clients = support_search_available_clients();
+
if (sizeof($clients)) {
- $sql = "SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count, t.state, t.priority, t.client FROM {node} n LEFT JOIN {support_ticket} t ON n.nid = t.nid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid WHERE (c.status = " . COMMENT_PUBLISHED . " OR c.status IS NULL) AND n.status = 1 AND n.type = 'support_ticket' AND client IN (" . implode(', ', $clients) . ") $state";
+ $query = db_select('node', 'n')->extend('PagerDefault');
+ $query->leftjoin('support_ticket', 't', 't.nid = n.nid');
+ $query->join('node_comment_statistics', 's', 's.nid = n.nid');
+ $query->join('users', 'u', 'u.uid = n.uid');
+ $query->leftjoin('comment', 'c', 'c.nid = n.nid');
+ $query->condition(db_or()
+ ->condition('c.status', COMMENT_PUBLISHED)
+ ->isNull('c.status'))
+ ->condition('n.status', NODE_PUBLISHED)
+ ->condition('n.type', 'support_ticket')
+ ->condition('t.client', $clients);
+
+ if ($state < 0) {
+ $states = _support_get_state(SUPPORT_STATE_CLOSED);
+ $query->condition('t.state', $states, 'NOT IN');
+ }
+ else if ($state) {
+ $query->condition('t.state', $state);
+ }
+
if ($assigned) {
- $sql .= " AND t.assigned = $user->uid";
+ $query->condition('t.assigned', $user->uid);
}
+
if (!$assigned || (user_access('only view own tickets') && !user_access('administer support') && !user_access('edit any ticket') && !user_access('delete any ticket'))) {
- $sql .= " AND n.uid = $user->uid";
+ $query->condition('n.uid', $user->uid);
}
- $sql = db_rewrite_sql($sql);
- $sql .= tablesort_sql($header);
+
switch (variable_get('support_secondary_sort_order', 0)) {
case 0:
$order = 'ASC';
@@ -86,25 +99,30 @@ function support_page_user($user, $assigned = FALSE, $state = NULL) {
}
switch (variable_get('support_secondary_sort_tickets', 0)) {
case 1:
- $sql .= ", last_updated $order";
+ $query->orderBy('last_updated', $order);
break;
case 2:
- $sql .= ", n.nid $order";
+ $query->orderBy('n.nid', $order);
break;
case 3:
- $sql .= ", t.state $order";
+ $query->orderBy('t.state', $order);
break;
case 4:
- $sql .= ", t.priority $order";
+ $query->orderBy('t.priority', $order);
break;
}
- $sql_count = "SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {support_ticket} t ON n.nid = t.nid LEFT JOIN {comments} c ON n.nid = c.nid WHERE (c.status = " . COMMENT_PUBLISHED . " OR c.status IS NULL) AND n.status = 1 AND n.type = 'support_ticket' AND t.assigned = $user->uid $state";
- $sql_count = db_rewrite_sql($sql_count);
- $result = pager_query($sql, 50, 0, $sql_count);
+
+ $query->fields('n', array('nid',' title', 'type', 'changed', 'uid'))
+ ->fields('u', array('name'))
+ ->fields('s', array('comment_count'))
+ ->fields('t', array('client',' state', 'priority', 'assigned'))
+ ->addExpression('GREATEST(n.changed, s.last_comment_timestamp)', 'last_updated');
+
+ $result = $query->execute();
}
$row = 0;
$rows = array();
- while ($ticket = db_fetch_object($result)) {
+ foreach ($result as $ticket) {
drupal_alter('support_page_list_ticket', $ticket);
$account = user_load($ticket->uid);
$comments = l($ticket->comment_count, "node/$ticket->nid", array('fragment' => 'comments'));
@@ -117,50 +135,56 @@ function support_page_user($user, $assigned = FALSE, $state = NULL) {
'data' => array(
array(
'data' => l($ticket->nid, "node/$ticket->nid"),
- 'class' => 'ticket-id',
+ 'class' => array('ticket-id'),
),
array(
'data' => l(_support_truncate($ticket->title), "node/$ticket->nid"),
- 'class' => 'ticket-title',
+ 'class' => array('ticket-title'),
),
array(
'data' => format_date($ticket->last_updated, 'short'),
- 'class' => 'ticket-updated',
+ 'class' => array('ticket-updated'),
),
array(
'data' => l(_support_truncate($account->name, 24), "user/$account->uid"),
- 'class' => 'ticket-reported',
+ 'class' => array('ticket-reported'),
),
array(
'data' => _support_state($ticket->state),
- 'class' => 'ticket-state',
+ 'class' => array('ticket-state'),
),
array(
'data' => _support_priorities($ticket->priority),
- 'class' => 'ticket-priority',
+ 'class' => array('ticket-priority'),
),
array(
'data' => $comments,
- 'class' => 'ticket-updates',
+ 'class' => array('ticket-updates'),
),
),
- 'class' => "state-$ticket->state priority-$ticket->priority",
+ 'class' => array("state-$ticket->state priority-$ticket->priority"),
);
if (_support_access_tickets() > 1) {
$rows[$row]['data'][] = l($client->name, "support/$client->path");
}
$row++;
}
- // TODO Please change this theme call to use an associative array for the $variables parameter.
- return theme('support_page_user', $header, $rows);
+
+ if (count($rows) == 0)
+ $rows[] = array(array(
+ 'data' => t('No tickets available.'),
+ 'colspan' => count($header),
+ ));
+
+ return theme('support_page_user', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => array('support'))));
}
/**
- * @todo Please document this function.
+ * @TODO Please document this function.
* @see http://drupal.org/node/1354
*/
-function theme_support_page_user($header, $rows) {
- // TODO: Should this theme support_page_user be declared in hook_theme()?
- // TODO Please change this theme call to use an associative array for the $variables parameter.
- return theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => 'support'))) . theme('pager');
+function theme_support_page_user($variables) {
+ $header = $variables['header'];
+ $rows = $variables['rows'];
+ return theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => array('support')))) . theme('pager');
}
diff --git a/support_charts/support_charts.info b/support_charts/support_charts.info
index 87d0eaf..6e72d8b 100644
--- a/support_charts/support_charts.info
+++ b/support_charts/support_charts.info
@@ -3,4 +3,11 @@ description = Charting for the helpdesk and support ticketing system.
package = Support
dependencies[] = support
dependencies[] = chart
-core = 6.x
+core = 7.x
+
+; Information added by drupal.org packaging script on 2011-02-25
+version = "7.x-1.x-dev"
+core = "7.x"
+project = "support"
+datestamp = "1298620301"
+
diff --git a/support_mailcmd/support_mailcmd.info b/support_mailcmd/support_mailcmd.info
index 67a1e7e..e0186ad 100644
--- a/support_mailcmd/support_mailcmd.info
+++ b/support_mailcmd/support_mailcmd.info
@@ -2,4 +2,4 @@ name = Support Mail Commands
package = Support
description = Advanced support ticket editing via emil.
dependencies[] = support
-core = 6.x
+core = 7.x
diff --git a/support_overview/support_overview.info b/support_overview/support_overview.info
index d4885e8..f90bd98 100644
--- a/support_overview/support_overview.info
+++ b/support_overview/support_overview.info
@@ -2,4 +2,4 @@ name = Support Overview
package = Support
description = Overview summary of clients
dependencies[] = support
-core = 6.x
+core = 7.x