diff --git a/wrenchboard/src/shared_tool/family_acc.cc b/wrenchboard/src/shared_tool/family_acc.cc index 2e4f5496..cd00745e 100644 --- a/wrenchboard/src/shared_tool/family_acc.cc +++ b/wrenchboard/src/shared_tool/family_acc.cc @@ -128,7 +128,7 @@ long WrenchFamilyInviteList(CVars in, CVars &out){ out["total_record"] = "0"; res = pgsql_query("SELECT * " " FROM members_family_relative " - " WHERE member_id = %lu ) " + " WHERE member_id = %lu " " AND status IN ( 1,2,3,4,5) " " ORDER BY id DESC ", member_id ); @@ -188,27 +188,35 @@ long WrenchFamilyInvite(CVars in, CVars &out){ if ( load_db_record(out, "SELECT count(id) AS prev_entry FROM members_family_relative " " WHERE LOWER('%s') = LOWER(email) AND member_id= %lu", in["email"].c_str(), member_id)== 0){ - CVars xx; - xx["member_id"] = member_id; - xx["member_id"].set_valid(true); - xx["member_uid"] = in["uid"]; - xx["member_uid"].set_valid(true); - xx["firstname"] = in["firstname"]; - xx["firstname"].set_valid(true); - xx["lastname"] = in["lastname"]; - xx["lastname"].set_valid(true); - xx["email"] = in["email"]; - xx["email"].set_valid(true); - xx["family_type"] = in["family_type"]; - xx["family_type"].set_valid(true); + if ( out["prev_entry"].Long()> 0){ + out["status_msg"] = "Duplicate"; + out["status_msg"] = "DUPLICATE"; + } + else{ + CVars xx; + xx["member_id"] = member_id; + xx["member_id"].set_valid(true); + xx["member_uid"] = in["uid"]; + xx["member_uid"].set_valid(true); + xx["firstname"] = in["firstname"]; + xx["firstname"].set_valid(true); + xx["lastname"] = in["lastname"]; + xx["lastname"].set_valid(true); + xx["email"] = in["email"]; + xx["email"].set_valid(true); + xx["family_type"] = in["family_type"]; + xx["family_type"].set_valid(true); + + out["invite_id"] = insert_db_record(DBS_VALID, "members_family_relative", "members_family_relative_id_seq", xx); + if(out["invite_id"].Long() > 0 ){ + // load_db_record( out, "SELECT id AS suggest_id,* FROM members_family_suggesttask WHERE id = %lu ", out["suggested_task_id"].Long()); + // family_email(WRENCHBOARD_FAMILY_SGGESTTASKS, out, out); // + } + ret = PHP_API_OK; + out["status"] = "OK"; + + } - out["invite_id"] = insert_db_record(DBS_VALID, "members_family_relative", "members_family_relative_id_seq", xx); - if(out["invite_id"].Long() > 0 ){ - // load_db_record( out, "SELECT id AS suggest_id,* FROM members_family_suggesttask WHERE id = %lu ", out["suggested_task_id"].Long()); - // family_email(WRENCHBOARD_FAMILY_SGGESTTASKS, out, out); // - } - ret = PHP_API_OK; - out["status"] = "OK"; } else{