This a rather large commit that needs a lot of fine-tuning. If you

update, you'll break your site as you need switching from structure
to index.module: so this can be considered an intermediate commit.

If you upgrade, and you are welcome to, just create a collection
called "section" (for now) and assign your nodes some attributes
in the described format.

Feedback and bugreports are welcomed.  Questions will be answered.

CHANGES:

- comment system:
   + when replying to a node (rather then to a comment), that
     node is displayed above the reply form.
   + when replying to a comment (rather then to a node), that
     comment is displayd above the reply form.

- removed structure.inc, removed structure.module.

- node.inc:
   + added 2 new node functions called 'node_attribute_edit()' and
     'node_attribute_save()' used to 'hook in' any indexing system
    including your home-brewed stuff if you'd want to.  Currently,
    index.module is the facto default index system.

    See story.module for usage.

- book.module, story.module, poll.module, page.module, forum.module:
   + added preview functionality to administration section (via node
     module).
   + removed all references to structure.inc (category, topic).

- moderate.module:
   + removed all references to structure.inc (category, topic).

- book.module, story.module, page.module, forum.module:
   + increased the sizes of some textareas.

- submit.php:
   + removed all references to structure.inc (category, topic).

- marvin.theme:
   + removed dead code: function story() was depricated.

- unconed.theme:
   + removed hardcoded references to drop.org.

- marvin.theme, unconed.theme, jeroen.theme, yaroon.theme, example.theme:
   + removed all references to structure.inc (category, topic).

TODO:

- file.module, trip_link.module:
   + update preview functionality:
       see story.module for example.
   + remove references to 'cid' and 'tid', use 'attribute' instead:
       see story.module for example.

- extend and build upon index.module as well as making it configurable

5 files changed, 29 insertions, 168 deletions

diff --git a/includes/comment.inc b/includes/comment.inc
index f7bea9ac6..0a8ea9e12 100644
--- a/includes/comment.inc
+++ b/includes/comment.inc
@@ -54,7 +54,10 @@ function comment_reply($pid, $id) {
     $item = db_fetch_object(db_query("SELECT comments.*, users.userid FROM comments LEFT JOIN users ON comments.author = users.id WHERE comments.cid = '$pid'"));
     comment_view(new Comment($item->userid, $item->subject, $item->comment, $item->timestamp, $item->url, $item->fake_email, comment_score($comment), $comment->votes, $item->cid, $item->lid), t("reply to this comment"));
   }
-  else $pid = 0;
+  else {
+    node_view(node_get_object(array("nid" => $id)));
+    $pid = 0;
+  }
 
   // Build reply form:
   $output .= "<FORM ACTION=\"$REQUEST_URI\" METHOD=\"post\">\n";
diff --git a/includes/common.inc b/includes/common.inc
index 581ab3558..a60ca3236 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -258,7 +258,6 @@ function page_footer() {
 $conf = conf_init();
 
 include_once "includes/$conf.php";
-include_once "includes/structure.inc";
 include_once "includes/database.inc";
 include_once "includes/variable.inc";
 include_once "includes/comment.inc";
diff --git a/includes/node.inc b/includes/node.inc
index 155ba3f00..38dd79a85 100644
--- a/includes/node.inc
+++ b/includes/node.inc
@@ -211,8 +211,12 @@ function node_preview($node) {
   return $node;
 }
 
+function node_index($string) {
+  return $string ? implode(" / ", node_attributes_view($string)) : "&nbsp;";
+}
+
 function node_attributes_edit($edit) {
-  return index_collection_form("section", ($edit[section] ? $edit[section] : "section:". field_get($edit[attribute], "section")));
+  return index_collection_form("section", ($edit[section] ? $edit[section] : "section:". field_get($edit[attribute], "section") .";"));
 }
 
 function node_attributes_save($edit) {
@@ -224,6 +228,16 @@ function node_attributes_save($edit) {
   }
 }
 
+function node_attributes_view($string) {
+  foreach (explode(";", $string) as $data) {
+    $entry = explode(":", $data);
+    if (in_array($entry[0], array("section"))) {
+      $array[] = "<a href=\"?$entry[0]=$entry[1]\">$entry[1]</a>";
+    }
+  }
+  return $array ? $array : array();
+}
+
 function node_visible($node) {
   global $user, $status;
   return ($node->status == $status[posted]) || ($node->status == $status[queued] && $user->id) || user_access($user, $node->type) || user_access($user, "node");
diff --git a/includes/structure.inc b/includes/structure.inc
deleted file mode 100644
index fdac8e811..000000000
--- a/includes/structure.inc
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-// ----- category -----
-
-function _category_get($field, $value) {
-  return db_query("SELECT * FROM category WHERE $field = '$value'");
-}
-
-// returns the category object where $field = $value:
-function category_get_object($field, $value) {
-  return db_fetch_object(_category_get($field, $value));
-}
-
-// returns the category array where $field = $value:
-function category_get_array($field, $value) {
-  return db_fetch_array(_category_get($field, $value));
-}
-
-// save a category:
-function category_save($edit) {
-  if (!$edit[cid]) $edit[cid] = db_insert_id(db_query("INSERT INTO category (name) VALUES ('". check_query($edit[name])."')"));
-  foreach ($edit as $key=>$value) db_query("UPDATE category SET $key = '". check_query($value) ."' WHERE cid = '$edit[cid]'");
-}
-
-
-// delete category $cid:
-function category_del($cid) {
-  db_query("DELETE FROM category WHERE cid = '". check_query($cid) ."'");
-  db_query("UPDATE node SET cid = 0 WHERE cid = '". check_query($cid) ."'");
-}
-
-// return post threshold:
-function category_post_threshold($cid) {
-  $category = db_fetch_object(db_query("SELECT post AS threshold FROM category WHERE cid = '". check_query($cid) ."'"));
-  return $category->threshold;
-}
-
-// return dump threshold:
-function category_dump_threshold($cid) {
-  $category = db_fetch_object(db_query("SELECT dump AS threshold FROM category WHERE cid = '". check_query($cid) ."'"));
-  return $category->threshold;
-}
-
-// return expiration threshold:
-function category_expire_threshold($cid) {
-  $category = db_fetch_object(db_query("SELECT expire AS threshold FROM category WHERE cid = '". check_query($cid) ."'"));
-  return $category->threshold;
-}
-
-// return default comment status of category $cid:
-function category_comment($cid) {
-  $category = category_get_object("cid", $cid);
-  return $category->comment ? $category->comment : 0;
-}
-
-// return default promote status of category $cid:
-function category_promote($cid) {
-  $category = category_get_object("cid", $cid);
-  return $category->promote ? $category->promote : 0;
-}
-
-// return default submission status of category $cid:
-function category_submission($cid) {
-  $category = category_get_object("cid", $cid);
-  return $category->submission ? $category->submission : 0;
-}
-
-// return linked string with name of category $cid:
-function category_name($cid) {
-  $category = category_get_object("cid", $cid);
-  return ($category) ? "<A HREF=\"index.php?category=$category->cid\">$category->name</A>" : "";
-}
-
-function category_form_select($type, $edit = array(), $size = 1) {
-  $result = db_query("SELECT * FROM category WHERE type = '$type'");
-  while ($category = db_fetch_object($result)) {
-    $options .= "<OPTION VALUE=\"$category->cid\"". ($edit[cid] == $category->cid ? "SELECTED" : "") .">". check_form($category->name) ."</OPTION>";
-  }
-  return "<SELECT NAME=\"edit[cid]\" SIZE=\"$size\"". ($size > 1 ? "MULTIPLE" : "") .">$options</SELECT>\n";
-}
-
-// ----- topic -----
-
-function _topic_get($field, $value) {
-  return db_query("SELECT * FROM topic WHERE $field = '$value'");
-}
-
-// returns the topic object where $field = $value:
-function topic_get_object($field, $value) {
-  return db_fetch_object(_topic_get($field, $value));
-}
-
-// returns the topic array where $field = $value:
-function topic_get_array($field, $value) {
-  return db_fetch_array(_topic_get($field, $value));
-}
-
-// save a topic:
-function topic_save($edit) {
-  if (!$edit[tid]) $edit[tid] = db_insert_id(db_query("INSERT INTO topic (name) VALUES ('". check_query($edit[name])."')"));
-  foreach ($edit as $key=>$value) db_query("UPDATE topic SET $key = '". check_query($value) ."' WHERE tid = '$edit[tid]'");
-}
-
-// returns a sorted tree-representation of all topics:
-function topic_tree($parent = 0, $name = "", $tree = array()) {
-  $result = db_query("SELECT * FROM topic WHERE pid = '$parent' ORDER BY name");
-  while ($topic = db_fetch_object($result)) {
-    $tree[$topic->tid] = ($name ? "$name - $topic->name" : $topic->name);
-    $tree = topic_tree($topic->tid, $tree[$topic->tid], $tree);
-  }
-  return $tree;
-}
-
-// delete topic $tid:
-function topic_del($tid) {
-  db_query("DELETE FROM topic WHERE tid = '". check_query($tid) ."'");
-  db_query("UPDATE node SET tid = 0 WHERE tid = '". check_query($tid) ."'");
-}
-
-// return linked string with name of topic $tid:
-function topic_name($tid, $name = 0) {
-  $topic = topic_get_object("tid", $tid);
-  $name = $name ? "<A HREF=\"index.php?topic=$topic->tid\">$topic->name</A> - $name" : "<A HREF=\"index.php?topic=$topic->tid\">$topic->name</A>";
-  return ($topic->pid) ? topic_name($topic->pid, $name) : $name;
-}
-
-// return moderators for topic $tid:
-function topic_moderate($tid) {
-  $topic = topic_get_object("tid", $tid);
-  return $topic->moderate;
-}
-
-// renders a HTML form to select one or more topics:
-function topic_form_select($edit = array(), $size = 1) {
-  foreach (topic_tree() as $tid=>$name) {
-    $options .= "<OPTION VALUE=\"$tid\"". ($edit[tid] == $tid ? "SELECTED" : "") .">". check_form($name) ."</OPTION>";
-  }
-  return "<SELECT NAME=\"edit[tid]\" SIZE=\"$size\"". ($size > 1 ? "MULTIPLE" : "") .">$options</SELECT>\n";
-}
-
-// ----- structure -----
-
-// add node $nid to category $cid and topic $tid:
-function structure_save($nid, $cid, $tid) {
-  category_node($nid, $cid);
-  topic_node($nid, $tid);
-}
-
-// render a HMTL selection form:
-function structure_form($type, $edit = array(), $size = 1) {
-  $output .= "<B>Category and topic:</B><BR>\n";
-  $output .= category_form_select($type, $edit, $size) ." ". topic_form_select($edit, $size) ."<BR>";
-  $output .= "<SMALL><I>". t("Select the category and the topic this submission belongs in.") ."</I></SMALL><P>";
-  return $output;
-}
-
-?>
\ No newline at end of file
diff --git a/includes/theme.inc b/includes/theme.inc
index 7cb07bfc9..4bc6e57ea 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1,15 +1,17 @@
 <?php
 
 class BaseTheme {
-    function links($links = array(), $status = 0, $node = 0) {
-      if ($status == 1)
-        $links = array_merge(theme_morelink($node), $links);
-      foreach ($links as $link) {
-        $_links[] = count($link) == 2 ? "<A HREF=\"$link[0]\"><FONT COLOR=\"$theme->link\">". t($link[1]) ."</FONT></A>" : t($link[0]);
-      }
-      if ($status == 2) return ($_links ? implode(" | ", $_links) : "");
-      else return ($_links ? "[ ". implode(" | ", $_links) ." ]" : "");
+  function links($links = array(), $status = 0, $node = 0) {
+    if ($status == 1)
+      $links = array_merge(theme_morelink($node), $links);
+
+    foreach ($links as $link) {
+      $_links[] = count($link) == 2 ? "<A HREF=\"$link[0]\"><FONT COLOR=\"$theme->link\">". t($link[1]) ."</FONT></A>" : t($link[0]);
     }
+
+    if ($status == 2) return ($_links ? implode(" | ", $_links) : "");
+    else return ($_links ? "[ ". implode(" | ", $_links) ." ]" : "");
+  }
 }
 
 function theme_init() {