From 9ec5e63c07000defaead29192b56f95b05f0c4bc Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Wed, 31 Aug 2022 18:25:59 -0400 Subject: [PATCH] fix --- .../email/JOB/job_interest_client.mailfile | 12 ++--- .../email/JOB/job_interest_member.mailfile | 14 +++--- .../email/JOB/job_interest_message.mailfile | 14 +++--- wrenchboard/src/shared_tool/email.cc | 46 +++++++++++++++---- 4 files changed, 57 insertions(+), 29 deletions(-) diff --git a/wrenchboard/email/JOB/job_interest_client.mailfile b/wrenchboard/email/JOB/job_interest_client.mailfile index 34ec4dc7..820de865 100644 --- a/wrenchboard/email/JOB/job_interest_client.mailfile +++ b/wrenchboard/email/JOB/job_interest_client.mailfile @@ -56,7 +56,7 @@ body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px;
-WrenchBoard +WrenchBoard
@@ -136,7 +136,7 @@ Title Offer ID -{{offer_code}} +{{offer_code}} @@ -197,7 +197,7 @@ Note that this task was posted in the public domain and the owner can select any - + @@ -218,7 +218,7 @@ Please contact us at https://www.wrenchboard.com/contact if you have any questi ® {{site_name}} 2022
-You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. +You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. @@ -227,12 +227,12 @@ You received this email because a user sent a job to you from {{site_name}}. If -Facebook +Facebook -Twitter +Twitter diff --git a/wrenchboard/email/JOB/job_interest_member.mailfile b/wrenchboard/email/JOB/job_interest_member.mailfile index 0883f722..3405e309 100644 --- a/wrenchboard/email/JOB/job_interest_member.mailfile +++ b/wrenchboard/email/JOB/job_interest_member.mailfile @@ -56,7 +56,7 @@ body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px;
-WrenchBoard +WrenchBoard
@@ -135,7 +135,7 @@ Title Offer ID -{{offer_code}} +{{offer_code}} @@ -192,7 +192,7 @@ Detail - + @@ -213,7 +213,7 @@ Please contact us at https://www.wrenchboard.com/contact if you have any questi ® {{site_name}} 2022
-You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. +You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. @@ -222,12 +222,12 @@ You received this email because a user sent a job to you from {{site_name}}. If -Facebook +Facebook -Twitter +Twitter @@ -247,7 +247,5 @@ You received this email because a user sent a job to you from {{site_name}}. If - - diff --git a/wrenchboard/email/JOB/job_interest_message.mailfile b/wrenchboard/email/JOB/job_interest_message.mailfile index a7a37177..5a39bec0 100644 --- a/wrenchboard/email/JOB/job_interest_message.mailfile +++ b/wrenchboard/email/JOB/job_interest_message.mailfile @@ -56,7 +56,7 @@ Subject: {{subject}}
- WrenchBoard + WrenchBoard
@@ -101,7 +101,7 @@ Subject: {{subject}} -You have received a messager from a {{site_name}} because of your interest in the task " {{job_title}} " at {{added}}. +You have received a messager from a {{site_name}} because of your interest in the task " {{job_title}} " at {{added}}. @@ -113,7 +113,7 @@ You have received a messager from a - + @@ -151,7 +151,7 @@ You have received a messager from a - + @@ -172,7 +172,7 @@ You have received a messager from a ® {{site_name}} 2022
- You received this email because of your interest in a task @ {{site_name}}. If you get this email in error, please contact us. + You received this email because of your interest in a task @ {{site_name}}. If you get this email in error, please contact us. @@ -181,12 +181,12 @@ You have received a messager from a - Facebook + Facebook - Twitter + Twitter diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index b401f8dc..9dfa6f93 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -60,7 +60,10 @@ long SendmarketMessage(CVars in, CVars &out) { form.LetStr("site_trade_name", "Connecting Opportunities"); vars2form(in, form); - in["server_name"] = "https://dashboard.wrenchboard.com"; + in["server_name"] = CfgReadChar("system.server_name"); + form.LetStr("server_name", in["server_name"].c_str()); + + // in["server_name"] = "https://dashboard.wrenchboard.com"; int c = 0; @@ -141,8 +144,13 @@ long cron_email(long mailtype, CVars in, CVars &out) { char late_subject[120]; const PGresult *res; - char * server_name = getenv("SERVER_NAME"); - form.LetStr("server_name", server_name); + // char * server_name = getenv("SERVER_NAME"); + // form.LetStr("server_name", server_name); + + in["server_name"] = CfgReadChar("system.server_name"); + form.LetStr("server_name", in["server_name"].c_str()); + + form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_trade_name", "Connecting Opportunities"); @@ -157,7 +165,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://dashboard.wrenchboard.com"; + // in["server_name"] = "https://dashboard.wrenchboard.com"; int c = 0; @@ -237,8 +245,12 @@ long coupon_email(long mailtype, CVars in, CVars &out) { char listing_items[1024]; const PGresult *res; bool exclude_email = true; - char * server_name = getenv("SERVER_NAME"); - form.LetStr("server_name", "https://dashboard.wrenchboard.com"); + // char * server_name = getenv("SERVER_NAME"); + // form.LetStr("server_name", "https://dashboard.wrenchboard.com"); + + in["server_name"] = CfgReadChar("system.server_name"); + form.LetStr("server_name", in["server_name"].c_str()); + form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_trade_name", "Connecting Opportunities"); @@ -898,21 +910,39 @@ long getContractMemberClientEmail(long contract_id, CVars &out) { } long test_email(CVars in, CVars &out) { - CVars x; + CVars x,y,z; C_CGI_Form form("", ""); out["server_name"] = CfgReadChar("system.server_name"); form.LetStr("server_name", out["server_name"].c_str()); form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_trade_name", "Connecting Opportunities"); - +/* if (load_db_record(x, "select p.*,m.firstname,m.lastname,m.email from password_reset p LEFT JOIN members m ON m.id =p.member_id WHERE p.id = 8 ")) { vars2form(x, form); } form.LetStr("subject", "This is Test Email"); form.LetStr("email", in["email"].c_str()); form.Email("ALERT/template.mailfile"); +*/ + if (load_db_record(x, "SELECT o.*,to_char(o.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire2,j.title,j.description,j.timeline_days,j.price FROM members_jobs_offer o LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.id = %lu AND o.status >0", in["offer_id"].Long())) { + vars2form(x, form); + if (load_db_record(y, "SELECT email,balance,firstname FROM members WHERE id = %lu", x["member_id"].Long())) { + vars2form(y, form); + form.LetStr("subject", "Job Interest Recieved"); + form.LetStr("email", "ameye+member@chiefsoft.com"); + form.Email("JOB/job_interest_member.mailfile"); + } + if (load_db_record(z, "SELECT mi.*,m.firstname,m.lastname,m.email from members_offer_interest mi LEFT JOIN members m ON m.id = mi.member_id WHERE mi.id = %lu", in["interest_id"].Long())) { + vars2form(z, form); + form.LetStr("subject", "Job Interest Sent"); + form.LetStr("email", "ameye+client@chiefsoft.com"); + form.Email("JOB/job_interest_client.mailfile"); + } + + } + return 0; }