CHANGES:

- "Formified" node.module and structure.module.

- Added moderator capabilities to topics in structure.module; you can
  define the default moderators.

1 files changed, 23 insertions, 27 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index cff8e636d..8b31f63c5 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -30,19 +30,17 @@ function node_overview($query = array()) {
 function node_admin_view($id) {
   $node = node_get_object("nid", $id);
 
-  $output .= "<FORM ACTION=\"admin.php?mod=node&id=$node->nid\" METHOD=\"post\">\n";
-  $output .= form_item("Title", check_output($node->title));
-  $output .= form_item("Author", format_username($node->userid));
-  $output .= form_item("Status", node_status($node, $node->status));
-  $output .= form_item("Comment", node_comment_status($node->comment));
-  $output .= form_item("Promote", node_promote_status($node->promote));
-  $output .= form_item("Moderate", check_output($node->moderate));
-  $output .= form_item("Date", format_date($node->timestamp));
-  $output .= form_submit("Edit node");
-  $output .= form_submit("Delete node");
-  $output .= "</FORM>\n";
-
-  return $output;
+  $form .= form_item("Title", check_output($node->title));
+  $form .= form_item("Author", format_username($node->userid));
+  $form .= form_item("Status", node_status($node, $node->status));
+  $form .= form_item("Comment", node_comment_status($node->comment));
+  $form .= form_item("Promote", node_promote_status($node->promote));
+  $form .= form_item("Moderate", check_output($node->moderate));
+  $form .= form_item("Date", format_date($node->timestamp));
+  $form .= form_submit("Edit node");
+  $form .= form_submit("Delete node");
+
+  return form("admin.php?mod=node&id=$node->nid", $form);
 }
 
 function node_admin_edit($id) {
@@ -50,20 +48,18 @@ function node_admin_edit($id) {
 
   $node = node_get_object("nid", $id);
 
-  $output .= "<FORM ACTION=\"admin.php?mod=node&id=$node->nid\" METHOD=\"post\">\n";
-  $output .= form_item("Title", check_output($node->title));
-  $output .= form_select("Author", "author", $node->author, array($node->author => $node->userid, $user->id => $user->userid));
-  $output .= form_select("Status", "status", $node->status, node_status($node));
-  $output .= form_select("Comment", "comment", $node->comment, node_comment_status());
-  $output .= form_select("Promote", "promote", $node->promote, node_promote_status());
-  $output .= form_textfield("Moderate", "moderate", $node->moderate, 35, 255, t("A comma-seperated list of usernames."));
-  $output .= form_select("Date", "timestamp", $node->timestamp, array($node->timestamp => format_date($node->timestamp) ." (original)", time() => format_date(time()) ." (current)"));
-  $output .= form_hidden("nid", $node->nid);
-  $output .= form_submit("View node");
-  $output .= form_submit("Save node");
-  $output .= "</FORM>\n";
-
-  return $output;
+  $form .= form_item("Title", check_output($node->title));
+  $form .= form_select("Author", "author", $node->author, array($node->author => $node->userid, $user->id => $user->userid));
+  $form .= form_select("Status", "status", $node->status, node_status($node));
+  $form .= form_select("Comment", "comment", $node->comment, node_comment_status());
+  $form .= form_select("Promote", "promote", $node->promote, node_promote_status());
+  $form .= form_textfield("Moderate", "moderate", $node->moderate, 35, 255, t("Provide a comma-seperated list of the moderators their usernames."));
+  $form .= form_select("Date", "timestamp", $node->timestamp, array($node->timestamp => format_date($node->timestamp) ." (original)", time() => format_date(time()) ." (current)"));
+  $form .= form_hidden("nid", $node->nid);
+  $form .= form_submit("View node");
+  $form .= form_submit("Save node");
+
+  return form("admin.php?mod=node&id=$node->nid", $form);
 }
 
 function node_delete($id) {