--- /home/cvs/contributions/modules/casetracker/casetracker.module	2006-05-09 14:46:48.000000000 -0400
+++ casetracker.module	2006-05-09 18:36:30.000000000 -0400
@@ -270,7 +270,6 @@
        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'");
          $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'");
@@ -282,7 +281,7 @@
           $arguments = array('casetracker_case', $argument);
         }
         else {
-         $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 ='casetracker_case' AND p_id = %d AND n.uid = %d ");
+           $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 n.uid = %d ");
           $arguments = array('casetracker_case', $argument, $user->uid);
         }
       }  
@@ -387,7 +386,7 @@
  */
  
 function casetracker_case_view(&$node, $teaser = false, $page = false) {
-  $project_name_breadcrumb = db_result(db_query("SELECT title FROM node WHERE nid = %d",$node->p_id));
+  $project_name_breadcrumb = db_result(db_query("SELECT title FROM {node} n WHERE n.nid = %d", $node->p_id));
   drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('projects'), 'casetracker/projects'), l(t('%name', array('%name' => $project_name_breadcrumb)), 'node/'.$node->p_id),l(t('all cases'),'project/cases/'.$node->p_id.'/all')));
   $node = node_prepare($node, $teaser);
   $project = node_load(array('nid' => $node->p_id, 'type' => 'casetracker_project'));
@@ -460,7 +459,7 @@
                                '#collapsible' => FALSE,
                                '#collapsed' => TRUE);
   $case_status_options = casetracker_options_select(casetracker_case_status, case_status_id, case_status_name);
-  $result = db_query(db_rewrite_sql("SELECT * FROM {node} WHERE type = 'casetracker_project'"));
+  $result = db_query(db_rewrite_sql("SELECT * FROM {node} n WHERE n.type = 'casetracker_project'"));
   while ($row = db_fetch_array($result)) {
      $project_options[$row['nid']] = $row['title'];
   }  
@@ -480,7 +479,7 @@
     $arr_assign_yes = array();
   }  
   else {
-    $arr_assign_yes = array('readonly'=>true);
+    $arr_assign_yes = array('disabled'=>'true');
   }   
   $form['case_detail']['assign_to'] = array(
                                             '#type' => 'textfield',
@@ -579,7 +578,7 @@
  */
 
 function casetracker_case_delete($node) {
-  $project_name = db_result(db_query("SELECT title FROM {node} WHERE  nid = %d", $node->nid));
+  $project_name = db_result(db_query("SELECT title FROM {node} n WHERE n.nid = %d", $node->nid));
   casetracker_mail($node, 'delete', $project_name);
   
   // Deleting the corresponding comment
@@ -1854,7 +1853,7 @@
 function casetracker_taxonomy_form() {
   //echo "Entering";
   $options = array();
-  $result = db_query(db_rewrite_sql("SELECT * FROM {node} WHERE type = 'casetracker_project'"));
+  $result = db_query(db_rewrite_sql("SELECT * FROM {node} n WHERE n.type = 'casetracker_project'"));
   while($row = db_fetch_array($result)) {
     $options[$row[nid]] = $row['title'];
   }  
@@ -2083,7 +2082,7 @@
  * Implementation of hook_settings().
  */
 function casetracker_settings() {
-  $result = db_query("SELECT * FROM {node} WHERE type='casetracker_project'");
+  $result = db_query("SELECT * FROM {node} n WHERE n.type='casetracker_project'");
   while($row = db_fetch_array($result)) {
     $options[$row['nid']] = $row['title'];
   }