*** empty log message ***

svn path=/trunk/boinc/; revision=11125

checkin_notes

@@ -9990,3 +9990,14 @@ David  8 Sept 2006
 		procinfo_win.C
 	win_build/
 		boinc_cli_curl.vcproj
+
+David  8 Sept 2006
+    - Web RPCs: return correct error codes
+
+    html/
+        inc/
+            xml.inc
+        user/
+            am_set_info.php
+            create_account.php
+            create_team.php

doc/logo.php

@@ -5,7 +5,7 @@ page_head("Logos and graphics");
 
 echo "
 
-<h2>The BOINC logo</h2>
+<h2>The current BOINC logo and icons</h2>
 <ul>
 <li>
 The logo in its native form as <a href=logo/logo.doc>a Word document</a>.
@@ -17,18 +17,31 @@ Hi-res versions of the logo:
 <li>
 An icon for BOINC-related Podcasts, from Christian Beer:
 <img align=top src=images/Logo_blau.jpg>
-
 </ul>
-We welcome alternative ideas.
+<p>
+The 'B in a circle' icon was designed by Tim Lan.
+The Mac variant was contributed by Juho Viitasalo.
+
+<h2>New BOINC logo?</h2>
+<p>
+We are looking for a new graphical identity for BOINC.
 Our criteria:
 <ul>
-<li> It should look good on a white background,
+<li> It should work on light-colored backgrounds.
-and should have a transparent-background variant that
+<li> It should include graphics of various sizes,
-works with any light-colored background.
+including icons (16x16 up to 128x128),
-<li> It should allow recognizable and visually consistent versions
+a web-site logo (roughly 200x100),
-ranging from a 16x16 icon up to a 200x300 rectangle.
+and an installer splash screen (roughly 400x300).
-<li> It should refer in some way either to 'BOINC' as a sound effect,
+These should all be recognizable and visually consistent.
-    or to global distributed computing, or both.
+<li>
+It should appeal to people of all interests and demographics.
+In particular, it should NOT have a futuristic,
+high-tech, aggressive, or sci-fi look.
+<li>
+It would be good (though not vital) for the logo
+to suggest global distributed computing,
+or scientific research, or both.
+
 </ul>
 Here are some submissions:
 <p>
@@ -100,12 +113,6 @@ If you have an opinion, please <a href=contact.php>contact us</a>.
 </td></tr>
 </table>
 
-<h2>BOINC icons</h2>
-<p>
-The 'B in a circle' icon was designed by Tim Lan.
-The Mac variant was contributed by Juho Viitasalo.
-<p>
-
 <h2>Coinage</h2>
 Tony/Knightrider/Chuggybus has created BOINC coinage.
 See the <a href=images/coins/>large</a>

doc/recruit.php

@@ -58,8 +58,9 @@ Will it be released to the public?
 When, and under what terms?
 <li> Show all the scientific results of the computation so far,
 and any publications that arise from these results.
-(<a href=http://folding.stanford.edu/papers.html>Folding@home</a>
+(<a href=http://depts.washington.edu/~bakerpg/publications.html>Rosetta@home</a>
-provides a good example of this).
+and <a href=http://folding.stanford.edu/papers.html>Folding@home</a>
+provide good examples of this).
 Announce new results and publications on the News column.
 Make sure your News column is being properly published as an RSS feed.
 <li> Give some personal information about your team members:

doc/web_rpc.php

@@ -48,8 +48,26 @@ If an RPC fails, the returned XML document is
     <error_num>N</error_num>
     <error_string>xxx</error_string>
 </error>")."
-where N is a BOINC error number
+where N is a BOINC error number and xxx is a textual description.
-(see lib/error_numbers.h) and xxx is a textual description.
+BOINC error numbers are in lib/error_numbers.h; common errors are:
+";
+list_start();
+list_item("-1", "Generic error (error_string may have more info)");
+list_item("-112", "Invalid XML (e.g., the preferences passed to am_set_info.php are invalid)");
+list_item("-136", "Item not found in database
+    (bad ID of any sort, or ID refers to an item not owned by the caller)");
+list_item("-137", "Name is not unique (Can't create account because
+    email address already in use,
+    or can't create team because name is in use)");
+list_item("-138", "Can't access database (treat same as -183)");
+list_item("-161", "Item not found (deprecated; treat same as -136)");
+list_item("-183", "Project is temporarily down");
+list_item("-205", "Email address has invalid syntax");
+list_item("-206", "Wrong password");
+list_item("-207", "Non-unique email address (treat same as -137)");
+list_item("-208", "Account creation disabled");
+list_end();
+echo "
 <li>
 The output is XML.
 <li>

html/inc/xml.inc

@@ -22,10 +22,15 @@ function xml_header() {
 function xml_error($num, $msg=null) {
     if (!$msg) {
         switch($num) {
+        case -112: $msg = "Invalid XML"; break;
         case -136: $msg = "Invalid ID"; break;
+        case -137: $msg = "Name or email address is not unique"; break;
         case -138: $msg = "Can't access database"; break;
         case -183: $msg = "Project is temporarily offline"; break;
+        case -205: $msg = "Email address has invalid syntax"; break;
         case -206: $msg = "Invalid password"; break;
+        case -207: $msg = "Email address is not unique"; break;
+        case -208: $msg = "Account creation is disabled"; break;
         default: "Unknown error"; break;
         }
     }

html/user/am_set_info.php

@@ -81,7 +81,7 @@ if ($project_prefs) {
     $project_prefs = str_replace("\\r\\n", "\n", $project_prefs);
     $x = bad_xml($project_prefs, "<project_preferences>", "</project_preferences>");
     if ($x) {
-        xml_error(-1, "Invalid project preferences: $x");
+        xml_error(-112, "Invalid project preferences: $x");
     }
     $query .= " project_prefs='$project_prefs', ";
 }

html/user/create_account.php

@@ -27,14 +27,13 @@ if (!is_valid_email_addr($email_addr)) {
 }
 
 if (strlen($passwd_hash) != 32) {
-    xml_error(-206);
+    xml_error(-1, "password hash length not 32");
 }
 
 $user = lookup_user_email_addr($email_addr);
-$bad = false;
 if ($user) {
     if ($user->passwd_hash != $passwd_hash) {
-        $bad = true;
+        xml_error(-206);
     } else {
         $authenticator = $user->authenticator;
     }
@@ -45,17 +44,13 @@ if ($user) {
     $query = "insert into user (create_time, email_addr, name, authenticator, expavg_time, send_email, show_hosts, cross_project_id, passwd_hash) values($now, '$email_addr', '$user_name', '$authenticator', unix_timestamp(), 1, 1, '$cross_project_id', '$passwd_hash')";
     $result = mysql_query($query);
     if (!$result) {
-        $bad = true;
+        xml_error(-137);
     }
 }
 
-if ($bad) {
+echo " <account_out>\n";
-    xml_error(-207);
+echo "   <authenticator>$authenticator</authenticator>\n";
-} else {
+echo "</account_out>\n";
-    echo " <account_out>\n";
-    echo "   <authenticator>$authenticator</authenticator>\n";
-    echo "</account_out>\n";
-}
 
 ?>
 

html/user/create_team.php

@@ -55,7 +55,7 @@ if ($result) {
 </create_team_reply>
 ";
 } else {
-    xml_error(-1, "could not create team");
+    xml_error(-137, "could not create team");
 }
 
 ?>