1 files changed, 18 insertions, 55 deletions

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index cee88f998..5c2f9005f 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -15,90 +15,53 @@ function comment_find($keys) {
 
 function comment_edit($id) {
   $result = db_query("SELECT c.*, u.userid FROM comments c LEFT JOIN users u ON c.author = u.id WHERE c.cid = '$id'");
-
   $comment = db_fetch_object($result);
 
-  $output .= "<FORM ACTION=\"admin.php?mod=comment&op=save&id=$id\" METHOD=\"post\">\n";
-
-  $output .= "<B>Author:</B><BR>\n";
-  $output .= format_username($comment->userid) ."<P>\n";
-
-  $output .= "<B>Subject:</B><BR>\n";
-  $output .= "<INPUT TYPE=\"text\" NAME=\"subject\" SIZE=\"50\" VALUE=\"". check_textfield($comment->subject) ."\"><P>\n";
+  $form .= form_item(t("Author"), format_username($comment->userid));
+  $form .= form_textfield(t("Subject"), "subject", $comment->subject, 50, 128);
+  $form .= form_textarea(t("Comment"), "comment", $comment->comment, 50, 10);
+  $form .= form_submit("Save comment");
 
-  $output .= "<B>Comment:</B><BR>\n";
-  $output .= "<TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"10\" NAME=\"comment\">". check_textarea($comment->comment) ."</TEXTAREA><P>\n";
-
-  $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Save comment\">\n";
-  $output .= "</FORM>\n";
-
-  print $output;
+  return form("admin.php?mod=comment&id=$id", $form);
 }
 
-function comment_save($id, $subject, $comment) {
-  db_query("UPDATE comments SET subject = '$subject', comment = '$comment' WHERE cid = '$id'");
-  watchdog("message", "comment: modified '$subject'");
+function comment_save($id, $edit) {
+  db_query("UPDATE comments SET subject = '". check_input($edit[subject]) ."', comment = '". check_input($edit[comment]) ."' WHERE cid = '$id'");
+  watchdog("message", "comment: modified '$edit[subject]'");
 }
 
-function comment_display($order = "date") {
-  // Initialize variables:
-  $fields = array("author" => "author", "date" => "timestamp DESC", "subject" => "subject");
-
-  // Perform SQL query:
-  $result = db_query("SELECT c.*, u.userid FROM comments c LEFT JOIN users u ON u.id = c.author ORDER BY c.$fields[$order] LIMIT 50");
+function comment_display() {
+  $result = db_query("SELECT c.*, u.userid FROM comments c LEFT JOIN users u ON u.id = c.author ORDER BY timestamp DESC LIMIT 50");
 
-  // Display comments:
   $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
-  $output .= " <TR>\n";
-  $output .= "  <TH ALIGN=\"right\" COLSPAN=\"3\">\n";
-  $output .= "   <FORM ACTION=\"admin.php?mod=comment\" METHOD=\"post\">\n";
-  $output .= "    <SELECT NAME=\"order\">\n";
-  foreach ($fields as $key=>$value) {
-    $output .= "     <OPTION VALUE=\"$key\"". ($key == $order ? " SELECTED" : "") .">Sort by $key</OPTION>\n";
-  }
-  $output .= "    </SELECT>\n";
-  $output .= "    <INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Update\">\n";
-  $output .= "   </FORM>\n";
-  $output .= "  </TH>\n";
-  $output .= " </TR>\n";
-
-  $output .= " <TR>\n";
-  $output .= "  <TH>subject</TH>\n";
-  $output .= "  <TH>author</TH>\n";
-  $output .= "  <TH>operations</TH>\n";
-  $output .= " </TR>\n";
-
+  $output .= " <TR><TH>subject</TH><TH>author</TH><TH>date</TH><TH COLSPAN=\"2\">operations</TH></TR>\n";
   while ($comment = db_fetch_object($result)) {
-    $output .= " <TR><TD><A HREF=\"node.php?id=$comment->lid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</A></TD><TD>". format_username($comment->userid) ."</TD><TD ALIGN=\"center\"><A HREF=\"admin.php?mod=comment&op=edit&id=$comment->cid\">edit</A></TD></TR>\n";
+    $output .= " <TR><TD><A HREF=\"node.php?id=$comment->lid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</A></TD><TD>". format_username($comment->userid) ."</TD><TD>". format_date($comment->timestamp, "small") ."</TD><TD><A HREF=\"admin.php?mod=comment&op=edit&id=$comment->cid\">edit comment</A></TD><TD><A HREF=\"admin.php?mod=comment&op=delete&id=$comment->cid\">delete comment</A></TD></TR>\n";
   }
-
   $output .= "</TABLE>\n";
 
-  print $output;
+  return $output;
 }
 
 function comment_admin() {
-  global $op, $id, $mod, $keys, $subject, $comment, $order;
+  global $op, $id, $edit, $mod, $keys, $order;
 
   print "<SMALL><A HREF=\"admin.php?mod=comment\">overview</A> | <A HREF=\"admin.php?mod=comment&op=search\">search comment</A></SMALL><HR>\n";
 
   switch ($op) {
     case "edit":
-      comment_edit($id);
+      print comment_edit($id);
       break;
     case "search":
       print search_form($keys);
       print search_data($keys, $mod);
       break;
     case "Save comment":
-      comment_save(check_input($id), check_input($subject), check_input($comment));
-      comment_display();
-      break;
-    case "Update":
-      comment_display(check_input($order));
+      print status(comment_save(check_input($id), $edit));
+      print comment_display();
       break;
     default:
-      comment_display();
+      print comment_display();
   }
 }