Index: faq.install
===================================================================
RCS file: faq.install
diff -N faq.install
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ faq.install	1 Jul 2006 00:24:43 -0000
@@ -0,0 +1,20 @@
+<?php
+
+// $Id$
+
+/**
+ * Install the initial schema.
+ */
+function faq_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {faq} (
+        fid int(11) unsigned NOT NULL default '0',
+        weight int(4) default '0',
+        PRIMARY KEY (fid)) 
+        /*!40100 DEFAULT CHARACTER SET utf8 */"
+      );
+      break;
+  }
+}
Index: faq.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/faq.module,v
retrieving revision 1.1
diff -u -d -b -w -r1.1 faq.module
--- faq.module	28 Apr 2006 21:28:11 -0000	1.1
+++ faq.module	1 Jul 2006 00:24:44 -0000
@@ -11,9 +11,7 @@
  * Implementation of hook_perm()
  */
 function faq_perm(){
-	return array(
-		FAQ_ADMIN
-	);
+	return array(FAQ_ADMIN);
 }
 
 /**
@@ -26,10 +24,10 @@
 }
 
 /**
- * Implementation of hook_node_name()
+ * Implementation of hook_node_info().
  */
-function faq_node_name(){
-	return 'faq';
+function faq_node_info() {
+  return array('faq' => array('name' => t('faq'), 'base' => 'faq'));
 }
 
 /**
@@ -40,10 +38,22 @@
 	$items = array();
 
 	if($may_cache){
+    $items[] = array(
+      'path' => 'faq',
+      'title' => t('FAQs'),
+      'callback' => 'theme_faq_list',
+      'access' => user_access('access content'), 
+      'type' => MENU_SUGGESTED_ITEM
+    );
+    $items[] = array(
+      'path' => 'faq/show', 
+      'title' => t('FAQs'),
+      'callback' => 'theme_faq_show', 
+      'access' => user_access('access content'), 
+      'type' => MENU_SUGGESTED_ITEM
+    );
 	}
 
-	$items[] = array('path' => 'faq', 'title' => t('FAQs'), 'callback' => 'theme_faq_list', 'access' => user_access('access content'), 'type' => MENU_NORMAL_ITEM);
-	$items[] = array('path' => 'faq/show', 'title' => t('FAQs'), 'callback' => 'theme_faq_show', 'access' => user_access('access content'), 'type' => MENU_CALLBACK);
 
 	return $items;
 
@@ -53,17 +63,34 @@
  * Implementation of hook_form()
  */
 function faq_form(&$node){
-	$ouptut = '';
 	$values = array();
 	for($i = -10; $i <= 10; $i++){
 		$values[$i] = $i;
 	}
-	$output .= form_select(t('Weight'), 'weight', isset($node->weight) ? $node->weight : '0', $values);
-	foreach(taxonomy_node_form('faq', $node) as $vocab){
-		$output .= $vocab;
-	}
-	$output .= form_textarea(t('Answer'), 'body', $node->body, 60, 20, 'Enter the answer to the question given in the title.', NULL, TRUE);
-	return $output;
+  $form = array();
+	$form['title'] = array(
+    '#type' => 'textfield',
+    '#title'=> t('Question'),
+    '#default_value' => $node->title,
+    '#weight'=>'-1',
+  );
+	$form['body'] = array(
+    '#type' => 'textarea',
+    '#title'=> t('Answer'),
+    '#default_value' => $node->body,
+    '#rows'=>20,
+    '#cols'=>20,
+    '#description'=>'Enter the answer to the question given in the title.',
+    '#weight'=>'-1',
+  );
+  $form['weight'] = array(
+    '#type' => 'select', 
+    '#title' => t('Weight'), 
+    '#default_value' =>  isset($node->weight) ? $node->weight : '0',
+    '#options' => $values,
+    '#weight'=>'0',
+  );
+	return $form;
 }
 
 /**
@@ -104,7 +131,7 @@
 						$block['subject'] = t('FAQ Categories');
 						$block['content'] = '<ul>' . "\n";
 						foreach($terms as $name => $tid){
-							$block['content'] .= '<li><a href="faq/show/' . $tid . '">' . $name . '</a></li>' . "\n";
+							$block['content'] .= '<li>' . l($name, 'faq/show/' . $tid) . '</li>' . "\n";
 						}
 						$block['content'] .= '</ul>' . "\n";
 					}
@@ -182,13 +209,13 @@
 function theme_faq_highlights($order = 'created', $num = 5){
 	$output = '';
 
-	$sql = 'SELECT n.nid, n.title, n.teaser FROM {node} n WHERE n.type = "faq" AND n.status = 1 ORDER BY n.created DESC LIMIT ' . intval($num);
-
 	if($order == 'rating' && function_exists('voting_get_vote')){
-		$sql = 'SELECT v.content_id nid, SUM(v.vote) rating FROM {votes} v, {node} n WHERE v.content_id = n.nid AND n.type = "faq" GROUP BY v.content_id ORDER BY rating DESC LIMIT ' . intval($num);
+		$result = db_query('SELECT v.content_id nid, SUM(v.vote) rating FROM {votes} v, {node} n WHERE v.content_id = n.nid AND n.type = "faq" GROUP BY v.content_id ORDER BY rating DESC LIMIT ' . intval($num));
+	}
+  else {
+    $result = db_query('SELECT n.nid, n.title, r.body FROM {node} n INNER JOIN {node_revisions} r ON r.nid = n.nid, {term_node} t, {faq} f WHERE t.nid = n.nid AND f.fid = n.nid AND n.type="faq" AND n.status=1 ORDER BY f.weight, n.title');
 	}
 
-	$result = db_query($sql);
 	$output .= '<ul>' . "\n";
 	while($node = db_fetch_object($result)){
 		$node = node_load(array('nid' => $node->nid));
@@ -199,14 +226,17 @@
 			$node->rating_form = voting_control_node($node, false, true);
 		}
 
-		//$output .= node_view($node, 1);
-		$output .= '<li><a href="node/' . $node->nid . '">' . $node->title . '</a></li>' . "\n";		
-		//$output .= '<p>' . $node->teaser . '</p>' . "\n";		
-		//$output .= '' . "\n";		
+    if ($node->taxonomy) {
+      $term = array_pop(array_keys($node->taxonomy));
+      $output .= '<li>' . l($node->title, 'faq/show/' . $term, array(), '#q_' . $node->nid) . '</li>' . "\n";		
+    }
+    else {
+      $output .= '<li>' . l($node->title, 'node/' . $node->nid) . '</li>' . "\n";		
+    }
 	}
 	$output .= '</ul>' . "\n";
 
-	$output .= '<p><br /><a href="faq">All FAQs</a></p>' . "\n";
+	$output .= '<p><br />' . l(t('All FAQs'), 'faq') .'</p>' . "\n";
 
 	return $output;
 }
@@ -215,17 +245,17 @@
 	$found = false;
 	$result = db_query('SELECT n.nid, n.title FROM {node} n, {term_node} t, {faq} f WHERE t.nid = n.nid AND f.fid = n.nid AND n.type="faq" AND n.status=1 AND t.tid = %d ORDER BY f.weight, n.title', $term->tid);
 
-	$output = '<h2><a href="faq/show/' . $term->tid . '">' . $term->name . '</a></h2>' . "\n";
+  $output = '<h2>'  . l($term->name, 'faq/show/' . $term->tid) . '</h2>' . "\n";
 	$output .= '<ul>' . "\n";
 	while($node = db_fetch_object($result)){
 		$node = node_prepare($node);
 
 		$edit = '';
 		if(user_access('administer nodes')){
-			$edit = ' (<a href="node/' . $node->nid . '/edit">edit</a>)';
+      $edit = ' ' . l('edit', 'node/' . $node->nid . 'edit');
 		}
 
-		$output .= '<li><a href="faq/show/' . $term->tid . '#q_' . $node->nid . '">' . $node->title . '</a>' . $edit . '</li>';
+    $output .= '<li>' . l($node->title, 'faq/show/' . $term->tid, array(), '#q_' . $node->nid) . $edit . '</li>';
 		$found = true;
 	}	
 	$output .= '</ul>' . "\n";
@@ -242,8 +272,10 @@
 function theme_faq_get_faqs_for_term($term){
 	$found = false;
 	$output = '';
-	$title = '<h1>' . $term->name . ' FAQ</h1>' . "\n";
-	$result = db_query('SELECT n.nid, n.title, n.body FROM {node} n, {term_node} t, {faq} f WHERE t.nid = n.nid AND f.fid = n.nid AND n.type="faq" AND n.status=1 AND t.tid = %d ORDER BY f.weight, n.title', $term->tid);
+  if (!$term->tid) {
+    return t('No terms defined');
+  }
+  $result = db_query('SELECT n.nid, n.title, r.body FROM {node} n INNER JOIN {node_revisions} r ON r.nid = n.nid, {term_node} t, {faq} f WHERE t.nid = n.nid AND f.fid = n.nid AND n.type="faq" AND n.status=1 AND t.tid = %d ORDER BY f.weight, n.title', $term->tid);
 
 	$links = '<ul>' . "\n";
 	while($node = db_fetch_object($result)){
@@ -252,35 +284,41 @@
 
 		$edit = '';
 		if(user_access('administer nodes')){
-			$edit = '<a href="node/' . $node->nid . '/edit">edit</a>';
+      $edit = ' ' .l('edit', 'node/'.$node->nid. '/edit');
 		}
 
-		$links .= '<li><a href="faq/show/' . $term->tid . '#q_' . $node->nid . '">' . $node->title . '</a>' . ($edit == '' ? '' : ' (' . $edit . ') ') . '</li>';
+    $links .= '<li><a href="#q_' . $node->nid . '">' . check_plain($node->title) . '</a>'. $edit . '</li>';
 
 		//Add the voting form if enabled and applicable. Hacky, I know.
 		if($node->voting && function_exists('voting_control_node')){
 			$node->body .= voting_control_node($node, false, true);
 		}
 
-		//$output .= '<div class="faq">' . "\n" . '<a name="q_' . $node->nid . '"></a>' . "\n" . '<h3>' . $node->title . '</h3>' . "\n" . $node->body .  "\n" . '<a href="faq/show/' . $term->tid . '#top">top</a> ' . $edit . '</div>';
-		$output .= '<div class="faq">' . "\n" . '<a name="q_' . $node->nid . '"></a>' . "\n" . '<h3>' . $node->title . '</h3>' . "\n" . $node->body .  "\n" . '<a href="faq/show/' . $term->tid . '#top">top</a> ' . $edit . '</div>';
+		$output .= '<div class="faq">' . "\n";
+    $output .= '<a name="q_' . $node->nid . '"></a>' . "\n";
+    $output .= '<h3>' . $node->title . '</h3>' . "\n";
+    $output .= $node->body .  "\n";
+    $output .= '<a href="#top">top</a> ';
+    $output .= $edit;
+    $output .= '</div>';
+
 		$found = true;
 	}
 	$links .= '</ul>' . "\n";
 
-	$output = $title . $links . $output;
+	$output = $links . $output;
 
 	if(!$found){
-		$output = $title;
+    return '<h1>' . $term->name . ' FAQ</h1>' . "\n";
 	}
 	return $output;
 }
 
-function faq_help(){
+function faq_help($section){
 	switch ($section) {
-		case 'admin/modules#help':
+		case 'admin/modules#faq':
 			return t('Allows you to create FAQ nodes that are presented in a standard FAQ layout (questions up top, anchor links below, etc.).');
-		case 'node/add#help':
+		case 'node/add#faq':
 			return t('Be sure to create some categories prior to adding any FAQs so that they can be browsed easily.');
 	}
 }