From 08aeba56ac6cf4dd681be519ebc992a6dbdc1bbc Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 24 Apr 2009 10:49:54 +0000
Subject: [PATCH] - client: message tweak - ops: don't import teams if using
 invitation codes

svn path=/trunk/boinc/; revision=17874
---
 checkin_notes            | 19 ++++++++++++++-----
 client/work_fetch.cpp    |  4 ++--
 doc/boinc_news.php       |  6 ++++++
 html/ops/team_import.php |  6 ++++++
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index c84e8e2e42..4f9827822d 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4134,12 +4134,12 @@ Rom    22 Apr 2009
         win_util.cpp, .h
 
 David  22 Apr 2009
-	- client: When a preemptable task wasn't preempted
-		(e.g. because it hadn't finished its time slice)
-		we were failing to mark it as scheduled.
+    - client: When a preemptable task wasn't preempted
+        (e.g. because it hadn't finished its time slice)
+        we were failing to mark it as scheduled.
 
-	client/
-		cpu_sched.cpp
+    client/
+        cpu_sched.cpp
 
 Rom    23 Apr 2009
     - WINBUILD: More project file cleanup.
@@ -4155,3 +4155,12 @@ Rom    23 Apr 2009
         stdwx.h
     win_build/
         boincmgr_curl.vcproj
+
+David  24 Apr 2009
+    - client: message tweak
+    - ops: don't import teams if using invitation codes
+
+    client/
+        work_fetch.cpp
+    html/ops/
+        team_import.php
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index 5b75e33afc..a12dfefba3 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -314,8 +314,8 @@ void RSC_WORK_FETCH::print_state(const char* name) {
 
 void WORK_FETCH::print_state() {
     msg_printf(0, MSG_INFO, "[wfd] ------- start work fetch state -------");
-    msg_printf(0, MSG_INFO, "[wfd] target work buffer: %.2f sec",
-        gstate.work_buf_total()
+    msg_printf(0, MSG_INFO, "[wfd] target work buffer: %.2f + %.2f sec",
+        gstate.work_buf_min(), gstate.work_buf_additional()
     );
     cpu_work_fetch.print_state("CPU");
     if (coproc_cuda) {
diff --git a/doc/boinc_news.php b/doc/boinc_news.php
index 055b5d3e98..22d887cb31 100644
--- a/doc/boinc_news.php
+++ b/doc/boinc_news.php
@@ -1,6 +1,12 @@
 <?
 
 $project_news = array(
+array("April 21, 2009",
+    "A <a href=http://event.twgrid.org/isgc2009/asiaathome/wiki/index.php/Main_Page>workshop on volunteer computing with BOINC</a>
+    was held in Taipei on 16-17 April.
+    Lecture outlines and slides are available online.
+    "
+),
 array("April 9, 2009",
     "BOINC 6.6 has been released to public for Windows and
     MacOS X.  Please visit the <a href=http://boinc.berkeley.edu/download.php>download</a> page and upgrade today."
diff --git a/html/ops/team_import.php b/html/ops/team_import.php
index 938b612412..f9f65150d5 100755
--- a/html/ops/team_import.php
+++ b/html/ops/team_import.php
@@ -24,6 +24,12 @@ require_once("../inc/util.inc");
 require_once("../inc/user.inc");
 require_once("../inc/team.inc");
 require_once("../inc/email.inc");
+require_once("../inc/project.inc");
+
+if(defined('INVITE_CODES')) {
+    echo "Account creation is protected by invitation codes, so not importing teams';
+    exit;
+}
 
 // set the following to 1 to print queries but not do anything