james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

early bbcode support for comments, and comments page uses standard thumb html generator

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@36 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-04-29 02:43:41 +00:00
parent 26997b1b59
commit 38a8df40ae
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ext/comment.ext.php
View File

@ -28,20 +28,20 @@ class Comment { // {{{
$this->poster_ip = $row['poster_ip']; $this->poster_ip = $row['poster_ip'];
} }
public function to_html($link_to_image = false) { public function to_html($trim=false) {
global $user; global $user;
$i_uid = int_escape($this->owner_id); $i_uid = int_escape($this->owner_id);
$h_name = html_escape($this->owner_name); $h_name = html_escape($this->owner_name);
$h_poster_ip = html_escape($this->poster_ip); $h_poster_ip = html_escape($this->poster_ip);
$h_comment = bbcode2html($this->comment); $h_comment = ($trim ? substr(bbcode_to_text($this->comment), 0, 50)."..." : bbcode_to_html($this->comment));
$i_comment_id = int_escape($this->comment_id); $i_comment_id = int_escape($this->comment_id);
$i_image_id = int_escape($this->image_id); $i_image_id = int_escape($this->image_id);
$h_userlink = "<a href='".make_link("user/$h_name")."'>$h_name</a>"; $h_userlink = "<a href='".make_link("user/$h_name")."'>$h_name</a>";
$h_dellink = $user->is_admin() ? $h_dellink = $user->is_admin() ?
"<br>($h_poster_ip, <a href='".make_link("comment/delete/$i_comment_id/$i_image_id")."'>Del</a>)" : ""; "<br>($h_poster_ip, <a href='".make_link("comment/delete/$i_comment_id/$i_image_id")."'>Del</a>)" : "";
$h_imagelink = $link_to_image ? "<a href='".make_link("post/view/$i_image_id")."'>&gt;&gt;&gt;</a>\n" : ""; $h_imagelink = $trim ? "<a href='".make_link("post/view/$i_image_id")."'>&gt;&gt;&gt;</a>\n" : "";
return "<p>$h_userlink: $h_comment $h_imagelink $h_dellink</p>"; return "<p>$h_userlink: $h_comment $h_imagelink $h_dellink</p>";
} }
} // }}} } // }}}
@ -87,7 +87,6 @@ class CommentList extends Extension {
global $config; global $config;
if($config->get_int("comment_count") > 0) { if($config->get_int("comment_count") > 0) {
$page->add_side_block(new Block("Comments", $this->build_recent_comments()), 50); $page->add_side_block(new Block("Comments", $this->build_recent_comments()), 50);
// $page->add_quicknav("Comments", make_link("comments/list"));
} }
} }
@ -190,10 +189,9 @@ class CommentList extends Extension {
while(!$result->EOF) { while(!$result->EOF) {
$image = $database->get_image($result->fields["image_id"]); $image = $database->get_image($result->fields["image_id"]);
$html = "<div style='text-align: left'>"; $html = "<div style='text-align: left'>";
$html .= "<a href='".make_link("post/view/{$image->id}")."'>"; $html .= "<div style='float: left; margin-right: 16px;'>" . build_thumb_html($image) . "</div>";
$html .= "<img src='".($image->get_thumb_link())."' align='left' style='margin-right: 16px;'></a>"; $html .= $this->build_image_comments($image->id);
$html .= $this->build_image_comments($image->id);
$html .= "</div>"; $html .= "</div>";
$html .= "<div style='clear:both;'>".($this->build_postbox($image->id))."</div>"; $html .= "<div style='clear:both;'>".($this->build_postbox($image->id))."</div>";
@ -230,7 +228,7 @@ class CommentList extends Extension {
LEFT JOIN users ON comments.owner_id=users.id LEFT JOIN users ON comments.owner_id=users.id
WHERE comments.image_id=? WHERE comments.image_id=?
ORDER BY comments.id ASC ORDER BY comments.id ASC
", array($i_image_id)); ", array($i_image_id), false);
$html .= "</div>"; $html .= "</div>";
return $html; return $html;
} }
@ -240,12 +238,7 @@ class CommentList extends Extension {
$html = $this->query_to_html(" $html = $this->query_to_html("
SELECT SELECT
users.id as user_id, users.name as user_name, users.id as user_id, users.name as user_name,
if( comments.comment as comment, comments.id as comment_id,
length(comments.comment) > 50,
concat(substring(comments.comment, 1, 50), ' ...'),
comments.comment
) as comment,
comments.id as comment_id,
comments.image_id as image_id, comments.owner_ip as poster_ip comments.image_id as image_id, comments.owner_ip as poster_ip
FROM comments FROM comments
LEFT JOIN users ON comments.owner_id=users.id LEFT JOIN users ON comments.owner_id=users.id
@ -272,7 +265,7 @@ class CommentList extends Extension {
} }
} }
private function query_to_html($query, $args, $link_to_image=false) { private function query_to_html($query, $args, $trim=false) {
global $database; global $database;
global $config; global $config;
@ -280,7 +273,7 @@ class CommentList extends Extension {
$result = $database->db->Execute($query, $args); $result = $database->db->Execute($query, $args);
while(!$result->EOF) { while(!$result->EOF) {
$comment = new Comment($result->fields); $comment = new Comment($result->fields);
$html .= $comment->to_html($link_to_image); $html .= $comment->to_html($trim);
$result->MoveNext(); $result->MoveNext();
} }
return $html; return $html;