From 149b2c67945a7d63b9940951cef5ceb64884963f Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 26 Nov 2008 03:28:48 +0000
Subject: [PATCH] - server: if "terms_of_use.txt" exists in project dir,    
 send it in get_project_config.php;     6.4 clients will display a dialog to
 accept terms of use during attach.

svn path=/trunk/boinc/; revision=16563
---
 checkin_notes                    | 8 ++++++++
 doc/poll_results.php             | 4 ++--
 html/inc/bossa_example4.inc      | 2 +-
 html/user/get_project_config.php | 5 +++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 927d28a3af..e06754dce4 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -9641,3 +9641,11 @@ Rom    25 Nov 2008
     
     clientgui/
         TermsOfUsePage.cpp,
+
+David  25 Nov 2008
+    - server: if "terms_of_use.txt" exists in project dir,
+        send it in get_project_config.php;
+        6.4 clients will display a dialog to accept terms of use during attach.
+
+    html/user/
+        get_project_config.php
diff --git a/doc/poll_results.php b/doc/poll_results.php
index 2c19795c3e..5494949cb1 100644
--- a/doc/poll_results.php
+++ b/doc/poll_results.php
@@ -9,10 +9,10 @@ $cachefile = "cache/poll_results_$language_in_use.html";
 $cache_time = 3600*24;
 if (file_exists($cachefile)) {
     $age = time() - filemtime($cachefile);
-    if ($age < $cache_time) {
+    //if ($age < $cache_time) {
         readfile($cachefile);
         exit();
-    }
+    //}
 }
 set_time_limit(0);
 ini_set("memory_limit", "2048M");
diff --git a/html/inc/bossa_example4.inc b/html/inc/bossa_example4.inc
index 03bc70a0a0..16bc012d18 100644
--- a/html/inc/bossa_example4.inc
+++ b/html/inc/bossa_example4.inc
@@ -165,7 +165,7 @@ function control_bar($features, $inst) {
         $str2 = "a";
     }
     echo "
-        <div style=\"position:fixed; top:0px; left:0px; padding-top: 10px; padding-left: 20px; width:100%; background-color:white\">
+        <div style=\"position:absolute; top:0px; left:0px; padding-top: 10px; padding-left: 20px; width:100%; background-color:white\">
         <input type=hidden name=bji value=\"$inst->id\">
         If you see $str2 feature:
     ";
diff --git a/html/user/get_project_config.php b/html/user/get_project_config.php
index e3af2e5642..4194e1861d 100644
--- a/html/user/get_project_config.php
+++ b/html/user/get_project_config.php
@@ -92,6 +92,11 @@ if (sched_stopped()) {
 
 show_platforms();
 
+$terms_of_use = trim(file_get_contents("../../terms_of_use.txt"));
+if ($terms_of_use) {
+    echo "<terms_of_use>\n$terms_of_use\n</terms_of_use>\n";
+}
+
 echo "
 </project_config>
 ";