diff --git a/wrenchboard/src/shared_tool/account.cc b/wrenchboard/src/shared_tool/account.cc index 33ca6cab..6df5fffe 100644 --- a/wrenchboard/src/shared_tool/account.cc +++ b/wrenchboard/src/shared_tool/account.cc @@ -2110,7 +2110,7 @@ long WrenchSendReferLoadLink(CVars in, CVars &out) { long WrenchSendRefer(CVars in, CVars &out) { logfmt(logINFO, "long WrenchSendRefer(CVars in, CVars out)"); long ret = PHP_API_BAD_PARAM; - CVars ml; + try { //out = in; out["status"] = ""; @@ -2165,14 +2165,7 @@ long WrenchSendRefer(CVars in, CVars &out) { const PGresult *res4 = pgsql_query("UPDATE members_refer_friend SET sent=now() WHERE id=%lu", refer_id); in["refer_id"] = refer_id; in["refer_id"].set_valid(true); - - ml["action"] = ACCOUNT_SEND_REFEREMAIL; ml["action"].set_valid( true ); - ml["topic"] = "ACCOUNT_SEND_REFEREMAIL"; ml["topic"].set_valid( true ); - ml["refer_id"] = refer_id; ml["refer_id"].set_valid( true ); - //ml["interest_id"] = in["interest_id"]; ml["interest_id"].set_valid( true ); - submit_cron_email(ml); - - // account_email(ACCOUNT_SEND_REFEREMAIL, in, out); // ALERT REFER EMAIL + account_email(ACCOUNT_SEND_REFEREMAIL, in, out); // ALERT REFER EMAIL out["status"] = "Refer message sent"; ret = PHP_API_OK; } diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index a11661f0..962b4ab5 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -508,7 +508,6 @@ long family_email(long mailtype, CVars in, CVars &out) { long account_email(long mailtype, CVars in, CVars &out) { - //REQ_LONG( in, "member_id", 1, -1 ); CVars x, ml; C_CGI_Form form("", ""); @@ -537,11 +536,18 @@ long account_email(long mailtype, CVars in, CVars &out) { case ACCOUNT_SEND_REFEREMAIL: REQ_LONG(in, "refer_id", 1, -1); - if (load_db_record(x, "SELECT r.*,m.firstname AS send_firstname,m.lastname AS send_lastname,date_part('year',now()) AS yyyy FROM members_refer_friend r LEFT JOIN members m ON m.id = r.member_id WHERE r.id = %lu ", in["refer_id"].Long())) { - vars2form(x, form); - form.LetStr("email", x["email"].c_str()); - form.Email("ACCOUNT/member_refer_individual.mailfile"); - } + ml["action"] = ACCOUNT_SEND_REFEREMAIL; ml["action"].set_valid( true ); + ml["topic"] = "ACCOUNT_SEND_REFEREMAIL"; ml["topic"].set_valid( true ); + ml["refer_id"] = in["refer_id"]; ml["refer_id"].set_valid( true ); + //ml["interest_id"] = in["interest_id"]; ml["interest_id"].set_valid( true ); + submit_cron_email(ml); + +// +// if (load_db_record(x, "SELECT r.*,m.firstname AS send_firstname,m.lastname AS send_lastname,date_part('year',now()) AS yyyy FROM members_refer_friend r LEFT JOIN members m ON m.id = r.member_id WHERE r.id = %lu ", in["refer_id"].Long())) { +// vars2form(x, form); +// form.LetStr("email", x["email"].c_str()); +// form.Email("ACCOUNT/member_refer_individual.mailfile"); +// } break; case ACCOUNT_CREATED_MAIL: