From 181c9c4084dc35cdcc8800010adf933c726de9ad Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Thu, 3 Oct 2024 09:15:18 -0400 Subject: [PATCH] New cron emsil --- wrenchboard/src/include/cron_email.h | 11 ++++++ wrenchboard/src/shared_tool/cron_email.cc | 43 +++++++++++++++++++++++ wrenchboard/src/shared_tool/email.cc | 39 ++++++++++++++------ 3 files changed, 83 insertions(+), 10 deletions(-) create mode 100644 wrenchboard/src/include/cron_email.h create mode 100644 wrenchboard/src/shared_tool/cron_email.cc diff --git a/wrenchboard/src/include/cron_email.h b/wrenchboard/src/include/cron_email.h new file mode 100644 index 00000000..15d3932d --- /dev/null +++ b/wrenchboard/src/include/cron_email.h @@ -0,0 +1,11 @@ +#ifndef __mx_cron_email_h__ +#define __mx_cron_email_h__ + +#include "vars.h" + +long submit_cron_email(CVars in) +long CronSendMail(CVars in, CVars &out); + +#endif + + diff --git a/wrenchboard/src/shared_tool/cron_email.cc b/wrenchboard/src/shared_tool/cron_email.cc new file mode 100644 index 00000000..0b056bd3 --- /dev/null +++ b/wrenchboard/src/shared_tool/cron_email.cc @@ -0,0 +1,43 @@ +#include "email.h" +#include "clog.h" +#include "cgi.h" +#include "input.h" +#include "wrenchboard_api.h" +#include "safestring.h" +#include "cfg.h" +#include +#include "pgsql_wrapper.h" +#include "pgsql.h" + +void vars2form(CVars &v, C_CGI_Form &form); + +extern int mailsend(CVars in, CVars &out); + +/* + +CREATE TABLE email_message( + id SERIAL, + uid uuid DEFAULT uuid_generate_v4(), + topic VARCHAR(150) NOT NULL, + action INT DEFAULT 0, + member_id INT DEFAULT 0, + job_id INT DEFAULT 0, + offer_id INT DEFAULT 0, + contract_id INT DEFAULT 0, + status INT DEFAULT 1, + added timestamp without time zone DEFAULT now(), + completed timestamp + ); + ALTER TABLE ONLY email_message + ADD CONSTRAINT email_message_id_key UNIQUE (id); + */ + + long submit_cron_email(CVars in){ + return insert_db_record( DBS_VALID, "email_message", "email_message_id_seq", in ); + } + + long CronSendMail(CVars in, CVars &out){ + + + return 0; + } \ No newline at end of file diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 17409ec6..1ff0b73a 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -1,4 +1,5 @@ #include "email.h" +#include "cron_email.h" #include "clog.h" #include "cgi.h" #include "input.h" @@ -1233,6 +1234,7 @@ long LocationAccountLoginMail(CVars in) { REQ_LONG(in, "member_id", 1, -1); CVars x; CVars out; + CVars ml; C_CGI_Form form("", ""); form.LetStr("main_site_url", "https://www.wrenchboard.com/"); out["server_name"] = CfgReadChar("system.server_name"); @@ -1240,9 +1242,14 @@ long LocationAccountLoginMail(CVars in) { form.LetStr("site_name", "WrenchBoard"); if (load_db_record(x, "SELECT * 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"); +// vars2form(x, form); +// form.LetStr("email", x["email"].c_str()); +// form.Email("ACCOUNT/member_welcome.mailfile"); + // CVars ml; + ml["action"] = WRENCHBOARD_ACCOUNT_LOGIN; ml["action"].set_valid( true ); + ml["topic"] = "WRENCHBOARD_ACCOUNT_LOGIN"; ml["topic"].set_valid( true ); + ml["member_id"] = in["member_id"]; ml["member_id"].set_valid( true ); + submit_cron_email(ml); } return 0; } @@ -1334,6 +1341,7 @@ long AlertActions(CVars in) { long ManagerAccountLoginMail(CVars in) { REQ_LONG(in, "member_id", 1, -1); CVars x; + CVars ml; CVars out; C_CGI_Form form("", ""); form.LetStr("main_site_url", "https://www.wrenchboard.com/"); @@ -1342,9 +1350,14 @@ long ManagerAccountLoginMail(CVars in) { form.LetStr("site_name", "WrenchBoard"); if (load_db_record(x, "SELECT * 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"); +// vars2form(x, form); +// form.LetStr("email", x["email"].c_str()); +// form.Email("ACCOUNT/member_welcome.mailfile"); + // CVars ml; + ml["action"] = WRENCHBOARD_ACCOUNT_LOGIN; ml["action"].set_valid( true ); + ml["topic"] = "WRENCHBOARD_ACCOUNT_LOGIN"; ml["topic"].set_valid( true ); + ml["member_id"] = in["member_id"]; ml["member_id"].set_valid( true ); + submit_cron_email(ml); } return 0; } @@ -1389,6 +1402,7 @@ long WelcomeAccountMail(CVars in) // TESTED REQ_LONG(in, "member_id", 1, -1); CVars x; CVars out; + CVars ml; C_CGI_Form form("", ""); form.LetStr("main_site_url", "https://www.wrenchboard.com/"); out["server_name"] = CfgReadChar("system.server_name"); @@ -1396,10 +1410,15 @@ long WelcomeAccountMail(CVars in) // TESTED form.LetStr("site_name", "WrenchBoard"); 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"); - } +// vars2form(x, form); +// form.LetStr("email", x["email"].c_str()); +// form.Email("ACCOUNT/member_welcome.mailfile"); + // CVars ml; + ml["action"] = WRENCHBOARD_ACCOUNT_LOGIN; ml["action"].set_valid( true ); + ml["topic"] = "WRENCHBOARD_ACCOUNT_LOGIN"; ml["topic"].set_valid( true ); + ml["member_id"] = in["member_id"]; ml["member_id"].set_valid( true ); + submit_cron_email(ml); + } in["title"] = "Account Creation Completed"; in["message"] = "Account Creation Completed";