4 files changed, 368 insertions, 366 deletions
diff --git a/modules/forum.module b/modules/forum.module
index 53eaafce1..fe487d9a0 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -1,91 +1,92 @@
-<?php
-// $Id$
-
-function forum_node($field) {
-  $info["name"] = t("discussion forum");
-  $info["description"] = t("A forum is a threaded discussion, enabling users to communicate about a particular topic.");
-
-  return $info[$field];
-}
-
-function forum_access($op, $node) {
-  if ($op == "view") {
-    return $node->status;
-  }
-}
-
-function forum_save() {
-  if ($op == "approve") {
-    return array("status" => 1);
-  }
-
-  if ($op == "create") {
-    return array("promote" => 0, "moderate" => 0, "status" => 1);
-  }
-
-  if ($op == "update") {
-    return array();
-  }
-
-  if ($op == "update") {
-    return array("status" => 0);
-  }
-}
-
-function forum_link($type) {
-  if ($type == "page" && user_access("access content")) {
-    $links[] = "<a href=\"module.php?mod=forum\">". t("forum") ."</a>";
-  }
-
-  return $links ? $links : array();
-}
-
-function forum_view($node) {
-  global $theme;
-  $output .= "<P><A HREF=\"module.php?mod=forum\">". t("Forum") ."</A> / <B><A HREF=\"node.php?id=$node->nid\">". check_output($node->title) ."</A></B>:</P><P>". check_output($node->body) ."</P>";
-  $theme->box(t("Discussion forum"), $output);
-}
-
-function forum_form(&$node, &$help, &$error) {
-  $output .= form_textarea("Body", "body", $node->body, 60, 10);
-
-  return $output;
-}
-
-
-function forum_num_comments($nid) {
-  $value = db_fetch_object(db_query("SELECT COUNT(cid) AS count FROM comments WHERE lid = '$nid'"));
-  return ($value) ? $value->count : 0;
-}
-
-function forum_last_comment($nid) {
-  $value = db_fetch_object(db_query("SELECT timestamp FROM comments WHERE lid = '$nid' ORDER BY timestamp DESC LIMIT 1"));
-  return ($value) ? format_date($value->timestamp, "small") : "&nbsp;";
-}
-
-function forum_page() {
-  global $theme;
-
-  if (user_access("access content")) {
-    $result = db_query("SELECT nid FROM node WHERE type = 'forum' ORDER BY title");
-
-    $output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\">";
-    $output .= " <tr><th>". t("Forum") ."</th><th>". t("Comments") ."</th><th>". t("Last comment") ."</th></tr>";
-    while ($node = db_fetch_object($result)) {
-      $node = node_load(array("nid" => $node->nid));
-      $output .= " <tr><td><a href=\"node.php?id=$node->nid\">". check_output($node->title) ."</a><br /><small>". check_output($node->body, 1) ."</small></td><td align=\"center\">". forum_num_comments($node->nid) ."</td><td align=\"center\">". forum_last_comment($node->nid) ."</td></tr>";
-    }
-    $output .= "</table>";
-
-    $theme->header();
-    $theme->box(t("Discussion forum"), $output);
-    $theme->footer();
-  }
-  else {
-    $theme->header();
-    $theme->box(t("Access denied"), message_access());
-    $theme->footer();
-  }
-}
-
+<?php
+// $Id$
+
+function forum_node($field) {
+  $info["name"] = t("discussion forum");
+  $info["description"] = t("A forum is a threaded discussion, enabling users to communicate about a particular topic.");
+
+  return $info[$field];
+}
+
+function forum_access($op, $node) {
+  if ($op == "view") {
+    return $node->status;
+  }
+}
+
+function forum_save() {
+  if ($op == "approve") {
+    return array("status" => 1);
+  }
+
+  if ($op == "create") {
+    return array("promote" => 0, "moderate" => 0, "status" => 1);
+  }
+
+  if ($op == "update") {
+    return array();
+  }
+
+  if ($op == "update") {
+    return array("status" => 0);
+  }
+}
+
+function forum_link($type) {
+  if ($type == "page" && user_access("access content")) {
+    $links[] = "<a href=\"module.php?mod=forum\">". t("forum") ."</a>";
+  }
+
+  return $links ? $links : array();
+}
+
+function forum_view($node) {
+  global $theme;
+  $output .= "<p><a href=\"module.php?mod=forum\">". t("Forum") ."</a> / <b><a href=\"node.php?id=$node->nid\">". check_output($node->title) ."</a></b>:</p><p>". check_output($node->body) ."</p>";
+  $theme->box(t("Discussion forum"), $output);
+}
+
+function forum_form(&$node, &$help, &$error) {
+
+  $output .= form_textarea("Body", "body", $node->body, 60, 10);
+
+  return $output;
+}
+
+
+function forum_num_comments($nid) {
+  $value = db_fetch_object(db_query("SELECT COUNT(cid) AS count FROM comments WHERE lid = '$nid'"));
+  return ($value) ? $value->count : 0;
+}
+
+function forum_last_comment($nid) {
+  $value = db_fetch_object(db_query("SELECT timestamp FROM comments WHERE lid = '$nid' ORDER BY timestamp DESC LIMIT 1"));
+  return ($value) ? format_date($value->timestamp, "small") : "&nbsp;";
+}
+
+function forum_page() {
+  global $theme;
+
+  if (user_access("access content")) {
+    $result = db_query("SELECT nid FROM node WHERE type = 'forum' ORDER BY title");
+
+    $output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\">";
+    $output .= " <tr><th>". t("Forum") ."</th><th>". t("Comments") ."</th><th>". t("Last comment") ."</th></tr>";
+    while ($node = db_fetch_object($result)) {
+      $node = node_load(array("nid" => $node->nid));
+      $output .= " <tr><td><a href=\"node.php?id=$node->nid\">". check_output($node->title) ."</a><br /><small>". check_output($node->body, 1) ."</small></td><td align=\"center\">". forum_num_comments($node->nid) ."</td><td align=\"center\">". forum_last_comment($node->nid) ."</td></tr>";
+    }
+    $output .= "</table>";
+
+    $theme->header();
+    $theme->box(t("Discussion forum"), $output);
+    $theme->footer();
+  }
+  else {
+    $theme->header();
+    $theme->box(t("Access denied"), message_access());
+    $theme->footer();
+  }
+}
+
 ?>
 \ No newline at end of file
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 53eaafce1..fe487d9a0 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -1,91 +1,92 @@
-<?php
-// $Id$
-
-function forum_node($field) {
-  $info["name"] = t("discussion forum");
-  $info["description"] = t("A forum is a threaded discussion, enabling users to communicate about a particular topic.");
-
-  return $info[$field];
-}
-
-function forum_access($op, $node) {
-  if ($op == "view") {
-    return $node->status;
-  }
-}
-
-function forum_save() {
-  if ($op == "approve") {
-    return array("status" => 1);
-  }
-
-  if ($op == "create") {
-    return array("promote" => 0, "moderate" => 0, "status" => 1);
-  }
-
-  if ($op == "update") {
-    return array();
-  }
-
-  if ($op == "update") {
-    return array("status" => 0);
-  }
-}
-
-function forum_link($type) {
-  if ($type == "page" && user_access("access content")) {
-    $links[] = "<a href=\"module.php?mod=forum\">". t("forum") ."</a>";
-  }
-
-  return $links ? $links : array();
-}
-
-function forum_view($node) {
-  global $theme;
-  $output .= "<P><A HREF=\"module.php?mod=forum\">". t("Forum") ."</A> / <B><A HREF=\"node.php?id=$node->nid\">". check_output($node->title) ."</A></B>:</P><P>". check_output($node->body) ."</P>";
-  $theme->box(t("Discussion forum"), $output);
-}
-
-function forum_form(&$node, &$help, &$error) {
-  $output .= form_textarea("Body", "body", $node->body, 60, 10);
-
-  return $output;
-}
-
-
-function forum_num_comments($nid) {
-  $value = db_fetch_object(db_query("SELECT COUNT(cid) AS count FROM comments WHERE lid = '$nid'"));
-  return ($value) ? $value->count : 0;
-}
-
-function forum_last_comment($nid) {
-  $value = db_fetch_object(db_query("SELECT timestamp FROM comments WHERE lid = '$nid' ORDER BY timestamp DESC LIMIT 1"));
-  return ($value) ? format_date($value->timestamp, "small") : "&nbsp;";
-}
-
-function forum_page() {
-  global $theme;
-
-  if (user_access("access content")) {
-    $result = db_query("SELECT nid FROM node WHERE type = 'forum' ORDER BY title");
-
-    $output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\">";
-    $output .= " <tr><th>". t("Forum") ."</th><th>". t("Comments") ."</th><th>". t("Last comment") ."</th></tr>";
-    while ($node = db_fetch_object($result)) {
-      $node = node_load(array("nid" => $node->nid));
-      $output .= " <tr><td><a href=\"node.php?id=$node->nid\">". check_output($node->title) ."</a><br /><small>". check_output($node->body, 1) ."</small></td><td align=\"center\">". forum_num_comments($node->nid) ."</td><td align=\"center\">". forum_last_comment($node->nid) ."</td></tr>";
-    }
-    $output .= "</table>";
-
-    $theme->header();
-    $theme->box(t("Discussion forum"), $output);
-    $theme->footer();
-  }
-  else {
-    $theme->header();
-    $theme->box(t("Access denied"), message_access());
-    $theme->footer();
-  }
-}
-
+<?php
+// $Id$
+
+function forum_node($field) {
+  $info["name"] = t("discussion forum");
+  $info["description"] = t("A forum is a threaded discussion, enabling users to communicate about a particular topic.");
+
+  return $info[$field];
+}
+
+function forum_access($op, $node) {
+  if ($op == "view") {
+    return $node->status;
+  }
+}
+
+function forum_save() {
+  if ($op == "approve") {
+    return array("status" => 1);
+  }
+
+  if ($op == "create") {
+    return array("promote" => 0, "moderate" => 0, "status" => 1);
+  }
+
+  if ($op == "update") {
+    return array();
+  }
+
+  if ($op == "update") {
+    return array("status" => 0);
+  }
+}
+
+function forum_link($type) {
+  if ($type == "page" && user_access("access content")) {
+    $links[] = "<a href=\"module.php?mod=forum\">". t("forum") ."</a>";
+  }
+
+  return $links ? $links : array();
+}
+
+function forum_view($node) {
+  global $theme;
+  $output .= "<p><a href=\"module.php?mod=forum\">". t("Forum") ."</a> / <b><a href=\"node.php?id=$node->nid\">". check_output($node->title) ."</a></b>:</p><p>". check_output($node->body) ."</p>";
+  $theme->box(t("Discussion forum"), $output);
+}
+
+function forum_form(&$node, &$help, &$error) {
+
+  $output .= form_textarea("Body", "body", $node->body, 60, 10);
+
+  return $output;
+}
+
+
+function forum_num_comments($nid) {
+  $value = db_fetch_object(db_query("SELECT COUNT(cid) AS count FROM comments WHERE lid = '$nid'"));
+  return ($value) ? $value->count : 0;
+}
+
+function forum_last_comment($nid) {
+  $value = db_fetch_object(db_query("SELECT timestamp FROM comments WHERE lid = '$nid' ORDER BY timestamp DESC LIMIT 1"));
+  return ($value) ? format_date($value->timestamp, "small") : "&nbsp;";
+}
+
+function forum_page() {
+  global $theme;
+
+  if (user_access("access content")) {
+    $result = db_query("SELECT nid FROM node WHERE type = 'forum' ORDER BY title");
+
+    $output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\">";
+    $output .= " <tr><th>". t("Forum") ."</th><th>". t("Comments") ."</th><th>". t("Last comment") ."</th></tr>";
+    while ($node = db_fetch_object($result)) {
+      $node = node_load(array("nid" => $node->nid));
+      $output .= " <tr><td><a href=\"node.php?id=$node->nid\">". check_output($node->title) ."</a><br /><small>". check_output($node->body, 1) ."</small></td><td align=\"center\">". forum_num_comments($node->nid) ."</td><td align=\"center\">". forum_last_comment($node->nid) ."</td></tr>";
+    }
+    $output .= "</table>";
+
+    $theme->header();
+    $theme->box(t("Discussion forum"), $output);
+    $theme->footer();
+  }
+  else {
+    $theme->header();
+    $theme->box(t("Access denied"), message_access());
+    $theme->footer();
+  }
+}
+
 ?>
 \ No newline at end of file
diff --git a/modules/page.module b/modules/page.module
index ae84e8a41..70d00b49b 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -1,94 +1,94 @@
-<?php
-// $Id$
-
-$GLOBALS["format"] = array(0 => "HTML", 1 => "PHP", 2 => "text");
-
-function page_node($field) {
-  $info["name"] = t("static page");
-  $info["description"] = t("If you just want to add a static page with a link in the menu to your site, this would be the best choice.  Unlike a story, a page by-passes the submission queue.");
-
-  return $info[$field];
-}
-
-function page_access($op, $node) {
-  if ($op == "view") {
-    return $node->status;
-  }
-}
-
-function page_save($op, $node) {
-  if ($op == "approve") {
-    return array("status" => 1);
-  }
-
-  if ($op == "create") {
-    return array("format", "link", "promote" => 0, "moderate" => 0, "status" => 1);
-  }
-
-  if ($op == "decline") {
-    return array("status" => 0);
-  }
-
-  if ($op == "update") {
-    return array("format", "link");
-  }
-}
-
-function page_insert($node) {
-  db_query("INSERT INTO page (nid, format, link) VALUES ('$node->nid', '$node->format', '$node->link')");
-}
-
-function page_update($node) {
-  db_query("UPDATE page SET format = '$node->format', link = '$node->link' WHERE nid = '$node->nid'");
-}
-
-function page_delete(&$node) {
-  db_query("DELETE FROM page WHERE nid = '$node->nid'");
-}
-
-function page_load($node) {
-  $page = db_fetch_object(db_query("SELECT format, link FROM page WHERE nid = '$node->nid'"));
-  return $page;
-}
-
-function page_link($type) {
-  if ($type == "page") {
-    $result = db_query("SELECT nid, link FROM page WHERE link != '' ORDER BY link");
-    while ($page = db_fetch_object($result)) {
-      $links[] = "<a href=\"node.php?id=$page->nid\">$page->link</a>";
-    }
-  }
-
-  return $links ? $links : array();
-}
-
-function page_view($node, $main = 0) {
-  global $format, $theme;
-
-  switch ($format[$node->format]) {
-    case "PHP":
-      print eval($node->body);
-      break;
-    case "text":
-      $theme->box($node->title, nl2br(htmlentities($node->body)));
-      break;
-    default:
-      $theme->box($node->title, check_output($node->body, 1));
-  }
-}
-
-function page_form(&$node, &$help, &$error) {
-  global $format, $op;
-
-  if ($op != t("Preview") && $format[$node->format] == "PHP") {
-    $node->body = addslashes($node->body);
-  }
-
-  $output .= form_textarea("Body", "body", $node->body, 60, 20);
-  $output .= form_textfield("Link", "link", $node->link, 60, 64);
-  $output .= form_select("Type", "format", $node->format, $format);
-
-  return $output;
-}
-
+<?php
+// $Id$
+
+$GLOBALS["format"] = array(0 => "HTML", 1 => "PHP", 2 => "text");
+
+function page_node($field) {
+  $info["name"] = t("static page");
+  $info["description"] = t("If you just want to add a static page with a link in the menu to your site, this would be the best choice.  Unlike a story, a page by-passes the submission queue.");
+
+  return $info[$field];
+}
+
+function page_access($op, $node) {
+  if ($op == "view") {
+    return $node->status;
+  }
+}
+
+function page_save($op, $node) {
+  if ($op == "approve") {
+    return array("status" => 1);
+  }
+
+  if ($op == "create") {
+    return array("format", "link", "promote" => 0, "moderate" => 0, "status" => 1);
+  }
+
+  if ($op == "decline") {
+    return array("status" => 0);
+  }
+
+  if ($op == "update") {
+    return array("format", "link");
+  }
+}
+
+function page_insert($node) {
+  db_query("INSERT INTO page (nid, format, link) VALUES ('$node->nid', '$node->format', '$node->link')");
+}
+
+function page_update($node) {
+  db_query("UPDATE page SET format = '$node->format', link = '$node->link' WHERE nid = '$node->nid'");
+}
+
+function page_delete(&$node) {
+  db_query("DELETE FROM page WHERE nid = '$node->nid'");
+}
+
+function page_load($node) {
+  $page = db_fetch_object(db_query("SELECT format, link FROM page WHERE nid = '$node->nid'"));
+  return $page;
+}
+
+function page_link($type) {
+  if ($type == "page") {
+    $result = db_query("SELECT nid, link FROM page WHERE link != '' ORDER BY link");
+    while ($page = db_fetch_object($result)) {
+      $links[] = "<a href=\"node.php?id=$page->nid\">$page->link</a>";
+    }
+  }
+
+  return $links ? $links : array();
+}
+
+function page_view($node, $main = 0) {
+  global $format, $theme;
+
+  switch ($format[$node->format]) {
+    case "PHP":
+      print eval($node->body);
+      break;
+    case "text":
+      $theme->box($node->title, nl2br(htmlentities($node->body)));
+      break;
+    default:
+      $theme->box($node->title, check_output($node->body, 1));
+  }
+}
+
+function page_form(&$node, &$help, &$error) {
+  global $format, $op;
+
+  if ($op != t("Preview") && $format[$node->format] == "PHP") {
+    $node->body = addslashes($node->body);
+  }
+
+  $output .= form_textarea("Body", "body", $node->body, 60, 20);
+  $output .= form_textfield("Link", "link", $node->link, 60, 64);
+  $output .= form_select("Type", "format", $node->format, $format);
+
+  return $output;
+}
+
 ?>
 \ No newline at end of file
diff --git a/modules/page/page.module b/modules/page/page.module
index ae84e8a41..70d00b49b 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -1,94 +1,94 @@
-<?php
-// $Id$
-
-$GLOBALS["format"] = array(0 => "HTML", 1 => "PHP", 2 => "text");
-
-function page_node($field) {
-  $info["name"] = t("static page");
-  $info["description"] = t("If you just want to add a static page with a link in the menu to your site, this would be the best choice.  Unlike a story, a page by-passes the submission queue.");
-
-  return $info[$field];
-}
-
-function page_access($op, $node) {
-  if ($op == "view") {
-    return $node->status;
-  }
-}
-
-function page_save($op, $node) {
-  if ($op == "approve") {
-    return array("status" => 1);
-  }
-
-  if ($op == "create") {
-    return array("format", "link", "promote" => 0, "moderate" => 0, "status" => 1);
-  }
-
-  if ($op == "decline") {
-    return array("status" => 0);
-  }
-
-  if ($op == "update") {
-    return array("format", "link");
-  }
-}
-
-function page_insert($node) {
-  db_query("INSERT INTO page (nid, format, link) VALUES ('$node->nid', '$node->format', '$node->link')");
-}
-
-function page_update($node) {
-  db_query("UPDATE page SET format = '$node->format', link = '$node->link' WHERE nid = '$node->nid'");
-}
-
-function page_delete(&$node) {
-  db_query("DELETE FROM page WHERE nid = '$node->nid'");
-}
-
-function page_load($node) {
-  $page = db_fetch_object(db_query("SELECT format, link FROM page WHERE nid = '$node->nid'"));
-  return $page;
-}
-
-function page_link($type) {
-  if ($type == "page") {
-    $result = db_query("SELECT nid, link FROM page WHERE link != '' ORDER BY link");
-    while ($page = db_fetch_object($result)) {
-      $links[] = "<a href=\"node.php?id=$page->nid\">$page->link</a>";
-    }
-  }
-
-  return $links ? $links : array();
-}
-
-function page_view($node, $main = 0) {
-  global $format, $theme;
-
-  switch ($format[$node->format]) {
-    case "PHP":
-      print eval($node->body);
-      break;
-    case "text":
-      $theme->box($node->title, nl2br(htmlentities($node->body)));
-      break;
-    default:
-      $theme->box($node->title, check_output($node->body, 1));
-  }
-}
-
-function page_form(&$node, &$help, &$error) {
-  global $format, $op;
-
-  if ($op != t("Preview") && $format[$node->format] == "PHP") {
-    $node->body = addslashes($node->body);
-  }
-
-  $output .= form_textarea("Body", "body", $node->body, 60, 20);
-  $output .= form_textfield("Link", "link", $node->link, 60, 64);
-  $output .= form_select("Type", "format", $node->format, $format);
-
-  return $output;
-}
-
+<?php
+// $Id$
+
+$GLOBALS["format"] = array(0 => "HTML", 1 => "PHP", 2 => "text");
+
+function page_node($field) {
+  $info["name"] = t("static page");
+  $info["description"] = t("If you just want to add a static page with a link in the menu to your site, this would be the best choice.  Unlike a story, a page by-passes the submission queue.");
+
+  return $info[$field];
+}
+
+function page_access($op, $node) {
+  if ($op == "view") {
+    return $node->status;
+  }
+}
+
+function page_save($op, $node) {
+  if ($op == "approve") {
+    return array("status" => 1);
+  }
+
+  if ($op == "create") {
+    return array("format", "link", "promote" => 0, "moderate" => 0, "status" => 1);
+  }
+
+  if ($op == "decline") {
+    return array("status" => 0);
+  }
+
+  if ($op == "update") {
+    return array("format", "link");
+  }
+}
+
+function page_insert($node) {
+  db_query("INSERT INTO page (nid, format, link) VALUES ('$node->nid', '$node->format', '$node->link')");
+}
+
+function page_update($node) {
+  db_query("UPDATE page SET format = '$node->format', link = '$node->link' WHERE nid = '$node->nid'");
+}
+
+function page_delete(&$node) {
+  db_query("DELETE FROM page WHERE nid = '$node->nid'");
+}
+
+function page_load($node) {
+  $page = db_fetch_object(db_query("SELECT format, link FROM page WHERE nid = '$node->nid'"));
+  return $page;
+}
+
+function page_link($type) {
+  if ($type == "page") {
+    $result = db_query("SELECT nid, link FROM page WHERE link != '' ORDER BY link");
+    while ($page = db_fetch_object($result)) {
+      $links[] = "<a href=\"node.php?id=$page->nid\">$page->link</a>";
+    }
+  }
+
+  return $links ? $links : array();
+}
+
+function page_view($node, $main = 0) {
+  global $format, $theme;
+
+  switch ($format[$node->format]) {
+    case "PHP":
+      print eval($node->body);
+      break;
+    case "text":
+      $theme->box($node->title, nl2br(htmlentities($node->body)));
+      break;
+    default:
+      $theme->box($node->title, check_output($node->body, 1));
+  }
+}
+
+function page_form(&$node, &$help, &$error) {
+  global $format, $op;
+
+  if ($op != t("Preview") && $format[$node->format] == "PHP") {
+    $node->body = addslashes($node->body);
+  }
+
+  $output .= form_textarea("Body", "body", $node->body, 60, 20);
+  $output .= form_textfield("Link", "link", $node->link, 60, 64);
+  $output .= form_select("Type", "format", $node->format, $format);
+
+  return $output;
+}
+
 ?>
 \ No newline at end of file