Load sender address from configuration.

src/Makefile

@@ -322,10 +322,10 @@ UTIL-MAIL-SOURCES=util-mail.scm util-io.import.scm	\
 util-mail.o: util-mail.import.scm
 util-mail.import.scm: $(UTIL-MAIL-SOURCES)
 
-REMINDERS-SOURCES=reminders.scm brmember.import.scm	\
+REMINDERS-SOURCES=reminders.scm brmember.import.scm		\
 	util-mail.import.scm util-dict-list.import.scm		\
 	members-payments.import.scm util-format.import.scm	\
-	brmember-format.import.scm
+	brmember-format.import.scm configuration.import.scm
 
 reminders.o: reminders.import.scm
 reminders.import.scm: $(REMINDERS-SOURCES)

src/configuration.scm

@@ -38,6 +38,7 @@
   *apikeys-file*
   *jendasap-checked*
   *bank-dir*
+  *email-from*
   
   load-configuration!
   )
@@ -79,6 +80,9 @@
  ;; Where are the bank CSV files
  (define *bank-dir* (make-parameter #f))
 
+ ;; From address for emails
+ (define *email-from* (make-parameter "Brmlab - Rada <rada@brmlab.cz>"))
+
  ;; Loads the configuration file and possibly changes the default
  ;; parameters.
  (define (load-configuration!)
@@ -95,7 +99,9 @@
 		 ((members-directory) (*members-directory* v))
 		 ((apikeys-file) (*apikeys-file* v))
 		 ((jendasap-checked) (*jendasap-checked* v))
-		 ((bank-dir) (*bank-dir* v)))))
+		 ((bank-dir) (*bank-dir* v))
+		 ((email-from) (*email-from* v))
+		 )))
 	   (loop (cdr lines)))))))
 
  )

src/hackerbase.scm

@@ -62,6 +62,7 @@
 (define =apikeys-file= (make-parameter #f))
 (define =jendasap-checked= (make-parameter #f))
 (define =bank-dir= (make-parameter #f))
+(define =email-from= (make-parameter #f))
 
 ;; Arguments parsing
 (command-line
@@ -108,7 +109,7 @@
 	 (-quiet- #t)
 	 (*progress-quiet* #t))
  (-from (email) "Sender email address"
-	(*reminder-from* email))
+	(=email-from= email))
  ""
  "Query options:"
  (-mi (id) "Specify member by id" (-member-id- (string->number id)))
@@ -179,6 +180,8 @@
   (*jendasap-checked* (=jendasap-checked=)))
 (when (=bank-dir=)
   (*bank-dir* (=bank-dir=)))
+(when (=email-from=)
+  (*email-from* (=email-from=)))
 
 ;; Run tests
 (when (-run-tests?-)

src/reminders.scm

@@ -28,7 +28,6 @@
 (module
  reminders
  (
-  *reminder-from*
   make+print-reminder-email
   make+send-reminder-email
   )
@@ -41,10 +40,8 @@
 	 util-dict-list
 	 members-payments
 	 util-format
-	 brmember-format)
-
- ;; From address
- (define *reminder-from* (make-parameter "Brmlab - Rada <rada@brmlab.cz>"))
+	 brmember-format
+	 configuration)
 
  ;; Creates reminder email body
  (define (reminder-email-body mr)
@@ -101,7 +98,7 @@
    (let ((em (make-reminder-email mr)))
      (print "Sending " (ldict-ref em 'subject) " originally to " (ldict-ref em 'to))
      (send-mail (ldict-ref em 'body)
-		#:from (*reminder-from*)
+		#:from (*email-from*)
 		#:to "joe@joe.cz"
 		#:subject (ldict-ref em 'subject))))