Merge pull request #5468 from BOINC/dpa_server_demo2

fix some spurious server warning messages
BOINC · Dec 20, 2023 · 59a5224 · 59a5224
2 parents 1972a3c + 66f34a7
commit 59a5224
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/html/user/notices.php b/html/user/notices.php
@@ -69,14 +69,6 @@ function notices_rss_end() {
 
 $notifies = BoincNotify::enum("userid = $userid $since_clause");
 
-$threads = [];
-$forum = news_forum();
-if ($forum) {
-    $threads = BoincThread::enum(
-        "forum = $forum->id and hidden=0 and status=0 $since_clause"
-    );
-}
-
 // there may be a better way to do this
 
 $items = array();
@@ -88,12 +80,18 @@ function notices_rss_end() {
     $items[] = $i;
 }
 
-foreach ($threads as $t) {
-    $i = new StdClass;
-    $i->type = 1;
-    $i->time = $t->create_time;
-    $i->val = $t;
-    $items[] = $i;
+$forum = news_forum();
+if ($forum) {
+    $threads = BoincThread::enum(
+        "forum = $forum->id and hidden=0 and status=0 $since_clause"
+    );
+    foreach ($threads as $t) {
+        $i = new StdClass;
+        $i->type = 1;
+        $i->time = $t->create_time;
+        $i->val = $t;
+        $items[] = $i;
+    }
 }
 
 usort($items, 'notice_cmp');

diff --git a/sched/file_upload_handler.cpp b/sched/file_upload_handler.cpp
@@ -346,7 +346,10 @@ int handle_file_upload(FILE* in, R_RSA_PUBLIC_KEY& key) {
             found_data = true;
             break;
         }
-        log_messages.printf(MSG_WARNING, "unrecognized: %s", buf);
+        strip_whitespace(buf);
+        if (strlen(buf)) {
+            log_messages.printf(MSG_WARNING, "unrecognized: %s", buf);
+        }
     }
     if (strlen(name) == 0) {
         return return_error(ERR_PERMANENT, "Missing name");