*** empty log message ***

svn path=/trunk/boinc/; revision=10641

checkin_notes

@@ -7503,3 +7503,9 @@ David  12 July 2006
     client/
         client_types.C
         gui_rpc_server_ops.C
+
+David  12 July 2006
+    - added a linux makefile for core client
+
+    client/
+        Makefile.linux (new)

client/Makefile.linux

@@ -0,0 +1,66 @@
+CC = g++ -g -I ../ -I ../lib/
+
+PROGS = boinc_client
+
+all: $(PROGS)
+
+clean:
+	rm $(PROGS)
+
+OBJ = \
+    acct_mgr.o \
+    acct_setup.o \
+    app.o \
+    app_control.o \
+    app_graphics.o \
+    app_start.o \
+    check_state.o \
+    client_msgs.o \
+    client_state.o \
+    client_types.o \
+    cpu_sched.o \
+    cs_account.o \
+    cs_apps.o \
+    cs_benchmark.o \
+    cs_cmdline.o \
+    cs_data.o \
+    cs_files.o \
+    cs_prefs.o \
+    cs_scheduler.o \
+    cs_statefile.o \
+    cs_trickle.o \
+    dhrystone.o \
+    dhrystone2.o \
+    file_names.o \
+    file_xfer.o \
+    gui_http.o \
+    gui_rpc_server.o \
+    gui_rpc_server_ops.o \
+    hostinfo_network.o \
+    hostinfo_unix.o \
+    http_curl.o \
+    log_flags.o \
+    main.o \
+    net_stats.o \
+    pers_file_xfer.o \
+    scheduler_op.o \
+    ss_logic.o \
+    time_stats.o  \
+    whetstone.o
+
+LIBS = -L ../lib \
+    -lboinc \
+    -lpthread \
+    -lssl \
+    -L /usr/local/lib/ -lcurl
+
+.C.o:
+	$(CC) -c -o $*.o $<
+
+boinc_client: $(OBJ)
+	$(CC) $(OBJ) $(LIBS) -o boinc_client
+
+dependencies: *.C
+	$(CC) -M *.C > dependencies
+
+include dependencies

client/check_security.C

@@ -30,7 +30,9 @@
 #include "util.h"
 #include "error_numbers.h"
 #include "file_names.h"
+#ifdef SANDBOX
 #include "SetupSecurity.h"
+#endif
 
 static int CheckNestedDirectories(char * basepath, int depth);
 

db/boinc_db.C

@@ -872,7 +872,6 @@ void TRANSITIONER_ITEM::parse(MYSQL_ROW& r) {
     res_file_delete_state = safe_atoi(r[i++]);
     res_sent_time = safe_atoi(r[i++]);
     res_hostid = safe_atoi(r[i++]);
-    res_received_time = safe_atoi(r[i++]);
 }
 
 int DB_TRANSITIONER_ITEM_SET::enumerate(
@@ -927,8 +926,7 @@ int DB_TRANSITIONER_ITEM_SET::enumerate(
             "   res.validate_state, "
             "   res.file_delete_state, "
             "   res.sent_time, "
-            "   res.hostid, "
-            "   res.received_time "
+            "   res.hostid "
             "FROM "
             "   workunit AS wu "
             "       LEFT JOIN result AS res ON wu.id = res.workunitid "

db/boinc_db.h

@@ -497,7 +497,6 @@ struct TRANSITIONER_ITEM {
     int res_file_delete_state;
     int res_sent_time;
     int res_hostid;
-    int res_received_time;
 
     void clear();
     void parse(MYSQL_ROW&);

doc/email_lists.php

@@ -10,6 +10,8 @@ The follow email lists are available.
 Click to subscribe or post to a list.
 Because of spam problems,
 you must subscribe to a list in order to post to it.
+Make sure you post from the same email address
+under which you subscribed.
 
 <p>
 <b><font size=+1 color=#f00000>

doc/poll.inc

@@ -153,16 +153,16 @@ function gen_xml_choice($x, $choice) {
     $xml = "";
     $radio_name= $choice["radio_name"];
     if ($radio_name) {
-        $val = $x[$radio_name];
+        $val = urlencode($x[$radio_name]);
         $xml .= "<$radio_name>$val</$radio_name>\n";
     } else {
         $options = $choice["options"];
         foreach ($options as $name=>$text) {
-            $val = $x[$name];
+            $val = urlencode($x[$name]);
             $xml .= "<$name>$val</$name>\n";
         }
         $other_name = $choice['other_name'];
-        $text = $x[$other_name];
+        $text = urlencode($x[$other_name]);
         $xml .= "<$other_name>$text</$other_name>\n";
     }
     return $xml;

doc/poll.php

@@ -19,6 +19,12 @@ participation and achieve greater scientific results.
 <p>
 Please answer as many questions as you want,
 then go to the bottom and click OK.
+If you previously completed the survey but your answers have changed,
+please complete it again -
+your new answers will replace the old ones.
+<p>
+The current results of the survey are
+<a href=poll_results.php>here</a>.
 ";
 
 echo "<form name=blah action=poll_action.php>\n";

doc/poll_data.inc

@@ -11,7 +11,9 @@ $lother_text = "lother_text";
 $fother_text = "fother_text";
 $wother_text = "wother_text";
 $nother_text = "nother_text";
-$improved = "improved";
+$cother_text = "cother_text";
+$vother_text = "vother_text";
+$improved = "improved_text";
 
 $choice0 = array(
     "text" => "Yes - I've been running BOINC on my computer for...",
@@ -87,23 +89,24 @@ $factors = array(
 
 $comp_items = array(
     array(
-        "radio_name"=>"kind",
-        "text"=>"What kind of computer do you have?",
+        "text"=>"What kind of computers do you have?",
         "options" => array(
             "windows"=>"Windows",
             "mac"=>"Macintosh",
             "linux"=>"Linux",
-            "other_unix"=>"Other Unix",
         ),
+        "radio_name"=>false,
+        "other_name"=>"cother_text",
     ),
     array(
-        "radio_name"=>"venue",
-        "text"=>"Where is your computer?",
+        "text"=>"Where are your computers?",
         "options" => array(
             "home"=>"Home",
             "work"=>"Work",
             "school"=>"School",
         ),
+        "radio_name"=>false,
+        "other_name"=>"vother_text",
     ),
     array(
         "radio_name"=>"ncomputers",
@@ -117,7 +120,7 @@ $comp_items = array(
     ),
     array(
         "radio_name"=>"turned_on",
-        "text"=>"On average, how many hours per day is your computer turned on?",
+        "text"=>"On average, how many hours per day are your computers turned on?",
         "options" => array(
             "t08"=>"0-8",
             "t823"=>"8-23",
@@ -205,8 +208,8 @@ function generate_xml($x) {
     $xml .= gen_xml_choice($x, $where_item);
     $xml .= gen_xml_choices($x, $comp_items);
     $xml .= gen_xml_choices($x, $you_items);
-    $xml .= "<$country>".$x[$country]."</$country>\n";
-    $xml .= "<$improved>".$x[$improved]."</$improved>\n";
+    $xml .= "<$country>".urlencode($x[$country])."</$country>\n";
+    $xml .= "<$improved>".urlencode($x[$improved])."</$improved>\n";
     return $xml;
 }