\n";
$output .= form_hidden("nid", $nid);
- $result = db_query("SELECT c.cid, c.pid, c.nid, c.subject, c.comment, c.timestamp, u.uid, u.name, u.picture, u.data, c.score, c.users FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0 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", $cid);
+ $result = db_query('SELECT c.cid, c.pid, c.nid, c.subject, c.comment, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.picture, u.data, c.score, c.users FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0 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', $cid);
if ($comment = db_fetch_object($result)) {
+ $comment->name = $comment->registered_name ? $comment->registered_name : $comment->name;
$output .= theme("comment_view", $comment, theme('links', module_invoke_all('link', 'comment', $comment, 1)));
}
@@ -559,7 +596,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, c.name , c.mail, c.homepage, u.uid, u.name AS registered_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 .= " 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";
@@ -667,6 +704,7 @@
while ($comment = db_fetch_object($result)) {
$comment = drupal_unpack($comment);
+ $comment->name = $comment->registered_name ? $comment->registered_name : $comment->name;
$comment->depth = count(explode(".", $comment->thread)) - 1;
if ($mode == 1) {
@@ -861,12 +899,13 @@
** Edit comments:
*/
- $result = db_query("SELECT c.cid, c.subject, u.uid, u.name FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE nid = %d AND c.status = 0 ORDER BY c.timestamp", $node->nid);
+ $result = db_query('SELECT c.cid, c.subject, c.name, u.uid, u.name AS registered_name, c.name FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE nid = %d AND c.status = 0 ORDER BY c.timestamp', $node->nid);
$header = array(t("title"), t("author"), array("data" => t("operations"), "colspan" => 3));
while ($comment = db_fetch_object($result)) {
+ $comment->name = $comment->registered_name ? $comment->registered_name : $comment->name;
$rows[] = array(l($comment->subject, "node/view/$node->nid", NULL, NULL, "comment-$comment->cid"), format_name($comment), l(t("view comment"), "node/view/$node->nid", NULL, NULL, $comment->cid), l(t("edit comment"), "admin/comment/edit/$comment->cid"), l(t("delete comment"), "admin/comment/delete/$comment->cid"));
}
@@ -881,8 +920,9 @@
function comment_admin_edit($id) {
- $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);
+ $result = db_query('SELECT c.*, u.name AS registered_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->name = $comment->registered_name ? $comment->registered_name : $comment->name;
$comment = drupal_unpack($comment);
if ($comment) {
@@ -910,7 +950,8 @@
}
function comment_delete($cid, $confirmed = 0) {
- $comment = db_fetch_object(db_query("SELECT c.*, u.name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.cid = %d", $cid));
+ $comment = db_fetch_object(db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.cid = %d', $cid));
+ $comment->name = $comment->registered_name ? $comment->registered_name : $comment->name;
if ($comment->cid) {
if ($confirmed) {
@@ -963,11 +1004,12 @@
array("data" => t("operations"), "colspan" => 2)
);
- $sql = "SELECT c.*, u.name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.status = ". check_query($status);
+ $sql = 'SELECT c.subject, c.nid, c.cid, c.comment, c.timestamp, c.status, c.name, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.status = '. check_query($status);
$sql .= tablesort_sql($header);
$result = pager_query($sql, 50);
while ($comment = db_fetch_object($result)) {
+ $comment->name = $comment->registered_name ? $comment->registered_name : $comment->name;
$rows[] = array(l($comment->subject, "node/view/$comment->nid/$comment->cid", array("title" => htmlspecialchars(truncate_utf8($comment->comment, 128))), NULL, "comment-$comment->cid") ." ". (node_is_new($comment->nid, $comment->timestamp) ? theme("mark") : ""), format_name($comment), ($comment->status == 0 ? t("published") : t("not published")) ."
". format_date($comment->timestamp, "small") ." | ". l(t("edit comment"), "admin/comment/edit/$comment->cid"), l(t("delete comment"), "admin/comment/delete/$comment->cid"));
}
@@ -1227,10 +1269,29 @@
$form .= "\n";
// name field:
- $form .= form_item(t("Your name"), format_name($user));
+ if ($user->uid) {
+ $form .= form_item(t('Your name'), format_name($user));
+ }
+ else if (variable_get('comment_name_field', 0)) {
+ $form .= form_textfield(t('Your name'), 'name', $edit[name] ? $edit[name] : variable_get('anonymous', 'Anonymous') , 20, 40);
+ }
+
+
+ // e-mail field
+ if (! $user->uid && variable_get('comment_mail_field', 0)) {
+ $form .= form_textfield(t('E-Mail'), 'mail', $edit['mail'], 20, 40);
+ }
+
+ // homepage field
+ if (! $user->uid && variable_get('comment_homepage_field', 0)) {
+ $form .= form_textfield(t('Homepage'), 'homepage', $edit['homepage'], 20, 40);
+ }
+
// subject field:
- $form .= form_textfield(t("Subject"), "subject", $edit["subject"], 50, 64);
+ if (variable_get('comment_subject_field', 0)) {
+ $form .= form_textfield(t('Subject'), 'subject', $edit['subject'], 50, 64);
+ }
// comment field:
$form .= form_textarea(t("Comment"), "comment", $edit["comment"] ? $edit["comment"] : $user->signature, 70, 10, filter_tips_short());
@@ -1378,18 +1439,35 @@
$output = "\n";
return $output;
}
+function theme_comment_name($comment) {
+ if ($comment->uid || $comment->name) {
+ $output = format_name($comment);
+ }
+ else {
+ $name = $comment->name;
+ $name = $comment->homepage ? ' $name)) . '">' . $name . '' : $name;
+ $name .= $comment->mail ? ' < $comment->name)) . '">' . $comment->mail . '>' : '';
+ $output = $name . ' (' . t("identity not verified") . ')' ;
+ }
+ return $output;
+}
+
function theme_comment_folded($comment) {
- $output = "\n";
+ $output = '';
return $output;
}
@@ -1600,6 +1678,9 @@
**
** The select statement may optionally provide "nid", which is a secondary
** identifier which is currently used byt the comment module.
+ **
+ ** Notice this will not search through comments table 'name' field, but will
+ ** do through users table one.
*/
$find = do_search(array("keys" => $keys, "type" => "comment", "select" => "select s.lno as lno, c.nid as nid, c.subject as title, c.timestamp as created, u.uid as uid, u.name as name, s.count as count FROM {search_index} s, {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE s.lno = c.cid AND s.type = 'comment' AND c.status = 0 AND s.word like '%'"));
|