- client: add <stderr_head> config option;

sends the first rather than last 64KB of stderr to server.
    This doesn't belong here; this choice should come from the server.
    I may take this out later.
- user web: when add a private message, always add a notification

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

checkin_notes

@@ -314,3 +314,25 @@ Bernd  12 Jan 2010
 
     sched/
         file_deleter.cpp
+
+David  12 Jan 2010
+    - client: add <stderr_head> config option;
+        sends the first rather than last 64KB of stderr to server.
+        This doesn't belong here; this choice should come from the server.
+        I may take this out later.
+    - user web: when add a private message, always add a notification
+
+    client/
+        app_control.cpp
+        log_flags.cpp,h
+    html/
+        inc/
+            news.inc
+            pm.inc
+        project.sample/
+            project.inc
+        user/
+            edit_form_preferences_form.php
+            rss_main.php
+    lib/
+        util.cpp

client/app_control.cpp

@@ -668,7 +668,9 @@ bool ACTIVE_TASK::read_stderr_file() {
     int max_len = 63*1024;
     sprintf(path, "%s/%s", slot_dir, STDERR_FILE);
     if (!boinc_file_exists(path)) return false;
-    if (read_file_string(path, stderr_file, max_len, true)) return false;
+    if (read_file_string(path, stderr_file, max_len, !config.stderr_head)) {
+        return false;
+    }
 
     result->stderr_out += "<stderr_txt>\n";
     result->stderr_out += stderr_file;

client/log_flags.cpp

@@ -219,6 +219,8 @@ CONFIG::CONFIG() {
     clear();
 }
 
+// this is called first thing by client
+//
 void CONFIG::clear() {
     allow_multiple_clients = false;
     alt_platforms.clear();
@@ -248,6 +250,7 @@ void CONFIG::clear() {
     save_stats_days = 30;
     simple_gui_only = false;
     start_delay = 0;
+    stderr_head = false;
     suppress_net_info = false;
     use_all_gpus = false;
     use_certs = false;
@@ -355,6 +358,7 @@ int CONFIG::parse_options(XML_PARSER& xp) {
         if (xp.parse_int(tag, "save_stats_days", save_stats_days)) continue;
         if (xp.parse_bool(tag, "simple_gui_only", simple_gui_only)) continue;
         if (xp.parse_double(tag, "start_delay", start_delay)) continue;
+        if (xp.parse_bool(tag, "stderr_head", stderr_head)) continue;
         if (xp.parse_bool(tag, "suppress_net_info", suppress_net_info)) continue;
         if (xp.parse_bool(tag, "use_all_gpus", use_all_gpus)) continue;
         if (xp.parse_bool(tag, "use_certs", use_certs)) continue;

client/log_flags.h

@@ -137,6 +137,7 @@ struct CONFIG {
     int save_stats_days;
     bool simple_gui_only;
     double start_delay;
+    bool stderr_head;
     bool suppress_net_info;
     bool use_all_gpus;
     bool use_certs;

html/inc/news.inc

@@ -46,13 +46,17 @@ function news_item($date, $title, $post) {
     ";
 }
 
-function show_news($start, $count) {
+function news_forum() {
     if (defined("NEWS_FORUM_NAME")) {
         $forum_name = NEWS_FORUM_NAME;
     } else {
         $forum_name = "News";
     }
-    $forum = BoincForum::lookup("parent_type=0 and title = '$forum_name'");
+    return BoincForum::lookup("parent_type=0 and title = '$forum_name'");
+}
+
+function show_news($start, $count) {
+    $forum = news_forum();
     if (!$forum) {
         echo "
             No news forum.  Run html/ops/create_forums.php.

html/inc/pm.inc

@@ -152,11 +152,11 @@ function pm_send($to_user, $subject, $content, $send_email) {
             );
             break;
         }
-
-        // create notification in any case
-        //
-        BoincNotify::insert("(userid, create_time, type, opaque) values ($to_user->id, ".time().", ".NOTIFY_PM.", $mid)");
     }
+
+    // create notification in any case
+    //
+    BoincNotify::insert("(userid, create_time, type, opaque) values ($to_user->id, ".time().", ".NOTIFY_PM.", $mid)");
 }
 
 function pm_count($userid, $duration) {

html/project.sample/project.inc

@@ -44,7 +44,7 @@ function project_footer($show_return, $show_date, $prefix) {
     // If you include any links, prepend URL with $prefix
     echo "<br><hr noshade size=1><center>";
     if ($show_return) {
-        echo "<a href=".$prefix."index.php>Home</a> | <a href=".$prefix."home.php>My Account</a> | <a href=".$prefix."forum_index.php>Message Boards</a><br>\n";
+        echo "<a href=".$prefix."index.php>Home</a> &middot; <a href=".$prefix."home.php>Your account</a> &middot; <a href=".$prefix."forum_index.php>Message boards</a><br>\n";
     }
     echo "<br><br>Copyright &copy; ".date("Y ").COPYRIGHT_HOLDER."</center>\n";
     if ($show_date) {

html/user/edit_forum_preferences_form.php

@@ -199,7 +199,7 @@ row2("Filtered users".
 );
 
 row1("Update");
-row2("Click here to update message board preferences", "<input type=submit value=\"Update\">");
+row2("Click here to update preferences", "<input type=submit value=\"Update\">");
 echo "</form>\n";
 row1("Reset");
 row2("Or click here to reset preferences to the defaults",

html/user/rss_main.php

@@ -18,13 +18,9 @@
 
 require_once("../project/project.inc");
 require_once("../inc/forum_rss.inc");
+require_once("../inc/news.inc");
 
-if (defined("NEWS_FORUM_NAME")) {
-    $forum_name = NEWS_FORUM_NAME;
-} else {
-    $forum_name = "News";
-}
-$forum = BoincForum::lookup("parent_type=0 and title = '$forum_name'");
+$forum = news_forum();
 if (!$forum) {
     exit;
 }

lib/util.cpp

@@ -347,7 +347,9 @@ int read_file_malloc(const char* path, char*& buf, size_t max_len, bool tail) {
 
 // read file (at most max_len chars, if nonzero) into string
 //
-int read_file_string(const char* path, string& result, size_t max_len, bool tail) {
+int read_file_string(
+    const char* path, string& result, size_t max_len, bool tail
+) {
     result.erase();
     int retval;
     char* buf;