From e0edf1932d3caccfa791dcdbfe79fb02601c3907 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sat, 23 Apr 2022 11:38:57 -0400 Subject: [PATCH] fix --- wrenchboard/src/shared_tool/email.cc | 14 ++++++++++++++ wrenchboard/src/shared_tool/jobs.cc | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 3a799151..a05995f1 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -1031,16 +1031,30 @@ long WelcomeAccountMail(CVars in) // TESTED long JobAddedMail(CVars in) //TESTED { + + + REQ_LONG(in, "member_id", 1, -1); REQ_LONG(in, "job_id", 1, -1); CVars x; CVars out; C_CGI_Form form("", ""); + const PGresult *res; char * server_name = getenv("SERVER_NAME"); form.LetStr("server_name", "https://dashboard.wrenchboard.com"); form.LetStr("site_name", "WrenchBoard"); + // testing exclusion first + res = pgsql_query("SELECT * FROM members_settings WHERE member_id = %lu AND pref_id='S0008' AND status=100", in["member_id"].Long()); + if (res != NULL && pgsql_num_rows(res) > 0) { + + } + else{ + return 0; + } + + if (load_db_record(x, "SELECT j.*,j.title as title2,m.email,m.firstname FROM members_jobs j LEFT JOIN members m ON m.id = j.member_id WHERE j.id = %lu AND j.member_id = %lu", in["job_id"].Long(), in["member_id"].Long())) { vars2form(x, form); form.LetStr("email", x["email"].c_str()); diff --git a/wrenchboard/src/shared_tool/jobs.cc b/wrenchboard/src/shared_tool/jobs.cc index 675b3c7e..4231803a 100644 --- a/wrenchboard/src/shared_tool/jobs.cc +++ b/wrenchboard/src/shared_tool/jobs.cc @@ -1086,6 +1086,10 @@ long WrenchCreateJobs(CVars in, CVars &out) { x["loc"].set_valid(true); x["job_detail"] = in["job_detail"]; x["job_detail"].set_valid(true); + //country added + x["country"] = in["country"]; + x["country"].set_valid(true); + job_id = insert_db_record(DBS_VALID, "members_jobs", "members_jobs_id_seq", x); if (job_id) {