--- drupal/modules/comment.module 2004-04-28 15:09:00.000000000 +0200
+++ contributions/sandbox/pablobm/modules/comment.module 2004-04-28 16:28:20.054156448 +0200
@@ -1,5 +1,5 @@
thread = (string)rtrim((string)$parent->thread, "/");
@@ -411,10 +422,18 @@
}
}
+ /*
+ ** Additional fields
+ */
+
+ $misc = serialize(array(
+ 'anon_name' => $edit['anon_name'],
+ 'anon_email' => $edit['anon_email'],
+ 'anon_homepage' => $edit['anon_homepage']));
$edit["cid"] = db_next_id("{comments}_cid");
- db_query("INSERT INTO {comments} (cid, nid, pid, uid, subject, comment, hostname, timestamp, status, score, users, thread) VALUES (%d, %d, %d, %d, '%s', '%s', '%s', %d, %d, %d, '%s', '%s')", $edit["cid"], $edit["nid"], $edit["pid"], $user->uid, $edit["subject"], $edit["comment"], $_SERVER['REMOTE_ADDR'], time(), $status, $score, $users, $thread);
+ db_query("INSERT INTO {comments} (cid, nid, pid, uid, subject, comment, hostname, timestamp, status, score, users, thread, misc) VALUES (%d, %d, %d, %d, '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s')", $edit["cid"], $edit["nid"], $edit["pid"], $user->uid, $edit["subject"], $edit["comment"], $_SERVER['REMOTE_ADDR'], time(), $status, $score, $users, $thread, $misc);
/*
** Tell the other modules a new comment has been submitted:
@@ -555,7 +574,7 @@
** Multiple comments view
*/
- $query .= "SELECT c.cid as cid, c.pid, c.nid, c.subject, c.comment, c.timestamp, u.uid, u.name, u.picture, u.data, c.score, c.users, c.thread FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = '". check_query($nid) ."' AND c.status = 0";
+ $query .= "SELECT c.cid as cid, c.pid, c.nid, c.subject, c.comment, c.timestamp, u.uid, u.name, u.picture, u.data, c.score, c.users, c.thread, c.misc FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = '". check_query($nid) ."' AND c.status = 0";
$query .= " GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.timestamp, u.uid, u.name, u.picture, u.data, c.score, c.users, c.thread";
@@ -663,6 +682,7 @@
while ($comment = db_fetch_object($result)) {
$comment = drupal_unpack($comment);
+ $comment = drupal_unpack($comment, "misc");
$comment->depth = count(explode(".", $comment->thread)) - 1;
if ($mode == 1) {
@@ -840,7 +860,7 @@
$comments_per_page = $_POST["comments_per_page"];
comment_save_settings(check_query($mode), check_query($order), check_query($threshold), check_query($comments_per_page));
- drupal_goto(comment_node_url());
+ drupal_goto(comment_referer_load());
break;
}
}
@@ -880,6 +900,7 @@
$result = db_query("SELECT c.*, u.name, u.uid FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status != 2", $id);
$comment = db_fetch_object($result);
$comment = drupal_unpack($comment);
+ $comment = drupal_unpack($comment, "misc");
if ($comment) {
$form .= form_item(t("Author"), format_name($comment));
@@ -1223,10 +1244,16 @@
$form .= "\n";
// name field:
- $form .= form_item(t("Your name"), format_name($user));
+ $form .= _form_comment_author($user, $edit["anon_name"]);
+
+ // e-mail field
+ $form .= _form_comment_email($user, $edit["anon_email"]);
+
+ // homepage field
+ $form .= _form_comment_homepage($user, $edit["anon_homepage"]);
// subject field:
- $form .= form_textfield(t("Subject"), "subject", $edit["subject"], 50, 64);
+ $form .= _form_comment_subject($user, $edit["anon_homepage"]);
// comment field:
$form .= form_textarea(t("Comment"), "comment", $edit["comment"] ? $edit["comment"] : $user->signature, 70, 10, filter_tips_short());
@@ -1247,6 +1274,39 @@
return theme("box", $title, form($form, "post", url("comment/reply/". $edit["nid"])));
}
+function _form_comment_author($user, $default) {
+ $default = $default ? $default : 'anonymous';
+
+ if ($user->uid) {
+ $form = form_item(t("Your name"), format_name($user));
+ }
+ else if (variable_get('comment_author_field', 0)) {
+ $form = form_textfield(t("Your name"), 'anon_name', $default , 20, 40);
+ }
+ return $form;
+}
+
+function _form_comment_email($user, $default) {
+ if (! $user->uid && variable_get('comment_email_field', 0)) {
+ $form = form_textfield(t("E-Mail"), "anon_email", $default, 20, 40);
+ }
+ return $form;
+}
+
+function _form_comment_homepage($user, $default) {
+ if (! $user->uid && variable_get('comment_homepage_field', 0)) {
+ $form = form_textfield(t("Homepage"), "anon_homepage", $default, 20, 40);
+ }
+ return $form;
+}
+
+function _form_comment_subject($user, $default) {
+ if (variable_get('comment_subject_field', 0)) {
+ $form .= form_textfield(t("Subject"), "subject", $default, 50, 64);
+ }
+ return $form;
+}
+
function theme_comment_view($comment, $links = "", $visible = 1) {
/*
@@ -1370,17 +1430,48 @@
$output = "\n";
+
$output .= "". check_output($comment->comment) ."
\n";
$output .= "$links
\n";
$output .= "\n";
return $output;
}
+function theme_comment_author($comment) {
+ if (! $comment->anon_name) {
+ $output .= format_name($comment);
+ }
+ else {
+ $name = $comment->anon_name;
+ $name = $comment->anon_homepage ? ' $name)) . '">' . $name . '' : $name;
+ $name .= $comment->anon_email ? ' < $comment->anon_name)) . '">' . $comment->anon_email . '>' : '';
+ $output .= $name . t(" (identity not verified)");
+ }
+ return $output;
+}
+
+function _comment_format_url($url) {
+ if($url) {
+ $purl = parse_url($url);
+ if(!$purl['scheme']) {
+ $purl['scheme'] = 'http';
+ }
+ $result = $purl['scheme'] . '://' . $purl['host'] . $purl['path'];
+ }
+ else {
+ $result = '';
+ }
+ return $result;
+}
+
function theme_comment_folded($comment) {
$output = "\n";
return $output;
}