diff --git a/checkin_notes b/checkin_notes index fdc50c91ed..a4b3b02d95 100644 --- a/checkin_notes +++ b/checkin_notes @@ -1202,7 +1202,7 @@ David 26 Feb 2011 validator.cpp Makefile.am -David 26 Feb 2011 +David 28 Feb 2011 - user web: add a feature allowing project admins to control whether news items are exported as notices. The creator of a news item is shown a "Don't export" or "Export" @@ -1218,3 +1218,12 @@ David 26 Feb 2011 forum_thread.php notices.php forum_thread_status.php + +David 28 Feb 2011 + - user web: bug fix to the last checkin + - boinccmd: fix --get_project_config operation + + html/user; + forum_thread_status.php + client/ + boinc_cmd.cpp diff --git a/client/boinc_cmd.cpp b/client/boinc_cmd.cpp index 38bc13165a..20514b6e0e 100644 --- a/client/boinc_cmd.cpp +++ b/client/boinc_cmd.cpp @@ -67,7 +67,6 @@ Commands:\n\ --get_messages [ seqno ] show messages > seqno\n\ --get_notices [ seqno ] show notices > seqno\n\ --get_project_config URL\n\ - --get_project_config_poll\n\ --get_project_status show status of all attached projects\n\ --get_proxy_settings\n\ --get_simple_gui_info show status of projects and active tasks\n\ @@ -472,13 +471,23 @@ int main(int argc, char** argv) { } else if (!strcmp(cmd, "--get_project_config")) { char* gpc_url = next_arg(argc, argv,i); retval = rpc.get_project_config(string(gpc_url)); - } else if (!strcmp(cmd, "--get_project_config_poll")) { - PROJECT_CONFIG pc; - retval = rpc.get_project_config_poll(pc); - if (retval) { - printf("retval: %d\n", retval); - } else { - pc.print(); + if (!retval) { + while (1) { + PROJECT_CONFIG pc; + retval = rpc.get_project_config_poll(pc); + if (retval) { + printf("poll status: %s\n", boincerror(retval)); + } else { + if (pc.error_num) { + printf("poll status: %s\n", boincerror(pc.error_num)); + if (pc.error_num != ERR_IN_PROGRESS) break; + boinc_sleep(1); + } else { + pc.print(); + break; + } + } + } } } else if (!strcmp(cmd, "--lookup_account")) { ACCOUNT_IN lai; diff --git a/html/user/forum_thread_status.php b/html/user/forum_thread_status.php index 6b95b84892..7b69a5700b 100644 --- a/html/user/forum_thread_status.php +++ b/html/user/forum_thread_status.php @@ -33,18 +33,23 @@ $logged_in_user = get_logged_in_user(); $owner = BoincUser::lookup_id($thread->owner); if ($logged_in_user->id == $owner->id){ - $ret = $thread->update("status=".THREAD_SOLVED); + $action = get_str("action"); + if ($action == "set") { + $ret = $thread->update("status=1"); + } else { + $ret = $thread->update("status=0"); + } if (!$ret){ error_page("Could not update the status of the thread: ".$thread->id); } } else { - error_page("You must be the owner of the thread to do this"); + error_page("You must be the creator of the thread to update its status"); } // -------------- -page_head("Status of the thread"); -echo "
The status has been updated. Thank you!
"; +page_head("Thread status updated"); +echo "The status has been updated.
"; echo ""; page_tail(); ?>