CHANGES:

- Added new form_* functions to common.inc, used for building
  forms: it should improve 'stability' (no form typos, every-
  thing properly escaped/unescaped) and should help providing
  a very consistent user interface (wrt forms).

- Adjusted node.module to use the new form functions.
  (Can be used as an example.)

- Adjusted book.module to use the new form functions.
  (Can be used as an example.)

- Merged function.inc into common.inc!

- Slowly removing all global $status and $rstatus variables:
  use node_status() instead.

TODO:

- Apart from implementing the permission system, I'll spend
  some time updating most modules today and tomorrow to use
  the new form functions.

1 files changed, 18 insertions, 24 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index 3c377a2a4..af5292fb4 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -24,40 +24,34 @@ 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 .= "<B>Title:</B><BR>". check_output($node->title) ."<P>\n";
-  $output .= "<B>Author:</B><BR>". format_username($node->userid) ."<P>\n";
-  $output .= "<B>Status:</B><BR>". $rstatus[$node->status] ."<P>\n";
-  $output .= "<B>Comment:</B><BR>". node_comment_status($node->comment) ."<P>\n";
-  $output .= "<B>Promote:</B><BR>". node_promote_status($node->promote) ."<P>\n";
-  $output .= "<B>Date:</B><BR>". format_date($node->timestamp) ."<P>\n";
-  $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Edit node\">\n";
-  $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Delete node\">\n";
+  $output .= form_item("Title", check_output($node->title));
+  $output .= form_item("Author", format_username($node->userid));
+  $output .= form_item("Status", $rstatus[$node->status]);
+  $output .= form_item("Comment", node_comment_status($node->comment));
+  $output .= form_item("Promote", node_promote_status($node->promote));
+  $output .= form_item("Date", format_date($node->timestamp));
+  $output .= form_submit("Edit node");
+  $output .= form_submit("Delete node");
   $output .= "</FORM>\n";
 
   return $output;
 }
 
 function node_admin_edit($id) {
-  global $user, $status;
+  global $user;
 
   $node = node_get_object("nid", $id);
 
-  foreach (array($node->userid => $node->author, $user->userid => $user->id) as $value=>$key) $author .= " <OPTION VALUE=\"$key\"". (($node->author == $key) ? " SELECTED" : "") .">$value</OPTION>\n";
-  foreach (array(format_date($node->timestamp) ." (original)" => $node->timestamp, format_date(time()) ." (current)" => time()) as $value=>$key) $timestamp .= " <OPTION VALUE=\"$key\"". (($node->timestamp == $key) ? " SELECTED" : "") .">$value</OPTION>\n";
-  foreach (node_status($node) as $value) $display .= " <OPTION VALUE=\"". $status[$value] ."\"". (($node->status == $status[$value]) ? " SELECTED" : "") .">$value</OPTION>\n";
-  foreach (node_comment_status() as $key=>$value) $comment .= " <OPTION VALUE=\"$key\"". ($node->comment == $key ? " SELECTED" : "") .">$value</OPTION>\n";
-  foreach (node_promote_status() as $key=>$value) $promote .= " <OPTION VALUE=\"$key\"". ($node->promote == $key ? " SELECTED" : "") .">$value</OPTION>\n";
-
   $output .= "<FORM ACTION=\"admin.php?mod=node&id=$node->nid\" METHOD=\"post\">\n";
-  $output .= "<B>Title:</B><BR>". check_output($node->title) ."<P>\n";
-  $output .= "<B>Author:</B><BR><SELECT NAME=\"edit[author]\">$author</SELECT><P>\n";
-  $output .= "<B>Status:</B><BR><SELECT NAME=\"edit[status]\">$display</SELECT><P>\n";
-  $output .= "<B>Comment:</B><BR><SELECT NAME=\"edit[comment]\">$comment</SELECT><P>\n";
-  $output .= "<B>Promote:</B><BR><SELECT NAME=\"edit[promote]\">$promote</SELECT><P>\n";
-  $output .= "<B>Date:</B><BR><SELECT NAME=\"edit[timestamp]\">$timestamp</SELECT><P>\n";
-  $output .= "<INPUT TYPE=\"hidden\" NAME=\"edit[nid]\" VALUE=\"$node->nid\">\n";
-  $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"View node\">\n";
-  $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Save node\">\n";
+  $output .= form_item("Title", check_output($node->title));
+  $output .= form_select("Author", "author", array($node->author => $node->userid, $user->id => $user->userid), $node->author);
+  $output .= form_select("Status", "status", node_status($node), $node->status);
+  $output .= form_select("Comment", "comment", node_comment_status(), $node->comment);
+  $output .= form_select("Promote", "promote", node_promote_status(), $node->promote);
+  $output .= form_select("Date", "timestamp", array($node->timestamp => format_date($node->timestamp) ." (original)", time() => format_date(time()) ." (current)"), $node->timestamp);
+  $output .= form_hidden("nid", $node->nid);
+  $output .= form_submit("View node");
+  $output .= form_submit("Save node");
   $output .= "</FORM>\n";
 
   return $output;