-./configure --disable_server --disable_client +./configure --disable-server --disable-clientdiff --git a/doc/docutil.php b/doc/docutil.php index a06a132dcb..ed22d75e74 100644 --- a/doc/docutil.php +++ b/doc/docutil.php @@ -89,7 +89,7 @@ function html_text($x) { } function list_start($attrs = 'width=100%') { - echo "
| $x | diff --git a/doc/help_db.php b/doc/help_db.php index d117007d59..757f2c6d75 100644 --- a/doc/help_db.php +++ b/doc/help_db.php @@ -10,6 +10,15 @@ function rating_insert($r) { return mysql_query($query); } +function rating_lookup($r) { + $auth = mysql_real_escape_string($r->auth); + $query = "select * from rating where volunteerid=$r->volunteerid and auth='$auth'"; + $result = mysql_query($query); + $rating = mysql_fetch_object($result); + mysql_free_result($result); + return $rating; +} + function rating_update($r) { $auth = mysql_real_escape_string($r->auth); $comment = mysql_real_escape_string($r->comment); @@ -30,7 +39,10 @@ function ratings_get($volid) { function rating_vol_auth($volid, $auth) { $auth = mysql_real_escape_string($auth); - mysql_query("select * from rating where volunteerid=$vold and auth='$auth'"); + $result = mysql_query("select * from rating where volunteerid=$volid and auth='$auth'"); + $rating = mysql_fetch_object($result); + mysql_free_result($result); + return $rating; } function vol_insert($vol) { @@ -63,16 +75,33 @@ function vol_update($vol) { return mysql_query($query); } -function vol_update_rating($vol, $rating) { +function vol_update_rating($vol, $old_rating, $rating) { + $diff = $rating->rating - $old_rating->rating; + $query = "update volunteer set rating_sum=rating_sum+$diff where id=$vol->id"; + return mysql_query($query); +} + +function vol_new_rating($vol, $rating) { $query = "update volunteer set nratings=nratings+1, rating_sum=rating_sum+$rating where id=$vol->id"; return mysql_query($query); } +function vol_update_status($vol) { + $query = "update volunteer set last_check=$vol->last_check, last_online=$vol->last_online, status=$vol->status where id=$vol->id"; + return mysql_query($query); +} + function get_vols($lang) { $vols = array(); $result = mysql_query("select * from volunteer"); while ($vol = mysql_fetch_object($result)) { - $vols[] = $vol; + if ($lang) { + if ($vol->lang1 == $lang || $vol->lang2 == $lang) { + $vols[] = $vol; + } + } else { + $vols[] = $vol; + } } mysql_free_result($result); return $vols; diff --git a/doc/help_funcs.php b/doc/help_funcs.php index daad306df2..41c061ab59 100644 --- a/doc/help_funcs.php +++ b/doc/help_funcs.php @@ -1,6 +1,7 @@ =0; $i--) { $text = ""; if ($i==0) $text="No"; if ($i==5) $text="Yes"; - $selected = ($val==$i)?"selected":""; + $checked = ($val==$i)?"checked":""; $x .= " -
$text
";
}
diff --git a/doc/help_lang.php b/doc/help_lang.php
index 17ebe2d655..2015a193c2 100644
--- a/doc/help_lang.php
+++ b/doc/help_lang.php
@@ -12,6 +12,20 @@ function vol_info($vol) {
return $x;
}
+function order_vols($vols) {
+ $online = array();
+ $offline = array();
+ foreach ($vols as $vol) {
+ if (online($vol->status)) {
+ $online[] = $vol;
+ } else {
+ $offline[] = $vol;
+ }
+ }
+ shuffle($online);
+ return array_merge($online, $offline);
+}
+
function vol_modes($vol) {
$x = "";
if ($vol->voice_ok && $vol->text_ok) {
@@ -42,19 +56,19 @@ function rating_info($vol) {
else if ($x > 0.0) $img = "stars-0-5.gif";
else $img = "stars-0-0.gif";
return "
- |
+ Contact $vol->name on Skype
+
+
";
if ($vol->voice_ok) {
- echo "
+ Note: BOINC helpers are unpaid volunteers. + Their advise is not endorsed by BOINC + or the University of California. After the conversation is over, please give us your feedback: @@ -42,11 +74,13 @@ function live_contact($vol, $rating) { list_end(); echo " + |
Call $vol->name on Skype
Chat with $vol->name on Skype
Contact $vol->name by email\n"; + echo " + |
@@ -128,15 +168,24 @@ if ($send_email) {
";
page_tail();
} else {
- page_head("Contact $vol->name");
+ page_head("Help Volunteer: $vol->name");
+ echo show_info($vol);
$status = skype_status($vol->skypeid);
+ if ($status != $vol->status) {
+ $vol->status = $status;
+ $vol->last_check = time();
+ if (online($vol->status)) {
+ $vol->last_online = time();
+ }
+ vol_update_status($vol);
+ }
$image = button_image($status);
echo "
";
if (online($status)) {
- $rating = rating_vol_auth($vol, $uid);
+ $rating = rating_vol_auth($vol->id, $uid);
if (!$rating) $rating->rating = -1;
live_contact($vol, $rating);
}
diff --git a/doc/help_vol_edit.php b/doc/help_vol_edit.php
index 17c379c68d..3fcce0c87b 100644
--- a/doc/help_vol_edit.php
+++ b/doc/help_vol_edit.php
@@ -147,7 +147,7 @@ if ($create == 'OK') {
list_item("Email address", input("email_addr", ""));
list_item("Password
If you forgot your password,
leave this blank, and we'll email it to you.",
- input("password", "")
+ password("password", "")
);
list_item("", ""
);
diff --git a/doc/help_volunteer.php b/doc/help_volunteer.php
index caadfbd263..3e23c6e316 100644
--- a/doc/help_volunteer.php
+++ b/doc/help_volunteer.php
@@ -178,9 +178,11 @@ tell the caller that,
and suggest that they call another volunteer
or try the message boards.
+If another Help Volunteer is online, you can try adding +them to the call using skype's 'conference' feature. +
If you get a call with a problem that you think you can solve -but need to do some research, -tell the caller that. +but need to do some research, tell the caller that. Ask them to send you an email using the web page they're looking at, and to include their email address so that you can get back to them. diff --git a/doc/intro_user.php b/doc/intro_user.php index 20a3c2223a..469edfdf62 100644 --- a/doc/intro_user.php +++ b/doc/intro_user.php @@ -81,6 +81,35 @@ or uploading the output files). In rare cases (e.g. if errors occur on one or more computers) you may never receive credit for a computation. + + +
How the software works +
+The BOINC client software looks and acts like a single program,
+but it's actually made up of several separate programs :
+
+
++
-
+
- The core client (named boinc.exe on Windows) communicates +with external servers to get and report work. +It runs and controls applications. +
- Applications are the programs that do scientific computing. +Several of them may run at the same time on a computer +with more than one CPU. +
- The BOINC Manager, or GUI, (named boincmgr.exe on Windows) +provides a graphical interface that lets you control the core client - +for example, by telling it to suspend and resume applications. +The GUI communicates with the core client by a TCP connection. +Normally this is a local connection; +however, it's possible to control a core client remotely. +
- The screensaver runs when you're away from the computer. +It communicates with the core client by local TCP, +instructing it to tell one of the applications to generate +screensaver graphics. +
-Wikis+Contents+
Credit statistics++The following web sites show statistics for one or more BOINC projects. +These sites use XML-format data exported by BOINC projects. +The format is described +here. +If you're interested in running your own site or +participating in the development efforts, +please contact the people listed below. +"; +shuffle($stats_sites); +site_list($stats_sites); +echo " + + Statistics signature images++The following sites offer dynamically-generated +images showing your statistics in BOINC projects. +Use these in your email or message-board signature. +"; +shuffle($sig_sites); +site_list($sig_sites); +echo " + + Team statistics+"; +shuffle($team_stats_sites); +site_list($team_stats_sites); +echo " + +WikisUser-editable sites with information and documentation about BOINC. "; shuffle($wiki_sites); site_list($wiki_sites); echo " -Project status sites+ +Project status sitesShow if the servers of various projects are up or down. -Users of the Day+ +Users of the Day- |
-Credit statistics-"; -shuffle($stats_sites); -site_list($stats_sites); -echo " -Team statistics-"; -shuffle($team_stats_sites); -site_list($team_stats_sites); -echo " - |
Information, message boards, and teams
+ +Other BOINC-related web sites
"; list_start(); echo " @@ -163,7 +195,7 @@ language("German", array( site("http://www.bc-team.org/", "BOINC Confederation"), site("http://www.boincfun.tk/", "BOINCfun"), site("http://www.setigermany.de", "SETI.Germany"), - site("http://www.sar-hessen.de", "Team Science and Research Hessen"), + site("http://www.sar-hessen.org", "Team Science and Research Hessen"), site("http://www.boinc.de/", "www.boinc.de"), site( "http://www.boinc-lubeca.de/", "BOINC - LUBECA (Lübeck, Germany)"), site( "http://www.boinc-forum.de/", "www.boinc-forum.de"), diff --git a/doc/participate.php b/doc/participate.php index 226cc0fe9c..fe02c2896d 100644 --- a/doc/participate.php +++ b/doc/participate.php @@ -39,12 +39,6 @@ echo "-
Web sites
- -