Merge branch 'master' of git@github.com:shish/shimmie2

This commit is contained in:
Shish 2011-12-31 13:57:56 +00:00
commit e8791d0759
2 changed files with 39 additions and 0 deletions

View File

@ -171,6 +171,10 @@ class CommentList extends SimpleExtension {
$i_comment_count = Comment::count_comments_by_user($event->display_user);
$h_comment_rate = sprintf("%.1f", ($i_comment_count / $i_days_old));
$event->add_stats("Comments made: $i_comment_count, $h_comment_rate per day");
global $user;
$recent = $this->get_user_recent_comments($event->display_user->id, 10);
$this->theme->display_user_comments($recent);
}
public function onDisplayingImage(DisplayingImageEvent $event) {
@ -312,6 +316,28 @@ class CommentList extends SimpleExtension {
return $comments;
}
private function get_user_recent_comments($user_id, $count) {
global $config;
global $database;
$rows = $database->get_all("
SELECT
users.id as user_id, users.name as user_name, users.email as user_email,
comments.comment as comment, comments.id as comment_id,
comments.image_id as image_id, comments.owner_ip as poster_ip,
comments.posted as posted
FROM comments
LEFT JOIN users ON comments.owner_id=users.id
WHERE users.id = :user_id
ORDER BY comments.id DESC
LIMIT :limit
", array("user_id"=>$user_id, "limit"=>$count));
$comments = array();
foreach($rows as $row) {
$comments[] = new Comment($row);
}
return $comments;
}
private function get_comments($image_id) {
global $config;
global $database;

View File

@ -114,6 +114,19 @@ class CommentListTheme extends Themelet {
}
/**
* Show comments made by a user
*/
public function display_user_comments($comments) {
global $page;
$html = "";
foreach($comments as $comment) {
$html .= $this->comment_to_html($comment, true);
}
$page->add_block(new Block("Comments", $html, "left", 70));
}
protected function comment_to_html($comment, $trim=false) {
global $user;