diff --git a/html/inc/forum.inc b/html/inc/forum.inc index 3821b5d995..d40aeeb0cf 100644 --- a/html/inc/forum.inc +++ b/html/inc/forum.inc @@ -26,6 +26,8 @@ define('NEW_IMAGE', 'unread_post.png'); define('NEW_IMAGE_HEIGHT','15'); define('EMPHASIZE_IMAGE', 'emphasized_post.png'); define('EMPHASIZE_IMAGE_HEIGHT','15'); +define('FILTER_IMAGE', 'filtered_post.png'); +define('FILTER_IMAGE_HEIGHT','15'); define ('SOLUTION', 'This answered my question'); define ('SUFFERER', 'I also have this question'); @@ -481,13 +483,13 @@ function show_post($post, $thread, $logged_in_user, $n, $controls=FORUM_CONTROLS if ($user->create_time>time()-ST_NEW_TIME) $fstatus=ST_NEW; /*...*/ } - if ($fstatus) echo "
$fstatus"; + if ($fstatus) echo "
$fstatus"; if (!$filter || !$rated_below_threshold){ - echo "

"; + echo "

"; if ($user->has_avatar and $logged_in_user->hide_avatars!=1) echo "avatar."\" alt=\"Avatar\">
"; - echo "Joined: ", gmdate('M j, Y', $user->create_time), "
Posts: ", $user->posts, "

"; + echo "Joined: ", gmdate('M j, Y', $user->create_time), "
Posts: ", $user->posts, "

"; } echo " @@ -499,9 +501,9 @@ function show_post($post, $thread, $logged_in_user, $n, $controls=FORUM_CONTROLS } echo " - +
- \n"; + echo "\n\n"; if ($controls == FORUM_CONTROLS) { - //echo ""; + //no special controls in forum } else if ($controls == HELPDESK_CONTROLS && $separate) { echo "
"; + "; //cellborder=0 deleted - what did it do? if ($post->timestamp>$logged_in_user->thread_last_visited){ echo "\"Unread"; @@ -514,19 +516,17 @@ function show_post($post, $thread, $logged_in_user, $n, $controls=FORUM_CONTROLS Posted: ", pretty_time_str($post->timestamp); ; - if ($post->parent_post) echo " - in response to parent_post>Message ID $post->parent_post."; - if ($can_edit && $controls != NO_CONTROLS) echo " id>[Edit this post]"; + if ($post->parent_post) echo " - in response to parent_post\">Message ID $post->parent_post."; + if ($can_edit && $controls != NO_CONTROLS) echo " id\">[Edit this post]"; if ($post->modified) echo "
Last modified: ", pretty_time_Str($post->modified); if ($rated_below_threshold && $filter){ - echo "
This post has been filtered (rating: ".($post->score * $post->votes)."), press id."&filter=false#".$post->id."\">here to view this thread without filtering"; + echo "
This post has been filtered (rating: ".($post->score * $post->votes)."), press id."&filter=false#".$post->id."\">here to view this thread without filtering"; } - echo "

\n		Rate this post:"; - //show_select_from_array("rating", $post_ratings, "0"); // <---- Old obsolete rating method (remove someday) - //echo " @@ -561,21 +561,21 @@ function show_post($post, $thread, $logged_in_user, $n, $controls=FORUM_CONTROLS $posttext=externalize_links($posttext); } echo "

", $posttext, "

"; - echo " + echo "
- "; + echo ""; } else if ($controls == HELPDESK_CONTROLS && !$separate) { - echo " / Score: ", ($post->score * $post->votes), ""; + echo " / Score: ", ($post->score * $post->votes), ""; } else { - echo " / Rating: ", ($post->score * $post->votes), " - rate: id."&choice=p\">+ / id."&choice=n\">-"; + echo " / Rating: ", ($post->score * $post->votes), " - rate: id."&choice=p\">+ / id."&choice=n\">-"; } if ($controls == FORUM_CONTROLS) { - echo ""; + echo ""; } else if ($controls == HELPDESK_CONTROLS && !$separate) { - echo ""; + echo ""; } echo "
ID: ", $post->id; + ID: ", $post->id; if ($controls == HELPDESK_CONTROLS && $separate) { - echo "[id . "&post=" . $post->id . "#input\">Reply to this post][id . "&post=" . $post->id . "#input\">Reply to this post][id . "&post=" . $post->id . "&helpdesk=1#input\">Reply to this answer][id . "&post=" . $post->id . "&helpdesk=1#input\">Reply to this answer]
"; } @@ -630,7 +630,7 @@ function image_as_link($text){ function start_forum_table($headings, $span=NULL) { echo "

- +
"; @@ -646,7 +646,7 @@ function start_forum_table($headings, $span=NULL) { } function end_forum_table() { - echo "

\n"; + echo "
\n"; } // generate a "select" element from an array of values @@ -681,20 +681,20 @@ function show_forum_title($forum=NULL, $thread=NULL, $helpdesk=false) { } else if ($forum && !$thread) { echo ""; if ($helpdesk) { - echo "", " Questions and problems : "; + echo "", " Questions and problems : "; } else { - echo "", " Message boards : "; + echo "", " Message boards : "; } echo $forum->title; echo "
"; } else if ($forum && $thread) { echo ""; if ($helpdesk) { - echo "", " Questions and problems : "; + echo "", " Questions and problems : "; } else { - echo "", " Message boards : "; + echo "", " Message boards : "; } - echo "id>", $forum->title, " : "; + echo "id\">", $forum->title, " : "; echo strip_tags(stripslashes($thread->title)); echo "
"; } else { @@ -717,18 +717,18 @@ function show_thread($thread, $n) { $last = time_diff_str($thread->timestamp, time()); $m = $n%2; echo " - - + + $n) Posted $posted
Last response $last - $where : $category->name : - id>$forum->title : - id>$title + $where : $category->name : + id\">$forum->title : + id\">$title
- $excerpt + $excerpt "; @@ -750,9 +750,9 @@ function show_post2($post, $n) { echo " - $n) $where : $category->name : - id>$forum->title : - id>$title + $n) $where : $category->name : + id\">$forum->title : + id\">$title
Posted $when by $user->name
@@ -768,7 +768,7 @@ function show_forum_summary($forum) { - id>", $forum->title, + id\">", $forum->title, "
", $forum->description, "