*** empty log message ***

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

checkin_notes

@@ -8146,3 +8146,12 @@ David  28 July 2006
         user/
             ffmail_action.php
             ffmail_form.php
+
+David  28 July 2006
+    - user web: tweak f2f email
+    - forums: help desk is separate
+
+    html/user/
+        ffmail_action.php
+        ffmail_form.php
+        forum_index.php

html/user/ffmail_action.php

@@ -26,6 +26,7 @@ $subject = file_get_contents('../ops/ffmail/subject');
 $preview = get_str('preview', true);
 $uname = get_str('uname');
 $uemail = get_str('uemail');
+$comment = get_str('comment', true);
 
 $action = get_str('action');
 if ($action=='Preview') {
@@ -45,10 +46,13 @@ if ($action=='Preview') {
     ";
     page_tail();
 } else {
+    page_head("Sending emails");
+    $found = false;
     for ($i=0; $i<5; $i++) {
         $n = get_str("n$i", true);
         $e = get_str("e$i", true);
         if ($n && $e) {
+            $found = true;
             $mail = new PHPMailer();
             $mail->AddAddress($e, $n);
             $mail->Subject = $subject;
@@ -62,9 +66,26 @@ if ($action=='Preview') {
             $mail->FromName = $uname;
             $mail->Host = $PHPMAILER_HOST;
             $mail->Mailer = $PHPMAILER_MAILER;
-            $mail->Send();
+            if ($mail->Send()) {
+                echo "<br>email sent successfully to $e\n";
+            } else {
+                echo "<br>failed to send email to $e: $mail->ErrorInfo\n";
+            }
         }
     }
+    if ($found) {
+        echo "
+            <p>
+            Thanks for telling your friends about ".PROJECT.".
+        ";
+    } else {
+        echo "
+            You forgot to enter your friends' names and/or email addresses;
+            Please <a href=ffmail_form.php>return to the form</a>
+            and enter them.
+        ";
+    }
+    page_tail();
 }
 
 exit();

html/user/ffmail_form.php

@@ -3,33 +3,26 @@
 require_once("../inc/util.inc");
 
 db_init();
-$user = get_logged_in_user(false);
-page_head("Tell others about ".PROJECT);
+$user = get_logged_in_user();
+page_head("Tell your friends about ".PROJECT);
 
 
 echo "
 <table width=600><tr><td>
-Help us by telling your friends and family about ".PROJECT.".
+Help us by telling your friends, family and coworkers about ".PROJECT.".
 <p>
 Fill in this form with the names and email addresses
-of people you think might to participate in ".PROJECT.".
+of people you think might be interested in ".PROJECT.".
 We'll send them an email in your name,
 and you can add your own message if you like.
 <form method=get action=ffmail_action.php>
 <table cellpadding=4>
 <tr><td class=heading>Your name:</td><td class=heading>Your email address:</td></tr>
-";
-if ($user) {
-    echo "
-        <tr><td><b>$user->name</b></td><td><b>$user->email_addr</b></td></tr>
-        <input type=hidden name=uname value=\"$user->name\">
-        <input type=hidden name=uemail value=\"$user->email_addr\">
-    ";
-} else {
-    echo "<tr><td><input name=uname></td><td><input name=uemail></td></tr>
-    ";
-}
-echo "
+<tr><td><b>$user->name</b></td><td><b>$user->email_addr</b></td></tr>
+
+<input type=hidden name=uname value=\"$user->name\">
+<input type=hidden name=uemail value=\"$user->email_addr\">
+
 <tr><td class=heading>Friend's name:</td><td class=heading>Friend's email address:</td></tr>
 ";
 for ($i=0; $i<5; $i++) {

html/user/forum_index.php

@@ -25,24 +25,34 @@ function forum_summary($forum) {
 }
 
 page_head(tr(FORUM_TITLE));
+
+echo "
+    <p>
+    If you have a question or problem, please use the
+    <a href=forum_help_desk.php>Questions & answers</a>
+    area instead of the Message boards.
+    <p>
+";
+
 show_forum_title(NULL, NULL, false);
 start_forum_table(array(tr(FORUM_TOPIC), tr(FORUM_THREADS), tr(FORUM_POSTS), tr(FORUM_LAST_POST)));
 
 $categories = $mainFactory->getCategories();
 $i=0;
-// For each category
 while ($categories[$i]){
-    echo '
-        <tr class="subtitle">
-            <td class="category" colspan="4">'.$categories[$i]->getName().'</td>
-        </tr>
-    ';
-    $forums = $categories[$i]->getForums();
-    $ii=0;
-    // Show a summary of each of the forums
-    while ($forums[$ii]){
-	echo forum_summary($forums[$ii]);
-	$ii++;
+    if (!$categories[$i]->getType()) {
+        echo '
+            <tr class="subtitle">
+                <td class="category" colspan="4">'.$categories[$i]->getName().'</td>
+            </tr>
+        ';
+        $forums = $categories[$i]->getForums();
+        $ii=0;
+        // Show a summary of each of the forums
+        while ($forums[$ii]){
+            echo forum_summary($forums[$ii]);
+            $ii++;
+        }
     }
     $i++;
 }