Use globals object in database rather than /_config/globals.json everywhere

[ndcode_site.git] / api / contact / send_enquiry.json.jst

diff --git a/api/contact/send_enquiry.json.jst b/api/contact/send_enquiry.json.jst
index d6b9d80..04ac3b0 100644 (file)
--- a/api/contact/send_enquiry.json.jst
+++ b/api/contact/send_enquiry.json.jst
@@ -2,7 +2,6 @@ let crypto = require('crypto')
 let XDate = require('xdate')
 
 return async env => {
-  let globals = await env.site.get_json('/_config/globals.json')
   let nodemailer_contact = await env.site.get_nodemailer(
     '/_config/nodemailer_contact.json'
   )
@@ -35,9 +34,15 @@ return async env => {
         )
 
       let transaction = await env.site.database.Transaction()
+      let contact_from, contact_to
       try {
         // initialize env.session_key, set cookie in env.response
         session_cookie(env, transaction)
+
+        let globals = await (await transaction.get({})).get('globals')
+        contact_from = await globals.get_json('contact_from')
+        contact_to = await globals.get_json('contact_to')
+
         await transaction.commit()
       }
       catch (error) {
@@ -55,10 +60,10 @@ return async env => {
           'Enquiry'
       await nodemailer_contact.sendMail(
         {
-          from: globals.contact_from,
-          to: globals.contact_to,
+          from: contact_from,
+          to: contact_to,
           replyTo: `${name} <${details.email}>`,
-          subject: subject,
+          subject,
           text: details.message
         }
       )