diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 51fe34be..c9367dfc 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -1127,18 +1127,24 @@ long SignupPendingAlertMailfile(CVars in) { CVars x; CVars out; C_CGI_Form form("", ""); - out["alertemail"] = CfgReadChar("transnotif.contact"); - out["server_name"] = CfgReadChar("system.server_name"); - form.LetStr("server_name", out["server_name"].c_str()); - form.LetStr("site_name", "WrenchBoard"); - form.LetStr("subject", "WrenchBoard Contact Us Alert"); + try{ + out["alertemail"] = CfgReadChar("transnotif.contact"); + + out["server_name"] = CfgReadChar("system.server_name"); + form.LetStr("server_name", out["server_name"].c_str()); + form.LetStr("site_name", "WrenchBoard"); + form.LetStr("subject", "WrenchBoard Contact Us Alert"); + + if (load_db_record(x, "SELECT *,email as email2,to_char(expire, 'Day Mon dd, yyyy HH:MI AM') AS expire,to_char(added, 'Day Mon dd, yyyy HH:MI AM') AS added FROM members_pending WHERE id = %lu ", in["pending_id"].Long())) { + vars2form(x, form); + form.LetStr("email", out["alertemail"].c_str()); + form.Email("ALERT/alert_signup.mailfile"); + } + } catch (bad_parameter) { + out["status"] = "ERROR"; + } - if (load_db_record(x, "SELECT *,email as email2,to_char(expire, 'Day Mon dd, yyyy HH:MI AM') AS expire,to_char(added, 'Day Mon dd, yyyy HH:MI AM') AS added FROM members_pending WHERE id = %lu ", in["pending_id"].Long())) { - vars2form(x, form); - form.LetStr("email", out["alertemail"].c_str()); - form.Email("ALERT/alert_signup.mailfile"); - } return 0; } @@ -1204,27 +1210,32 @@ long AccountPendingMail(CVars in) //TESTED CVars x; CVars out; C_CGI_Form form("", ""); - form.LetStr("main_site_url", "https://www.wrenchboard.com/"); - 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"); + try{ + form.LetStr("main_site_url", "https://www.wrenchboard.com/"); + 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 *,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) { - form.Email("ACCOUNT/member_pending_mobile.mailfile"); + 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) { + form.Email("ACCOUNT/member_pending_mobile.mailfile"); - } else { - form.Email("ACCOUNT/member_pending_mobile.mailfile"); + } else { + form.Email("ACCOUNT/member_pending_mobile.mailfile"); + } } + + in["title"] = "Account Pending Created"; + in["message"] = "Account Pending"; + in["title"].set_valid(true); + in["message"].set_valid(true); + } catch (bad_parameter) { + out["status"] = "ERROR"; } - in["title"] = "Account Pending Created"; - in["message"] = "Account Pending"; - in["title"].set_valid(true); - in["message"].set_valid(true); return 0; }