X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/b90b0980f97ea3c9623f99db83abeb7419b916b2..b6392a52a07ca163e5a1ee1b46d62a48ef395829:/app.sml

diff --git a/app.sml b/app.sml
index d018983..aa9fb15 100644
--- a/app.sml
+++ b/app.sml
@@ -9,6 +9,7 @@ datatype status =
        | ACCEPTED
        | REJECTED
        | ADDED
+       | BEING_ADDED
 
 val statusFromInt =
     fn 0 => CONFIRMING
@@ -16,6 +17,7 @@ val statusFromInt =
      | 2 => ACCEPTED
      | 3 => REJECTED
      | 4 => ADDED
+     | 5 => BEING_ADDED
      | _ => raise C.Sql "Bad status"
 
 val statusToInt =
@@ -24,6 +26,7 @@ val statusToInt =
      | ACCEPTED => 2
      | REJECTED => 3
      | ADDED => 4
+     | BEING_ADDED => 5
 
 fun statusFromSql v = statusFromInt (C.intFromSql v)
 fun statusToSql s = C.intToSql (statusToInt s)
@@ -32,32 +35,38 @@ type app = { id : int, name : string, rname : string, gname : string option, ema
 	     forward : bool, uses : string, other : string,
 	     passwd : string, status : status, applied : C.timestamp, ipaddr : string option,
 	     confirmed : C.timestamp option, decided : C.timestamp option,
-	     msg : string}
+	     msg : string, unix_passwd : string,
+	     paypal : string option, checkout : string option }
 
 fun mkAppRow [id, name, rname, gname, email, forward, uses, other, passwd, status,
-	      applied, ipaddr, confirmed, decided, msg] =
+	      applied, ipaddr, confirmed, decided, msg, unix_passwd, paypal, checkout] =
     { id = C.intFromSql id, name = C.stringFromSql name, rname = C.stringFromSql rname,
-      gname = (if C.isNull gname then NONE else SOME (C.stringFromSql gname)),
+      gname = Init.nullableFromSql C.stringFromSql gname,
       email = C.stringFromSql email, forward = C.boolFromSql forward,
       uses = C.stringFromSql uses, other = C.stringFromSql other, passwd = C.stringFromSql passwd,
       status = statusFromSql status, applied = C.timestampFromSql applied,
-      ipaddr = (if C.isNull ipaddr then NONE else SOME (C.stringFromSql ipaddr)),
-      confirmed = if C.isNull confirmed then NONE else SOME (C.timestampFromSql confirmed),
-      decided = if C.isNull decided then NONE else SOME (C.timestampFromSql decided),
-      msg = C.stringFromSql msg}
+      ipaddr = Init.nullableFromSql C.stringFromSql ipaddr,
+      confirmed = Init.nullableFromSql C.timestampFromSql confirmed,
+      decided = Init.nullableFromSql C.timestampFromSql decided,
+      msg = C.stringFromSql msg, unix_passwd = C.stringFromSql unix_passwd,
+      paypal = Init.nullableFromSql C.stringFromSql paypal,
+      checkout = Init.nullableFromSql C.stringFromSql checkout}
   | mkAppRow r = rowError ("app", r)
 
 fun lookupApp id =
-    case C.oneOrNoRows (getDb ()) ($`SELECT id, name, rname, gname, email, forward, uses, other, passwd, status, applied, ipaddr, confirmed, decided, msg
+    case C.oneOrNoRows (getDb ()) ($`SELECT id, name, rname, gname, email, forward, uses, other, passwd, status, applied, ipaddr, confirmed, decided,
+				            msg, unix_passwd, paypal, checkout
 				     FROM MemberApp
 				     WHERE id = ^(C.intToSql id)`) of
 	SOME row => mkAppRow row
       | NONE => raise Fail "Membership application not found"
 
-fun listApps status =
-    C.map (getDb ()) mkAppRow ($`SELECT id, name, rname, gname, email, forward, uses, other, passwd, status, applied, ipaddr, confirmed, decided, msg
+fun listApps statuses =
+    C.map (getDb ()) mkAppRow ($`SELECT id, name, rname, gname, email, forward, uses, other, passwd, status, applied, ipaddr, confirmed, decided,
+			                msg, unix_passwd, paypal, checkout
 			         FROM MemberApp
-			         WHERE status = ^(statusToSql status)
+			         WHERE status IN (^(String.concatWith "," (map statusToSql statuses)))
+				   AND NOT (status = 2 AND decided < CURRENT_TIMESTAMP - INTERVAL '1 MONTH')
 			         ORDER BY applied`)
 
 fun mkVoteRow [id, name] = (C.intFromSql id, C.stringFromSql name)
@@ -110,10 +119,43 @@ fun approve (app, msg) =
 	OS.Process.isSuccess (Mail.mclose mail)
     end
 
+fun preAdd app =
+    let
+	val _ = C.dml (getDb ()) ($`UPDATE MemberApp
+				    SET status = 5
+				    WHERE id = ^(C.intToSql app)`)
+
+	val app = lookupApp app
+
+	val outf = TextIO.openOut (Config.passwordFiles ^ #name app)
+    in
+	TextIO.output (outf, #unix_passwd app);
+	TextIO.output1 (outf, #"\n");
+	TextIO.closeOut outf
+    end
+
 fun add app =
-    ignore (C.dml (getDb ()) ($`UPDATE MemberApp
-				SET status = 3
-			        WHERE id = ^(C.intToSql app)`))
+    let
+	val appR = lookupApp app
+    in
+	ignore (C.dml (getDb ()) ($`UPDATE MemberApp
+				    SET status = 4
+				    WHERE id = ^(C.intToSql app)`));
+	OS.FileSys.remove (Config.passwordFiles ^ #name appR)
+    end
+
+fun welcome app =
+    let
+    	val app = lookupApp app
+
+	val mail = Mail.mopen ()
+    in
+	Mail.mwrite (mail, "To: ");
+	Mail.mwrite (mail, #email app);
+	Mail.mwrite (mail, "\n");
+	Mail.mwrite (mail, Util.readFile "/home/hcoop/portal/paid.txt");
+	ignore (Mail.mclose mail)
+    end
 
 fun abortAdd app =
     ignore (C.dml (getDb ()) ($`UPDATE MemberApp
@@ -137,4 +179,22 @@ fun readTosBody () = readFile "/home/hcoop/public_html/tos.body.html"
 fun readTosAgree () = readFile "/home/hcoop/public_html/tos.agree.html"
 fun readTosMinorAgree () = readFile "/home/hcoop/public_html/tos.agree.minor.html"
 
+fun searchPaypal paypal =
+    C.map (getDb ()) mkAppRow ($`SELECT id, name, rname, gname, email, forward, uses, other, passwd, status, applied, ipaddr, confirmed, decided,
+			                msg, unix_passwd, paypal, checkout
+			         FROM MemberApp
+			         WHERE paypal = ^(C.stringToSql (normEmail paypal))
+				   AND status = 2
+				   AND decided >= CURRENT_TIMESTAMP - INTERVAL '1 MONTH'
+			         ORDER BY applied`)
+
+fun searchCheckout checkout =
+    C.map (getDb ()) mkAppRow ($`SELECT id, name, rname, gname, email, forward, uses, other, passwd, status, applied, ipaddr, confirmed, decided,
+			                msg, unix_passwd, paypal, checkout
+			         FROM MemberApp
+			         WHERE checkout = ^(C.stringToSql (normEmail checkout))
+				   AND status = 2
+				   AND decided >= CURRENT_TIMESTAMP - INTERVAL '1 MONTH'
+			         ORDER BY applied`)
+
 end