From f351e21bf807af3ed59fea6d0e6fae1ca925e220 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 17 Feb 2006 22:01:22 +0000
Subject: [PATCH] show posts

svn path=/trunk/boinc/; revision=9500
---
 checkin_notes                | 11 +++++++++++
 doc/acct_mgt.php             | 22 +++++++++-------------
 doc/code_signing.php         | 10 ++++------
 doc/key_setup.php            |  6 +++++-
 html/inc/profile.inc         | 14 ++++++--------
 html/inc/user.inc            | 21 ++++++++++++---------
 html/user/delete_profile.php | 21 +++++++++------------
 7 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 06219b5e8d..845531d4ce 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -2034,3 +2034,14 @@ Rom    17 Feb 2006
         ViewProjects.cpp
         ViewTransfers.cpp
 
+David  17 Feb 2006
+    - user web: restore posts link on public user page
+        (not sure how it got deleted)
+    - minor code cleanup
+
+    html/
+        inc/
+            profile.inc
+            user.inc
+        user/
+            delete_profile.php
diff --git a/doc/acct_mgt.php b/doc/acct_mgt.php
index 645ea9cd5f..4b7241dbf3 100644
--- a/doc/acct_mgt.php
+++ b/doc/acct_mgt.php
@@ -68,8 +68,6 @@ If hackers break into an account manager server,
 they could potentially cause the account manager
 to instruct all its clients to attach to malicious a BOINC project
 that runs a malicious application.
-
-<p>
 To prevent this type of attack, the URLs distributed by
 an account manager are digitally signed.
 Each AM has its own <b>signing key</b> pair.
@@ -79,19 +77,17 @@ The private key should be stored only on a physically secure,
 non-connected host that is used to sign URLs.
 
 <p>
-To sign URLs, download the BOINC software on a Linux machine,
-and compile the program that generates keys and signs things (lib/crypt_prog).
-Then generate a key pair and generate signatures for your URLs.
+To sign URLs, compile <a href=key_setup.php>crypt_prog</a>,
+BOINC's encryption utility program.
+(Instructions for downloading and compiling code
+are <a href=compile.php>here</a>.)
+Generate a key pair and generate signatures for your URLs.
 At some point you'll need to commit to a permanent key pair,
 at which point you should move the private key to
-the signing machine (disconnected) and make sure there are
-no copies of it elsewhere.
-Make a copy or two on CD-ROM also, or just print it out on paper.
-
-<p>
-Instructions for downloading/compiling code are <a href=compile.php>here</a>.
-<p>
-Instructions for using the crypto program are <a href=key_setup.php>here</a>
+the signing machine (disconnected).
+Make a copy or two on CD-ROM also, and/or print it out on paper;
+keep these in a safe place.
+Delete all other copies of the private key.
 
 <h2>Farm managers</h2>
 <p>
diff --git a/doc/code_signing.php b/doc/code_signing.php
index 022999d880..1e474dc68d 100644
--- a/doc/code_signing.php
+++ b/doc/code_signing.php
@@ -20,8 +20,7 @@ and possibly the end of all BOINC projects.
 </b>
 <ul>
 <li> Choose a computer
-(an old, slow one is fine) to act as your
-'code signing machine'.
+(an old, slow one is fine) to act as your 'code signing machine'.
 After being set up,
 this computer <b>must remain physically secure
 and disconnected from the network</b>
@@ -32,10 +31,9 @@ the code-signing machine.
 A USB-connected disk or CD-RW will work,
 or if your files are small you can use a floppy disk.
 <li>
-Install boinc/lib/crypt_prog on the code signing machine
-(it's easiest if the machine runs
-Unix/Linux, but it should be easy to compile
-crypt_prog for Windows too).
+Install <a href=key_setup>crypt_prog</a> on the code signing machine
+(it's easiest if the machine runs Unix/Linux;
+Windows can be used but requires Visual Studio 2003).
 
 <li>
 Run 'crypt_prog -genkey' to create a code-signing key pair.
diff --git a/doc/key_setup.php b/doc/key_setup.php
index a98d3ab7e7..ba5ebcb786 100644
--- a/doc/key_setup.php
+++ b/doc/key_setup.php
@@ -3,7 +3,11 @@ require_once("docutil.php");
 page_head("The encryption utility");
 echo "
 <p>
-The program <b>lib/crypt_prog</b> performs various encryption tasks.
+The program <code>lib/crypt_prog</code> performs various encryption tasks.
+<p>
+crypt_prog is built by the standard build procedure on Unix systems.
+You can also build it on Windows (with Visual Studio 2003)
+using the project file <code>win_build/crypt_prog.vcproj</code>.
 
 <h2>Creating encryption keys</h2>
 <dl>
diff --git a/html/inc/profile.inc b/html/inc/profile.inc
index 4b99b48948..689dbabe15 100644
--- a/html/inc/profile.inc
+++ b/html/inc/profile.inc
@@ -76,7 +76,7 @@ function show_profile_creation_page($user) {
     //
     $profile = get_profile($user->id);
     if (isset($_POST['submit']) && $_POST['submit']) {
-        process_create_results($user, $profile);
+        process_create_profile($user, $profile);
         exit();
     }
 
@@ -151,7 +151,6 @@ function offensive_profile_warning($verify_flag) {
 }
 
 function show_picture_option($profile) {
-
     row1("Picture");
 
     $warning = "";
@@ -170,11 +169,10 @@ function show_picture_option($profile) {
 <p>
 To replace it,
 click the \"Browse\" button and select a JPEG or PNG file (50KB or less).
-<input name=\"picture\" type=\"file\"><br>
+<input name=picture type=file><br>
 <p>
-To remove it from your profile,
-check this box:
-<input type=\"checkbox\" name=\"delete_pic\">
+To remove it from your profile, check this box:
+<input type=checkbox name=delete_pic>
 <p>
 </td></tr>";
         rowify("<br>");
@@ -186,7 +184,7 @@ If you would like include a picture with your profile,
 click the \"Browse\" button and select a JPEG or PNG file.
 Please select images of 50KB or less.
 <p>
-<input name=\"picture\" type=\"file\">
+<input name=picture type=file>
         ");
         rowify("<br>");
     }
@@ -230,7 +228,7 @@ function delete_user_pictures($userid) {
 // $profile is null if user doesn't already have a profile.
 // Don't assign to $profile->x if this is the case.
 //
-function process_create_results($user, $profile) {
+function process_create_profile($user, $profile) {
     $response1 = $_POST['response1'];
     $response2 = $_POST['response2'];
     $language = $_POST['language'];
diff --git a/html/inc/user.inc b/html/inc/user.inc
index d9e450a312..3949bc4c4c 100644
--- a/html/inc/user.inc
+++ b/html/inc/user.inc
@@ -103,7 +103,7 @@ function show_user_info_private($user) {
     } else {
         row2("Team", "None (<a href=team.php>find a team</a>)");
     }
-    $tot=total_posts($user);
+    $tot = total_posts($user);
     if ($tot) {
         row2("Message boards", "<a href=".URL_BASE."forum_user_posts.php?userid=$user->id>$tot posts</a>");
     }
@@ -141,14 +141,16 @@ function show_user_summary_public($user) {
     } else {
         row2("Computers", "hidden");
     }
-    # Does this project accept donations?
-    # If so, do you want to have a link next to user name as it appears on the web site?
-    if ($user->donated == 1) { 
-      require_once("../project/donations.inc");
-      $x .= DONATION_LINK;
-      row2("Donor",$x);
-      }
+    $tot = total_posts($user);
+    if ($tot) {
+        row2("Message boards", "<a href=".URL_BASE."forum_user_posts.php?userid=$user->id>$tot posts</a>");
+    }
 
+    if ($user->donated == 1) { 
+        require_once("../project/donations.inc");
+        $x .= DONATION_LINK;
+        row2("Donor",$x);
+    }
 }
 
 function show_profile_link($user) {
@@ -169,7 +171,8 @@ function show_user_page_private($user) {
 
     // Does this project accept donations? Then put in a project specific
     // function to show user donation information in ../project/donations.inc
-	if (parse_bool($config, "donations_accepted")) {
+    //
+    if (parse_bool($config, "donations_accepted")) {
       require_once("../project/donations.inc");
       show_user_donations_private($user);
     }
diff --git a/html/user/delete_profile.php b/html/user/delete_profile.php
index 0be2e2e1da..3d1cccfa63 100644
--- a/html/user/delete_profile.php
+++ b/html/user/delete_profile.php
@@ -15,22 +15,19 @@ page_head("Profile delete confirmation");
 
 echo "<form action=", $_SERVER['PHP_SELF'], " method=\"POST\">";
 
-start_table_noborder();
-row1("Delete your profile");
-
-rowify("
+echo "
     <h2>Are you sure?</h2><p>
     Deleted profiles are gone forever and cannot be recovered --
     you will have to start from scratch
     if you want another profile in the future.
-");
-rowify(
-    "<br>If you're sure, click the \"Delete\" button below
-    to remove your profile from our database."
-);
-echo "<tr><td align=\"center\"><br><input type=\"submit\" name=\"delete\" value=\"Delete\"></td></tr>";
-end_table();
-echo "</form>";
+    <p>
+    If you're sure, click 'Delete'
+    to remove your profile from our database.
+
+    <p>
+    <input type=submit name=delete value=Delete>
+    </form>
+";
 
 page_tail();