From 8b8eaf88f9064b22083f3ea52038f75780b2cf16 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Thu, 3 Feb 2022 19:08:43 -0500 Subject: [PATCH] fix --- .../email/ACCOUNT/member_welcome.mailfile | 107 ++++++++---------- wrenchboard/src/shared_tool/email.cc | 10 +- 2 files changed, 52 insertions(+), 65 deletions(-) diff --git a/wrenchboard/email/ACCOUNT/member_welcome.mailfile b/wrenchboard/email/ACCOUNT/member_welcome.mailfile index 4076d4e8..e57ee0ec 100644 --- a/wrenchboard/email/ACCOUNT/member_welcome.mailfile +++ b/wrenchboard/email/ACCOUNT/member_welcome.mailfile @@ -6,42 +6,26 @@ Subject: Welcome to {{site_name}} Welcome to {{site_name}} - + - +
@@ -53,34 +37,40 @@ Subject: Welcome to {{site_name}} -
- - - - -
- WrenchBoard -
+ + + + + + + + +
+ WrenchBoard +
+ {{site_trade_name}} +
- +
-
- + + + + + + +
+ - - - - - - -
- {{site_name}} -
- {{site_trade_name}} -
+
+ WrenchBoard +
+ {{site_trade_name}} +
@@ -160,11 +150,11 @@ With {{site_name}}, you can enjoy free coor
+ @@ -199,8 +189,5 @@ With {{site_name}}, you can enjoy free coor
- ® {{site_name}} 2017
+ ® {{site_name}} 2022
You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us.
- - - \ No newline at end of file diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 25740236..be8c4b91 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -60,7 +60,7 @@ long SendmarketMessage(CVars in, CVars &out) { form.LetStr("site_trade_name", "Connecting Experts with Clients"); vars2form(in, form); - in["server_name"] = "https://www.wrenchboard.com"; + in["server_name"] = "https://dashboard.wrenchboard.com"; int c = 0; @@ -157,7 +157,7 @@ long cron_email(long mailtype, CVars in, CVars &out) { if (load_db_record(x, "SELECT *,email as email2,to_char(last_login, 'Day Mon dd, yyyy HH:MI AM') AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) { - in["server_name"] = "https://www.wrenchboard.com"; + in["server_name"] = "https://dashboard.wrenchboard.com"; int c = 0; @@ -275,7 +275,7 @@ long account_email(long mailtype, CVars in, CVars &out) { if (load_db_record(x, "SELECT *,email as email2,to_char(last_login, 'Day Mon dd, yyyy HH:MI AM') AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) { - in["server_name"] = "https://www.wrenchboard.com"; + in["server_name"] = "https://dashboard.wrenchboard.com"; int c = 0; @@ -417,7 +417,7 @@ long job_email(long mailtype, CVars in, CVars &out) { vars2form(y, form); // FOR CRON JOBS SET SERVER NAME form.LetStr("preview_count", in["preview_count"].c_str()); - form.LetStr("server_name", "www.wrenchboard.com"); + form.LetStr("server_name", "dashboard.wrenchboard.com"); vars2form(x, form); form.LetStr("subject", "Completed Task Processing Past Due"); form.LetStr("email", y["email"].c_str()); @@ -431,7 +431,7 @@ long job_email(long mailtype, CVars in, CVars &out) { if (load_db_record(x, "SELECT m.firstname,m.email,mj.title,c.* FROM members_jobs_contract c LEFT JOIN members m ON m.id=c.client_id LEFT JOIN members_jobs mj ON mj.id = c.job_id WHERE c.id=%lu AND c.due_remind IS NULL", in["contract_id"].Long())) { // FOR CRON JOBS SET SERVER NAME - form.LetStr("server_name", "www.wrenchboard.com"); + form.LetStr("server_name", "dashboard.wrenchboard.com"); vars2form(x, form); form.LetStr("subject", "Task Due Date Approaching"); form.LetStr("email", x["email"].c_str());