Index: casetracker.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/casetracker/casetracker.module,v
retrieving revision 1.68.2.2
diff -u -p -r1.68.2.2 casetracker.module
--- casetracker.module	5 Sep 2006 16:57:02 -0000	1.68.2.2
+++ casetracker.module	17 Dec 2006 00:11:55 -0000
@@ -294,26 +294,26 @@ function casetracker_cases_table($argume
    );
    switch(arg(3)) {
      case 'assigned_to_me':
-       $sql = db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE cs.assign_to = %d and n.type ='%s'");
+       $sql = db_rewrite_sql("SELECT n.nid, n.*, cs.*, c.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE cs.assign_to = %d and n.type ='%s'");
        $arguments = array($user->uid, 'casetracker_case');
        break;
      case 'opened_by_me':
-       $sql = db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.uid = %d and n.type ='%s'");
+       $sql = db_rewrite_sql("SELECT n.nid, n.*, cs.*, c.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.uid = %d and n.type ='%s'");
        $arguments = array($user->uid, 'casetracker_case');
        break;
      case 'priority':
        $case_id = (int)arg(4);
-       $sql = db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND cs.case_priority_id = %d");
+       $sql = db_rewrite_sql("SELECT n.nid, n.*, cs.*, c.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND cs.case_priority_id = %d");
        $arguments = array('casetracker_case',$case_id);
        break;
      case 'state':
        $case_id = (int)arg(4);
-       $sql = db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND cs.case_status_id = %d");
+       $sql = db_rewrite_sql("SELECT n.nid, n.*, cs.*, c.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND cs.case_status_id = %d");
        $arguments = array('casetracker_case',$case_id);
        break;
      case 'type':
        $case_id = (int)arg(4);
-       $sql = db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND cs.case_type_id = %d");
+       $sql = db_rewrite_sql("SELECT n.nid, n.*, cs.*, c.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND cs.case_type_id = %d");
        $arguments = array('casetracker_case',$case_id);
        break;
      default :
@@ -321,11 +321,11 @@ function casetracker_cases_table($argume
          $argument = arg(2);
        }
        if (!$argument ) {
-         $sql = db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE ( n.uid = %d OR cs.assign_to = %d ) AND n.type ='%s'");
+         $sql = db_rewrite_sql("SELECT n.nid, n.*, cs.*, c.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE ( n.uid = %d OR cs.assign_to = %d ) AND n.type ='%s'");
          $arguments = array($user->uid, $user->uid, 'casetracker_case');
        }
       if($argument == 'all_cases'){
-         $sql = db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s'");
+         $sql = db_rewrite_sql("SELECT n.nid, n.*, cs.*, c.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s'");
          $arguments = array('casetracker_case');
        }
       if(is_numeric($argument)) {
@@ -338,25 +338,25 @@ function casetracker_cases_table($argume
         if(arg(4)==t('state')){
             drupal_set_title(t('Cases for '.$project_name_for_case_listing.'<br>'.l(t('Click here to view all cases'),'project/cases/'.arg(2).'/all')));
         $case_id = arg(5);
-        $sql = db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND p_id = %d AND cs.case_status_id = %d");
+        $sql = db_rewrite_sql("SELECT n.nid, n.*, cs.*, c.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND p_id = %d AND cs.case_status_id = %d");
         $arguments = array('casetracker_case', $argument,$case_id);
         }
          else if(arg(4)=='priority'){
             drupal_set_title(t('Cases for '.$project_name_for_case_listing.'<br>'.l(t('Click here to view all cases'),'project/cases/'.arg(2).'/all')));
         $case_id = arg(5);
-        $sql = db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND p_id = %d AND cs.case_priority_id = %d");
+        $sql = db_rewrite_sql("SELECT n.nid, n.*, cs.*, c.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND p_id = %d AND cs.case_priority_id = %d");
         $arguments = array('casetracker_case', $argument,$case_id);
          }
          else if(arg(4)==t('type')){
             drupal_set_title(t('Cases for '.$project_name_for_case_listing.'<br>'.l(t('Click here to view all cases'),'project/cases/'.arg(2).'/all')));
         $case_id = arg(5);
-        $sql = db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND p_id = %d AND cs.case_type_id = %d");
+        $sql = db_rewrite_sql("SELECT n.nid, n.*, cs.*, c.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND p_id = %d AND cs.case_type_id = %d");
         $arguments = array('casetracker_case', $argument,$case_id);
          }
          else {
            $project_name_for_case_listing = db_result(db_query("SELECT title FROM {node} WHERE nid = %d",arg(2)));
            drupal_set_title("Cases for"." ".$project_name_for_case_listing);
-           $sql = db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND p_id = %d ");
+           $sql = db_rewrite_sql("SELECT n.nid, n.*, cs.*, c.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s' AND p_id = %d ");
            $arguments = array('casetracker_case', $argument);
          }
         }
@@ -446,11 +446,11 @@ function casetracker_projects_table($arg
     array('data' => t('Edit')),
     array('data' => t('Add a case to this project')));
   if ($argument == 'all_projects') {
-    $sql = db_rewrite_sql("SELECT n.*, cp.* FROM {node} n INNER JOIN {casetracker_project} cp on n.vid = cp.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type IN (".str_pad('', count(variable_get('casetracker_project_node_types',array('casetracker_project'))) * 5 - 1, "'%s',").")");
+    $sql = db_rewrite_sql("SELECT n.nid, n.*, cp.* FROM {node} n INNER JOIN {casetracker_project} cp on n.vid = cp.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type IN (".str_pad('', count(variable_get('casetracker_project_node_types',array('casetracker_project'))) * 5 - 1, "'%s',").")");
     $arguments = variable_get('casetracker_project_node_types',array('casetracker_project'));
   }
   else {
-    $sql = db_rewrite_sql("SELECT n.*, cp.* FROM {node} n INNER JOIN {casetracker_project} cp on n.vid = cp.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.uid = %d AND n.type IN (".str_pad('', count(variable_get('casetracker_project_node_types',array('casetracker_project'))) * 5 - 1, "'%s',").")");
+    $sql = db_rewrite_sql("SELECT n.nid, n.*, cp.* FROM {node} n INNER JOIN {casetracker_project} cp on n.vid = cp.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.uid = %d AND n.type IN (".str_pad('', count(variable_get('casetracker_project_node_types',array('casetracker_project'))) * 5 - 1, "'%s',").")");
     $arguments = array_merge(array($user->uid), variable_get('casetracker_project_node_types',array('casetracker_project')));
   }
   $tablesort = tablesort_sql($headers);
@@ -592,7 +592,7 @@ function casetracker_case_form(&$node) {
     '#collapsed' => TRUE);
   $case_status_options = casetracker_case_state_option('status');
   $keys = array_keys($case_status_options);
-  $result = db_query(db_rewrite_sql("SELECT * FROM {node} n WHERE n.type IN (".str_pad('', count(variable_get('casetracker_project_node_types', array('casetracker_project')))* 5 - 1, "'%s',").")"), variable_get('casetracker_project_node_types',array('casetracker_project')));
+  $result = db_query(db_rewrite_sql("SELECT n.nid, n.* FROM {node} n WHERE n.type IN (".str_pad('', count(variable_get('casetracker_project_node_types', array('casetracker_project')))* 5 - 1, "'%s',").")"), variable_get('casetracker_project_node_types',array('casetracker_project')));
   while ($row = db_fetch_array($result)) {
      $project_options[$row['nid']] = $row['title'];
   }
@@ -1335,7 +1335,7 @@ function casetracker_form_alter($form_id
           '#collapsed' => TRUE,
         '#weight' => -10);
 
-        $result = db_query(db_rewrite_sql("SELECT * FROM {node} n WHERE n.type IN (".str_pad('', count(variable_get('casetracker_project_node_types',array('casetracker_project')))* 5 - 1, "'%s',").")"),variable_get('casetracker_project_node_types',array('casetracker_project')));
+        $result = db_query(db_rewrite_sql("SELECT n.nid, n.* FROM {node} n WHERE n.type IN (".str_pad('', count(variable_get('casetracker_project_node_types',array('casetracker_project')))* 5 - 1, "'%s',").")"),variable_get('casetracker_project_node_types',array('casetracker_project')));
         while($row = db_fetch_array($result)) {
           $project_options[$row['nid']] = $row['title'];
         }
@@ -1554,7 +1554,7 @@ function casetracker_form_alter($form_id
       }
       break;
     case 'casetracker_case_node_form':
-      $count = db_fetch_object(db_query(db_rewrite_sql("SELECT COUNT(*) AS count FROM {node} n WHERE n.type IN (".str_pad('', count(variable_get('casetracker_project_node_types', array('casetracker_project')))* 5 - 1, "'%s',").")"), variable_get('casetracker_project_node_types',array('casetracker_project'))));
+      $count = db_fetch_object(db_query(db_rewrite_sql("SELECT COUNT(n.nid) AS count FROM {node} n WHERE n.type IN (".str_pad('', count(variable_get('casetracker_project_node_types', array('casetracker_project')))* 5 - 1, "'%s',").")"), variable_get('casetracker_project_node_types',array('casetracker_project'))));
       if ($count->count == 0) {
         unset($form['case_detail'], $form['og_nodeapi'], $form['submit'], $form['preview']);
         $type = array_shift(variable_get('casetracker_project_node_types', array('casetracker_project')));
@@ -1998,7 +1998,7 @@ function casetracker_search_page_header(
  */
 function casetracker_taxonomy_form() {
   $options = array();
-  $result = db_query(db_rewrite_sql("SELECT * FROM {node} n WHERE n.type = 'casetracker_project'"));
+  $result = db_query(db_rewrite_sql("SELECT n.nid, n.* FROM {node} n WHERE n.type = 'casetracker_project'"));
   while($row = db_fetch_array($result)) {
     $options[$row['nid']] = $row['title'];
   }
@@ -2316,11 +2316,11 @@ function casetracker_block($op = 'list',
         $block['content'] = drupal_get_form('jump_to_case_form', $form, 'jump_to_case_form_submit1');
         return $block;
       case 1:
-        $result = db_query(db_rewrite_sql("SELECT * FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid WHERE type = 'casetracker_case' order by created desc LIMIT 0, %d"), variable_get('casetracker_latest_cases_block_num_items', '10'));
+        $result = db_query(db_rewrite_sql("SELECT n.nid, n.*, cs.* FROM {node} n INNER JOIN {casetracker_case} cs on n.vid = cs.vid WHERE type = 'casetracker_case' order by created desc LIMIT 0, %d"), variable_get('casetracker_latest_cases_block_num_items', '10'));
         $items = array();
         while( $row = db_fetch_array($result)) {
           $project_no = db_result(db_query("SELECT max(project_no) FROM {casetracker_project} WHERE nid = %d", $row['p_id']));
-          $project_result = db_query("SELECT * FROM {node} WHERE nid = %d", $row['p_id']);
+          $project_result = db_query("SELECT n.nid, n.* FROM {node} n WHERE n.nid = %d", $row['p_id']);
           $project_row = db_fetch_array($project_result);
           $items[] = array(
             'project_no' => $project_no,