fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(mail): code cleaning and improved messages

Browse Source
This commit is contained in:
Steffen Jost 2022-01-10 17:29:27 +01:00
parent 859f5b8494
commit 71950d9e5c
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Foundation/Yesod/Auth.hs
View File

@ -269,7 +269,7 @@ upsertCampusUser upsertMode ldapData = do
, .. , ..
} }
userUpdate = [ userUpdate = [
-- UserDisplayName =. userDisplayName -- SJ asks: why is the display name not updated? -- UserDisplayName =. userDisplayName -- never updated, since users are allowed to change their DisplayName
UserFirstName =. userFirstName UserFirstName =. userFirstName
, UserSurname =. userSurname , UserSurname =. userSurname
, UserEmail =. userEmail , UserEmail =. userEmail

4
src/Mail.hs
View File

@ -315,8 +315,8 @@ defMailT ls (MailT mailC) = do
fromAddress <- defaultFromAddress fromAddress <- defaultFromAddress
(ret, mail, smtpData) <- runRWST mailC ls (emptyMail fromAddress) (ret, mail, smtpData) <- runRWST mailC ls (emptyMail fromAddress)
mail' <- maybeT (return mail) $ do mail' <- maybeT (return mail) $ do
guardM $ lift useReplyToInstead -- if sender must be fixed within ObjectIdDomain, use replyTo instead guardM useReplyToInstead -- if sender must be fixed within ObjectIdDomain, use replyTo instead
domain <- lift mailObjectIdDomain domain <- mailObjectIdDomain
let sender = mail ^. _mailFrom let sender = mail ^. _mailFrom
isdomainaddress = (Text.isInfixOf `on` Text.toCaseFold) domain (sender ^. _addressEmail) -- not sure how to use CI.mk and isInfixOf here isdomainaddress = (Text.isInfixOf `on` Text.toCaseFold) domain (sender ^. _addressEmail) -- not sure how to use CI.mk and isInfixOf here
$logDebugS "Mail" $ "Use ReplyTo instead of Sender: " <> tshow isdomainaddress <> " From was: " <> renderAddress sender <> " From is: " <> renderAddress fromAddress $logDebugS "Mail" $ "Use ReplyTo instead of Sender: " <> tshow isdomainaddress <> " From was: " <> renderAddress sender <> " From is: " <> renderAddress fromAddress

14
templates/i18n/help-instructions/de-de-formal.hamlet
View File

@ -3,13 +3,13 @@ $newline never
<p> <p>
Bitte bedenken Sie beim Stellen Ihrer Anfrage, dass das # Bitte bedenken Sie beim Stellen Ihrer Anfrage, dass das #
Uni2work-Kernteam aktuell aus Sarah Vaupel und Gregor Kleen besteht # FRADrive-Kernteam aktuell zu klein ist, #
und zwei Personen nicht hinreichend sind um in allen Fällen eine # um eine zeitnahe Bearbeitung Ihres Anliegens #
zeitnahe Bearbeitung Ihres Anliegens zu garantieren. zu garantieren.
<p> <p>
Falls sich Ihr Anliegen auf eine konkrete Veranstaltung bezieht, # Falls sich Ihr Anliegen auf einen konkreten Kurs bezieht, #
ziehen Sie bitte auch in Betracht (insbesondere bei zeitkritischen # ziehen Sie bitte auch in Betracht sich direkt an die #
Anliegen wie z.B. Abgaben) sich direkt an die Kursverwalter zu # Kursverwalter zu wenden (insbesondere bei zeitkritischen #
wenden. Anliegen wie z.B. Abgaben).

5
templates/i18n/help-instructions/en-eu.hamlet
View File

@ -2,9 +2,8 @@ $newline never
<p> <p>
When formulating your request please consider that the Uni2work core # When formulating your request please consider that the FRADrive core team #
team currently consists of Sarah Vaupel and Gregor Kleen and that # is currently too small to guarantee a timely answer in all cases.
two people are not enough to guarantee a timely answer in all cases.
<p> <p>