diff --git a/wrenchboard/email/ACCOUNT/member_login.mailfile b/wrenchboard/email/ACCOUNT/member_login.mailfile index e065ca23..47422a3f 100644 --- a/wrenchboard/email/ACCOUNT/member_login.mailfile +++ b/wrenchboard/email/ACCOUNT/member_login.mailfile @@ -142,7 +142,7 @@ Recently added task(s) ® {{site_name}} {{YYYY}}
-You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us. +You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us. diff --git a/wrenchboard/email/ACCOUNT/member_pending_mobile.mailfile b/wrenchboard/email/ACCOUNT/member_pending_mobile.mailfile index f5af1ed0..1634a411 100644 --- a/wrenchboard/email/ACCOUNT/member_pending_mobile.mailfile +++ b/wrenchboard/email/ACCOUNT/member_pending_mobile.mailfile @@ -149,7 +149,7 @@ Or ® {{site_name}} {{YYYY}}
-You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us. +You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us. diff --git a/wrenchboard/email/ACCOUNT/member_welcome.mailfile b/wrenchboard/email/ACCOUNT/member_welcome.mailfile index 04e85d4a..ce629f62 100644 --- a/wrenchboard/email/ACCOUNT/member_welcome.mailfile +++ b/wrenchboard/email/ACCOUNT/member_welcome.mailfile @@ -126,7 +126,7 @@ With {{site_name}}, you can set up a family accoun ® {{site_name}} {{YYYY}}
-You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us. +You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us. diff --git a/wrenchboard/email/SENDMONEY/sm_completed.mailfile b/wrenchboard/email/SENDMONEY/sm_completed.mailfile index 0c4801e8..8f138fa6 100644 --- a/wrenchboard/email/SENDMONEY/sm_completed.mailfile +++ b/wrenchboard/email/SENDMONEY/sm_completed.mailfile @@ -156,7 +156,7 @@ You have account withdraw action from your account at - Please contact us at {{server_name}}/contact if you have any question about this email. + Please contact us at {{main_site_url}}/contact if you have any question about this email. diff --git a/wrenchboard/email/SENDMONEY/sm_completed_alert.mailfile b/wrenchboard/email/SENDMONEY/sm_completed_alert.mailfile index bef79073..586b1f3d 100644 --- a/wrenchboard/email/SENDMONEY/sm_completed_alert.mailfile +++ b/wrenchboard/email/SENDMONEY/sm_completed_alert.mailfile @@ -157,7 +157,7 @@ border: none; - Please contact us at {{server_name}}/contact if you have any question about this email. + Please contact us at {{main_site_url}}/contact if you have any question about this email. diff --git a/wrenchboard/email/SENDMONEY/sm_pending.mailfile b/wrenchboard/email/SENDMONEY/sm_pending.mailfile index 565aa168..92a865f3 100644 --- a/wrenchboard/email/SENDMONEY/sm_pending.mailfile +++ b/wrenchboard/email/SENDMONEY/sm_pending.mailfile @@ -151,7 +151,7 @@ You have account withdraw action from your account at -Please contact us at {{server_name}}/contact if you have any question about this email. +Please contact us at {{main_site_url}}/contact if you have any question about this email. diff --git a/wrenchboard/email/SENDMONEY/sm_pending_alert.mailfile b/wrenchboard/email/SENDMONEY/sm_pending_alert.mailfile index e9327fb5..55f19425 100644 --- a/wrenchboard/email/SENDMONEY/sm_pending_alert.mailfile +++ b/wrenchboard/email/SENDMONEY/sm_pending_alert.mailfile @@ -143,7 +143,7 @@ border: none; -

Please login into the BKO manage the status of this transfer.

+

Please login into the BKO manage the status of this transfer.

@@ -157,7 +157,7 @@ border: none; - Please contact us at {{server_name}}/contact if you have any question about this email. + Please contact us at {{main_site_url}}/contact if you have any question about this email. diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 07f37086..675eb0ed 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -756,6 +756,8 @@ long sendmoney_email(long mailtype, CVars in, CVars &out) { CVars x, y, z; C_CGI_Form form("", ""); + form.LetStr("main_site_url", "https://www.wrenchboard.com/"); + //char * server_name; // = getenv("SERVER_NAME"); out["server_name"] = CfgReadChar("system.server_name"); //sprintf(server_name, "%s", out["server_name"].c_str()); @@ -984,7 +986,7 @@ long LocationAccountLoginMail(CVars in) { CVars x; CVars out; C_CGI_Form form("", ""); - + form.LetStr("main_site_url", "https://www.wrenchboard.com/"); out["server_name"] = CfgReadChar("system.server_name"); form.LetStr("server_name", out["server_name"].c_str()); form.LetStr("site_name", "WrenchBoard"); @@ -1080,7 +1082,7 @@ long ManagerAccountLoginMail(CVars in) { CVars x; CVars out; C_CGI_Form form("", ""); - + form.LetStr("main_site_url", "https://www.wrenchboard.com/"); out["server_name"] = CfgReadChar("system.server_name"); form.LetStr("server_name", out["server_name"].c_str()); form.LetStr("site_name", "WrenchBoard"); @@ -1099,7 +1101,7 @@ long AccountPendingMail(CVars in) //TESTED CVars x; CVars out; C_CGI_Form form("", ""); - + form.LetStr("main_site_url", "https://www.wrenchboard.com/"); out["server_name"] = CfgReadChar("system.server_name"); form.LetStr("server_name", out["server_name"].c_str()); form.LetStr("site_name", "WrenchBoard"); @@ -1129,7 +1131,7 @@ long WelcomeAccountMail(CVars in) // TESTED CVars x; CVars out; C_CGI_Form form("", ""); - + form.LetStr("main_site_url", "https://www.wrenchboard.com/"); out["server_name"] = CfgReadChar("system.server_name"); form.LetStr("server_name", out["server_name"].c_str()); form.LetStr("site_name", "WrenchBoard"); @@ -1159,7 +1161,7 @@ long JobAddedMail(CVars in) //TESTED CVars out; C_CGI_Form form("", ""); const PGresult *res; - + form.LetStr("main_site_url", "https://www.wrenchboard.com/"); out["server_name"] = CfgReadChar("system.server_name"); form.LetStr("server_name", out["server_name"].c_str()); form.LetStr("site_name", "WrenchBoard"); @@ -1205,7 +1207,7 @@ long CreateWrenchBoardGroupMail(CVars in) { CVars x; CVars out; C_CGI_Form form("", ""); - + form.LetStr("main_site_url", "https://www.wrenchboard.com/"); out["server_name"] = CfgReadChar("system.server_name"); form.LetStr("server_name", out["server_name"].c_str()); form.LetStr("site_name", "WrenchBoard");