From c0776ea188075726b085137483e56ead88ef4c42 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 22 Jul 2010 22:57:15 +0000
Subject: [PATCH] - user web: put RSS item titles in CDATA - sched: get rid of
 unused config items - manager: msg tweak

svn path=/trunk/boinc/; revision=22045
---
 checkin_notes              | 13 +++++++++++++
 clientgui/BOINCTaskBar.cpp |  2 +-
 html/inc/notify.inc        |  2 +-
 sched/sched_config.cpp     |  2 --
 sched/sched_config.h       |  2 --
 sched/sched_send.cpp       |  2 +-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 8268ae62a6..2f571191b7 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5498,3 +5498,16 @@ Rom    22 July 2010
     
     clientgui/
         NoticeListCtrl.cpp
+
+Rom    22 July 2010
+    - user web: put RSS item titles in CDATA
+    - sched: get rid of unused config items
+    - manager: msg tweak
+
+    clientgui/
+        BOINCTaskBar.cpp
+    sched/
+        sched_config.cpp,h
+        sched_send.cpp
+    html/inc/
+        notify.inc
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 15c671d6d5..dcf92bcfb3 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -777,7 +777,7 @@ void CTaskBarIcon::UpdateNoticeStatus() {
                 QueueBalloon(
                     m_iconTaskBarNormal,
                     strTitle,
-                    _("One or more notices are now available for viewing."),
+                    _("There are new notices - click to view."),
                     BALLOONTYPE_INFO
                 );
 #ifdef __WXMAC__
diff --git a/html/inc/notify.inc b/html/inc/notify.inc
index 897e8fb3cd..a0478175c0 100644
--- a/html/inc/notify.inc
+++ b/html/inc/notify.inc
@@ -44,7 +44,7 @@ function show_notify_rss_item($notify) {
 
     $news_date=gmdate('D, d M Y H:i:s',$notify->create_time) . ' GMT';
     echo "<item>
-        <title>$title</title>
+        <title><![CDATA[$title]]></title>
         <guid>".URL_BASE."_notify_$notify->id</guid>
         <link>".htmlentities($url)."</link>
         <description><![CDATA[$msg]]></description>
diff --git a/sched/sched_config.cpp b/sched/sched_config.cpp
index 2e6a552df3..8bfcb2e703 100644
--- a/sched/sched_config.cpp
+++ b/sched/sched_config.cpp
@@ -144,8 +144,6 @@ int SCHED_CONFIG::parse(FILE* f) {
         if (xp.parse_bool(tag, "ended", ended)) continue;
         if (xp.parse_int(tag, "shmem_work_items", shmem_work_items)) continue;
         if (xp.parse_int(tag, "feeder_query_size", feeder_query_size)) continue;
-        if (xp.parse_int(tag, "granted_credit_ramp_up", granted_credit_ramp_up)) continue;
-        if (xp.parse_double(tag, "granted_credit_weight", granted_credit_weight)) continue;
         if (xp.parse_str(tag, "httpd_user", httpd_user, sizeof(httpd_user))) continue;
         if (xp.parse_bool(tag, "enable_assignment", enable_assignment)) continue;
         if (xp.parse_bool(tag, "job_size_matching", job_size_matching)) continue;
diff --git a/sched/sched_config.h b/sched/sched_config.h
index 214604640e..2af80da4e3 100644
--- a/sched/sched_config.h
+++ b/sched/sched_config.h
@@ -78,8 +78,6 @@ struct SCHED_CONFIG {
     int reliable_on_priority;
         // results with a priority equal or greater than this value
         // will be sent to reliable hosts
-    int granted_credit_ramp_up; 
-    double granted_credit_weight;
     bool distinct_beta_apps;
         // allow users to select beta apps independently
     bool ended;
diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp
index a3d3869f21..9e8524b827 100644
--- a/sched/sched_send.cpp
+++ b/sched/sched_send.cpp
@@ -780,7 +780,7 @@ static int insert_after(char* buffer, const char* after, const char* text) {
     char* p;
     char temp[BLOB_SIZE];
 
-    if (strlen(buffer) + strlen(text) > BLOB_SIZE-1) {
+    if (strlen(buffer) + strlen(text) >= BLOB_SIZE-1) {
         log_messages.printf(MSG_CRITICAL,
             "insert_after: overflow: %d %d\n",
             (int)strlen(buffer),