diff --git a/wrenchboard/email/ACCOUNT/member_pending_mobile.mailfile b/wrenchboard/email/ACCOUNT/member_pending_mobile.mailfile index e33d4ff1..f5af1ed0 100644 --- a/wrenchboard/email/ACCOUNT/member_pending_mobile.mailfile +++ b/wrenchboard/email/ACCOUNT/member_pending_mobile.mailfile @@ -1,26 +1,33 @@ -Subject: {{site_name}} - Pending Signup - Verify {{email}} +Subject: {{site_name}} - Verify {{email}} to Continue - + {{site_name}} - Pending Signup - Verify {{email}} @@ -33,16 +40,16 @@ img {height: auto;}
- + -
+ - +
@@ -76,7 +83,7 @@ img {height: auto;}
- +
Hello {{firstname}}, @@ -98,21 +105,23 @@ Hello {{firstname}},
- +
- - - +
- - +
-For app sign up ,enter the number {{signup_random}} to continue. -
-For Web sign up , Click here to verify account to continue. +		 +Enter the number {{signup_random}} in the mobile app to continue. +
+Or
+ Click here to verify account to continue your account on the web. +
-Note : The link will expire by:{{expire}} +Note : The link will expire by:{{expire}}
@@ -126,13 +135,7 @@ Note : The link will expire by:{{expire}}
-  If you did not initiate this account creation or have any further support question, Please contact us at https://www.wrenchboard.com/contact
-
-  With {{site_name}},you can enjoy free connection to makerplace for all of your ability. We are simply here to empower you.. -
{{site_name}} Team @@ -145,8 +148,8 @@ Note : The link will expire by:{{expire}} @@ -181,7 +184,4 @@ You received this email because you subscribe to {{site_name}}. If you get this
-® {{site_name}} 2022
-You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us. +® {{site_name}} {{YYYY}}
+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/email/ACCOUNT/member_welcome.mailfile b/wrenchboard/email/ACCOUNT/member_welcome.mailfile index 94dc163b..640286ce 100644 --- a/wrenchboard/email/ACCOUNT/member_welcome.mailfile +++ b/wrenchboard/email/ACCOUNT/member_welcome.mailfile @@ -121,7 +121,7 @@ With {{site_name}}, you can enjoy free coordinated diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index c44a6f02..6da01806 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -1084,7 +1084,7 @@ long AccountPendingMail(CVars in) //TESTED form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_trade_name", "Connecting Opportunities"); - if (load_db_record(x, "SELECT *,to_char(expire, 'Day Mon dd, yyyy HH:MI AM') AS expire FROM members_pending WHERE id = %lu ", in["pending_id"].Long())) { + if (load_db_record(x, "SELECT *,to_char(expire, 'Day Mon dd, yyyy HH:MI AM') AS expire,to_char(now(), 'yyyy') AS YYYY FROM members_pending WHERE id = %lu ", in["pending_id"].Long())) { vars2form(x, form); form.LetStr("email", x["email"].c_str()); if (x["signup_random"] != "" && x["signup_random"].Long() > 0 && in["mobile_email"].Long() == 100) { @@ -1113,7 +1113,7 @@ long WelcomeAccountMail(CVars in) // TESTED form.LetStr("server_name", out["server_name"].c_str()); form.LetStr("site_name", "WrenchBoard"); - if (load_db_record(x, "SELECT * FROM members WHERE id = %lu ", in["member_id"].Long())) { + if (load_db_record(x, "SELECT *,to_char(now(), 'yyyy') AS YYYY FROM members WHERE id = %lu ", in["member_id"].Long())) { vars2form(x, form); form.LetStr("email", x["email"].c_str()); form.Email("ACCOUNT/member_welcome.mailfile");
- ® {{site_name}} 2022
+ ® {{site_name}} {{YYYY}}
You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us.