summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/comment.inc10
-rw-r--r--includes/node.inc2
-rw-r--r--includes/theme.inc14
-rw-r--r--modules/forum.module97
-rw-r--r--modules/forum/forum.module97
-rw-r--r--modules/page.module1
-rw-r--r--modules/page/page.module1
-rw-r--r--updates/2.00-to-x.xx.sql8
8 files changed, 210 insertions, 20 deletions
diff --git a/includes/comment.inc b/includes/comment.inc
index 580dcdc98..51aad93f1 100644
--- a/includes/comment.inc
+++ b/includes/comment.inc
@@ -155,16 +155,6 @@ function comment_num_replies($id, $count = 0) {
return ($result) ? db_result($result, 0) : 0;
}
-function comment_num_filtered($lid, $pid) {
- global $user;
-
- $threshold = ($user->id) ? $user->threshold : "0";
- $pid = ($pid) ? $pid : 0;
-
- $result = db_query("SELECT COUNT(cid) FROM comments WHERE lid = '$lid' AND pid = '$pid' AND ((votes = 0 AND score < $threshold) OR (score / votes < $threshold))");
- return ($result) ? db_result($result, 0) : 0;
-}
-
function comment_moderation($comment) {
global $comment_votes, $op, $user;
diff --git a/includes/node.inc b/includes/node.inc
index 374732ae6..8f43f411d 100644
--- a/includes/node.inc
+++ b/includes/node.inc
@@ -177,7 +177,7 @@ function node_control($node) {
</SCRIPT>
<?php
- if ($user->id)
+ if ($user->id)
$choices = array("node.php?id=$node->nid" => t("view node"), "submit.php?mod=$node->type" => t("add node"), "submit.php?mod=$node->type&op=update&id=$node->nid" => t("update node"), "node.php?op=history&id=$node->nid" => t("view history"));
else
$choices = array("node.php?id=$node->nid" => t("view node"), "node.php?op=history&id=$node->nid" => t("view history"));
diff --git a/includes/theme.inc b/includes/theme.inc
index dbeb5fab8..793824d06 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -14,14 +14,14 @@ function theme_init() {
function theme_link($separator = " | ") {
global $repository;
- $links = array("<A HREF=\"index.php\">". t("home") ."</A>",
- "<A HREF=\"search.php\">". t("search") ."</A>",
- "<A HREF=\"submit.php\">". t("submit") ."</A>");
- if (is_array($repository[diary]))
- $links[] = "<A HREF=\"module.php?mod=diary\">". t("diary") ."</A>";
+ $links[] = "<A HREF=\"index.php\">". t("home") ."</A>";
+ $links[] = "<A HREF=\"search.php\">". t("search") ."</A>";
+ $links[] = "<A HREF=\"submit.php\">". t("submit") ."</A>";
+ if ($repository[forum]) $links[] = "<A HREF=\"module.php?mod=forum\">".t("forum") ."</A>";
+ if ($repository[diary]) $links[] = "<A HREF=\"module.php?mod=diary\">". t("diary") ."</A>";
$links[] = "<A HREF=\"account.php\">". t("account") ."</A>";
- if (is_array($repository[diary]))
- $links[] = "<A HREF=\"module.php?mod=book\">". t("handbook") ."</A>";
+ if ($repository[book]) $links[] = "<A HREF=\"module.php?mod=book\">". t("handbook") ."</A>";
+
return implode($separator, $links);
}
diff --git a/modules/forum.module b/modules/forum.module
new file mode 100644
index 000000000..e5500f7a5
--- /dev/null
+++ b/modules/forum.module
@@ -0,0 +1,97 @@
+<?php
+
+$module = array("type" => "forum_type",
+ "page" => "forum_page",
+ "admin" => "forum_admin");
+
+$format = array(0 => HTML, 1 => PHP, 2 => text);
+
+function forum_type() {
+ return array("forum", "forum");
+}
+
+function forum_status() {
+ return array(dumped, posted);
+}
+
+function forum_form($edit = array()) {
+ global $format;
+
+ $output .= "<FORM ACTION=\"admin.php?mod=forum\" METHOD=\"post\">\n";
+
+ $output .= "<B>Subject:</B><BR>\n";
+ $output .= "<INPUT NAME=\"edit[title]\" SIZE=\"55\" VALUE=\"". check_textfield($edit[title]) ."\"><P>\n";
+
+ $output .= structure_form("forum", $edit);
+
+ $output .= "<B>Body:</B><BR>\n";
+ $output .= "<TEXTAREA NAME=\"edit[body]\" COLS=\"55\" ROWS=\"10\" WRAP=\"virtual\">". check_textarea($edit[body]) ."</TEXTAREA><P>\n";
+
+ $output .= "<INPUT TYPE=\"hidden\" NAME=\"edit[nid]\" VALUE=\"$edit[nid]\">\n";
+
+ $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Save forum\">\n";
+ $output .= "</FORM>\n";
+
+ return $output;
+}
+
+function forum_save($edit) {
+ global $status;
+ node_save(array_merge($edit, array(type => "forum", status => $status[posted])));
+}
+
+function forum_num_comments($nid) {
+ $value = db_fetch_object(db_query("SELECT COUNT(cid) AS count FROM comments WHERE lid = '$nid' AND pid != 0"));
+ 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;
+
+ $result = db_query("SELECT nid FROM node WHERE type = 'forum' ORDER BY title");
+
+ $output .= "<TABLE BORDER=\"0\" CELLSPACING=\"4\" CELLPADDING=\"4\">\n";
+ $output .= " <TR><TH>". t("Forum") ."</TH><TH>". t("Comments") ."</TH><TH>". t("Last comment") ."</TH></TR>";
+ while ($node = db_fetch_object($result)) {
+ $node = node_get_object("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>\n";
+
+ $theme->header();
+ $theme->box(t("Discussion forum"), $output);
+ $theme->footer();
+}
+
+function forum_overview() {
+ return node_overview(array(0, "WHERE n.type = 'forum' ORDER BY n.title"));
+}
+
+function forum_admin() {
+ global $id, $op, $edit, $type;
+
+ print "<SMALL><A HREF=\"admin.php?mod=forum&op=add\">add new forum</A> | <A HREF=\"admin.php?mod=forum\">overview</A></SMALL><HR>\n";
+
+ $type = ($type ? $type : 0);
+
+ switch ($op) {
+ case "add":
+ print forum_form();
+ break;
+ case "edit":
+ print forum_form(node_get_array(nid, $id));
+ break;
+ case "Save forum":
+ print status(forum_save($edit));
+ // fall through:
+ default:
+ print forum_overview();
+ }
+}
+
+?> \ No newline at end of file
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
new file mode 100644
index 000000000..e5500f7a5
--- /dev/null
+++ b/modules/forum/forum.module
@@ -0,0 +1,97 @@
+<?php
+
+$module = array("type" => "forum_type",
+ "page" => "forum_page",
+ "admin" => "forum_admin");
+
+$format = array(0 => HTML, 1 => PHP, 2 => text);
+
+function forum_type() {
+ return array("forum", "forum");
+}
+
+function forum_status() {
+ return array(dumped, posted);
+}
+
+function forum_form($edit = array()) {
+ global $format;
+
+ $output .= "<FORM ACTION=\"admin.php?mod=forum\" METHOD=\"post\">\n";
+
+ $output .= "<B>Subject:</B><BR>\n";
+ $output .= "<INPUT NAME=\"edit[title]\" SIZE=\"55\" VALUE=\"". check_textfield($edit[title]) ."\"><P>\n";
+
+ $output .= structure_form("forum", $edit);
+
+ $output .= "<B>Body:</B><BR>\n";
+ $output .= "<TEXTAREA NAME=\"edit[body]\" COLS=\"55\" ROWS=\"10\" WRAP=\"virtual\">". check_textarea($edit[body]) ."</TEXTAREA><P>\n";
+
+ $output .= "<INPUT TYPE=\"hidden\" NAME=\"edit[nid]\" VALUE=\"$edit[nid]\">\n";
+
+ $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Save forum\">\n";
+ $output .= "</FORM>\n";
+
+ return $output;
+}
+
+function forum_save($edit) {
+ global $status;
+ node_save(array_merge($edit, array(type => "forum", status => $status[posted])));
+}
+
+function forum_num_comments($nid) {
+ $value = db_fetch_object(db_query("SELECT COUNT(cid) AS count FROM comments WHERE lid = '$nid' AND pid != 0"));
+ 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;
+
+ $result = db_query("SELECT nid FROM node WHERE type = 'forum' ORDER BY title");
+
+ $output .= "<TABLE BORDER=\"0\" CELLSPACING=\"4\" CELLPADDING=\"4\">\n";
+ $output .= " <TR><TH>". t("Forum") ."</TH><TH>". t("Comments") ."</TH><TH>". t("Last comment") ."</TH></TR>";
+ while ($node = db_fetch_object($result)) {
+ $node = node_get_object("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>\n";
+
+ $theme->header();
+ $theme->box(t("Discussion forum"), $output);
+ $theme->footer();
+}
+
+function forum_overview() {
+ return node_overview(array(0, "WHERE n.type = 'forum' ORDER BY n.title"));
+}
+
+function forum_admin() {
+ global $id, $op, $edit, $type;
+
+ print "<SMALL><A HREF=\"admin.php?mod=forum&op=add\">add new forum</A> | <A HREF=\"admin.php?mod=forum\">overview</A></SMALL><HR>\n";
+
+ $type = ($type ? $type : 0);
+
+ switch ($op) {
+ case "add":
+ print forum_form();
+ break;
+ case "edit":
+ print forum_form(node_get_array(nid, $id));
+ break;
+ case "Save forum":
+ print status(forum_save($edit));
+ // fall through:
+ default:
+ print forum_overview();
+ }
+}
+
+?> \ No newline at end of file
diff --git a/modules/page.module b/modules/page.module
index 9cf760933..0e188fe19 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -1,7 +1,6 @@
<?php
$module = array("type" => "page_type",
- "page" => "page_page",
"admin" => "page_admin");
$format = array(0 => HTML, 1 => PHP, 2 => text);
diff --git a/modules/page/page.module b/modules/page/page.module
index 9cf760933..0e188fe19 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -1,7 +1,6 @@
<?php
$module = array("type" => "page_type",
- "page" => "page_page",
"admin" => "page_admin");
$format = array(0 => HTML, 1 => PHP, 2 => text);
diff --git a/updates/2.00-to-x.xx.sql b/updates/2.00-to-x.xx.sql
index 2ac5ef3ae..416fe2810 100644
--- a/updates/2.00-to-x.xx.sql
+++ b/updates/2.00-to-x.xx.sql
@@ -122,3 +122,11 @@ CREATE TABLE cvs (
message text,
timestamp int(11) DEFAULT '0' NOT NULL
);
+
+# 27/04/2001:
+CREATE TABLE forum (
+ lid int(10) unsigned DEFAULT '0' NOT NULL auto_increment,
+ nid int(10) unsigned DEFAULT '0' NOT NULL,
+ body text NOT NULL,
+ PRIMARY KEY (lid)
+);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 06:53:07 +0000