diff --git a/checkin_notes b/checkin_notes index 6445fc23eb..b7bfc2c7e8 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3934,4 +3934,12 @@ Rom 18 May 2012 clientgui/res/ openclicon.xpm (deleted) multicore.xpm (deleted) - \ No newline at end of file + +David 18 May 2012 + - client: show option in log, + and give warning if include this while in sandbox mode + - web: update URLs for BOINCstats + html/inc/ + stats_sites.inc + client/ + log_flags.cpp diff --git a/client/log_flags.cpp b/client/log_flags.cpp index ceab783f05..fbf195bae4 100644 --- a/client/log_flags.cpp +++ b/client/log_flags.cpp @@ -42,6 +42,7 @@ #include "file_names.h" #include "project.h" #include "result.h" +#include "sandbox.h" using std::string; @@ -213,19 +214,32 @@ void CONFIG::show() { FILE* f = fopen(REMOTEHOST_FILE_NAME, "r"); if (f) { msg_printf(NULL, MSG_INFO, - "Config: GUI RPC allowed from:" + "Config: GUI RPCs allowed from:" ); char buf[256]; while (fgets(buf, 256, f)) { strip_whitespace(buf); if (!(buf[0] =='#' || buf[0] == ';') && strlen(buf) > 0 ) { msg_printf(NULL, MSG_INFO, - "Config: %s", buf + " %s", buf ); } } fclose(f); } + if (vbox_window) { + msg_printf(NULL, MSG_INFO, + "Config: open console window for VirtualBox applications" + ); + if (g_use_sandbox) { + msg_printf(NULL, MSG_INFO, + " NOTE: the client is running in protected mode," + ); + msg_printf(NULL, MSG_INFO, + " so VirtualBox console windows cannot be opened." + ); + } + } } // This is used by the BOINC client. diff --git a/html/inc/stats_sites.inc b/html/inc/stats_sites.inc index e85eb43e66..99506700f0 100644 --- a/html/inc/stats_sites.inc +++ b/html/inc/stats_sites.inc @@ -26,7 +26,7 @@ $cpid_stats_sites = array( "http://www.allprojectstats.com/showuser.php?id=%s" ), array("BOINCstats", - "http://www.boincstats.com/stats/boinc_user_graph.php?pr=bo&id=%s" + "http://www.boincstats.com/en/stats/-1/user/detail/%s" ), array("BOINC Statistics for the WORLD!", "http://www.boincsynergy.com/stats/boinc-individual.php?cpid=%s" @@ -151,14 +151,14 @@ $sig_sites = array( ), ); -// the following sites generate cross-project team stats based on name +// the following sites generate cross-project team stats based on CPID // $team_name_sites = array( array("http://stats.free-dc.org/stats.php?page=teambycpid&team=", "Free-DC", "" ), - array("http://boincstats.com/stats/boinc_team_graph.php?pr=bo&teamcpid=", + array("http://boincstats.com/en/stats/-1/team/detail/", "BOINCstats.com", "hashlc" ), @@ -170,7 +170,7 @@ $team_name_sites = array( $host_sites = array( array( - "http://boincstats.com/stats/boinc_host_graph.php?pr=bo&id=", + "http://boincstats.com/en/stats/-1/detail/", "BOINCstats.com", "boincstats_icon.png" ),