Start work on merging dokuwiki users into mbase.
This commit is contained in:
parent
6a4817c46f
commit
dfb60f9682
1 changed files with 6 additions and 1 deletions
|
@ -98,6 +98,8 @@
|
||||||
(*bank-dir* dir))
|
(*bank-dir* dir))
|
||||||
(-checked (file) "File with last checked bank transaction ID"
|
(-checked (file) "File with last checked bank transaction ID"
|
||||||
(*checked-file* file))
|
(*checked-file* file))
|
||||||
|
(-dokuwiki (dir) "Base directory of DokuWiki"
|
||||||
|
(*doku-base* dir))
|
||||||
""
|
""
|
||||||
"Email options:"
|
"Email options:"
|
||||||
(-from (email) "Sender email address"
|
(-from (email) "Sender email address"
|
||||||
|
@ -218,7 +220,7 @@
|
||||||
#f))
|
#f))
|
||||||
|
|
||||||
;; Load ML(s) and merge them
|
;; Load ML(s) and merge them
|
||||||
(define-values (MB internal-ml)
|
(define-values (MB1 internal-ml)
|
||||||
(if MB0
|
(if MB0
|
||||||
(if (-ml-all-)
|
(if (-ml-all-)
|
||||||
(let ()
|
(let ()
|
||||||
|
@ -234,6 +236,9 @@
|
||||||
internal-ml)))
|
internal-ml)))
|
||||||
(values #f #f)))
|
(values #f #f)))
|
||||||
|
|
||||||
|
;; Load DokuWiki users
|
||||||
|
(define MB MB1)
|
||||||
|
|
||||||
;; If a member is specified by either id or nick, get its record
|
;; If a member is specified by either id or nick, get its record
|
||||||
(define mr
|
(define mr
|
||||||
(if (-member-id-)
|
(if (-member-id-)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue