release portal3 into production

[hcoop/portal.git] / app / app.sml

diff --git a/app/app.sml b/app/app.sml
index 12abe57..d59a627 100644 (file)
--- 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
@@ -161,7 +161,7 @@ fun validDomain s =
 
 fun validUsername name =
     size name <= 12
-    andalso size name > 0
+    andalso size name >= 2
     andalso Char.isLower (String.sub (name, 0))
     andalso CharVector.all Char.isAlphaNum name
 
@@ -197,4 +197,11 @@ fun confirm (id, passwd) =
          | NONE => false
     end
 
+fun appUserName id =
+    case C.oneOrNoRows (getDb ()) ($`SELECT name
+                                    FROM MemberApp
+                                    WHERE id = ^(C.intToSql id)`) of
+       SOME [name] => C.stringFromSql name
+      | NONE => raise Fail "Membership application not found"
+
 end