+ If you are already running the BOINC client: +
+ Select the Add Project command in the BOINC client. + Enter the project URL and your account key. ++ If you aren't running the BOINC client: +
+ Download the BOINC client. + Install and run the client. + Enter the project URL and your account key. ++
+ Your account initially has default preferences + (limits on CPU, disk and network usage). + View or edit these preferences. + "; + + send_auth_email($new_email_addr, $authenticator); + + page_tail(); + +?> diff --git a/html/user/create_account_action.php b/html/user/create_account_action.php index d666b4418e..b8d2feb223 100644 --- a/html/user/create_account_action.php +++ b/html/user/create_account_action.php @@ -53,19 +53,8 @@ function show_error($str) { if (!$result) { show_error("Couldn't create account"); } - page_head("Account created"); - echo "Your account has been created, - and an account key is being emailed to you. -
- If you don't already have it, - download the BOINC client. - Install and run the client, and give it your account key. -
- If you're already running the BOINC client, - select the Add Project command - and give it your account key. -
";
- send_auth_email($new_email_addr, $authenticator);
+ // In success case, redirect to a fixed page so that user can
+ // return to it without getting "Repost form data" stuff
- page_tail();
+ Header("Location: account_created.php");
diff --git a/html/user/prefs.inc b/html/user/prefs.inc
index ee5f17226f..0a705751a9 100644
--- a/html/user/prefs.inc
+++ b/html/user/prefs.inc
@@ -4,11 +4,9 @@
// preferences (global and project).
// Preferences are represented in two ways:
// - As a PHP structure (usually called $prefs)
+// This has fields dont_run_on_batteries, etc.
+// The fields "project_specific" is raw XML
// - As XML (usually called $prefs_xml)
-// Various functions are defined below for converting between these forms,
-// and also to/from HTML form elements
-
-// functions to parse preferences XML into a struct
//
// This XML has the general structure
// ";
echo " ";
echo " \n";
diff --git a/html/user/prefs_edit_project_action.php b/html/user/prefs_edit_project_action.php
index d1d48ef17c..e42b1ff62a 100644
--- a/html/user/prefs_edit_project_action.php
+++ b/html/user/prefs_edit_project_action.php
@@ -13,6 +13,7 @@ if ($user == NULL) {
exit();
}
+no_cache();
page_head("Preferences");
$prefs = prefs_parse($user->project_prefs);
prefs_project_parse_form($prefs);
diff --git a/html/user/prefs_edit_project_form.php b/html/user/prefs_edit_project_form.php
index f2d636b748..b4390aa36b 100644
--- a/html/user/prefs_edit_project_form.php
+++ b/html/user/prefs_edit_project_form.php
@@ -14,8 +14,8 @@ if ($user == NULL) {
}
page_head("Edit project preferences");
parse_str(getenv("QUERY_STRING"));
-$prefs = prefs_parse($user->prefs);
-prefs_form_project($prefs->project, "prefs_edit_project_action.php");
+$prefs = prefs_parse($user->project_prefs);
+prefs_form_project($prefs);
echo " \n";
page_tail();
diff --git a/html/user/project_specific_prefs.inc b/html/user/project_specific_prefs.inc
new file mode 100644
index 0000000000..daf6e8d8bd
--- /dev/null
+++ b/html/user/project_specific_prefs.inc
@@ -0,0 +1,55 @@
+$name\n";
+}
+
+// given struct, show form for editing
+//
+function project_specific_prefs_edit($prefs) {
+ $x = $prefs->color_scheme;
+ echo "\n";
- echo "
".TD2.LG_FONT."Global preferences: \n";
+ echo "".TD2.LG_FONT."Global preferences
+ \n";
if ($prefs->dont_run_on_batteries) {
$batteries = "No";
} else {
@@ -182,9 +191,11 @@ function prefs_show_global($prefs) {
function prefs_show_project($prefs) {
echo "
These apply to all BOINC projects in which you participate\n";
- echo "
";
}
@@ -199,63 +210,62 @@ function print_prefs_display($user) {
// Functions to display preference subsets as forms
//
function prefs_form_global($user, $prefs) {
- echo "\n";
}
function prefs_form_project($prefs) {
- echo "\n";
+ echo "\n";
}
////////////////////////////////////////////
@@ -277,7 +287,7 @@ function prefs_global_parse_form(&$prefs) {
function prefs_project_parse_form(&$prefs) {
parse_str(getenv("QUERY_STRING"));
$prefs->resource_share = $resource_share;
- $prefs->project_specific = $project_specific;
+ $prefs->project_specific = project_specific_prefs_parse_form();
}
@@ -322,13 +332,13 @@ function project_prefs_make_xml($prefs) {
//
// Update user's prefs in database, from a given structure
//
-function global_prefs_update($user, $prefs) {
+function global_prefs_update(&$user, $prefs) {
$prefs_xml = global_prefs_make_xml($prefs);
mysql_query("update user set global_prefs='$prefs_xml' where id=$user->id");
$user->global_prefs = $prefs_xml;
}
-function project_prefs_update($user, $prefs) {
+function project_prefs_update(&$user, $prefs) {
$prefs_xml = project_prefs_make_xml($prefs);
mysql_query("update user set project_prefs='$prefs_xml' where id=$user->id");
$user->project_prefs = $prefs_xml;
diff --git a/html/user/prefs.php b/html/user/prefs.php
index e80f2b495b..047d28b983 100644
--- a/html/user/prefs.php
+++ b/html/user/prefs.php
@@ -9,8 +9,8 @@
$user = get_user_from_auth($authenticator);
require_login($user);
- page_head("Preferences");
- print_prefs_display($user);
- page_tail();
+ page_head("Preferences");
+ print_prefs_display($user);
+ page_tail();
?>
diff --git a/html/user/prefs_edit_global_form.php b/html/user/prefs_edit_global_form.php
index a5281e554b..bbd90c4a48 100644
--- a/html/user/prefs_edit_global_form.php
+++ b/html/user/prefs_edit_global_form.php
@@ -13,7 +13,7 @@ if ($user == NULL) {
exit();
}
page_head("Edit Global Preferences");
-$prefs = prefs_parse($user->prefs);
+$prefs = prefs_parse($user->global_prefs);
prefs_form_global($user, $prefs);
echo "Back to preferences\n";
echo "".TD2.LG_FONT."Project preferences: \n";
+ echo "".TD2.LG_FONT."Project preferences
+ \n";
row2a("Resource Share: ", $prefs->resource_share);
- row2a("Project Specific Preferences: ", htmlspecialchars($prefs->project_specific));
+ $prefs = project_specific_prefs_parse($prefs);
+ project_specific_prefs_show($prefs);
echo "
These apply only to this projectEdit project preferences \n
+ ";
+}
+
+// QUERY_STRING has already been parsed into variables.
+// Return XML version of project-specific prefs
+//
+function project_specific_prefs_parse_form() {
+ parse_str(getenv("QUERY_STRING"));
+ return "Color scheme: \n
+ \n
+ \n
+ \n
+ \n
+ \n";
+}
+
+// parse XML, fill in struct
+//
+function project_specific_prefs_parse($prefs) {
+ $xml = $prefs->project_specific;
+ $prefs->color_scheme = parse_element($xml, "Color scheme: \n
+ $prefs->color_scheme \n
+
Return to main ".PROJECT." page
\n";
+ echo "
\n";
// put your copyright notice etc. here
- echo "
Copyright (c) 2002 Sample Project\n";
+ echo "
Copyright (c) 2002 ".PROJECT."