X-Git-Url: https://git.hcoop.net/hcoop/portal.git/blobdiff_plain/c198ab89e1599cfe5feb12d3b6d8a0f9216ef86c..HEAD:/app/app.sml

diff --git a/app/app.sml b/app/app.sml
index f1a2c14..ec3efcf 100644
--- a/app/app.sml
+++ b/app/app.sml
@@ -1,7 +1,7 @@
 structure App :> APP =
 struct
 
-val baseUrl = "https://join3.hcoop.net/join/"
+val baseUrl = "https://join.hcoop.net/join/"
 val portalUrl = Config.urlPrefix
 
 open Sql
@@ -171,9 +171,9 @@ fun validEmailUser s =
 					       (String.explode s)
 
 fun validEmail s =
-    (case String.fields (fn ch => ch = #"@") s of
-	 [user, host] => validEmailUser user andalso validDomain host
-       | _ => false)
+	case String.fields (fn ch => ch = #"@") s of
+	    [user, host] => validEmailUser user andalso validDomain host andalso not (List.exists (fn x => x = host) Config.joinBannedEmailDomains)
+	  | _ => false
 
 fun userExists name =
     case C.oneOrNoRows (getDb ()) ($`SELECT id FROM WebUser WHERE name = ^(C.stringToSql name)`) of