diff -urp old/casetracker.install new/casetracker.install --- old/casetracker.install 2008-04-18 18:18:54.000000000 +0530 +++ new/casetracker.install 2008-04-21 02:21:02.453125000 +0530 @@ -477,7 +477,7 @@ function casetracker_update_16() { // case numbers were supposed to be namespaced to the project, but that // never actually happened, so we'll loop through all the projects and // just start proper namespacing at whatever the last case number was. - $results = db_query("SELECT p_id, MAX(case_id) AS last_case_id FROM casetracker_case GROUP BY p_id"); + $results = db_query("SELECT p_id, MAX(case_id) AS last_case_id FROM {casetracker_case} GROUP BY p_id"); $project_case_numbers = array(); while ($result = db_fetch_object($results)) { $project_case_numbers[$result->p_id] = $result->last_case_id ? $result->last_case_id : 1; } // i know, i know, serializing an array, but it's my cross to bare. cases always start at 1. diff -urp old/casetracker.module new/casetracker.module --- old/casetracker.module 2008-04-18 19:57:44.000000000 +0530 +++ new/casetracker.module 2008-04-21 02:20:17.984375000 +0530 @@ -16,24 +16,24 @@ function casetracker_help($section) { case 'casetracker/projects': case 'casetracker/projects/all': case 'casetracker/projects/my': - return '

'.t('A list of projects created within Case Tracker, per your filter criteria.').'

'; + return '

'. t('A list of projects created within Case Tracker, per your filter criteria.') .'

'; case 'casetracker/cases': - case 'casetracker/cases/'.arg(2): - case 'casetracker/cases/'.arg(2).'/'.arg(3): - return '

'.t('A list of cases created within Case Tracker, per your filter criteria.').'

'; + case 'casetracker/cases/'. arg(2): + case 'casetracker/cases/'. arg(2) .'/'. arg(3): + return '

'. t('A list of cases created within Case Tracker, per your filter criteria.') .'

'; - case 'user/'.arg(1).'/cases': - return '

'.t('A list of cases you\'ve created or which have been assigned to you.').'

'; + case 'user/'. arg(1) .'/cases': + return '

'. t('A list of cases you\'ve created or which have been assigned to you.') .'

'; case 'admin/content/casetracker': - return '

'.t('Current Case Tracker case states are listed below.').'

'; + return '

'. t('Current Case Tracker case states are listed below.') .'

'; case 'admin/content/casetracker/state/add': - return '

'.t('You may add a new case state below.').'

'; - case 'admin/content/casetracker/state/edit/'.arg(4): - return '

'.t('You may edit an existing case state below.').'

'; + return '

'. t('You may add a new case state below.') .'

'; + case 'admin/content/casetracker/state/edit/'. arg(4): + return '

'. t('You may edit an existing case state below.') .'

'; case 'admin/settings/casetracker': - return '

'.t('Configure the various Case Tracker options with these settings.').'

'; + return '

'. t('Configure the various Case Tracker options with these settings.') .'

'; } } @@ -46,10 +46,10 @@ function casetracker_perm() { 'administer case tracker', 'assign case to user', //'assign cases if user is creator', - 'assign case to user if logged in user is assigned', + 'assign case to user if logged in user is assigned', 'set case status', - //'set status if user is creator', - 'set status if user is assigned', + //'set status if user is creator', + 'set status if user is assigned', 'set case priority', 'set case priority if user is assigned', 'show cases user tab', @@ -204,7 +204,7 @@ function casetracker_menu($may_cache) { // two feature requirements mean we have to futz with the global $_menu, // since we can't simply override already-defined menus by redeclaring. if (!user_access('access case tracker') && arg(0) == 'casetracker' && arg(1) == 'cases' && - preg_match('/all\/assigned:'.$user->uid.' author:'.$user->uid.' /', arg(2).'/'.arg(3))) { + preg_match('/all\/assigned:'. $user->uid .' author:'. $user->uid .' /', arg(2) .'/'. arg(3))) { if (user_access('show cases user tab')) { global $_menu; // make the baby druplicon cry. $mid = $_menu['path index']['casetracker/cases']; @@ -217,7 +217,7 @@ function casetracker_menu($may_cache) { $items[] = array( 'access' => user_access('show cases user tab'), 'callback' => 'casetracker_cases_overview', - 'callback arguments' => array('all', 'assigned:'.arg(1).' author:'.arg(1)), + 'callback arguments' => array('all', 'assigned:'. arg(1) .' author:'. arg(1)), 'path' => 'user/'. arg(1) .'/cases', 'title' => t('Cases'), 'type' => MENU_LOCAL_TASK, @@ -304,7 +304,7 @@ function casetracker_nodeapi(&$node, $op // cases: summary data to beginning of body. if (in_array($node->type, variable_get('casetracker_case_node_types', array('casetracker_basic_case')), TRUE)) { $project = node_load($node->pid); // used in the breadcrumb and our theme function, mostly for nid and project number display. - drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Case Tracker projects'), 'casetracker/projects'), l($project->title, 'node/'.$node->pid), l(t('All cases'), 'casetracker/cases/'.$node->pid.'/all'))); + drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Case Tracker projects'), 'casetracker/projects'), l($project->title, 'node/'. $node->pid), l(t('All cases'), 'casetracker/cases/'. $node->pid .'/all'))); $node->content['casetracker_case_summary'] = array('#value' => theme('casetracker_case_summary', $node, $project), '#weight' => -10); } @@ -344,68 +344,46 @@ function casetracker_case_form_common(&$ // check our settings for all node types assigned as projects, count them, // and add that many %s's to our SQL so as to grab all nodes of those types. $project_options = array(); // stores all found projects from set node types. - $results = db_query(db_rewrite_sql("SELECT n.nid, n.title FROM {node} n WHERE n.type IN (".str_pad('', count(array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project')))) * 5 - 1, "'%s',").") ORDER BY n.title"), array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project')))); + $results = db_query(db_rewrite_sql("SELECT n.nid, n.title FROM {node} n WHERE n.type IN (". str_pad('', count(array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project')))) * 5 - 1, "'%s',") .") ORDER BY n.title"), array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project')))); while ($result = db_fetch_array($results)) { $project_options[$result['nid']] = $result['title']; } // we predefine if the user has assign user access - $assignAccess = false; - if(user_access('assign case to user')) { - $assignAccess = true; + $assign_access = FALSE; + if (user_access('assign case to user')) { + $assign_access = true; } elseif ( ( $user->uid == $node->assign_to && user_access('assign case to user if logged in user is assigned') - ) - || - ( - $user->uid == $node->uid - && user_access('assign cases if user is creator') - ) + ) + || + ( + $user->uid == $node->uid + && user_access('assign cases if user is creator') + ) ) { - $assignAccess = true; + $assign_access = true; } // we predefine if the user has set status access - $setStatusAccess = false; - if(user_access('set case status')) - { - $setStatusAccess = true; + $set_status_access = FALSE; + if (user_access('set case status')) { + $set_status_access = TRUE; } - elseif ( - ( - $user->uid == $node->assign_to - && user_access('set status if user is assigned') - ) - || - ( - $user->uid == $node->uid - && user_access('set status if user is creator') - ) - ) { - $setStatusAccess = true; + elseif (($user->uid == $node->assign_to && user_access('set status if user is assigned')) || ($user->uid == $node->uid && user_access('set status if user is creator'))) { + $set_status_access = TRUE; } // predefine the priority set access - $setPriorityAccess = false; - if(user_access('set case priority')) - { - $setPriorityAccess = true; + $set_priority_access = FALSE; + if (user_access('set case priority')) { + $set_priority_access = TRUE; } - elseif ( - ( - $user->uid == $node->assign_to - && user_access('set case priority if user is assigned') - ) - || - ( - $user->uid == $node->uid - && user_access('set case priority if user is creator') - ) - ) { - $setPriorityAccess = true; + elseif (($user->uid == $node->assign_to && user_access('set case priority if user is assigned')) || ($user->uid == $node->uid && user_access('set case priority if user is creator'))) { + $set_priority_access = TRUE; } // if there's no project ID from the URL, or more than one project, @@ -429,10 +407,10 @@ function casetracker_case_form_common(&$ ); } else { - $tempKeys = array_keys($project_options); + $temp_keys = array_keys($project_options); $form['casetracker_project_information']['pid'] = array( '#type' => 'hidden', // default value, or the only the project ID in the project_options array. - '#default_value' => isset($default_project) ? $default_project : array_shift($tempKeys), + '#default_value' => isset($default_project) ? $default_project : array_shift($temp_keys), '#options' => $project_options, ); } @@ -447,49 +425,49 @@ function casetracker_case_form_common(&$ '#suffix' => '', // inline display. ); $form['casetracker_case_information']['assign_to'] = array( - '#type' => $assignAccess ? 'textfield' : 'hidden', + '#type' => $assign_access ? 'textfield' : 'hidden', '#title' => t('Assign to'), '#autocomplete_path' => 'casetracker/autocomplete', '#required' => TRUE, '#size' => 25, - '#default_value' => $assignAccess + '#default_value' => $assign_access ? isset($node->assign_to) ? casetracker_get_name($node->assign_to) : $node->name : isset($node->assign_to) ? casetracker_get_name($node->assign_to) : variable_get('casetracker_default_assign_to', variable_get('anonymous', t('Anonymous'))), ); $case_status_options = casetracker_case_state_load('status'); - $tempKeys = array_keys($case_status_options); + $temp_keys = array_keys($case_status_options); $form['casetracker_case_information']['case_status_id'] = array( - '#type' => $setStatusAccess ? 'select' : 'hidden', + '#type' => $set_status_access ? 'select' : 'hidden', '#title' => t('Status'), '#options' => $case_status_options, '#default_value' => isset($node->case_status_id) ? $node->case_status_id - : variable_get('casetracker_default_case_status', array_shift($tempKeys)), + : variable_get('casetracker_default_case_status', array_shift($temp_keys)), ); $case_priority_options = casetracker_case_state_load('priority'); - $tempKeys = array_keys($case_priority_options); + $temp_keys = array_keys($case_priority_options); $form['casetracker_case_information']['case_priority_id'] = array( '#type' => 'select', - '#type' => $setPriorityAccess ? 'select' : 'hidden', + '#type' => $set_priority_access ? 'select' : 'hidden', '#title' => t('Priority'), '#options' => $case_priority_options, '#default_value' => isset($node->case_priority_id) ? $node->case_priority_id - : variable_get('casetracker_default_case_priority', array_shift($tempKeys)), + : variable_get('casetracker_default_case_priority', array_shift($temp_keys)), ); $case_type_options = casetracker_case_state_load('type'); - $tempKeys = array_keys($case_type_options); + $temp_keys = array_keys($case_type_options); $form['casetracker_case_information']['case_type_id'] = array( '#type' => 'select', '#title' => t('Type'), '#options' => $case_type_options, '#default_value' => isset($node->case_type_id) ? $node->case_type_id - : variable_get('casetracker_default_case_type', array_shift($tempKeys)), + : variable_get('casetracker_default_case_type', array_shift($temp_keys)), ); return $form; @@ -510,10 +488,10 @@ function casetracker_case_state_overview foreach (array('priority', 'status', 'type') as $realm) { foreach (casetracker_case_state_load($realm) as $csid => $name) { $rows[] = array( - l($name, 'casetracker/cases/all/state/'.$csid), + l($name, 'casetracker/cases/all/state/'. $csid), $realm, - l(t('edit'), 'admin/content/casetracker/state/edit/'.$csid), - l(t('delete'), 'admin/content/casetracker/state/delete/'.$csid), ); + l(t('edit'), 'admin/content/casetracker/state/edit/'. $csid), + l(t('delete'), 'admin/content/casetracker/state/delete/'. $csid), ); } } @@ -532,7 +510,10 @@ function casetracker_case_state_overview * The case state ID to delete. */ function casetracker_case_state_delete($csid = NULL) { - if (!$csid) { return NULL; } // I SHALL NOT DELETE NOTHING! NOTHING AT ALL! + if (!$csid) { + // I SHALL NOT DELETE NOTHING! NOTHING AT ALL! + return NULL; + } db_query('DELETE FROM {casetracker_case_states} WHERE csid = %d', $csid); } @@ -734,14 +715,14 @@ function casetracker_cases_overview($pro // clauses ($case_filter_sql) and arguments ($case_filter_args) when needed. global $user; // I DON'T LIKE HOW YOU MAKE ME FEEL! PLEASE STOP IT! AAHHhHHHHHHh! - $caseTypes = _casetracker_getCaseTypes(); + $case_types = _casetracker_get_case_types(); $case_filter_args = strpos($case_filters, 'type') !== FALSE ? array() - : $caseTypes; + : $case_types; $case_filter_sql = strpos($case_filters, 'type') !== FALSE ? NULL - : array('n.type IN ('.str_pad('', count($caseTypes) * 5 - 1, "'%s',").')'); + : array('n.type IN ('. str_pad('', count($case_types) * 5 - 1, "'%s',") .')'); $case_filter_explanation = array(); // human readable explanation of filters. // first up is the project_filter. see README.txt about URLs. @@ -752,14 +733,18 @@ function casetracker_cases_overview($pro foreach ($project_filter_parts as $project_filter) { if ($project_filter == 'my') { $project_filter_args = array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project'))); $project_filter_args[] = $user->uid; - $results = db_query('SELECT n.nid FROM {node} n LEFT JOIN {casetracker_project} cp ON (n.vid = cp.vid) WHERE n.type IN ('.str_pad('', count(array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project')))) * 5 - 1, "'%s',").') AND n.uid = %d AND n.status = 1', $project_filter_args); - while ($result = db_fetch_object($results)) { $project_filter_nids[] = $result->nid; } + $results = db_query('SELECT n.nid FROM {node} n LEFT JOIN {casetracker_project} cp ON (n.vid = cp.vid) WHERE n.type IN ('. str_pad('', count(array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project')))) * 5 - 1, "'%s',") .') AND n.uid = %d AND n.status = 1', $project_filter_args); + while ($result = db_fetch_object($results)) { + $project_filter_nids[] = $result->nid; + } $case_filter_explanation[] = t('my projects'); } else { // probably project node ID(s). $project_filter_values = explode(',', $project_filter); foreach ($project_filter_values as $project_filter_value) { - if (!is_numeric($project_filter_value)) { continue; } + if (!is_numeric($project_filter_value)) { + continue; + } $project_filter_nids[] = $project_filter_value; $case_filter_explanation[] = t('project %title', array('%title' => db_result(db_query('SELECT title FROM {node} n WHERE n.nid = %d', $project_filter_value)))); @@ -768,14 +753,21 @@ function casetracker_cases_overview($pro } // project filtering is finished, so merge into mastah... if (count($project_filter_nids) >= 1) { // ... but only if values. $case_filter_args = array_merge($case_filter_args, $project_filter_nids); - $case_filter_sql[] = 'cc.pid IN ('.str_pad('', count($project_filter_nids) * 5 - 1, "'%s',").')'; + $case_filter_sql[] = 'cc.pid IN ('. str_pad('', count($project_filter_nids) * 5 - 1, "'%s',") .')'; } - } else { $case_filter_explanation[] = t('all projects'); } + } + else { + $case_filter_explanation[] = t('all projects'); + } // determine the projects part of the page title based on our criteria. $title_project_filters = t('filtered projects'); // just a generic default if we can't think of anything better. - if (is_numeric($project_filters)) { $title_project_filters = db_result(db_query('SELECT title FROM {node} n WHERE n.nid = %d', $project_filters)); } - elseif ($project_filters == 'all' || $project_filters == 'my') { $title_project_filters = t('!project_filters projects', array('!project_filters' => $project_filters)); } + if (is_numeric($project_filters)) { + $title_project_filters = db_result(db_query('SELECT title FROM {node} n WHERE n.nid = %d', $project_filters)); + } + elseif ($project_filters == 'all' || $project_filters == 'my') { + $title_project_filters = t('!project_filters projects', array('!project_filters' => $project_filters)); + } // case filters are up next - we support keyed and unkeyed filters // here, so have to loop a few more times to get it right and uber. @@ -796,25 +788,29 @@ function casetracker_cases_overview($pro if ($case_filter[0] == 'assigned') { $assigned_uids = array(); // numbers from input only. foreach ($case_filter_values as $case_filter_value) { - if (!is_numeric($case_filter_value)) { continue; } + if (!is_numeric($case_filter_value)) { + continue; + } $assigned_uids[] = $case_filter_value; $case_filter_args[] = $case_filter_value; $case_filter_explanation[] = t('assigned to %user', array('%user' => db_result(db_query('SELECT name FROM {users} u WHERE u.uid = %d', $case_filter_value)))); } // we do this out here with assigned_uids to make sure they're all numeric. - $case_filter_sql[] = 'cc.assign_to IN ('.str_pad('', count($assigned_uids) * 5 - 1, "'%s',").')'; + $case_filter_sql[] = 'cc.assign_to IN ('. str_pad('', count($assigned_uids) * 5 - 1, "'%s',") .')'; } if ($case_filter[0] == 'author') { $author_uids = array(); // numbers from input only. foreach ($case_filter_values as $case_filter_value) { - if (!is_numeric($case_filter_value)) { continue; } + if (!is_numeric($case_filter_value)) { + continue; + } $author_uids[] = $case_filter_value; $case_filter_args[] = $case_filter_value; $case_filter_explanation[] = t('created by %user', array('%user' => db_result(db_query('SELECT name FROM {users} u WHERE u.uid = %d', $case_filter_value)))); } // we do this out here with author_uids to make sure they're all numeric. - $case_filter_sql[] = 'n.uid IN ('.str_pad('', count($author_uids) * 5 - 1, "'%s',").')'; + $case_filter_sql[] = 'n.uid IN ('. str_pad('', count($author_uids) * 5 - 1, "'%s',") .')'; } // what follows is an edge case where the more sensible thing is to OR the queries, @@ -826,24 +822,26 @@ function casetracker_cases_overview($pro // we've processed all relevant (and alphabetically stored) case filters. if ($case_filter[0] == 'author' && strpos($case_filters, 'author:') !== FALSE && strpos($case_filters, 'assigned:') !== FALSE) { $sql_2 = array_pop($case_filter_sql); $sql_1 = array_pop($case_filter_sql); - $case_filter_sql[] = '('.$sql_1.' OR '.$sql_2.')'; // and make a new one. + $case_filter_sql[] = '('. $sql_1 .' OR '. $sql_2 .')'; // and make a new one. } if ($case_filter[0] == 'state') { $state_ids_by_realm = array(); $state_sql = array(); $state_args = array(); foreach ($case_filter_values as $case_filter_value) { - if (!is_numeric($case_filter_value)) { continue; } + if (!is_numeric($case_filter_value)) { + continue; + } $state = casetracker_case_state_load(NULL, $case_filter_value); $state_ids_by_realm[$state['realm']][] = $case_filter_value; $case_filter_explanation[] = t('case %realm %name', array('%realm' => $state['realm'], '%name' => $state['name'])); } // turn our IDs into a happy OR query. laborious. foreach ($state_ids_by_realm as $realm => $state_ids) { - $state_sql[] = 'cc.case_'.$realm.'_id IN ('.str_pad('', count($state_ids) * 5 - 1, "'%s',").')'; + $state_sql[] = 'cc.case_'. $realm .'_id IN ('. str_pad('', count($state_ids) * 5 - 1, "'%s',") .')'; $state_args = array_merge($state_args, $state_ids); } // and finally add them to our master query, so... if ($state_sql) { // make sure there's something there. - $case_filter_sql[] = '('.implode(' AND ', $state_sql).')'; + $case_filter_sql[] = '('. implode(' AND ', $state_sql) .')'; $case_filter_args = array_merge($case_filter_args, $state_args); } } @@ -852,12 +850,12 @@ function casetracker_cases_overview($pro $valid_node_types = array(); $all_node_types = node_get_types('names'); // for human readable names. foreach ($case_filter_values as $case_filter_value) { - if (isset($caseTypes[$case_filter_value])) { + if (isset($case_types[$case_filter_value])) { $valid_node_types[] = $case_filter_value; $case_filter_args[] = $case_filter_value; $case_filter_explanation[] = t('node type %type', array('%type' => $all_node_types[$case_filter_value])); } // we only want to search through node types that are valid casetracker case value-adds. - } $case_filter_sql[] = 'n.type IN ('.str_pad('', count($valid_node_types) * 5 - 1, "'%s',").')'; + } $case_filter_sql[] = 'n.type IN ('. str_pad('', count($valid_node_types) * 5 - 1, "'%s',") .')'; } } else { // unkeyed, currently only my or assigned. @@ -879,30 +877,39 @@ function casetracker_cases_overview($pro // in_array here instead of strpos since unkeyed filters are their own index. if ($case_filter_value == 'my' && in_array('assigned', $case_filter_parts) && in_array('my', $case_filter_parts)) { $sql_2 = array_pop($case_filter_sql); $sql_1 = array_pop($case_filter_sql); - $case_filter_sql[] = '('.$sql_1.' OR '.$sql_2.')'; // and make a new one. + $case_filter_sql[] = '('. $sql_1.' OR '. $sql_2 .')'; // and make a new one. } } } } - } else { $case_filter_explanation[] = t('all cases'); } + } + else { + $case_filter_explanation[] = t('all cases'); + } // determine the cases part of the page title. $title_case_filters = t('filtered cases'); // a generic default. - if ($case_filters == 'all') { $title_case_filters = t('all cases'); } - elseif ($case_filters == 'my') { $title_case_filters = t('my opened cases'); } - elseif ($case_filters == 'assigned') { $title_case_filters = t('my assigned cases'); } + if ($case_filters == 'all') { + $title_case_filters = t('all cases'); + } + elseif ($case_filters == 'my') { + $title_case_filters = t('my opened cases'); + } + elseif ($case_filters == 'assigned') { + $title_case_filters = t('my assigned cases'); + } // and set the page title now that all filteres are handled. drupal_set_title(t('%case_filter in %project_filter', array('%case_filter' => $title_case_filters, '%project_filter' => $title_project_filters))); // now, with our filter arguments out of the way, actually run the query and go nutty. - $case_filter_sql = count($case_filter_sql) ? 'AND '.implode(' AND ', $case_filter_sql) : NULL; // make a final string of WHERE clauses. + $case_filter_sql = count($case_filter_sql) ? 'AND '. implode(' AND ', $case_filter_sql) : NULL; // make a final string of WHERE clauses. // create the querys $sql_select = 'SELECT DISTINCT(n.nid), n.title, ncs.last_comment_timestamp, cc.case_number, cc.case_priority_id, cc.case_status_id, cc.case_type_id, cc.assign_to, cp.project_number '; $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) '; $sql_from = ' FROM {node} n LEFT JOIN {casetracker_case} cc ON (n.vid = cc.vid) LEFT JOIN {casetracker_project} cp ON (cp.nid = cc.pid) LEFT JOIN {node_comment_statistics} ncs ON (n.nid = ncs.nid) '; - $sql_where = ' WHERE n.status = 1 '.$case_filter_sql; + $sql_where = ' WHERE n.status = 1 '. $case_filter_sql; $sql_data = db_rewrite_sql($sql_select . $sql_from . $sql_where) . tablesort_sql($headers); $sql_pager = db_rewrite_sql($sql_count . $sql_from . $sql_where); @@ -913,56 +920,60 @@ function casetracker_cases_overview($pro $state_classes = ''; $state_links = array(); foreach (array('priority', 'status', 'type') as $state) { - $state_classes .= $state.'-'.preg_replace('/[^\w\-]/', '-', drupal_strtolower(casetracker_case_state_load($state, $result->{'case_'.$state.'_id'}))).' '; - $state_links[$state] = strpos($case_filters, 'state') !== FALSE ? str_replace('state:', 'state:'.$result->{'case_'.$state.'_id'}.',', $case_filters) : $case_filters .' state:'.$result->{'case_'.$state.'_id'}; - $state_links[$state] = "casetracker/cases/$project_filters/".str_replace('all ', '', $state_links[$state]); + $state_classes .= $state .'-'. preg_replace('/[^\w\-]/', '-', drupal_strtolower(casetracker_case_state_load($state, $result->{'case_'. $state .'_id'}))) .' '; + $state_links[$state] = strpos($case_filters, 'state') !== FALSE ? str_replace('state:', 'state:'. $result->{'case_'. $state .'_id'} .',', $case_filters) : $case_filters .' state:'. $result->{'case_'. $state .'_id'}; + $state_links[$state] = "casetracker/cases/$project_filters/". str_replace('all ', '', $state_links[$state]); } $state_classes = rtrim($state_classes); // pedant: remove final space from the classes. - $assign_to_display = $result->assign_to != 0 ? l(casetracker_get_name($result->assign_to), 'user/'.$result->assign_to, array('title' => t('View user profile.'))) : casetracker_get_name($result->assign_to); + $assign_to_display = $result->assign_to != 0 ? l(casetracker_get_name($result->assign_to), 'user/'. $result->assign_to, array('title' => t('View user profile.'))) : casetracker_get_name($result->assign_to); $rows[] = array('data' => array( - array( - 'data' => $result->project_number.'-'.$result->case_number, - 'class' => 'case-number', - ), - array( - 'data' => l($result->title, 'node/'.$result->nid), - 'class' => 'title', - ), - array( - 'data' => format_date($result->last_comment_timestamp, 'small'), - 'class' => 'last-updated' - ), - array( + array( + 'data' => $result->project_number .'-'. $result->case_number, + 'class' => 'case-number', + ), + array( + 'data' => l($result->title, 'node/'. $result->nid), + 'class' => 'title', + ), + array( + 'data' => format_date($result->last_comment_timestamp, 'small'), + 'class' => 'last-updated' + ), + array( 'data' => l(casetracker_case_state_load('priority', $result->case_priority_id), $state_links['priority']), - 'class' => 'priority', - ), - array( + 'class' => 'priority', + ), + array( 'data' => l(casetracker_case_state_load('status', $result->case_status_id), $state_links['status']), - 'class' => 'status', - ), - array( + 'class' => 'status', + ), + array( 'data' => l(casetracker_case_state_load('type', $result->case_type_id), $state_links['type']), - 'class' => 'type', - ), - array( + 'class' => 'type', + ), + array( 'data' => $assign_to_display, - 'class' => 'assign-to' - ), + 'class' => 'assign-to' + ), ), 'class' => $state_classes ); } if (count($rows) == 0) { - $rows[] = array(array('data' => t('No cases found.'), 'colspan' => 7)); + $rows[] = array(array('data' => t('No cases found.'), 'colspan' => 7)); } // turn the filter explanations into a comma-spliced list for human readout. we use a filter // criteria AND a page title, because sometimes the criteria is too big to fit nicely into both. - $output .= '
'.t('Case filter criteria:').' '; - if (count($case_filter_explanation) < 1) { $output .= t("Do you think you're being naughty?"); } - else { $output .= implode(', ', $case_filter_explanation).'.'; } $output .= '
'; - + $output .= '
'. t('Case filter criteria:') .' '; + if (count($case_filter_explanation) < 1) { + $output .= t("Do you think you're being naughty?"); + } + else { + $output .= implode(', ', $case_filter_explanation) .'.'; + } + $output .= '
'; $output .= theme('table', $headers, $rows, array('id' => 'casetracker-cases-overview')); $output .= theme('pager', NULL, 15, 0); return $output; @@ -981,7 +992,7 @@ function casetracker_projects_overview($ // we'll count how many node types can be cases so that we know how many // columns our Operations will span. array_filter will, in the absence of a // callback, return only indexes whose values do not evaluate to FALSE. - $case_types = _casetracker_getCaseTypes(); + $case_types = _casetracker_get_case_types(); $colspan_count = count($case_types) + 1; // one more for the 'view all cases' link. $headers = array( @@ -992,8 +1003,10 @@ function casetracker_projects_overview($ $filter_sql = NULL; $filter_args = array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project'))); - if ($project_filter == 'my') { global $user; $filter_sql = 'AND n.uid = %d'; $filter_args[] = $user->uid; } - $sql = db_rewrite_sql('SELECT n.nid, n.title, cp.project_number FROM {node} n LEFT JOIN {casetracker_project} cp ON (n.vid = cp.vid) WHERE n.type IN ('.str_pad('', count(array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project')))) * 5 - 1, "'%s',").') AND n.status = 1 '.$filter_sql); + if ($project_filter == 'my') { + global $user; $filter_sql = 'AND n.uid = %d'; $filter_args[] = $user->uid; + } + $sql = db_rewrite_sql('SELECT n.nid, n.title, cp.project_number FROM {node} n LEFT JOIN {casetracker_project} cp ON (n.vid = cp.vid) WHERE n.type IN ('. str_pad('', count(array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project')))) * 5 - 1, "'%s',") .') AND n.status = 1 '. $filter_sql); $results = pager_query($sql . tablesort_sql($headers), 15, 0, NULL, $filter_args); $node_types = node_get_types('names'); @@ -1003,25 +1016,21 @@ function casetracker_projects_overview($ // checking if project is group $node_result = node_load($result->nid); $querystring = _casetracker_get_og_query_string($node_result); - + // create the operations $operations = array( - l(t('view cases'), - 'casetracker/cases/'.$result->nid.'/all') - ); + l(t('view cases'), + 'casetracker/cases/'. $result->nid .'/all') + ); foreach ($case_types as $case_type) { $operations[] = l( - t('add !name', array('!name' => $node_types[$case_type])), - 'node/add/'.$case_type.'/'.$result->nid, array(), - $querystring - ); + t('add !name', array('!name' => $node_types[$case_type])), + 'node/add/'. $case_type .'/'. $result->nid, array(), + $querystring); } // create row - $rows[] = array_merge( - array($result->project_number, l($result->title, 'node/'.$result->nid)), - $operations - ); + $rows[] = array_merge(array($result->project_number, l($result->title, 'node/'. $result->nid)), $operations); } if (count($rows) == 0) { @@ -1051,8 +1060,8 @@ function casetracker_projects_overview($ */ function theme_casetracker_case_summary($case, $project) { $rows = array(); - $rows[] = array(t('Case number:'), $project->project_number.'-'.$case->case_number); - $rows[] = array(t('Project:'), l($project->title, 'node/'.$case->pid)); + $rows[] = array(t('Case number:'), $project->project_number .'-'. $case->case_number); + $rows[] = array(t('Project:'), l($project->title, 'node/'. $case->pid)); $rows[] = array(t('Opened by:'), theme_username($case)); $rows[] = array(t('Status:'), casetracker_case_state_load('status', $case->case_status_id)); $rows[] = array(t('Assigned:'), casetracker_get_name($case->assign_to)); @@ -1085,20 +1094,20 @@ function theme_casetracker_project_summa $querystring = _casetracker_get_og_query_string($project); $operations = array(); $node_types = node_get_types('names'); - $caseTypes = _casetracker_getCaseTypes(); - foreach ($caseTypes as $type) { + $case_types = _casetracker_get_case_types(); + foreach ($case_types as $type) { $operations[] = l( t('add !name', array('!name' => $node_types[$type])), - 'node/add/' . $type . '/' . $project->nid, + 'node/add/'. $type .'/'. $project->nid, array(), $querystring ); } $operations = implode(' | ', $operations); // ready for printing in our Operations table cell - delimited by a pipe. nonstandard. - $rows[] = array(t('Operations:'), $operations.' | '.l(t('view all project cases'), 'casetracker/cases/'.$project->nid.'/all')); + $rows[] = array(t('Operations:'), $operations .' | '. l(t('view all project cases'), 'casetracker/cases/'. $project->nid .'/all')); $output = '
'; - $output .= theme('table', NULL, $rows, array('class' => 'summary')); + $output .= theme('table', NULL, $rows, array('class' => 'summary')); $output .= '
'; return $output; } @@ -1120,7 +1129,7 @@ function casetracker_block($op = 'list', '#default_value' => variable_get('casetracker_block_latest_cases_count', 5), '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), ); - return $form; + return $form; } else if ($op == 'save' && $delta == 1) { variable_set('casetracker_block_latest_cases_count', $edit['casetracker_block_latest_cases_count']); @@ -1177,8 +1186,11 @@ function casetracker_block_jump_to_case_ function casetracker_block_jump_to_case_number_submit($form_id, $form_values) { $case_parts = explode('-', $form_values['case_number']); $result = db_fetch_object(db_query("SELECT cc.nid FROM {casetracker_case} cc LEFT JOIN {casetracker_project} cp ON (cc.pid = cp.nid) WHERE cp.project_number = %d AND cc.case_number = %d", $case_parts[0], $case_parts[1])); - if (!$result->nid) { drupal_set_message(t('Your case number was not found.'), 'error'); return NULL; } - return 'node/'.$result->nid; + if (!$result->nid) { + drupal_set_message(t('Your case number was not found.'), 'error'); + return NULL; + } + return 'node/'. $result->nid; } /** @@ -1191,9 +1203,9 @@ function casetracker_block_jump_to_case_ function theme_casetracker_block_latest_cases($cases) { $item_list = array(); foreach ($cases as $case) { - $case_link = l('['.$case['project']->project_number.'-'.$case['case']->case_number.'] '.$case['case']->title, 'node/'.$case['case']->nid); - $project_link = '('.l($case['project']->title, 'node/'.$case['project']->nid).')'; - $item_list[] = $case_link.' '.$project_link; + $case_link = l('['. $case['project']->project_number .'-'. $case['case']->case_number .'] '. $case['case']->title, 'node/'. $case['case']->nid); + $project_link = '('. l($case['project']->title, 'node/'. $case['project']->nid) .')'; + $item_list[] = $case_link .' '. $project_link; } // spit only if spittle. if (count($item_list) > 0) { return theme('item_list', $item_list); @@ -1220,14 +1232,17 @@ function casetracker_comment(&$comment, foreach ($case_fields as $case_field) { $case_data['old']->$case_field = $node->$case_field; $case_data['new']->$case_field = $comment[$case_field]; - if ($case_field == 'assign_to') { $case_data['new']->assign_to = casetracker_get_uid($comment['assign_to']); } - } $case_data['old']->case_title = $node->title; $case_data['new']->case_title = $comment['case_title']; + if ($case_field == 'assign_to') { + $case_data['new']->assign_to = casetracker_get_uid($comment['assign_to']); + } + } + $case_data['old']->case_title = $node->title; $case_data['new']->case_title = $comment['case_title']; db_query("UPDATE {node} SET title = '%s' WHERE nid = %d AND vid = %d", $case_data['new']->case_title, $comment['nid'], $comment['revision_id']); db_query("UPDATE {node_revisions} SET title = '%s' WHERE nid = %d AND vid = %d", $case_data['new']->case_title, $comment['nid'], $comment['revision_id']); db_query("UPDATE {casetracker_case} SET assign_to = %d, case_status_id = %d, case_priority_id = %d, case_type_id = %d, pid = %d WHERE nid = %d AND vid = %d ", $case_data['new']->assign_to, $case_data['new']->case_status_id, $case_data['new']->case_priority_id, $case_data['new']->case_type_id, $case_data['new']->prid, $comment['nid'], $comment['revision_id']); } - switch($op) { + switch ($op) { case 'insert': db_query("INSERT INTO {casetracker_comment_status} (cid, pid, assign_to, case_priority_id, case_type_id, case_status_id, state, title) VALUES (%d, %d, '%d', %d, %d, '%d', %d, '%s')", $comment['cid'], $case_data['old']->prid, $case_data['old']->assign_to, $case_data['old']->case_priority_id, $case_data['old']->case_type_id, $case_data['old']->case_status_id, 0, $case_data['old']->case_title); db_query("INSERT INTO {casetracker_comment_status} (cid, pid, assign_to, case_priority_id, case_type_id, case_status_id, state, title) VALUES (%d, %d, '%d', %d, %d, '%d', %d, '%s')", $comment['cid'], $case_data['new']->prid, $case_data['new']->assign_to, $case_data['new']->case_priority_id, $case_data['new']->case_type_id, $case_data['new']->case_status_id, 1, $case_data['new']->case_title); @@ -1243,7 +1258,9 @@ function casetracker_comment(&$comment, break; case 'view': $results = db_query("SELECT * FROM {casetracker_comment_status} WHERE cid = %d", $comment->cid); // hoo-hah. HOO-HAHAHAH! - while ($result = db_fetch_object($results)) { $state = $result->state ? 'new' : 'old'; $case_data[$state] = $result; } + while ($result = db_fetch_object($results)) { + $state = $result->state ? 'new' : 'old'; $case_data[$state] = $result; + } $comment->comment = casetracker_comment_changes($case_data) . $comment->comment; break; } @@ -1262,22 +1279,22 @@ function casetracker_comment_changes($ca if ($case_data['new']->pid != $case_data['old']->pid) { $old_project_title = db_result(db_query("SELECT title FROM {node} WHERE nid = %d", $case_data['old']->pid)); $new_project_title = db_result(db_query("SELECT title FROM {node} WHERE nid = %d", $case_data['new']->pid)); - $rows[] = array(t('Project:'), $old_project_title.' '.t('»').' '.$new_project_title); + $rows[] = array(t('Project:'), $old_project_title .' '. t('»') .' '. $new_project_title); } if ($case_data['new']->title != $case_data['old']->title) { - $rows[] = array(t('Title:'), $case_data['old']->title.' '.t('»').' '.$case_data['new']->title); + $rows[] = array(t('Title:'), $case_data['old']->title .' '. t('»') .' '. $case_data['new']->title); } if ($case_data['new']->case_status_id != $case_data['old']->case_status_id) { - $rows[] = array(t('Status:'), casetracker_case_state_load('status', $case_data['old']->case_status_id).' '.t('»').' '.casetracker_case_state_load('status', $case_data['new']->case_status_id)); + $rows[] = array(t('Status:'), casetracker_case_state_load('status', $case_data['old']->case_status_id) .' '. t('»') .' '. casetracker_case_state_load('status', $case_data['new']->case_status_id)); } if ($case_data['new']->assign_to != $case_data['old']->assign_to) { - $rows[] = array(t('Assigned:'), casetracker_get_name($case_data['old']->assign_to).' '.t('»').' '.casetracker_get_name($case_data['new']->assign_to)); + $rows[] = array(t('Assigned:'), casetracker_get_name($case_data['old']->assign_to) .' '. t('»') .' '. casetracker_get_name($case_data['new']->assign_to)); } if ($case_data['new']->case_priority_id != $case_data['old']->case_priority_id ) { - $rows[] = array(t('Priority:'), casetracker_case_state_load('priority', $case_data['old']->case_priority_id).' '.t('»').' '.casetracker_case_state_load('priority', $case_data['new']->case_priority_id)); + $rows[] = array(t('Priority:'), casetracker_case_state_load('priority', $case_data['old']->case_priority_id) .' '. t('»') .' '. casetracker_case_state_load('priority', $case_data['new']->case_priority_id)); } if ($case_data['new']->case_type_id != $case_data['old']->case_type_id ) { - $rows[] = array(t('Type:'), casetracker_case_state_load('type', $case_data['old']->case_type_id).' '.t('»').' '.casetracker_case_state_load('type', $case_data['new']->case_type_id)); + $rows[] = array(t('Type:'), casetracker_case_state_load('type', $case_data['old']->case_type_id) .' '. t('»') .' '. casetracker_case_state_load('type', $case_data['new']->case_type_id)); } return theme('table', NULL, $rows, array('class' => 'case_changes')); @@ -1291,8 +1308,12 @@ function casetracker_form_alter($form_id // add case options to our basic case type. if (in_array(str_replace('_node_form', '', $form_id), variable_get('casetracker_case_node_types', array('casetracker_basic_case')), TRUE)) { - $count = db_result(db_query(db_rewrite_sql("SELECT COUNT(*) AS count FROM {node} n WHERE n.type IN (".str_pad('', count(array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project')))) * 5 - 1, "'%s',").")"), array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project'))))); - if ($count == 0) { drupal_set_message(t('You must create a project before adding cases.'), 'error'); return; } // we can't make a link to a project here because the admin may have assigned more than one node type as project usable. + $count = db_result(db_query(db_rewrite_sql("SELECT COUNT(*) AS count FROM {node} n WHERE n.type IN (". str_pad('', count(array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project')))) * 5 - 1, "'%s',") .")"), array_filter(variable_get('casetracker_project_node_types', array('casetracker_basic_project'))))); + if ($count == 0) { + // we can't make a link to a project here because the admin may have assigned more than one node type as project usable. + drupal_set_message(t('You must create a project before adding cases.'), 'error'); + return; + } $form = casetracker_case_form_common($form, arg(3)); // proceed as normal with modifications. } @@ -1344,12 +1365,12 @@ function casetracker_settings() { foreach (array('priority', 'status', 'type') as $state) { $options = casetracker_case_state_load($state); - $tempKeys = array_keys($options); - $form['casetracker_general']['casetracker_default_case_'.$state] = array( + $temp_keys = array_keys($options); + $form['casetracker_general']['casetracker_default_case_'. $state] = array( '#type' => 'select', '#options' => $options, '#title' => t('Default case %state', array('%state' => $state)), - '#default_value' => variable_get('casetracker_default_case_'.$state, array_shift($tempKeys)), + '#default_value' => variable_get('casetracker_default_case_'. $state, array_shift($temp_keys)), '#description' => t('%state to be assigned the case if one is not explicitly defined.', array('%state' => ucfirst($state))), ); }; @@ -1453,15 +1474,15 @@ function _casetracker_get_og_query_strin $querystring = array(); // checking if project is group if ($project->type == 'group' - || isset($project->og_register) + || isset($project->og_register) ) { - $querystring[] = 'gids[]='.$project->nid; + $querystring[] = 'gids[]='. $project->nid; //checking if group-project is part of another group if (isset($project->og_groups) && is_array($project->og_groups) ) { foreach ($project->og_groups as $group) { - $querystring[] = 'gids[]='.$group; + $querystring[] = 'gids[]='. $group; } } } @@ -1471,7 +1492,7 @@ function _casetracker_get_og_query_strin && $project->type !== 'group' ) { foreach ($project->og_groups as $group) { - $querystring[] = 'gids[]='.$group; + $querystring[] = 'gids[]='. $group; } } @@ -1483,16 +1504,11 @@ function _casetracker_get_og_query_strin /** * Function to get all the case types where the user has access to * - * @param void - * @return array + * @param void + * @return array */ -function _casetracker_getCaseTypes() -{ - $allCases = array_filter( - variable_get('casetracker_case_node_types', - array('casetracker_basic_case') - ) - ) ; +function _casetracker_get_case_types() { + $all_cases = array_filter(variable_get('casetracker_case_node_types', array('casetracker_basic_case'))) ; /* $cases = array(); foreach($allCases AS $key => $value) @@ -1520,5 +1536,5 @@ function _casetracker_getCaseTypes() } } */ - return $allCases ; + return $all_cases ; } \ No newline at end of file diff -urp old/casetracker_dashboard.module new/casetracker_dashboard.module --- old/casetracker_dashboard.module 2008-04-18 18:18:54.000000000 +0530 +++ new/casetracker_dashboard.module 2008-04-21 02:39:59.359375000 +0530 @@ -9,12 +9,12 @@ function casetracker_dashboard_help($section) { switch ($section) { case 'casetracker/dashboard': - return '

' . t( + return '

'. t( 'Overview of number of cases for each project') . '

' ; break ; case 'admin/content/casetracker/dashboard': - return '

' . t('Adminster dashboard') . '

' ; + return '

'. t('Adminster dashboard') .'

' ; break ; } } @@ -69,8 +69,8 @@ function casetracker_dashboard_menu($may * Menu callback * Displays a list of all projects and a count of all their states. * - * @param void - * @return string + * @param void + * @return string */ function casetracker_dashboard_overview() { drupal_set_breadcrumb( @@ -82,7 +82,7 @@ function casetracker_dashboard_overview( 'casetracker/dashboard') )) ; drupal_add_css( - drupal_get_path('module', 'casetracker') . '/casetracker.css') ; + drupal_get_path('module', 'casetracker') .'/casetracker.css') ; $output = array( ) ; @@ -97,8 +97,8 @@ function casetracker_dashboard_overview( * Form callback * Configure the CaseTracker dashboard * - * @param void - * @return string + * @param void + * @return string */ function casetracker_dashboard_admin_form() { $form = array( @@ -115,12 +115,12 @@ function casetracker_dashboard_admin_for $states = casetracker_case_state_load('status') ; - $statesChecked = variable_get('casetracker_dashboard_states_done', + $states_checked = variable_get('casetracker_dashboard_states_done', array( )) ; foreach ($states as $csid => $title) { - $checked = isset($statesChecked[$csid]) ? $statesChecked[$csid] : false ; + $checked = isset($states_checked[$csid]) ? $states_checked[$csid] : false ; $form['casetracker_dashboard_admin'][$csid] = array( '#type' => 'checkbox', '#title' => t($title), @@ -134,9 +134,9 @@ function casetracker_dashboard_admin_for /** * Form submit hook * - * @param string - * @param array - * @return void + * @param string + * @param array + * @return void */ function casetracker_dashboard_admin_form_submit($_formId, $_formValues) { if ($_formValues['op'] == 'Save configuration') { @@ -161,8 +161,8 @@ function casetracker_dashboard_admin_for /** * Function to get an overview of all projects and their states count * - * @param void - * @return string + * @param void + * @return string */ function _casetracker_dashboard_states() { $output = array( @@ -175,11 +175,11 @@ function _casetracker_dashboard_states() $states = casetracker_case_state_load('status') ; // we get the project - cases count - $caseCount = _casetracker_dashboard_projectCasesCount() ; + $case_count = _casetracker_dashboard_projectCasesCount() ; // create the table array - $projectCaseCount = _casetracker_dashboard_createProjectCountArray( - $projects, $states, $caseCount) ; + $project_case_count = _casetracker_dashboard_create_project_count_array( + $projects, $states, $case_count) ; // create the overview table $headers = array( @@ -206,7 +206,7 @@ function _casetracker_dashboard_states() ) ; // theme the array - $output[] = theme('table', $headers, $projectCaseCount, + $output[] = theme('table', $headers, $project_case_count, array( 'id' => 'casetracker-dashboard' )) ; @@ -217,8 +217,8 @@ function _casetracker_dashboard_states() /** * Function to get all the projects * - * @param void - * @return array + * @param void + * @return array */ function _casetracker_dashboard_getProjects() { static $projects ; @@ -241,13 +241,11 @@ function _casetracker_dashboard_getProje // build the query $sql = db_rewrite_sql( - 'SELECT n.nid, n.title, cp.project_number ' . - 'FROM {node} n ' . 'LEFT JOIN {casetracker_project} cp ON (n.vid = cp.vid) ' . - 'WHERE n.type ' . 'IN (\'' . - implode('\',\'', - $filter_args) . - '\') ' . 'AND n.status = 1 ' . - $filter_sql) ; + 'SELECT n.nid, n.title, cp.project_number '. + 'FROM {node} n '.'LEFT JOIN {casetracker_project} cp ON (n.vid = cp.vid) '. + 'WHERE n.type '. + 'IN (\''. implode('\',\'', $filter_args) .'\') '. + 'AND n.status = 1 '. $filter_sql) ; $sql .= 'ORDER BY n.title ASC' ; @@ -280,38 +278,37 @@ function _casetracker_dashboard_projectC ))) ; $sql = db_rewrite_sql( - 'SELECT ' . ' n.nid, c.csid, Count(1) AS number_of_cases ' . - 'FROM ' . ' {node} AS n ' . ' Inner Join {casetracker_case} AS b ON (n.nid = b.pid) ' . - ' Inner Join {node} AS d ON (b.vid = d.vid)' . - ' Inner Join {casetracker_case_states} AS c ON (b.case_status_id = c.csid) ' . - 'WHERE ' . ' n.type IN (\'' . implode( - '\',\'', - $filter_args) . - '\') ' . ' AND n.status = 1 ') ; + 'SELECT n.nid, c.csid, Count(1) AS number_of_cases '. + 'FROM {node} AS n '. + 'Inner Join {casetracker_case} AS b ON (n.nid = b.pid) '. + 'Inner Join {node} AS d ON (b.vid = d.vid) '. + 'Inner Join {casetracker_case_states} AS c ON (b.case_status_id = c.csid) '. + 'WHERE n.type IN (\''. implode('\',\'', $filter_args) .'\') '. + 'AND n.status = 1 ') ; $sql .= 'GROUP BY n.nid, c.csid ' ; $sql .= 'ORDER BY n.nid ASC, c.csid ASC ' ; $results = db_query($sql) ; - $caseCounter = array( + $case_counter = array( ) ; while ($row = db_fetch_object($results)) { - $caseCounter[] = $row ; + $case_counter[] = $row ; } - return $caseCounter ; + return $case_counter ; } /** * Function to combine project - states and case count to one big array * - * @param array projects - * @param array states - * @param array count - * @return array + * @param array projects + * @param array states + * @param array count + * @return array */ -function _casetracker_dashboard_createProjectCountArray($_projects, $_states, +function _casetracker_dashboard_create_project_count_array($_projects, $_states, $_caseCount) { $overview = array( ) ; @@ -319,17 +316,17 @@ function _casetracker_dashboard_createPr // init vars $info = array( ) ; - $completedKeys = array( + $completed_keys = array( ) ; // get the state keys that have to be counted as done - $statesDone = variable_get( + $states_done = variable_get( 'casetracker_dashboard_states_done', array( )) ; - foreach ($statesDone as $key => $done) { + foreach ($states_done as $key => $done) { if (true === $done) { - $completedKeys[] = $key ; + $completed_keys[] = $key ; } } @@ -342,34 +339,33 @@ function _casetracker_dashboard_createPr ) ) ; foreach ($_states as $key => $value) { - $totals['state_' . $key] = $info['state_' . $key] = array( - 'data' => 0 - ) ; + $totals['state_'. $key] = $info['state_'. $key] = array( + 'data' => 0 + ); } $totals['todo'] = $info['todo'] = array( - 'data' => 0, - 'class' => 'devider' - ) ; + 'data' => 0, + 'class' => 'devider' + ); $totals['done'] = $info['done'] = array( - 'data' => 0 - ) ; + 'data' => 0 + ); $totals['total'] = $info['total'] = array( - 'data' => 0, - 'class' => 'devider' - ) ; + 'data' => 0, + 'class' => 'devider' + ); $totals['completed'] = $info['completed'] = array( - 'data' => 0, - 'class' => 'percent' - ) ; + 'data' => 0, + 'class' => 'percent' + ); // first add all possible projects as an extra array to the projects array foreach ($_projects as $key => $project) { - $link = l($project['title'], - 'casetracker/cases/' . $key . '/all') ; + $link = l($project['title'], 'casetracker/cases/'. $key .'/all') ; $overview[$key]['project'] = array( - 'data' => $link, - 'class' => 'project' - ) ; + 'data' => $link, + 'class' => 'project' + ); $overview[$key] = array_merge($overview[$key], $info) ; } @@ -378,12 +374,13 @@ function _casetracker_dashboard_createPr $nid = (int)$count->nid ; $csid = (int)$count->csid ; - $overview[$nid]['state_' . $csid]['data'] = (int)$count->number_of_cases ; - $totals['state_' . $csid]['data'] += (int)$count->number_of_cases ; - if (in_array($csid, $completedKeys)) { + $overview[$nid]['state_'. $csid]['data'] = (int)$count->number_of_cases ; + $totals['state_'. $csid]['data'] += (int)$count->number_of_cases ; + if (in_array($csid, $completed_keys)) { $overview[$nid]['done']['data'] += (int)$count->number_of_cases ; $totals['done']['data'] += (int)$count->number_of_cases ; - } else { + } + else { $overview[$nid]['todo']['data'] += (int)$count->number_of_cases ; $totals['todo']['data'] += (int)$count->number_of_cases ; } @@ -393,11 +390,12 @@ function _casetracker_dashboard_createPr // loop through the projects and count the percentage of completed cases foreach ($overview as $key => $project) { - if (0 < $project['total']['data']) { + if ($project['total']['data'] > 0) { $overview[$key]['completed']['data'] = round( ($project['done']['data'] / $project['total']['data']) * 100) ; - } else { + } + else { $overview[$key]['completed']['data'] = 100 ; } } @@ -407,7 +405,8 @@ function _casetracker_dashboard_createPr $totals['completed']['data'] = round( ($totals['done']['data'] / $totals['total']['data']) * 100) ; - } else { + } + else { $totals['completed']['data'] = 100 ; } diff -urp old/casetracker_mail.module new/casetracker_mail.module --- old/casetracker_mail.module 2008-04-18 18:18:54.000000000 +0530 +++ new/casetracker_mail.module 2008-04-21 02:49:56.718750000 +0530 @@ -12,7 +12,7 @@ function casetracker_mail_help($section) { switch ($section) { case 'admin/settings/casetracker_mail': - return '

'.t('Configure the various Case Tracker mail options with these settings.').'

'; + return '

'. t('Configure the various Case Tracker mail options with these settings.') .'

'; } } @@ -49,21 +49,21 @@ function casetracker_mail_send($case, $c global $user; // is it a comment post - $isComment = !is_null($comment); + $is_comment = !is_null($comment); // get the project data - $pid = ($isComment) - ? $comment['prid'] - : $case->pid; + $pid = ($is_comment) + ? $comment['prid'] + : $case->pid; $project = db_fetch_object(db_query("SELECT cp.project_number, n.title FROM {casetracker_project} cp LEFT JOIN {node} n ON (n.vid = cp.vid) WHERE cp.nid = %d", $pid)); // get the assigned to name - $assignToId = ($isComment) - ? $comment['assign_to'] - : $case->assign_to; - $assignToName = (is_numeric($assignToId)) - ? casetracker_get_name($assignToId) - : $assignToId; + $assign_to_id = ($is_comment) + ? $comment['assign_to'] + : $case->assign_to; + $assign_to_name = (is_numeric($assign_to_id)) + ? casetracker_get_name($assign_to_id) + : $assign_to_id; $variables = array( '%project_id' => $pid, @@ -71,29 +71,29 @@ function casetracker_mail_send($case, $c '%project_title' => $project->title, '%case_id' => $case->nid, '%case_number' => $project->project_number .'-'. $case->case_number, - '%case_title' => $isComment - ? $comment['case_title'] - : $case->title, + '%case_title' => $is_comment + ? $comment['case_title'] + : $case->title, '%case_type' => casetracker_case_state_load( - 'type', - $isComment - ? $comment['case_type_id'] - : $case->case_type_id), + 'type', + $is_comment + ? $comment['case_type_id'] + : $case->case_type_id), '%case_priority' => casetracker_case_state_load( - 'priority', - $isComment - ? $comment['case_priority_id'] - : $case->case_priority_id), + 'priority', + $is_comment + ? $comment['case_priority_id'] + : $case->case_priority_id), '%case_status' => casetracker_case_state_load( - 'status', - $isComment - ? $comment['case_status_id'] - : $case->case_status_id), - '%case_assigned' => $assignToName, + 'status', + $is_comment + ? $comment['case_status_id'] + : $case->case_status_id), + '%case_assigned' => $assign_to_name, '%case_author' => casetracker_get_name($case->uid), '%case_created' => format_date($case->created, 'large'), '%case_changed' => format_date($case->changed, 'large'), - '%case_url' => url('node/'.$case->nid, NULL, NULL, TRUE), + '%case_url' => url('node/'. $case->nid, NULL, NULL, TRUE), // @todo fails for CCK or non-body cases. '%case_description' => _casetracker_mail_plain_description($case->body), '%comment' => NULL, @@ -121,21 +121,28 @@ function casetracker_mail_send($case, $c // @todo this currently sends to only author and assigned. there needs to be // finer-grain control here, like an OG subscribers or all commenters, etc. $results = db_query( - "SELECT uid, name, mail FROM {users} WHERE uid IN (%d, %d, %d)", + "SELECT uid, name, mail FROM {users} WHERE uid IN (%d, %d, %d)", $comment['uid'], $case->uid, - is_numeric($assignToId) - ? $assignToId - : casetracker_get_uid($assignToId) + is_numeric($assign_to_id) + ? $assign_to_id + : casetracker_get_uid($assign_to_id) ); while ($result = db_fetch_object($results)) { - if ($result->uid == $user->uid) { continue; } // don't fire to currently commenting user. - if (!$result->mail) { continue; } // don't fire blanks. + if ($result->uid == $user->uid) { + // don't fire to currently commenting user. + continue; + } + if (!$result->mail) { + // don't fire blanks. + continue; + } // if we get here a mail is send $mail_status = drupal_mail('casetracker_mail', $result->mail, $subject, $body, $from, array('Message-ID' => $msg_id)); - if (!$mail_status) { // mail failure doesn't actually tell us much, since PHP returns no error string, but hey, feel good, right? + if (!$mail_status) { + // mail failure doesn't actually tell us much, since PHP returns no error string, but hey, feel good, right? watchdog('casetracker_mail', t('E-mail notification failed for %address.', array('%address' => $result->mail))); } } @@ -202,9 +209,9 @@ function casetracker_mailhandler($node, $node->assign_to = $node->assign_to ? $node->assign_to : $node->uid; foreach (array('priority', 'status', 'type') as $state) { $options = casetracker_case_state_load($state); - $node->{'case_'.$state.'_id'} = $node->{'case_'.$state} - ? db_result(db_query("SELECT csid FROM {casetracker_case_states} WHERE case_state_name = LOWER('%s') AND case_state_realm = '%s'", drupal_strtolower($node->{'case_'.$state}), $state)) - : variable_get('casetracker_default_case_'.$state, array_shift(array_keys($options))); + $node->{'case_'. $state .'_id'} = $node->{'case_'. $state} + ? db_result(db_query("SELECT csid FROM {casetracker_case_states} WHERE case_state_name = LOWER('%s') AND case_state_realm = '%s'", drupal_strtolower($node->{'case_'. $state}), $state)) + : variable_get('casetracker_default_case_'. $state, array_shift(array_keys($options))); } // @todo potential hack for CCK fields: explode on [ and make @@ -234,7 +241,7 @@ function casetracker_mailhandler($node, } // else (if no pid) then pass the node back for default processing) else { - return $node; + return $node; } } @@ -320,8 +327,8 @@ function _casetracker_mail_subject() { /** * Function to clear the possible html from a mail and generate readable txt version * - * @param string - * @return string + * @param string + * @return string */ function _casetracker_mail_plain_description($_description) { // tags that should be have a newline behind their ass @@ -331,9 +338,8 @@ function _casetracker_mail_plain_descrip '', '', '', '', '', '', '', ); - foreach($tags AS $tag) - { - $_description = str_replace($tag, $tag . "\n", $_description); + foreach ($tags AS $tag) { + $_description = str_replace($tag, $tag ."\n", $_description); } $result = filter_xss($_description, array('dd')); diff -urp old/casetracker_views.module new/casetracker_views.module --- old/casetracker_views.module 2008-04-18 19:57:44.000000000 +0530 +++ new/casetracker_views.module 2008-04-21 02:45:34.765625000 +0530 @@ -110,12 +110,12 @@ function casetracker_views_tables() { 'value-type' => 'array', ), 'assign_to_currentuid' => array( - 'help' => t('Filter Case Tracker cases by the current logged in user.'), - 'list' => 'views_handler_filter_usercurrent', - 'list-type' => 'select', - 'name' => t('Case Tracker: Assigned to current logged in User'), - 'field' => 'assign_to', - 'operator' => 'views_handler_operator_eqneq', + 'help' => t('Filter Case Tracker cases by the current logged in user.'), + 'list' => 'views_handler_filter_usercurrent', + 'list-type' => 'select', + 'name' => t('Case Tracker: Assigned to current logged in User'), + 'field' => 'assign_to', + 'operator' => 'views_handler_operator_eqneq', ), ), ); @@ -185,7 +185,7 @@ function casetracker_views_tables() { ); $tables['casetracker_case_node'] = array( - 'name' => 'node', + 'name' => 'node', 'join' => array( 'left' => array( @@ -223,18 +223,11 @@ function casetracker_views_tables() { * Views field handler; display the project number of the Case Tracker project. */ function casetracker_views_project_number($fieldinfo, $fielddata, $value, $data) { - if(!empty($data->casetracker_project_project_number)) - { + if (!empty($data->casetracker_project_project_number)) { return $data->casetracker_project_project_number; } - $project = db_fetch_object( - db_query( - db_rewrite_sql( - "SELECT cp.project_number FROM {casetracker_project} cp WHERE cp.nid = %d" - ), - $data->nid - ) - ); + $project = db_fetch_object(db_query(db_rewrite_sql( + "SELECT cp.project_number FROM {casetracker_project} cp WHERE cp.nid = %d"), $data->nid)); if ($project->project_number) { return $project->project_number; } @@ -244,20 +237,11 @@ function casetracker_views_project_numbe * Views field handler; display the project-case number of the Case Tracker case. */ function casetracker_views_case_number_full($fieldinfo, $fielddata, $value, $data) { - if(!empty($data->casetracker_project_project_number)) - { - return $data->casetracker_project_project_number - . '-' - . $data->casetracker_case_case_number; + if (!empty($data->casetracker_project_project_number)) { + return $data->casetracker_project_project_number .'-'. $data->casetracker_case_case_number; } - $project = db_fetch_object( - db_query( - db_rewrite_sql( - "SELECT cp.project_number FROM {casetracker_project} cp WHERE cp.nid = %d" - ), - $data->casetracker_case_pid - ) - ); + $project = db_fetch_object(db_query(db_rewrite_sql( + "SELECT cp.project_number FROM {casetracker_project} cp WHERE cp.nid = %d"), $data->casetracker_case_pid)); if ($project->project_number) { return $project->project_number .'-'. $data->casetracker_case_case_number; } @@ -277,7 +261,10 @@ function casetracker_views_priority_name */ function casetracker_views_project_name($fieldinfo, $fielddata, $value, $data) { $node = db_fetch_object(db_query(db_rewrite_sql("SELECT n.nid, n.title FROM {node} n WHERE n.nid = %d"), $data->casetracker_case_pid)); - if ($node->nid) { return l($node->title, "node/$node->nid"); } // returns a linked case tracker project title. + if ($node->nid) { + // returns a linked case tracker project title. + return l($node->title, "node/$node->nid"); + } } /** @@ -347,30 +334,25 @@ function casetracker_views_user_options( * Views field handler; Get a link to add a case for a project * @link http://drupal.org/node/99565 * - * @param array - * @param array - * @param mixed - * @param array - * @return string + * @param array + * @param array + * @param mixed + * @param array + * @return string */ function casetracker_views_field_createCaseLink_handler($fieldinfo, $fielddata, $value, $data) { $node_types = node_get_types('names'); $case_types = array_filter(variable_get('casetracker_case_node_types', array('casetracker_basic_case'))); $operations = array(); foreach ($case_types as $case_type) { - if($fielddata['options']) { - $linkText = $fielddata['options']; - } - else { - $linkText = t( - 'Add !name', - array('!name' => $node_types[$case_type]) - ); - } - - $operations[] = l( - $linkText, - 'node/add/'.$case_type.'/'.$data->nid + if ($fielddata['options']) { + $link_text = $fielddata['options']; + } + else { + $link_text = t('Add !name', array('!name' => $node_types[$case_type])); + } + + $operations[] = l($link_text, 'node/add/'. $case_type .'/'. $data->nid ); } return implode(' | ', $operations); @@ -379,18 +361,18 @@ function casetracker_views_field_createC /** * Views field handler; Get a link to view all project cases * - * @param array - * @param array - * @param mixed - * @param array - * @return string + * @param array + * @param array + * @param mixed + * @param array + * @return string */ function casetracker_views_field_viewProjectCases_link_handler($fieldinfo, $fielddata, $value, $data) { - $linkText = ($fielddata['options']) - ? $linkText = $fielddata['options'] + $link_text = ($fielddata['options']) + ? $link_text = $fielddata['options'] : t('View Cases'); return l( - $linkText, - 'casetracker/cases/' . $data->nid . '/all' + $link_text, + 'casetracker/cases/'. $data->nid .'/all' ); } \ No newline at end of file diff -urp old/casetracker_xmlrpc.module new/casetracker_xmlrpc.module --- old/casetracker_xmlrpc.module 2008-04-18 18:18:54.000000000 +0530 +++ new/casetracker_xmlrpc.module 2008-04-21 02:32:48.312500000 +0530 @@ -48,7 +48,9 @@ function casetracker_xmlrpc_xmlrpc() { */ function casetracker_xmlrpc_new_case($username, $password, $data) { $user = casetracker_xmlrpc_validate_user($username, $password); - if (!$user->uid) { return casetracker_xmlrpc_error($user); } + if (!$user->uid) { + return casetracker_xmlrpc_error($user); + } $data = (object)$data; node_save($data); // force to object. return t('Your data was accepted and submitted as a node.'); }