diff --git a/mermsemr/src/include/common_tool.h b/mermsemr/src/include/common_tool.h index 359eeb8..2d09de6 100644 --- a/mermsemr/src/include/common_tool.h +++ b/mermsemr/src/include/common_tool.h @@ -4,7 +4,9 @@ #include "vars.h" //void Confirmation( unsigned long payment_id, char * number, int sz ); -void GetMemberAccountLink( long member_id, unsigned long acc_link, char * number); +//void GetMemberAccountLink( long member_id, unsigned long acc_link, char * number); void GenerateInnerConfirmationSeed( char * number, int sz, int seed ); +long GetMemberAccountLink(long member_id, CVars &out); + #endif diff --git a/mermsemr/src/include/mermsemr_api.h b/mermsemr/src/include/mermsemr_api.h index c7cffc7..b7d1cdb 100644 --- a/mermsemr/src/include/mermsemr_api.h +++ b/mermsemr/src/include/mermsemr_api.h @@ -65,6 +65,8 @@ enum { // MERMS-GENERAL #define USER_CREATETASK 2200 #define USER_LOADTASK 5500 +#define USER_DELETETASK 7700 + #define MODE_SETVALUE 1001 #define MODE_GETVALUE 2002 diff --git a/mermsemr/src/shared_tool/common_tool.cc b/mermsemr/src/shared_tool/common_tool.cc index e6bd5fe..3bd5aa9 100644 --- a/mermsemr/src/shared_tool/common_tool.cc +++ b/mermsemr/src/shared_tool/common_tool.cc @@ -59,7 +59,16 @@ void ConfirmationNew(unsigned long payment_id, char * number, int sz) { strsafecpy(number, confirmation, sz); } -void GetMemberAccountLink(long member_id, unsigned long acc_link, char * number) { +long GetMemberAccountLink(long member_id, CVars &out){ + +long ret=0; + + ret = load_db_record(out, "SELECT * FROM members WHERE id = %lu",member_id); + +return 0; +} + +void GetMemberAccountLink2(long member_id, unsigned long acc_link, char * number) { SQLINTEGER rows; char offer_code[14]; diff --git a/mermsemr/src/shared_tool/function_members.cc b/mermsemr/src/shared_tool/function_members.cc index f294da0..16b9e44 100644 --- a/mermsemr/src/shared_tool/function_members.cc +++ b/mermsemr/src/shared_tool/function_members.cc @@ -44,7 +44,7 @@ long MemberLogin(CVars in, CVars &out) { out["acc_link"] = "ME345FT6789"; char acc_link[11]; - // GetMemberAccountLink(out["member_id"].Long(),acc_link, sizeof (acc_link) ); + GetMemberAccountLink(out["member_id"].Long(),out); // out["acc_link"] = acc_link; out["stauts"] = "OK"; @@ -366,6 +366,8 @@ long medTrUpdateProfile(CVars in, CVars &out) { long setMemberReminders(CVars in, CVars &out); long getMemberReminders(CVars in, CVars &out); +long delMemberReminders(CVars in, CVars &out); + long MemberReminders(CVars in, CVars &out) { try { @@ -378,6 +380,11 @@ long MemberReminders(CVars in, CVars &out) { case USER_LOADTASK: return getMemberReminders(in, out); break; + + case USER_DELETETASK: + return delMemberReminders(in, out); + break; + } } catch (bad_parameter) { logfmt(logINFO, "ERROR CALL CreateMember"); @@ -386,6 +393,35 @@ long MemberReminders(CVars in, CVars &out) { return 0; } +long delMemberReminders(CVars in, CVars &out){ + + +long ret = PHP_API_BAD_PARAM; + + logfmt(logINFO, "delMemberReminders()"); + + try { + + REQ_LONG(in, "member_id", 0, -1); + REQ_LONG(in, "tracked_id", 0, -1); + REQ_STRING(in, "sessionid", 2, 150, "(.*)"); + + const char * loc = getenv("REMOTE_ADDR"); + + pgsql_query("UPDATE members_reminders SET status = 0 WHERE status <> 0 AND member_id = %lu AND id = %lu", in["member_id"].Long(),in["tracked_id"].Long() ); + + if (ret > 0) { + + } + + } catch (bad_parameter) { + logfmt(logINFO, "ERROR CALL delMemberReminders"); + } + logfmt(logINFO, "/delMemberReminders()"); + +return ret; +} + long setMemberReminders(CVars in, CVars &out) { long ret = PHP_API_BAD_PARAM; logfmt(logINFO, "CreateMember()"); diff --git a/svrswww/api/backend_defines.php b/svrswww/api/backend_defines.php index 6501b66..d4e8380 100644 --- a/svrswww/api/backend_defines.php +++ b/svrswww/api/backend_defines.php @@ -2,6 +2,7 @@ // GENERAL define('USER_CREATETASK', 2200); define('USER_LOADTASK', 5500); +define('USER_DELETETASK', 7700); define('MODE_SETVALUE', 1001); define('MODE_GETVALUE', 2002); diff --git a/svrswww/api/users/index.php b/svrswww/api/users/index.php index cf5c8db..c87efb3 100644 --- a/svrswww/api/users/index.php +++ b/svrswww/api/users/index.php @@ -20,13 +20,14 @@ header('Access-Control-Allow-Origin: *'); header('Content-Type: application/json'); $endpoints = array( - 'createuser' => array('POST'), - 'login' => array('POST'), - 'userlogin' => array('POST'), - 'getprofile' => array('POST'), + 'createuser' => array('POST'), + 'login' => array('POST'), + 'userlogin' => array('POST'), + 'getprofile' => array('POST'), 'setprofile' => array('POST'), 'userstask' => array('POST'), - 'createtask' => array('POST') + 'createtask' => array('POST'), + 'deletetask' => array('POST') ); /* header("Access-Control-Allow-Origin: *"); @@ -96,7 +97,11 @@ switch ($endpoint) { case 'setprofile': $in["action"] = MERMS_USER_UPDATEPROFILE; $in["task_mode"] = MODE_SETVALUE; - break; + break; + case 'deletetask': + $in["action"] = MERMS_USER_REMINDERS; + $in["task_mode"] = USER_DELETETASK; + break; }