From 19267f06e1fa3b890c28a19af5a621bb2eba506b Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sat, 24 Nov 2007 04:51:03 +0000
Subject: [PATCH] - team import: fix string-escaping bugs - user web: don't
 show links to sched logs if they don't exist - user web: add new team types

svn path=/trunk/boinc/; revision=14295
---
 checkin_notes            | 12 ++++++++++++
 html/inc/host.inc        |  6 +++++-
 html/inc/team_types.inc  |  9 +++++++--
 html/ops/team_import.php |  6 +++---
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 69acf6d941..4d72775ed3 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -11611,3 +11611,15 @@ David  23 Nov 2007
             forum_reply.php
             pm.php
             sample_index.php
+
+David  23 Nov 2007
+    - team import: fix string-escaping bugs
+    - user web: don't show links to sched logs if they don't exist
+    - user web: add new team types
+
+    html/
+        inc/
+            host.inc
+            team_types.inc
+        ops/
+            team_import.php
diff --git a/html/inc/host.inc b/html/inc/host.inc
index c05af3b37f..7a7d38e0b9 100644
--- a/html/inc/host.inc
+++ b/html/inc/host.inc
@@ -18,7 +18,11 @@ function sched_log_name($x) {
 }
 
 function sched_log_link($x) {
-    return "<a href=\"../sched_logs/" . sched_log_name($x) . "\">" . time_str($x) . "</a>";
+    if (file_exists("../sched_logs")) {
+        return "<a href=\"../sched_logs/" . sched_log_name($x) . "\">" . time_str($x) . "</a>";
+    } else {
+        return time_str($x);
+    }
 }
 
 function location_form($host) {
diff --git a/html/inc/team_types.inc b/html/inc/team_types.inc
index 5113734696..3a93bd0960 100644
--- a/html/inc/team_types.inc
+++ b/html/inc/team_types.inc
@@ -8,12 +8,17 @@ $team_types = array(
     "Secondary school",
     "Junior college",
     "University or department",
-    "Government agency"
+    "Government agency",
+    "Non-profit organization",
+    "National",
+    "Local/regional",
+    "Computer type",
+    "Social/political/religious"
 );
 
 function team_type_name($num) {
     global $team_types;
-    if ($num>0 && $num<8) {
+    if ($num>0 && $num<count($team_types)) {
         return $team_types[$num];
     }
     return "None";
diff --git a/html/ops/team_import.php b/html/ops/team_import.php
index 0d9f9c8ff3..7589253991 100755
--- a/html/ops/team_import.php
+++ b/html/ops/team_import.php
@@ -106,7 +106,7 @@ function insert_case($t, $user) {
     }
     if (!$user) {
         echo "   making user $t->user_email\n";
-        $user = make_user($t->user_email, $t->user_name, random_string());
+        $user = make_user(mysql_real_escape_string($t->user_email), mysql_real_escape_string($t->user_name), random_string());
         if (!$user) {
             echo "   Can't make user $t->user_email\n";
             echo mysql_error();
@@ -176,8 +176,8 @@ function handle_team($f) {
     }
 
     echo "Processing $t->name $t->user_email\n";
-    $user = lookup_user_email_addr($t->user_email);
-    $team = lookup_team_name($t->name);
+    $user = lookup_user_email_addr(mysql_real_escape_string($t->user_email));
+    $team = lookup_team_name(mysql_real_escape_string($t->name));
     if ($team) {
         if (!$user) {
             echo "   team exists but user $t->user_email doesn't\n";