X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/9953bee7978169008d661880ebe93ffa14028401..b6392a52a07ca163e5a1ee1b46d62a48ef395829:/init.sml

diff --git a/init.sml b/init.sml
index 4db7408..ba3b2bf 100644
--- a/init.sml
+++ b/init.sml
@@ -128,9 +128,11 @@ fun addUser (name, rname, bal, app, shares) =
 	val db = getDb ()
 	val id = nextSeq (db, "WebUserSeq")
     in
-	C.dml db ($`INSERT INTO WebUser (id, name, rname, bal, joined, app, shares)
+	C.dml db ($`INSERT INTO WebUser (id, name, rname, bal, joined, app, shares, paypal, checkout)
 		    VALUES (^(C.intToSql id), ^(C.stringToSql name), ^(C.stringToSql rname), ^(C.intToSql bal),
-			    CURRENT_TIMESTAMP, ^(C.intToSql app), ^(C.intToSql shares))`);
+			    CURRENT_TIMESTAMP, ^(C.intToSql app), ^(C.intToSql shares),
+			    (SELECT paypal FROM MemberApp WHERE id = ^(C.intToSql app)),
+			    (SELECT checkout FROM MemberApp WHERE id = ^(C.intToSql app)))`);
 	id
     end
 
@@ -149,7 +151,7 @@ fun modUser (user : user) =
 
 fun byPledge () =
     C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app, shares, paypal, checkout
-			          FROM WebUser
+			          FROM WebUserPaying
 				  WHERE shares > 1
 			          ORDER BY shares DESC, name`)
 
@@ -157,7 +159,7 @@ fun deleteUser id =
     C.dml (getDb ()) ($`DELETE FROM WebUser WHERE id = ^(C.intToSql id)`)
 
 fun validUsername name =
-    size name <= 10
+    size name <= 12
     andalso size name > 0
     andalso Char.isLower (String.sub (name, 0))
     andalso CharVector.all Char.isAlphaNum name