diff --git a/checkin_notes b/checkin_notes index 9fd2f2f53a..576b744f75 100755 --- a/checkin_notes +++ b/checkin_notes @@ -6704,3 +6704,24 @@ Karl 2003/10/11 sched/ Makefile.am + +David Oct 12 2003 + - add "Confirm before accept executable" flag to global prefs + - Implement said flag in cmdline client: + - add "approval_pending" flag to FILE_INFO + - don't count a file as present if it has approval pending + - set approval pending flag on new exec files if + "confirm_executable" is set in global prefs + + TODO: implement in Win GUI; IMPORTANT!! + + client/ + client_state.C,h + client_types.C,h + cs_apps.C + cs_files.C + main.C + prefs_file_xfer.C + html_user/ + prefs.inc + white.css diff --git a/html/user/prefs.inc b/html/user/prefs.inc index 4b94a673a4..3aead7e655 100644 --- a/html/user/prefs.inc +++ b/html/user/prefs.inc @@ -152,6 +152,9 @@ function element_end_global($parser, $name) { case "hangup_if_dialed": $parse_result->hangup_if_dialed = true; break; + case "confirm_executable": + $parse_result->confirm_executable = true; + break; case "work_buf_min_days": $parse_result->work_buf_min_days = $text; break; @@ -205,6 +208,7 @@ function default_prefs_global() { $p->end_hour = 0; $p->confirm_before_connecting = false; $p->hangup_if_dialed = true; + $p->confirm_executable = false; $p->work_buf_min_days = 1; $p->work_buf_max_days = 3; $p->max_cpus = 2; @@ -232,6 +236,7 @@ function initialize_prefs_before_parsing_global() { $p->run_if_user_active = false; $p->confirm_before_connecting = false; $p->hangup_if_dialed = false; + $p->confirm_executable = false; return $p; } @@ -285,8 +290,8 @@ function hour_select($x, $name) { // display preference subsets // function prefs_show_global($prefs) { - row2("Work if computer on batteries?", $prefs->run_on_batteries?"Yes":"No"); - row2("Work if computer in use?", $prefs->run_if_user_active?"Yes":"No"); + row2("Do work if running on batteries?", $prefs->run_on_batteries?"Yes":"No"); + row2("Do work if computer in use?", $prefs->run_if_user_active?"Yes":"No"); if (!$prefs->run_if_user_active) { row2("Idle time before running", "$prefs->idle_time_to_run minutes"); } @@ -299,7 +304,8 @@ function prefs_show_global($prefs) { } row2("Use my computer only between", $x); row2("Confirm before connecting to network?", $prefs->confirm_before_connecting?"Yes":"No"); - row2("Disconnect when connection complete?", $prefs->hangup_if_dialed?"Yes":"No"); + row2("Disconnect when done?", $prefs->hangup_if_dialed?"Yes":"No"); + row2("Confirm before accepting executable?", $prefs->confirm_executable?"Yes":"No"); row2("Amount of work to buffer:", "$prefs->work_buf_min_days to $prefs->work_buf_max_days days"); row2("On multiprocessors, use at most", "$prefs->max_cpus processors"); row2("Write to disk at most every", "$prefs->disk_interval seconds"); @@ -315,7 +321,7 @@ function prefs_show_global($prefs) { function prefs_show_resource($prefs) { row2( "Resource share
- If you participate in multiple BOINC projects, this is the proportion of your resources used by ".PROJECT."", + If you participate in multiple BOINC projects, this is the proportion of your resources used by ".PROJECT."", $prefs->resource_share ); } @@ -371,7 +377,7 @@ function print_prefs_display_project($user) { function print_prefs_display_global($user) { $global_prefs = prefs_parse_global($user->global_prefs); - echo "General preferences
These apply to all BOINC projects in which you participate

"; + echo "General preferences
These apply to all BOINC projects in which you participate

"; start_table(); if ($global_prefs->home || $global_prefs->work || $global_prefs->school) { @@ -397,8 +403,8 @@ function print_prefs_display($user) { // Functions to display preference subsets as forms // function prefs_form_global($user, $prefs) { - $x = "Should ".PROJECT." run while the computer is on battery power? -
(This matters only for portable computers) + $x = "Do work while the computer is on battery power? +
(matters only for portable computers) "; $y = "Yes run_on_batteries?"checked":"") @@ -408,7 +414,7 @@ function prefs_form_global($user, $prefs) { "; row2($x, $y); - $x = "Should ".PROJECT." run while you're using the computer?"; + $x = "Do work while you're using the computer?"; $y = "Yes run_if_user_active?"checked":"") ."> No start_hour, "start_hour")."and".hour_select($prefs->end_hour, "end_hour"); row2($x, $y); - $x = "Should ".PROJECT." ask you before connecting to Internet? -
(This matters only if you use a modem) + $x = "Confirm before connecting to Internet? +
(matters only if you use a modem) "; $y = "Yes confirm_before_connecting?"checked":"") @@ -438,8 +444,8 @@ function prefs_form_global($user, $prefs) { "; row2($x, $y); - $x = "Should ".PROJECT." disconnect when done if it connected? -
(This matters only if you use a modem) + $x = "Disconnect when done? +
(matters only if you use a modem) "; $y = "Yes hangup_if_dialed?"checked":"") @@ -449,6 +455,17 @@ function prefs_form_global($user, $prefs) { "; row2($x, $y); + $x = "Confirm before accepting executable file? +
(currently implemented only on Unix/Linux) + "; + $y = "Yes confirm_executable?"checked":"") + ."> No confirm_executable?"":"checked") + ."> + "; + row2($x, $y); + $x = "Keep enough to work on disk to last between"; $y = " and @@ -506,7 +523,7 @@ function prefs_form_privacy($user) { function prefs_form_resource($prefs) { row2( "Resource share: -
The proportion of your computer's resources +
The proportion of your computer's resources (processing time and disk space) allocated to ".PROJECT." relative to the other BOINC projects in which you participate. @@ -560,6 +577,7 @@ function prefs_global_parse_form(&$prefs) { $idle_time_to_run = $_GET["idle_time_to_run"]; $confirm_before_connecting = $_GET["confirm_before_connecting"]; $hangup_if_dialed = $_GET["hangup_if_dialed"]; + $confirm_executable = $_GET["confirm_executable"]; $work_buf_min_days = $_GET["work_buf_min_days"]; $work_buf_max_days = $_GET["work_buf_max_days"]; $max_cpus = $_GET["max_cpus"]; @@ -577,6 +595,7 @@ function prefs_global_parse_form(&$prefs) { $prefs->end_hour = $_GET["end_hour"]; $prefs->confirm_before_connecting = ($confirm_before_connecting == "yes"); $prefs->hangup_if_dialed = ($hangup_if_dialed == "yes"); + $prefs->confirm_eecutable = ($confirm_eecutable == "yes"); if ($work_buf_min_days<0) $work_buf_min_days = 0; if ($work_buf_max_days<0) $work_buf_max_days = 0; @@ -642,6 +661,9 @@ function global_prefs_make_xml($prefs, $primary=true) { if ($prefs->hangup_if_dialed) { $xml = $xml."\n"; } + if ($prefs->confirm_executable) { + $xml = $xml."\n"; + } $xml = $xml ."$prefs->work_buf_min_days\n" ."$prefs->work_buf_max_days\n" diff --git a/html/user/white.css b/html/user/white.css index 1b6e3e883c..75f1ad10e3 100644 --- a/html/user/white.css +++ b/html/user/white.css @@ -21,7 +21,7 @@ body { } table { - border: 0px; + border: 0px; } table.bordered {