Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Do not show hidden threads to logged out users 

svn path=/trunk/boinc/; revision=11749
This commit is contained in:
Rytis Slatkevičius 2006-12-30 18:35:25 +00:00
parent 5f53916665
commit 6342a7e3a0
2 changed files with 81 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
checkin_notes
View File

@ -13896,3 +13896,9 @@ David 30 Dec 2006
sched/
start
Rytis 30 Dec 2006
- Forum: do not show hidden threads when the user is logged out.
html/user/
forum_thread.php

147
html/user/forum_thread.php
View File

@ -17,12 +17,23 @@ if ($filter != "false"){
$filter = false;
}
$logged_in_user = re_get_logged_in_user(false);
// Fetch the thread and increment the number of views
$thread = new Thread($threadid);
if ($thread->isHidden()) {
if ((!$logged_in_user) || (($logged_in_user) && (!$logged_in_user->isSpecialUser(S_MODERATOR)))) {
/* If the user logged in is a moderator, show him the
* thread if he goes so far as to name it by ID like this.
* Otherwise, hide the thread.
*/
error_page(tr(FORUM_THREAD_HIDDEN));
}
}
$forum = $thread->getForum();
$category = $forum->getCategory();
$logged_in_user = re_get_logged_in_user(false);
$title = cleanup_title($thread->getTitle());
if (!$sort_style) {
@ -54,19 +65,13 @@ if ($logged_in_user && $logged_in_user->hasJumpToUnread()){
$is_subscribed = $logged_in_user && $thread->isSubscribed($logged_in_user);
show_forum_title($forum, $thread);
if (($thread->isHidden()) && $logged_in_user && (!$logged_in_user->isSpecialUser(S_MODERATOR))) {
/* If the user logged in is a moderator, show him the
* thread if he goes so far as to name it by ID like this.
* Otherwise, hide the thread.
*/
error_page(tr(FORUM_THREAD_HIDDEN));
} else {
if ($thread->getType()!=0 && $thread->getStatus()==0){
$thread_owner = $thread->getOwner();
if ($logged_in_user){
if ($thread->getType()!=0 && $thread->getStatus()==0){
$thread_owner = $thread->getOwner();
if ($logged_in_user){
if ($thread_owner->getID() == $logged_in_user->getID()){
if ($thread->getPostCount()==0){} else {
// Show a "this question has been answered" to the author
if ($thread->getPostCount()!=0) {
// Show a "this question has been answered" to the author
echo "<div class=\"helpdesk_note\">
<form action=\"forum_thread_status.php\"><input type=\"hidden\" name=\"id\" value=\"".$thread->getID()."\">
<input type=\"submit\" value=\"My question was answered\">
@ -83,66 +88,64 @@ if (($thread->isHidden()) && $logged_in_user && (!$logged_in_user->isSpecialUser
</div>";
}
}
}
echo "
<form action=\"forum_thread.php\">
<input type=\"hidden\" name=\"id\" value=\"", $thread->getID(), "\">
<table width=\"100%\" cellspacing=0 cellpadding=0>
<tr>
<td align=\"left\">";
if (can_reply($thread, $logged_in_user)) {
echo $reply_text = "<a href=\"forum_reply.php?thread=".$thread->getID()."#input\">".tr(FORUM_THREAD_REPLY)."</a><br>";
}
if ($is_subscribed) {
echo tr(FORUM_THREAD_SUBSCRIBED)." ";
echo "<a href=\"forum_subscribe.php?action=unsubscribe&amp;thread=".$thread->getID()."\">".tr(FORUM_THREAD_UNSUBSCRIBE)."</a>.";
} else {
echo "<a href=\"forum_subscribe.php?action=subscribe&amp;thread=".$thread->getID()."\">".tr(FORUM_THREAD_SUBSCRIBE)."</a>";
}
//If the logged in user is moderator enable some extra features
if ($logged_in_user && $logged_in_user->isSpecialUser(S_MODERATOR)){
if ($thread->isHidden()){
echo "<br /><a href=\"forum_moderate_thread_action.php?action=unhide&amp;thread=".$thread->getID()."\">Un-Delete this thread</a>";
} else {
echo "<br /><a href=\"forum_moderate_thread.php?action=hide&amp;thread=".$thread->getID()."\">Delete this thread</a>";
}
if ($thread->isSticky()){
echo "<br /><a href=\"forum_moderate_thread_action.php?action=desticky&amp;thread=".$thread->getID()."\">De-sticky this thread</a>";
} else {
echo "<br /><a href=\"forum_moderate_thread_action.php?action=sticky&amp;thread=".$thread->getID()."\">Make this thread sticky</a>";
}
if ($thread->isLocked()) {
echo "<br /><a href=\"forum_moderate_thread_action.php?action=unlock&amp;thread=".$thread->getID()."\">Unlock thread</a>";
} else {
echo "<br /><a href=\"forum_moderate_thread_action.php?action=lock&amp;thread=".$thread->getID()."\">Lock thread</a>";
}
echo "<br /><a href=\"forum_moderate_thread.php?action=move&amp;thread=".$thread->getID()."\">Move this thread</a>";
echo "<br /><a href=\"forum_moderate_thread.php?action=title&amp;thread=".$thread->getID()."\">Edit thread title</a>";
}
// Display a box that allows the user to select sorting of the posts
echo "</td><td align=right style=\"border:0px\">";
echo "Sort ";
show_select_from_array("sort", $thread_sort_styles, $sort_style);
echo "<input type=submit value=OK>\n</td>";
echo "</tr>\n</table>\n</form>\n";
// Here is where the actual thread begins.
$headings = array(array(tr(FORUM_AUTHOR),"authorcol"), array(tr(FORUM_MESSAGE),"",2));
start_forum_table($headings, "id=\"thread\" width=100%");
show_posts($thread, $sort_style, $filter, $logged_in_user, true);
end_forum_table();
echo "<p>".$reply_text;
show_forum_title($forum, $thread);
$thread->incViews();
}
echo "
<form action=\"forum_thread.php\">
<input type=\"hidden\" name=\"id\" value=\"", $thread->getID(), "\">
<table width=\"100%\" cellspacing=0 cellpadding=0>
<tr>
<td align=\"left\">";
if (can_reply($thread, $logged_in_user)) {
echo $reply_text = "<a href=\"forum_reply.php?thread=".$thread->getID()."#input\">".tr(FORUM_THREAD_REPLY)."</a><br>";
}
if ($is_subscribed) {
echo tr(FORUM_THREAD_SUBSCRIBED)." ";
echo "<a href=\"forum_subscribe.php?action=unsubscribe&amp;thread=".$thread->getID()."\">".tr(FORUM_THREAD_UNSUBSCRIBE)."</a>.";
} else {
echo "<a href=\"forum_subscribe.php?action=subscribe&amp;thread=".$thread->getID()."\">".tr(FORUM_THREAD_SUBSCRIBE)."</a>";
}
//If the logged in user is moderator enable some extra features
if ($logged_in_user && $logged_in_user->isSpecialUser(S_MODERATOR)){
if ($thread->isHidden()){
echo "<br /><a href=\"forum_moderate_thread_action.php?action=unhide&amp;thread=".$thread->getID()."\">Un-Delete this thread</a>";
} else {
echo "<br /><a href=\"forum_moderate_thread.php?action=hide&amp;thread=".$thread->getID()."\">Delete this thread</a>";
}
if ($thread->isSticky()){
echo "<br /><a href=\"forum_moderate_thread_action.php?action=desticky&amp;thread=".$thread->getID()."\">De-sticky this thread</a>";
} else {
echo "<br /><a href=\"forum_moderate_thread_action.php?action=sticky&amp;thread=".$thread->getID()."\">Make this thread sticky</a>";
}
if ($thread->isLocked()) {
echo "<br /><a href=\"forum_moderate_thread_action.php?action=unlock&amp;thread=".$thread->getID()."\">Unlock thread</a>";
} else {
echo "<br /><a href=\"forum_moderate_thread_action.php?action=lock&amp;thread=".$thread->getID()."\">Lock thread</a>";
}
echo "<br /><a href=\"forum_moderate_thread.php?action=move&amp;thread=".$thread->getID()."\">Move this thread</a>";
echo "<br /><a href=\"forum_moderate_thread.php?action=title&amp;thread=".$thread->getID()."\">Edit thread title</a>";
}
// Display a box that allows the user to select sorting of the posts
echo "</td><td align=right style=\"border:0px\">";
echo "Sort ";
show_select_from_array("sort", $thread_sort_styles, $sort_style);
echo "<input type=submit value=OK>\n</td>";
echo "</tr>\n</table>\n</form>\n";
// Here is where the actual thread begins.
$headings = array(array(tr(FORUM_AUTHOR),"authorcol"), array(tr(FORUM_MESSAGE),"",2));
start_forum_table($headings, "id=\"thread\" width=100%");
show_posts($thread, $sort_style, $filter, $logged_in_user, true);
end_forum_table();
echo "<p>".$reply_text;
show_forum_title($forum, $thread);
$thread->incViews();
page_tail();
?>