diff --git a/html/user/beta_test_instructions.html b/html/user/beta_test_instructions.html new file mode 100644 index 0000000000..3faa92aaf3 --- /dev/null +++ b/html/user/beta_test_instructions.html @@ -0,0 +1,36 @@ +

Instructions for beta testers

+When you install and run the BOINC client, +it will ask you for a project URL and account key. + Then it should download two work units, +process them, upload the results, +and continue doing this forever. +

+ If at any point BOINC is neither computing nor transferring files, +something is probably wrong; +submit a bug report (see below). +

+Windows users: +The BOINC core client (accessable via its system tray icon) +has tabs that let you see projects, file transfers, +work in progress, and messages. +If you experience bugs, look at the file stderr.txt +in the BOINC directory. +If it's nonempty please include it in your bug report. +

+Unix and Mac OS/X users: +This version of the client has no GUI, +and writes to stderr and stdout. +Please include any suspicious-looking text in your bug reports. +

+January 23, 2003
+The stripchart diagnostic program is now available for public use. +Right now we only have 4 charts, but more will be added shortly. +For more information, read the documentation. +

+

+January 16, 2003
+BOINC 0.08 is released, which should fix some of the reported bugs. +

+Please report bugs by sending email to the boinc-beta mailing list on SourceForge.net. +To join this list, go to http://lists.sourceforge.net/lists/listinfo/boinc-beta. +"; diff --git a/html/user/change_pass_action.php b/html/user/change_pass_action.php deleted file mode 100644 index 331efdd864..0000000000 --- a/html/user/change_pass_action.php +++ /dev/null @@ -1,52 +0,0 @@ -web_password) { - if ($HTTP_POST_VARS["new_pass"] != $HTTP_POST_VARS["new_pass2"]) { - printf( - TABLE2."\n" - ."".DIFFPASS."\n" - ."" - ); - } else { - $query = sprintf("update user set web_password='%s' where id=%d", - $HTTP_POST_VARS["new_pass"], $user->id); - $result = mysql_query($query); - if ($result) { - printf( - TABLE2."\n" - ."Password changed successfully. Use your new password to\n" - ." login to your account.\n" - ."\n" - ); - } else { - printf( - TABLE2."\n" - ."Password was unable to be changed. Continue using your old \n" - ."password to login to your account. You can try \n" - ."changing your password again later.\n" - ."" - ); - } - } - } else { - printf( - TABLE2."\n" - ."".TD2.BADPASS."\n" - ."\n" - ); - } - page_tail(); -?> diff --git a/html/user/change_password.php b/html/user/change_password.php deleted file mode 100644 index 07eab32014..0000000000 --- a/html/user/change_password.php +++ /dev/null @@ -1,19 +0,0 @@ - diff --git a/html/user/edit.inc b/html/user/edit.inc deleted file mode 100644 index f64e3f73cf..0000000000 --- a/html/user/edit.inc +++ /dev/null @@ -1,92 +0,0 @@ -\n" - .TABLE2."\n" - . "".TD.LG_FONT."Old Password:\n" - ."To change your password, please enter your old password below:\n" - ."\n" - ."
\n" - ."".TD.LG_FONT."New Password:\n" - ."Next, enter your new password:\n" - ."\n" - ."Retype password to confirm:" - ."\n" - ."\n" - ."

       \n" - ."\n" - ); -} - - -function print_update_ok($e_ok) { - if ($e_ok == EMAIL_EXISTS) { - echo TABLE2."\n - There's already an account with that email address. - Click the Back button\n - in your browser to edit your information, - or login to your \n - ".$project." account.\n - Any other changes you've made, - if any, were successfully updated.\n - \n"; - } else if ($e_ok == EMAIL_FAIL) { - echo TABLE2."\n - Your email address failed to be updated. - Click the Back button\n - in your browser to edit your information, - or try again later.\n - Any other changes you've made, - if any, were successfully updated.\n - \n"; - } else if ($e_ok == EMAIL_UPDATED) { - echo TABLE2."\n - Your information was successfully updated. - A new, temporary password will be sent to the\n - email address you provided. - You must use this new password the next time you login. - \n\n"; - } else { - echo TABLE2."\n - Your information was successfully updated.\n - \n"; - } -} - -function print_update_fail($e_ok) { - if ($e_ok == EMAIL_EXISTS) { - echo TABLE2."\n - There's already an account with that email address. - Click the Back button in your browser - to edit your information, - or login to your \n - ".$project." account. \n - Any other changes you've made, if any, - failed to be updated. Please try again later.\n - \n"; - } else if ($e_ok == EMAIL_FAIL) { - echo TABLE2."\n - Your information failed to be updated. - Click the Back button\n - in your browser to edit your information, - or try again later.\n - \n"; - } else if ($e_ok == EMAIL_UPDATED) { - echo TABLE2."\n - Your email address was successfully updated. - A new, temporary password will be sent to the\n - email address you provided. - You must use this new password the next time you login.\n - Any other changes you've made, if any, - failed to be updated. Please try again later.\n - \n"; - } else { - echo TABLE2."\n - Your information failed to be updated. - Please try again later.\n - \n"; - } -} - -?> diff --git a/html/user/host.inc b/html/user/host.inc new file mode 100644 index 0000000000..c41f7f1a0d --- /dev/null +++ b/html/user/host.inc @@ -0,0 +1,117 @@ +venue == "home") $h = "selected"; + if ($host->venue == "work") $w = "selected"; + if ($host->venue == "school") $s = "selected"; + $x = "

+ id> + + +
+ "; + return $x; +} + +function show_host($host, $private) { + start_table(); + row1("Host Information"); + if ($private) { + row2("IP address", "$host->last_ip_addr
(same the last $host->nsame_ip_addr times)"); + row2("Domain name", $host->domain_name); + $x = $host->timezone/3600; + row2("Time zone", "UTC - $x hours"); + } + row2("Created", time_str($host->create_time)); + row2("Total Credit", $host->total_credit); + row2("Recent average credit", $host->expavg_credit); + row2("CPU type", "$host->p_vendor $host->p_model"); + row2("Number of CPUs", $host->p_ncpus); + row2("Operating System", "$host->os_name $host->os_version"); + $x = $host->m_nbytes/(1024*1024); + $y = round($x, 2); + row2("Memory", "$y MB"); + $x = $host->m_cache/1024; + $y = round($x, 2); + row2("Cache", "$y KB"); + + if ($private) { + $x = $host->m_swap/(1024*1024); + $y = round($x, 2); + row2("Swap space", "$y MB"); + $x = $host->d_total/(1024*1024*1024); + $y = round($x, 2); + row2("Total disk space", "$y GB"); + $x = $host->d_free/(1024*1024*1024); + $y = round($x, 2); + row2("Free Disk Space", "$y GB"); + } + $x = $host->p_fpops/(1000*1000); + $y = round($x, 2); + row2("Measured floating point speed", "$y million ops/sec"); + $x = $host->p_iops/(1000*1000); + $y = round($x, 2); + row2("Measured integer speed", "$y million ops/sec"); + $x = $host->p_membw/(1024*1024); + $y = round($x, 2); + row2("Measured memory bandwidth", "$y MB/sec"); + $x = $host->n_bwup/(1024); + $y = round($x, 2); + if ($y > 0) { + row2("Average upload rate", "$y KB/sec"); + } else { + row2("Average upload rate", "Unknown"); + } + $x = $host->n_bwdown/(1024); + $y = round($x, 2); + if ($y > 0) { + row2("Average download rate", "$y KB/sec"); + } else { + row2("Average download rate", "Unknown"); + } + if ($private) { + row2("Number of times client has contacted server", $host->rpc_seqno); + row2("Last time contacted server", time_str($host->rpc_time)); + row2("% of time client is on", 100*$host->on_frac." %"); + row2("% of time host is connected", 100*$host->connected_frac." %"); + row2("% of time user is active", 100*$host->active_frac." %"); + row2("Location", location_form($host)); + } + echo "\n"; + +} + +function host_table_start($title) { + start_table(); + row1($title, 6); + echo " + Rank
Click for more info + Owner + Total credit + Recent average credit + CPU type + Operating system + + "; +} + +function show_host_row($host, $i) { + $result = mysql_query("select * from user where id = $host->userid"); + $user = mysql_fetch_object($result); + mysql_free_result($result); + echo " + id>$i + id>$user->name + $host->total_credit + $host->expavg_credit + $host->p_vendor $host->p_model + $host->os_name $host->os_version + + "; +} + +?> diff --git a/html/user/hosts_user.php b/html/user/hosts_user.php new file mode 100644 index 0000000000..2900fa3072 --- /dev/null +++ b/html/user/hosts_user.php @@ -0,0 +1,22 @@ +name"); + $i = 1; + $result = mysql_query("select * from host where userid=$userid order by expavg_credit desc limit $max_hosts_display"); + while (($host = mysql_fetch_object($result)) && $max_hosts_display > 0) { + show_host_row($host, $i); + $max_hosts_display--; + $i++; + } + mysql_free_result($result); + echo "\n"; + page_tail(); +?> diff --git a/html/user/project_beta.inc b/html/user/project_beta.inc new file mode 100644 index 0000000000..6dc9e86027 --- /dev/null +++ b/html/user/project_beta.inc @@ -0,0 +1,44 @@ +black hole evaporation + +and other phenomena. +"; + + echo "

+Astropulse is based on BOINC, +which is being beta-tested. +We currently have enough volunteers for the beta test. +Stay tuned for an expanded beta test in the upcoming months. +

+Beta testers: click here +for instructions and news. +"; +} + +function project_banner($user) { + + echo " + +
+ Astropulse + + \n + "; + + if ($user) { + echo "Logged in as $user->name"; + } else { + echo "
"; + } + echo "

\n"; +} + +?> diff --git a/html/user/show_host_detail.php b/html/user/show_host_detail.php index 2f3c7e0b76..327856076d 100644 --- a/html/user/show_host_detail.php +++ b/html/user/show_host_detail.php @@ -1,86 +1,9 @@ venue == "home") $h = "selected"; - if ($host->venue == "work") $w = "selected"; - if ($host->venue == "school") $s = "selected"; - $x = "
- id> - - -
- "; - return $x; -} - -function show_host($host) { - start_table(); - row1("Host Information"); - row2("IP address", "$host->last_ip_addr
(same the last $host->nsame_ip_addr times)"); - row2("Domain name", $host->domain_name); - $x = $host->timezone/3600; - row2("Time zone", "UTC - $x hours"); - row2("Created", time_str($host->create_time)); - row2("Total Credit", $host->total_credit); - row2("Recent average credit", $host->expavg_credit); - row2("CPU type", "$host->p_vendor $host->p_model"); - row2("Number of CPUs", $host->p_ncpus); - row2("Operating System", "$host->os_name $host->os_version"); - $x = $host->m_nbytes/(1024*1024); - $y = round($x, 2); - row2("Memory", "$y MB"); - $x = $host->m_cache/1024; - $y = round($x, 2); - row2("Cache", "$y KB"); - $x = $host->m_swap/(1024*1024); - $y = round($x, 2); - row2("Swap space", "$y MB"); - $x = $host->d_total/(1024*1024*1024); - $y = round($x, 2); - row2("Total disk space", "$y GB"); - $x = $host->d_free/(1024*1024*1024); - $y = round($x, 2); - row2("Free Disk Space", "$y GB"); - $x = $host->p_fpops/(1000*1000); - $y = round($x, 2); - row2("Measured floating point speed", "$y million ops/sec"); - $x = $host->p_iops/(1000*1000); - $y = round($x, 2); - row2("Measured integer speed", "$y million ops/sec"); - $x = $host->p_membw/(1024*1024); - $y = round($x, 2); - row2("Measured memory bandwidth", "$y MB/sec"); - $x = $host->n_bwup/(1024); - $y = round($x, 2); - if ($y > 0) { - row2("Average upload rate", "$y KB/sec"); - } else { - row2("Average upload rate", "Unknown"); - } - $x = $host->n_bwdown/(1024); - $y = round($x, 2); - if ($y > 0) { - row2("Average download rate", "$y KB/sec"); - } else { - row2("Average download rate", "Unknown"); - } - row2("Number of times client has contacted server", $host->rpc_seqno); - row2("Last time contacted server", time_str($host->rpc_time)); - row2("% of time client is on", 100*$host->on_frac." %"); - row2("% of time host is connected", 100*$host->connected_frac." %"); - row2("% of time user is active", 100*$host->active_frac." %"); - row2("Location", location_form($host)); - echo "\n"; - -} $authenticator = init_session(); db_init(); $user = get_user_from_auth($authenticator); @@ -96,7 +19,7 @@ function show_host($host) { if ($host->userid != $user->id) { echo "Not your host\n"; } else { - show_host($host); + show_host($host, true); } } else { echo "Couldn't find host or user.

"; diff --git a/html/user/show_host_public.php b/html/user/show_host_public.php new file mode 100644 index 0000000000..1bca980f06 --- /dev/null +++ b/html/user/show_host_public.php @@ -0,0 +1,25 @@ +"; + } + } else { + echo "Couldn't find host.

"; + } + page_tail(); +?> diff --git a/html/user/show_user.php b/html/user/show_user.php index 416c881386..af26000a2f 100644 --- a/html/user/show_user.php +++ b/html/user/show_user.php @@ -5,15 +5,14 @@ init_session(); db_init(); - $id = $HTTP_GET_VARS["id"]; + $id = $HTTP_GET_VARS["userid"]; $result = mysql_query("select * from user where id = $id"); $user = mysql_fetch_object($result); mysql_free_result($result); if ($user) { - page_head("User stats for $user->name"); - echo("

Account stats for $user->name

"); + page_head("Account data for $user->name"); start_table(); show_user_stats($user); end_table(); diff --git a/html/user/team.inc b/html/user/team.inc index 3378e08616..64d4821633 100644 --- a/html/user/team.inc +++ b/html/user/team.inc @@ -4,38 +4,25 @@ require_once("util.inc"); require_once("db.inc"); require_once("sanitize_html.inc"); -function show_team($team) { - start_table(); - row2("ID", $team->id); - row2("founder", $team->userid); - row2("name", $team->name); - row2("url", $team->url); - row2("type", $team->type); - row2("name_html", $team->name_html); - row2("description", sanitize_html($team->description)); -} - function display_team_page($team) { page_head("$team->name"); if ($team->name_html != null) { echo "

"; echo "$team->name_html"; } - echo "

"; - echo "[id>Join] "; - echo "[id>Quit] "; - echo "[id>Edit*] "; - echo "[id>Remove Inactive Members*] "; - echo "[id>Disband Team*] "; - echo "[id>View Team Emails*]"; - echo "
* Team founder only"; - - echo "
"; - echo "

"; - echo ""; - echo "
"; - echo "Team Info:
"; - echo ""; + echo "

+ [id>Join] + [id>Quit] + [id>Edit*] + [id>Remove Inactive Members*] + [id>Disband Team*] + [id>View Team Emails*] +
* Team founder only +
+

+ "; + start_table(); + row1("Team info"); if (strlen($team->description)) { row2("Description", sanitize_html($team->description)); } @@ -44,52 +31,46 @@ function display_team_page($team) { } row2("Members", $team->nusers); - $query = sprintf( - "select * from user where teamid = %d", - $team->id - ); - $result = mysql_query($query); + $result = mysql_query("select * from user where teamid=$team->id"); $total_credit = 0; for ($i = 0; $i < $team->nusers; $i++) { $user = mysql_fetch_object($result); $total_credit = $total_credit + $user->total_credit; } - row2("Total Credit", $total_credit); - $query = sprintf( - "select * from user where id = %d", - $team->userid - ); - $result = mysql_query($query); + row2("Total credit", $total_credit); + $result = mysql_query("select * from user where id=$team->userid"); $user = mysql_fetch_object($result); - row2("Founder", $user->name); + row2("Founder", "id>$user->name"); + row2("Country", $team->country); echo "

"; echo "

"; - echo ""; - echo "
"; - echo "Team Members:
"; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; + start_table(); + row1("Team members", 4); + echo " + + + + + + "; - $query = sprintf( - "select * from user where teamid = %d order by expavg_credit desc", - $team->id - ); - $result = mysql_query($query); + $result = mysql_query("select * from user where teamid=$team->id order by expavg_credit desc"); - for ($i = 0; $i < $team->nusers; $i++) { + $j = 1; + while (true) { $user = mysql_fetch_object($result); - $j = $i+1; - echo ""; - echo ""; - echo ""; - echo ""; + if (!$user) break; + echo " + + + + + "; + $j++; } + mysql_free_result($result); echo "
NameTotal creditRecent average CPU
time per work unit		Country
NameTotal creditRecent average creditCountry
$j) $user->name"; - echo "$user->total_credit$user->expavg_credit$user->country
$j) id>$user->name + $user->total_credit$user->expavg_credit$user->country
"; page_tail(); } @@ -117,4 +98,25 @@ function require_founder_login($user, $team) { } } +function team_table_start() { + echo " + Name + Members + Average credit + Total credit + Country + + "; +} + +function show_team_row($team, $i) { + echo " + $i) id>$team->name + $team->nusers + $team->expavg_credit + $team->total_credit + $team->country + \n"; +} + ?> diff --git a/html/user/top_hosts.php b/html/user/top_hosts.php index 8e3f07255f..ab2b1ba119 100644 --- a/html/user/top_hosts.php +++ b/html/user/top_hosts.php @@ -1,39 +1,17 @@ - Owner - Total credit - Recent average credit - CPU type - -EOT; -} - -function show_host_row($host) { - $result = mysql_query("select * from user where id = $host->userid"); - $user = mysql_fetch_object($result); - mysql_free_result($result); - echo " - id>$user->name - $host->total_credit - $host->expavg_credit - $host->p_vendor $host->p_model - "; -} + require_once("host.inc"); $max_hosts_display = 100; db_init(); page_head("Top hosts"); - echo "

Top hosts

\n"; $result = mysql_query("select * from host order by expavg_credit desc limit $max_hosts_display"); - host_table_start(); + host_table_start("Top hosts"); + $i = 1; while (($host = mysql_fetch_object($result)) && $max_hosts_display > 0) { - show_host_row($host); + show_host_row($host, $i); $max_hosts_display--; + $i++; } mysql_free_result($result); echo "\n"; diff --git a/html/user/top_teams.php b/html/user/top_teams.php index 87ce24c911..74c439c77d 100644 --- a/html/user/top_teams.php +++ b/html/user/top_teams.php @@ -1,30 +1,19 @@ NameMembersAverage creditTotal credit - Founded"; -} - -function show_team_row($team) { - echo " - id>$team->name - $team->nusers - $team->expavg_credit - $team->total_credit - ".time_str($team->create_time)." - \n"; -} + require_once("team.inc"); db_init(); page_head("Top teams"); $result = mysql_query("select * from team order by expavg_credit desc, total_credit desc"); + start_table(); + row1("Teams", 5); team_table_start(); + $i = 1; while ($team = mysql_fetch_object($result)) { - show_team_row($team); + show_team_row($team, $i); + $i++; } mysql_free_result($result); echo "\n

\n"; diff --git a/html/user/top_users.php b/html/user/top_users.php index 33853f3c0d..340bdfb970 100644 --- a/html/user/top_users.php +++ b/html/user/top_users.php @@ -4,8 +4,9 @@ $authenticator = init_session(); db_init(); - page_head("Top users"); - $result = mysql_query("select * from user order by expavg_credit desc,total_credit desc"); + $numusers = 100; + page_head("Top $numusers users"); + $result = mysql_query("select * from user order by expavg_credit desc,total_credit desc limit $numusers"); user_table_start(); while ($user = mysql_fetch_object($result)) { show_user_row($user); diff --git a/html/user/user.inc b/html/user/user.inc index f6adaa0717..cb0ff6df7b 100644 --- a/html/user/user.inc +++ b/html/user/user.inc @@ -1,7 +1,7 @@ name"); $row = sprintf("%s User since", $project); row2($row, time_str($user->create_time)); row2("Total credit", $user->total_credit); @@ -13,6 +13,8 @@ function show_user_stats($user) { } else { row2("Team", "None"); } + row2("Country", $user->country); + row2("Hosts", "id>Click to view"); } function show_user_profile($user) { @@ -71,18 +73,24 @@ function show_user_page_private($user) { function user_table_start() { start_table(); echo " - NameAverage creditTotal credit - Participant since + + Name + Recent average credit + Total credit + Country + Participant since + "; } function show_user_row($user) { echo " - $user->name + id>$user->name $user->expavg_credit $user->total_credit + $user->country ".time_str($user->create_time)." - \n"; + \n"; } ?> diff --git a/html/user/util.inc b/html/user/util.inc index 87284c1240..2706c5afd5 100644 --- a/html/user/util.inc +++ b/html/user/util.inc @@ -3,26 +3,6 @@ require_once("db.inc"); require_once("project.inc"); -define("EMAIL_EXISTS", -1); -define("EMAIL_UPDATED", 1); -define("EMAIL_FAIL", -2); - -define("LG_FONT", ""); -define("SM_FONT", ""); - -define("TD", ""); -define("TD2", ""); -define("TD3", ""); - -define("TABLE", ""); -define("VISTABLE", "
"); -define("TABLE2", "
"); - -define("BG_COLOR", " bgcolor=ffffff "); -define("TITLE_COLOR", " bgcolor=000000 "); -define("TITLE_FONT", " "); -define("BODY_COLOR", " bgcolor=ffffff "); - // Sends the authenticator to the given email address // function send_auth_email($email_addr, $auth) { @@ -70,7 +50,7 @@ function show_login($user) { } function page_head($title, $user=null) { - echo "$title\n"; + echo "$title\n"; project_banner($user); @@ -106,15 +86,15 @@ function time_str($x) { } function start_table() { - echo "
"; + echo "
"; } function end_table() { echo "
\n"; } -function row1($x) { - echo "$x\n"; +function row1($x, $ncols=2) { + echo "$x\n"; } function row2($x, $y) { @@ -254,8 +234,4 @@ function split_munged_email_addr($addr, $string, &$email) { return true; } -// remove all HTML tags except vanilla formatting -// -function cleanse_html($text) { -} ?>