From c695c0f1e6aea662558743f1ed202727ed496c11 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 6 Mar 2007 18:22:04 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=12193
---
 checkin_notes                   | 10 ++++++
 doc/boinc_news.php              |  6 ++++
 html/inc/prefs.inc              | 16 +++++----
 html/user/host_venue_action.php | 61 +++++++++++++++++----------------
 4 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 8dcc05787d..9d24d1b8ac 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -2204,3 +2204,13 @@ Rom    6 Mar 2007
     lib/
         gui_rpc_client.h
         gui_rpc_client_ops.C
+
+David  6 Mar 2007
+    - User web: add "none" as an option for default host venue;
+        display this as "---" or "--- (none)"
+
+    html/
+        inc/
+            prefs.inc
+        user/
+            host_venue_action.php
diff --git a/doc/boinc_news.php b/doc/boinc_news.php
index b0952a7131..008f4c589e 100644
--- a/doc/boinc_news.php
+++ b/doc/boinc_news.php
@@ -1,6 +1,12 @@
 <?
 
 $project_news = array(
+array("March 6, 2007",
+    "The article <a href=http://www.linux-magazine.com/issue/71/Distributed_Applications_With_BOINC.pdf>Idle Cycles - building distributed applications with BOINC</a> Seil appears in the Oct 2006 issue of
+<a href=http://www.linux-magazine.com/issue/71>Linux Magazine</a>.
+In it, author Marc Seil
+provides a detailed description of how to set up a BOINC project."
+),
 array("March 1, 2007",
     "With <a href=http://boincpe.schreiter.info/>BOINCpe</a>
     you can run a dedicated BOINC machine using a RAM disk,
diff --git a/html/inc/prefs.inc b/html/inc/prefs.inc
index 65b54ba564..eccfd0063f 100644
--- a/html/inc/prefs.inc
+++ b/html/inc/prefs.inc
@@ -1128,16 +1128,20 @@ function prefs_form_project($prefs_xml, $error=false) {
 }
 
 function venue_show($user) {
-    row2("Default computer location", $user->venue);
+    $venue = $user->venue;
+    if ($venue =='') $venue = '---';
+    row2("Default computer location", $venue);
 }
 
 function venue_form($user) {
-    $h=$w=$s="";
-    if ($user->venue == "home") $h = "selected";
-    if ($user->venue == "work") $w = "selected";
-    if ($user->venue == "school") $s = "selected";
-    row2("Default computer location",
+    $n=$h=$w=$s='';
+    if ($user->venue == '') $n = 'selected';
+    if ($user->venue == 'home') $h = 'selected';
+    if ($user->venue == 'work') $w = 'selected';
+    if ($user->venue == 'school') $s = 'selected';
+    row2('Default computer location',
         "<select name=default_venue>
+        <option value=\"\" $n>---
         <option value=home $h>Home
         <option value=work $w>Work
         <option value=school $s>School
diff --git a/html/user/host_venue_action.php b/html/user/host_venue_action.php
index 1363383eaf..08d1d9d3b2 100644
--- a/html/user/host_venue_action.php
+++ b/html/user/host_venue_action.php
@@ -1,37 +1,40 @@
 <?php
-    require_once("../inc/db.inc");
-    require_once("../inc/util.inc");
 
-    db_init();
+require_once("../inc/db.inc");
+require_once("../inc/util.inc");
 
-    $user = get_logged_in_user();
+db_init();
 
-    $venue = get_venue("venue");
-    $hostid = get_int("hostid");
+$user = get_logged_in_user();
 
-    $host = lookup_host($hostid);
-    if (!$host) {
-        error_page("No such host");
-    }
-    if ($host->userid != $user->id) {
-        error_page("Not your host");
+$venue = get_venue("venue");
+$hostid = get_int("hostid");
+
+$host = lookup_host($hostid);
+if (!$host) {
+    error_page("No such host");
+}
+if ($host->userid != $user->id) {
+    error_page("Not your host");
+}
+
+$retval = mysql_query("update host set venue='$venue' where id = $hostid");
+if ($retval) {
+    page_head("Host venue updated");
+    if ($venue == '') {
+        $venue = '(none)';
     }
+    echo "
+        The venue of this host has been set to <b>$venue</b>.
+        <p>
+        This change will take effect the next time the
+        host communicates with this project.
+        <p>
+        <a href=show_host_detail.php?hostid=$hostid>Return to host page</a>.
+    ";
+    page_tail();
+} else {
+    db_error_page();
+}
 
-    $retval = mysql_query("update host set venue='$venue' where id = $hostid");
-    if ($retval) {
-        page_head("Host venue updated");
-        echo "
-            The venue of this host has been set to <b>$venue</b>.
-            <p>
-            This change will take effect the next time
-            the host requests work from the server,
-            or when you Update this project from
-            the BOINC Manager on the host.
-            <p>
-            <a href=show_host_detail.php?hostid=$hostid>Return to host page</a>.
-        ";
-        page_tail();
-    } else {
-        db_error_page();
-    }
 ?>