From be1c8ff44f45e127369f26fdfdf0fd620eeada0d Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 12 Jul 2006 23:18:57 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=10641 --- checkin_notes | 6 ++++ client/Makefile.linux | 66 +++++++++++++++++++++++++++++++++++++++++ client/check_security.C | 2 ++ db/boinc_db.C | 4 +-- db/boinc_db.h | 1 - doc/email_lists.php | 2 ++ doc/poll.inc | 6 ++-- doc/poll.php | 6 ++++ doc/poll_data.inc | 21 +++++++------ 9 files changed, 98 insertions(+), 16 deletions(-) create mode 100644 client/Makefile.linux diff --git a/checkin_notes b/checkin_notes index 0da4030a45..784b6f3017 100755 --- a/checkin_notes +++ b/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) diff --git a/client/Makefile.linux b/client/Makefile.linux new file mode 100644 index 0000000000..fd8a7e87e7 --- /dev/null +++ b/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 diff --git a/client/check_security.C b/client/check_security.C index 925e3e4aac..4889422873 100644 --- a/client/check_security.C +++ b/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); diff --git a/db/boinc_db.C b/db/boinc_db.C index 90905eda07..9b8e817493 100644 --- a/db/boinc_db.C +++ b/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 " diff --git a/db/boinc_db.h b/db/boinc_db.h index 225bfe0b1a..dc872b7763 100755 --- a/db/boinc_db.h +++ b/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&); diff --git a/doc/email_lists.php b/doc/email_lists.php index 3e93edcacb..c2ba8c320f 100644 --- a/doc/email_lists.php +++ b/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.

diff --git a/doc/poll.inc b/doc/poll.inc index b221ce02ea..6e7ffb1c49 100644 --- a/doc/poll.inc +++ b/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\n"; } else { $options = $choice["options"]; foreach ($options as $name=>$text) { - $val = $x[$name]; + $val = urlencode($x[$name]); $xml .= "<$name>$val\n"; } $other_name = $choice['other_name']; - $text = $x[$other_name]; + $text = urlencode($x[$other_name]); $xml .= "<$other_name>$text\n"; } return $xml; diff --git a/doc/poll.php b/doc/poll.php index a4294365f8..300354dc79 100644 --- a/doc/poll.php +++ b/doc/poll.php @@ -19,6 +19,12 @@ participation and achieve greater scientific results.

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. +

+The current results of the survey are +here. "; echo "

\n"; diff --git a/doc/poll_data.inc b/doc/poll_data.inc index 598cc1f779..071974a757 100644 --- a/doc/poll_data.inc +++ b/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]."\n"; - $xml .= "<$improved>".$x[$improved]."\n"; + $xml .= "<$country>".urlencode($x[$country])."\n"; + $xml .= "<$improved>".urlencode($x[$improved])."\n"; return $xml; }