- user web: clear team founder change if requester left team

- user web: check for deleted thread in subcription list
- user web: fix founder change link

svn path=/trunk/boinc/; revision=15070
This commit is contained in:
David Anderson 2008-04-21 14:04:01 +00:00
parent f1b6234b07
commit f66ec3932b
6 changed files with 21 additions and 3 deletions

View File

@ -3312,3 +3312,17 @@ Rom April 17 2008
SkinManager.cpp
lib/
common_defs.h
David April 21 2008
- user web: clear team founder change if requester left team
- user web: check for deleted thread in subcription list
- user web: fix founder change link
html/
inc/
team.inc
user.inc
user/
forum_index.php
team_change_founder_form.php
view_profile.php

View File

@ -96,7 +96,7 @@ function display_team_page($team, $user) {
if ($team->ping_user) {
$deadline = date_str(transfer_ok_time($team));
row2("Foundership change requested",
"<a href=team_change_founder_form.php?teamid=1>Respond by $deadline</a>"
"<a href=team_change_founder_form.php?teamid=$team->id>Respond by $deadline</a>"
);
}
} else {

View File

@ -315,7 +315,6 @@ function community_links($user) {
if ($tot) {
row2("Message boards", "<a href=\"".URL_BASE."forum_user_posts.php?userid=$user->id\">$tot posts</a>");
}
if ($g_logged_in_user && $g_logged_in_user->id != $user->id) {
row2("Contact", "<a href=\"pm.php?action=new&userid=".$user->id."\">Send private message</a>");
$friend = BoincFriend::lookup($g_logged_in_user->id, $user->id);

View File

@ -102,6 +102,10 @@ if ($user) {
show_thread_and_context_header();
foreach ($subs as $sub) {
$thread = BoincThread::lookup_id($sub->threadid);
if (!$thread) {
BoincSubscription::delete($user->id, $sub->threadid);
continue;
}
if ($thread->hidden) continue;
show_thread_and_context($thread, $user);
}

View File

@ -25,6 +25,7 @@ if ($team->ping_user != 0) {
echo "<p>Team member ".user_links($ping_user)." requested this
team's foundership on $x, but left the team, thus canceling the request.
";
$team->update("ping_user=0, ping_time=0");
} else {
$ping_user = BoincUser::lookup_id($team->ping_user);
$x = date_str(transfer_ok_time($team));

View File

@ -10,7 +10,7 @@ if (!$user) {
$logged_in_user = get_logged_in_user(false);
$caching = false;
if (!$logged_in_user || ($userid != $logged_in_user->id)) {
if (!$logged_in_user) {
$caching = true;
$cache_args = "userid=$userid";
start_cache(USER_PROFILE_TTL,$cache_args);