Low balance reminders

[bpt/portal.git] / init.sml

diff --git a/init.sml b/init.sml
index 2b2df7b..2507a45 100644 (file)
--- a/init.sml
+++ b/init.sml
@@ -1,16 +1,13 @@
 structure Init :> INIT =
 struct
 
-open Util Sql
+open Util Sql Config
 structure C = PgClient
 
 exception Access of string
 exception NeedTos
 
-val urlPrefix = "http://users.hcoop.net/portal/"
-val boardEmail = "board.fake@hcoop.net"
-
-fun conn () = C.conn "dbname='hcoop'"
+fun conn () = C.conn dbstring
 val close = C.close
 
 type user = {id : int, name : string, rname : string, bal : int, joined : C.timestamp,
@@ -47,7 +44,7 @@ fun init () =
            NONE => raise Fail "Not logged in"
          | SOME name =>
            (case C.oneOrNoRows c ($`SELECT id, name, rname, bal, joined, app
-                                    FROM WebUser
+                                    FROM WebUserActive
                                     WHERE name=^(C.stringToSql name)`) of
                 NONE => raise Fail "User not found"
               | SOME r =>
@@ -153,7 +150,7 @@ fun grandfatherUsers () =
                ignore (C.dml db ($`INSERT INTO MemberApp (id, name, rname, gname, email, forward, uses, other,
                                                        passwd, status, applied, confirmed, decided, msg)
                                 VALUES (^(C.intToSql aid), ^(C.stringToSql name), ^(C.stringToSql rname),
-                                        NULL, '^name@hcoop.net', FALSE, 'GRANDFATHERED', 'GRANDFATHERED',
+                                        NULL, '^name^(emailSuffix)', FALSE, 'GRANDFATHERED', 'GRANDFATHERED',
                                         'GRANDFATHERED', 4, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP,
                                         CURRENT_TIMESTAMP, 'GRANDFATHERED')`));
                ignore (C.dml db ($`UPDATE WebUser SET app = ^(C.intToSql aid) WHERE id = ^(C.intToSql id)`))
@@ -161,4 +158,4 @@ fun grandfatherUsers () =
     in
        C.app db mkApp "SELECT id, name, rname FROM WebUser WHERE app IS NULL"
     end
-end
\ No newline at end of file
+end