Skip to content
Snippets Groups Projects
Commit 7f2e4572 authored by Dries Buytaert's avatar Dries Buytaert
Browse files

- fixed bug in search.php 

- fixed bug in discussion.php
- theme update: comment() now takes 3 arguments:
    $comment - an object with comment data
    $link    - a link to the reply form of that particular
               comment
    $thread  - the subthread of that particular comment
- theme 'marvin' and theme 'zaphod' are updated, theme
  'unconed' is left to be done
parent fb348c6a
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Hide whitespace changes
Inline Side-by-side
account.php
+ 2
− 2
View file @ 7f2e4572
...@@ -201,7 +201,7 @@ function account_user($uname) { ...@@ -201,7 +201,7 @@ function account_user($uname) {
$box1 .= " <TR><TD ALIGN=\"right\"><B>Bio:</B></TD><TD>". format_data($account->bio) ."</TD></TR>\n"; $box1 .= " <TR><TD ALIGN=\"right\"><B>Bio:</B></TD><TD>". format_data($account->bio) ."</TD></TR>\n";
$box1 .= "</TABLE>\n"; $box1 .= "</TABLE>\n";
$result = db_query("SELECT c.cid, c.pid, c.sid, c.subject, c.timestamp, s.subject AS story FROM comments c LEFT JOIN users u ON u.id = c.author LEFT JOIN stories s ON s.id = c.sid WHERE u.userid = '$uname' AND c.timestamp > ". (time() - 1209600) ." ORDER BY cid DESC LIMIT 10"); $result = db_query("SELECT c.cid, c.pid, c.sid, c.subject, c.timestamp, s.subject AS story FROM comments c LEFT JOIN users u ON u.id = c.author LEFT JOIN stories s ON s.id = c.sid WHERE u.userid = '$uname' AND s.status = 2 AND s.timestamp > ". (time() - 1209600) ." ORDER BY cid DESC LIMIT 10");
while ($comment = db_fetch_object($result)) { while ($comment = db_fetch_object($result)) {
$box2 .= "<TABLE BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"1\">\n"; $box2 .= "<TABLE BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"1\">\n";
$box2 .= " <TR><TD ALIGN=\"right\"><B>Comment:</B></TD><TD><A HREF=\"discussion.php?id=$comment->sid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</A></TD></TR>\n"; $box2 .= " <TR><TD ALIGN=\"right\"><B>Comment:</B></TD><TD><A HREF=\"discussion.php?id=$comment->sid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</A></TD></TR>\n";
...@@ -418,4 +418,4 @@ function account_comments() { ...@@ -418,4 +418,4 @@ function account_comments() {
account_user($user->userid); account_user($user->userid);
} }
?> ?>
\ No newline at end of file
discussion.php
+ 11
− 10
View file @ 7f2e4572
...@@ -35,7 +35,7 @@ function discussion_kids($cid, $mode, $threshold, $level = 0, $dummy = 0) { ...@@ -35,7 +35,7 @@ function discussion_kids($cid, $mode, $threshold, $level = 0, $dummy = 0) {
$comments++; $comments++;
$link = "<A HREF=\"discussion.php?op=reply&sid=$comment->sid&pid=$comment->cid\"><FONT COLOR=\"$theme->hlcolor2\">reply to this comment</FONT></A>"; $link = "<A HREF=\"discussion.php?op=reply&sid=$comment->sid&pid=$comment->cid\"><FONT COLOR=\"$theme->hlcolor2\">reply to this comment</FONT></A>";
$theme->comment($comment->userid, check_output($comment->subject), check_output($comment->comment), $comment->timestamp, check_output($comment->url), check_output($comment->fake_email), discussion_score($comment), $comment->votes, $comment->cid, $link); $theme->comment(new Comment($comment->userid, $comment->subject, $comment->comment, $comment->timestamp, $comment->url, $comment->fake_email, discussion_score($comment), $comment->votes, $comment->cid), $link);
discussion_kids($comment->cid, $mode, $threshold, $level + 1, $dummy + 1); discussion_kids($comment->cid, $mode, $threshold, $level + 1, $dummy + 1);
} }
...@@ -45,7 +45,7 @@ function discussion_kids($cid, $mode, $threshold, $level = 0, $dummy = 0) { ...@@ -45,7 +45,7 @@ function discussion_kids($cid, $mode, $threshold, $level = 0, $dummy = 0) {
while ($comment = db_fetch_object($result)) { while ($comment = db_fetch_object($result)) {
if ($comment->score >= $threshold) { if ($comment->score >= $threshold) {
$link = "<A HREF=\"discussion.php?op=reply&sid=$comment->sid&pid=$comment->cid\"><FONT COLOR=\"$theme->hlcolor2\">reply to this comment</FONT></A>"; $link = "<A HREF=\"discussion.php?op=reply&sid=$comment->sid&pid=$comment->cid\"><FONT COLOR=\"$theme->hlcolor2\">reply to this comment</FONT></A>";
$theme->comment($comment->userid, check_output($comment->subject), check_output($comment->comment), $comment->timestamp, check_output($comment->url), check_output($comment->fake_email), discussion_score($comment), $comment->votes, $comment->cid, $link); $theme->comment(new Comment($comment->userid, $comment->subject, $comment->comment, $comment->timestamp, $comment->url, $comment->fake_email, discussion_score($comment), $comment->votes, $comment->cid), $link);
} }
discussion_kids($comment->cid, $mode, $threshold); discussion_kids($comment->cid, $mode, $threshold);
} }
...@@ -70,7 +70,7 @@ function discussion_childs($cid, $threshold, $level = 0, $thread) { ...@@ -70,7 +70,7 @@ function discussion_childs($cid, $threshold, $level = 0, $thread) {
$comments++; $comments++;
### Compose link: ### Compose link:
$thread .= "<LI><A HREF=\"discussion.php?id=$comment->sid&cid=$comment->cid&pid=$comment->pid\">". check_output($comment->subject) ."</A> by ". format_username($comment->userid) ." <SMALL>(". discussion_score($comment) .")<SMALL></LI>"; $thread .= "<LI><A HREF=\"discussion.php?id=$comment->sid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</A> by ". format_username($comment->userid) ." <SMALL>(". discussion_score($comment) .")<SMALL></LI>";
### Recursive: ### Recursive:
discussion_childs($comment->cid, $threshold, $level + 1, &$thread); discussion_childs($comment->cid, $threshold, $level + 1, &$thread);
...@@ -138,10 +138,10 @@ function discussion_display($sid, $pid, $cid, $level = 0) { ...@@ -138,10 +138,10 @@ function discussion_display($sid, $pid, $cid, $level = 0) {
### Display the comments: ### Display the comments:
if (empty($mode) || $mode == "threaded") { if (empty($mode) || $mode == "threaded") {
$thread = discussion_childs($comment->cid, $threshold); $thread = discussion_childs($comment->cid, $threshold);
$theme->comment($comment->userid, check_output($comment->subject), check_output($comment->comment), $comment->timestamp, $comment->url, $comment->fake_email, discussion_score($comment), $comment->votes, $comment->cid, $link, $thread); $theme->comment(new Comment($comment->userid, $comment->subject, $comment->comment, $comment->timestamp, $comment->url, $comment->fake_email, discussion_score($comment), $comment->votes, $comment->cid), $link, $thread);
} }
else { else {
$theme->comment($comment->userid, check_output($comment->subject), check_output($comment->comment), $comment->timestamp, $comment->url, $comment->fake_email, discussion_score($comment), $comment->votes, $comment->cid, $link); $theme->comment(new Comment($comment->userid, $comment->subject, $comment->comment, $comment->timestamp, $comment->url, $comment->fake_email, discussion_score($comment), $comment->votes, $comment->cid), $link);
discussion_kids($comment->cid, $mode, $threshold, $level); discussion_kids($comment->cid, $mode, $threshold, $level);
} }
} }
...@@ -157,7 +157,7 @@ function discussion_reply($pid, $sid) { ...@@ -157,7 +157,7 @@ function discussion_reply($pid, $sid) {
### Extract parent-information/data: ### Extract parent-information/data:
if ($pid) { if ($pid) {
$item = db_fetch_object(db_query("SELECT comments.*, users.userid FROM comments LEFT JOIN users ON comments.author = users.id WHERE comments.cid = $pid")); $item = db_fetch_object(db_query("SELECT comments.*, users.userid FROM comments LEFT JOIN users ON comments.author = users.id WHERE comments.cid = $pid"));
$theme->comment($item->userid, check_output($item->subject), check_output($item->comment), $item->timestamp, check_output($item->url), check_output($item->fake_email), discussion_score($comment), $comment->votes, $item->cid, "reply to this comment"); $theme->comment(new Comment($item->userid, $item->subject, $item->comment, $item->timestamp, $item->url, $item->fake_email, discussion_score($comment), $comment->votes, $item->cid), "reply to this comment");
} }
else { else {
$item = db_fetch_object(db_query("SELECT stories.*, users.userid FROM stories LEFT JOIN users ON stories.author = users.id WHERE stories.status != 0 AND stories.id = $sid")); $item = db_fetch_object(db_query("SELECT stories.*, users.userid FROM stories LEFT JOIN users ON stories.author = users.id WHERE stories.status != 0 AND stories.id = $sid"));
...@@ -201,7 +201,7 @@ function comment_preview($pid, $sid, $subject, $comment) { ...@@ -201,7 +201,7 @@ function comment_preview($pid, $sid, $subject, $comment) {
global $user, $theme, $allowed_html; global $user, $theme, $allowed_html;
### Preview comment: ### Preview comment:
$theme->comment($user->userid, check_output($subject), check_output($comment), time(), check_output($user->url), check_output($user->fake_email), "", "", "", "reply to this comment"); $theme->comment(new Comment($user->userid, $subject, $comment, time(), $user->url, $user->fake_email, "", "", ""), "reply to this comment");
### Build reply form: ### Build reply form:
$output .= "<FORM ACTION=\"discussion.php\" METHOD=\"post\">\n"; $output .= "<FORM ACTION=\"discussion.php\" METHOD=\"post\">\n";
...@@ -252,7 +252,7 @@ function comment_post($pid, $sid, $subject, $comment) { ...@@ -252,7 +252,7 @@ function comment_post($pid, $sid, $subject, $comment) {
$fake = db_result(db_query("SELECT COUNT(*) FROM stories WHERE id = $sid"), 0); $fake = db_result(db_query("SELECT COUNT(*) FROM stories WHERE id = $sid"), 0);
### Check for duplicate comments: ### Check for duplicate comments:
$duplicate = db_result(db_query("SELECT COUNT(*) FROM comments WHERE pid = '$pid' AND sid = '$sid' AND subject = '". addslashes($subject) ."' AND comment = '". addslashes($comment) ."'"), 0); $duplicate = db_result(db_query("SELECT COUNT(*) FROM comments WHERE pid = '$pid' AND sid = '$sid' AND subject = '". check_input($subject) ."' AND comment = '". check_input($comment) ."'"), 0);
if ($fake != 1) { if ($fake != 1) {
watchdog(3, "attemp to insert fake comment"); watchdog(3, "attemp to insert fake comment");
...@@ -267,7 +267,7 @@ function comment_post($pid, $sid, $subject, $comment) { ...@@ -267,7 +267,7 @@ function comment_post($pid, $sid, $subject, $comment) {
$subject = ($subject) ? $subject : substr($comment, 0, 29); $subject = ($subject) ? $subject : substr($comment, 0, 29);
### Add comment to database: ### Add comment to database:
db_insert("INSERT INTO comments (pid, sid, author, subject, comment, hostname, timestamp) VALUES ($pid, $sid, '$user->id', '". addslashes($subject) ."', '". addslashes($comment) ."', '". getenv("REMOTE_ADDR") ."', '". time() ."')"); db_insert("INSERT INTO comments (pid, sid, author, subject, comment, hostname, timestamp) VALUES ($pid, $sid, '$user->id', '". check_input($subject) ."', '". check_input($comment) ."', '". getenv("REMOTE_ADDR") ."', '". time() ."')");
### Compose header: ### Compose header:
header("Location: discussion.php?id=$sid"); header("Location: discussion.php?id=$sid");
...@@ -275,6 +275,7 @@ function comment_post($pid, $sid, $subject, $comment) { ...@@ -275,6 +275,7 @@ function comment_post($pid, $sid, $subject, $comment) {
} }
include "includes/theme.inc"; include "includes/theme.inc";
include "includes/comment.inc";
switch($op) { switch($op) {
case "Preview comment": case "Preview comment":
...@@ -308,4 +309,4 @@ function comment_post($pid, $sid, $subject, $comment) { ...@@ -308,4 +309,4 @@ function comment_post($pid, $sid, $subject, $comment) {
$theme->footer(); $theme->footer();
} }
?> ?>
\ No newline at end of file
includes/config.inc
+ 10
− 10
View file @ 7f2e4572
...@@ -11,17 +11,17 @@ ...@@ -11,17 +11,17 @@
#$dbname = "droporg"; #$dbname = "droporg";
### http://beta.drop.org/: ### http://beta.drop.org/:
$dbhost = "zind.net"; #$dbhost = "zind.net";
$dbuname = "dries";
$dbpass = "Abc123";
$dbname = "dries";
### http://dione/:
#$dbhost = "";
#$dbuname = "dries"; #$dbuname = "dries";
#$dbpass = "oakley"; #$dbpass = "Abc123";
#$dbname = "dries"; #$dbname = "dries";
### http://dione/:
$dbhost = "";
$dbuname = "dries";
$dbpass = "oakley";
$dbname = "dries";
# #
# Name of the site # Name of the site
# #
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
# #
# Submission moderation thresholds: # Submission moderation thresholds:
# #
$submission_post_threshold = "2"; $submission_post_threshold = "3";
$submission_dump_threshold = "-2"; $submission_dump_threshold = "-2";
?> ?>
\ No newline at end of file
includes/story.inc
+ 1
− 1
View file @ 7f2e4572
<? <?
class Story { class Story {
function story($userid, $subject, $abstract, $article, $category, $timestamp) { function Story($userid, $subject, $abstract, $article, $category, $timestamp) {
$this->userid = $userid; $this->userid = $userid;
$this->subject = $subject; $this->subject = $subject;
$this->abstract = $abstract; $this->abstract = $abstract;
......
search.php
+ 3
− 3
View file @ 7f2e4572
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
$output .= " <TD>\n"; $output .= " <TD>\n";
### Compose and perform query: ### Compose and perform query:
$query = "SELECT DISTINCT s.id, s.subject, u.userid, s.timestamp, COUNT(c.cid) AS comments FROM comments c, stories s LEFT JOIN users u ON s.author = u.id WHERE s.status = 2 AND s.id = c.sid "; $query = "SELECT s.id, s.subject, u.userid, s.timestamp, COUNT(c.cid) AS comments FROM stories s LEFT JOIN users u ON s.author = u.id LEFT JOIN comments c ON s.id = c.sid WHERE s.status = 2 ";
$query .= ($author) ? "AND u.userid = '$author' " : ""; $query .= ($author) ? "AND u.userid = '$author' " : "";
$query .= ($terms) ? "AND (s.subject LIKE '%$terms%' OR s.abstract LIKE '%$terms%' OR s.updates LIKE '%$terms%') " : ""; $query .= ($terms) ? "AND (s.subject LIKE '%$terms%' OR s.abstract LIKE '%$terms%' OR s.updates LIKE '%$terms%') " : "";
$query .= ($category) ? "AND s.category = '$category' GROUP BY c.sid " : "GROUP BY c.sid "; $query .= ($category) ? "AND s.category = '$category' GROUP BY s.id " : "GROUP BY s.id ";
$query .= ($order == "Oldest first") ? "ORDER BY s.timestamp ASC" : "ORDER BY s.timestamp DESC"; $query .= ($order == "Oldest first") ? "ORDER BY s.timestamp ASC" : "ORDER BY s.timestamp DESC";
$result = db_query("$query"); $result = db_query("$query");
...@@ -64,4 +64,4 @@ ...@@ -64,4 +64,4 @@
$theme->box("Search", $output); $theme->box("Search", $output);
$theme->footer(); $theme->footer();
?> ?>
\ No newline at end of file
submit.php
+ 2
− 2
View file @ 7f2e4572
...@@ -120,7 +120,7 @@ function submit_preview($subject, $abstract, $article, $category) { ...@@ -120,7 +120,7 @@ function submit_preview($subject, $abstract, $article, $category) {
$output .= "</FORM>\n"; $output .= "</FORM>\n";
$theme->header(); $theme->header();
$theme->article(new Story($user->userid, check_output($subject), check_output($abstract), check_output($article), check_output($category), time())); $theme->article(new Story($user->userid, $subject, $abstract, $article, $category, time()));
$theme->box("Submit a story", $output); $theme->box("Submit a story", $output);
$theme->footer(); $theme->footer();
} }
...@@ -160,4 +160,4 @@ function submit_submit($subject, $abstract, $article, $category) { ...@@ -160,4 +160,4 @@ function submit_submit($subject, $abstract, $article, $category) {
break; break;
} }
?> ?>
\ No newline at end of file
themes/marvin/marvin.theme
+ 7
− 8
View file @ 7f2e4572
...@@ -177,9 +177,8 @@ function commentControl($sid, $title, $threshold, $mode, $order) { ...@@ -177,9 +177,8 @@ function commentControl($sid, $title, $threshold, $mode, $order) {
###### ######
# Syntax.......: comment(...); # Syntax.......: comment(...);
# Description..: this function is used to theme user comments. # Description..: this function is used to theme user comments.
function comment($poster, $subject, $comment, $timestamp, $url, $email, $score, $votes, $cid, $link, $thread = "") { function comment($comment, $link, $thread = "") {
print "\n<!-- Comment: \"$subject\" by $poster -->\n"; print "<A NAME=\"$comment->cid\">\n";
print "<A NAME=\"$cid\">\n";
### Create comment header: ### Create comment header:
print "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"0\" BGCOLOR=\"#000000\" WIDTH=\"100%\">\n"; print "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"0\" BGCOLOR=\"#000000\" WIDTH=\"100%\">\n";
...@@ -193,22 +192,22 @@ function comment($poster, $subject, $comment, $timestamp, $url, $email, $score, ...@@ -193,22 +192,22 @@ function comment($poster, $subject, $comment, $timestamp, $url, $email, $score,
### Subject: ### Subject:
print " <TD ALIGN=\"right\" WIDTH=\"5%\"><B>Subject:</FONT></TD>\n"; print " <TD ALIGN=\"right\" WIDTH=\"5%\"><B>Subject:</FONT></TD>\n";
print " <TD WIDTH=\"80%\"><B><FONT COLOR=\"$this->hlcolor1\">$subject</FONT></B></TD>\n"; print " <TD WIDTH=\"80%\"><B><FONT COLOR=\"$this->hlcolor1\">". check_output($comment->subject) ."</FONT></B></TD>\n";
### Moderation: ### Moderation:
print " <TD ALIGN=\"right\" ROWSPAN=\"3\" VALIGN=\"middle\" WIDTH=\"15%\">\n"; print " <TD ALIGN=\"right\" ROWSPAN=\"3\" VALIGN=\"middle\" WIDTH=\"15%\">\n";
display_comment_moderation($cid, $poster, $score, $votes); display_comment_moderation($comment->cid, $comment->poster, $comment->score, $comment->votes);
print " </TD>\n"; print " </TD>\n";
print " </TR>\n"; print " </TR>\n";
### Author: ### Author:
print " <TR>\n"; print " <TR>\n";
print " <TD ALIGN=\"right\" VALIGN=\"top\">Author:</TD><TD>". format_username($poster) ."</TD>\n"; print " <TD ALIGN=\"right\" VALIGN=\"top\">Author:</TD><TD>". format_username($comment->userid) ."</TD>\n";
print " </TR>\n"; print " </TR>\n";
### Date ### Date
print " <TR>\n"; print " <TR>\n";
print " <TD ALIGN=\"right\">Date:</TD><TD>". format_date($timestamp) ."</TD>\n"; print " <TD ALIGN=\"right\">Date:</TD><TD>". format_date($comment->timestamp) ."</TD>\n";
print " </TR>\n"; print " </TR>\n";
print " </TABLE>\n"; print " </TABLE>\n";
...@@ -216,7 +215,7 @@ function comment($poster, $subject, $comment, $timestamp, $url, $email, $score, ...@@ -216,7 +215,7 @@ function comment($poster, $subject, $comment, $timestamp, $url, $email, $score,
print " </TR>\n"; print " </TR>\n";
### Print body of comment: ### Print body of comment:
if ($comment) print " <TR><TD BGCOLOR=\"#FFFFFF\">". check_output($comment, 1) ."</TD></TR>\n"; if ($comment->comment) print " <TR><TD BGCOLOR=\"#FFFFFF\">". check_output($comment->comment, 1) ."</TD></TR>\n";
### Print thread (if any): ### Print thread (if any):
if ($thread) print " <TR><TD BGCOLOR=\"$this->bgcolor1\">$thread</TD></TR>\n"; if ($thread) print " <TR><TD BGCOLOR=\"$this->bgcolor1\">$thread</TD></TR>\n";
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment