From c8c0e06d2e5824a73bdbfa3e92448fe7929b9b43 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 24 Nov 2008 20:27:18 +0000
Subject: [PATCH] - web: rename Bossa functions to avoid name conflict - web:
 bug fix in example core for app selection

svn path=/trunk/boinc/; revision=16546
---
 checkin_notes                                  | 12 ++++++++++++
 doc/boinc_news.php                             |  9 +++++++++
 doc/links.php                                  |  1 +
 html/ops/bossa_admin.php                       |  8 ++++----
 html/project.sample/project_specific_prefs.inc |  2 +-
 test/shrm                                      |  2 +-
 6 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 36802d6686..bf1d3546d6 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -9538,3 +9538,15 @@ David  24 Nov 2008
 
     client/
         rr_sim.cpp,h
+
+David  24 Nov 2008
+    - web: rename Bossa functions to avoid name conflict
+    - web: bug fix in example core for app selection
+
+    html/
+        ops/
+            bossa_admin.php
+        project.sample/
+            project_specific_prefs.php
+    test/
+        shrm
diff --git a/doc/boinc_news.php b/doc/boinc_news.php
index cce00e04d3..a59a6677c0 100644
--- a/doc/boinc_news.php
+++ b/doc/boinc_news.php
@@ -1,6 +1,15 @@
 <?
 
 $project_news = array(
+array("November 20, 2008",
+    "See a video celebrating the
+    <a href=http://www.worldcommunitygrid.org/newsletter/video/viewIDedicate.do>fourth anniversary of IBM World Community Grid</a>."
+),
+array("November 20, 2008",
+    "<a href=http://jarifa.unex.es/>Jarifa</a>,
+    a system for organizational grid computing using BOINC,
+    has a new name, logo, and domain."
+),
 array("November 7, 2008",
     "On 27-28 November 2008, AlmereGrid and EDGeS will organise a two-day <a href=http://edges-grid.eu/web/userforum/1sttraining>Desktop Grid workshop</a> in Almere, The Netherlands."
 ),
diff --git a/doc/links.php b/doc/links.php
index 217ad7080a..a6bc51a0a2 100644
--- a/doc/links.php
+++ b/doc/links.php
@@ -301,6 +301,7 @@ language("Slovak", array(
     site("http://www.boinc.sk/", "www.boinc.sk")
 ));
 language("Spanish", array(
+    site("http://www.seti.cl/", "BOINC SETI Chile"),
     site("http://www.easyboinc.org/", "Computación Distribuida"),
     site("http://foro.noticias3d.com/vbulletin/showthread.php?t=192297", "Noticias3D"),
     site("http://elmajo.blogspot.com", "Computación Distribuida"),
diff --git a/html/ops/bossa_admin.php b/html/ops/bossa_admin.php
index 99cfc48038..b7b5ba3190 100644
--- a/html/ops/bossa_admin.php
+++ b/html/ops/bossa_admin.php
@@ -34,7 +34,7 @@ function include_app_file($app_id) {
     require_once($file);
 }
 
-function show_app($app, $i) {
+function show_bossa_app($app, $i) {
     $j = $i%2;
     echo "<tr class=row$j>
         <td>Name: $app->name<br>
@@ -53,14 +53,14 @@ function show_app($app, $i) {
     show_button("bossa_admin.php?action=show_batches&app_id=$app->id", "Show batches", "Show batches");
 }
 
-function show_apps() {
+function show_bossa_apps() {
     $apps = BossaApp::enum();
     start_table();
     row1("Existing apps", 2);
     table_header("Name/description", "");
     $i = 0;
     foreach ($apps as $app) {
-        show_app($app, $i++);
+        show_bossa_app($app, $i++);
     }
     end_table();
 }
@@ -112,7 +112,7 @@ function user_settings() {
 
 function show_all() {
     admin_page_head("Bossa administration");
-    show_apps();
+    show_bossa_apps();
     echo "<p>";
     add_app_form();
     echo "<p>";
diff --git a/html/project.sample/project_specific_prefs.inc b/html/project.sample/project_specific_prefs.inc
index 02cd19d7b8..cec689d1d9 100644
--- a/html/project.sample/project_specific_prefs.inc
+++ b/html/project.sample/project_specific_prefs.inc
@@ -148,7 +148,7 @@ function project_specific_prefs_parse_form(&$error) {
             $app_id = $app[0];
             $present = isset($_GET["app_id_$app_id"]);
             if ($present) {
-                $x .= "<app_id>$app_id</app_id>\n";
+                $y .= "<app_id>$app_id</app_id>\n";
             } else {
                 $some_unchecked = true;
             }
diff --git a/test/shrm b/test/shrm
index 8137a94b58..fab55e58c3 100755
--- a/test/shrm
+++ b/test/shrm
@@ -1,4 +1,4 @@
-#! /usr/bin/csh
+#! /usr/bin/env csh
 
 set NAME=`whoami`
 set NUM=`ipcs | grep $NAME | awk '{print $2}'`