From 54bf84dd4e8ebb4bac72c7b194a58a915d6c2d33 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 10 Jun 2009 18:42:15 +0000
Subject: [PATCH] svn path=/trunk/boinc/; revision=18353

---
 checkin_notes                | 6 ++++--
 doc/spoken_languages.php     | 1 +
 html/user/create_account.php | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 9a8a24ac49..b4a5d41a93 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5245,13 +5245,15 @@ David  10 June 2009
         );
 
         Email addresses ending with any of those strings will be disallowed.
-    - Web RPCs: have am_set_info.php do the same checking for
-        email addresses (invalid, banned) as the other web code
+    - Web RPCs: have am_set_info.php and create_account.php
+        do the same checking for email addresses (invalid, banned)
+        as the other web code
 
     html/
         inc/
             user.inc
         user/
             am_set_info.php
+            create_account.php
             edit_email_form.php
             edit_email_action.php
diff --git a/doc/spoken_languages.php b/doc/spoken_languages.php
index ccd8792ea5..3c0cd10efb 100644
--- a/doc/spoken_languages.php
+++ b/doc/spoken_languages.php
@@ -8,6 +8,7 @@ $spoken_languages = array(
     'Bengali',
     'Bhojpuri',
     'Burmese',
+    'Catalan',
     'Chinese, Gan',
     'Chinese, Hakka',
     'Chinese, Jinyu',
diff --git a/html/user/create_account.php b/html/user/create_account.php
index 8e05eb51bb..e9d89f8c87 100644
--- a/html/user/create_account.php
+++ b/html/user/create_account.php
@@ -49,6 +49,9 @@ $user_name = get_str("user_name");
 if (!is_valid_email_addr($email_addr)) {
     xml_error(-205);
 }
+if (is_banned_email_addr($email_addr)) {
+    xml_error(-205);
+}
 
 if (strlen($passwd_hash) != 32) {
     xml_error(-1, "password hash length not 32");