jubabox/jubaboxweb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2020-01-01 09:08:49 -05:00
parent b4b0252019
commit 855ce7b4fb
6 changed files with 80 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jubabox/email/USERS/user_login.mailfile
+29 -188
View File
File diff suppressed because one or more lines are too long
jubabox/etc/jubabox_api.conf
+1 -1
View File
@@ -28,7 +28,7 @@ mailsend:
domain = "chiefsoft.com"; domain = "chiefsoft.com";
user = "savvy@chiefsoft.com"; user = "savvy@chiefsoft.com";
pass = "may12002!"; pass = "may12002!";
name = "Jubabox Beta"; name = "JubaBox Beta";
}; };
jubabox/src/include/jubabox_api.h
+3 -1
View File
@@ -42,7 +42,9 @@ enum {
#define USER_START 100000 #define USER_START 100000
#define USER_LOGIN 100011 #define USER_LOGIN 100011
#define USER_CREATE_ACCOUNT 100021
#define USER_VERIFY_ACCLINK 100022
#define USER_END 199999 #define USER_END 199999
jubabox/src/shared_tool/function_members.cc
+2 -2
View File
@@ -43,10 +43,10 @@ long medTMemberLogin(CVars in, CVars &out) {
out["stauts"] = "OK"; out["stauts"] = "OK";
/*LOAD THE SESSION INTO OUT now */ /*LOAD THE SESSION INTO OUT now */
load_db_record(out, "SELECT session FROM members_session WHERE member_id=%lu ORDER BY id DESC LIMIT 1", out["member_id"].Long()); load_db_record(out, "SELECT session FROM members_session WHERE member_id=%lu ORDER BY id DESC LIMIT 1", out["member_id"].Long());
member_email_calls(in["action"].Long(), in, out); member_email_calls(in["action"].Long(), out, out);
//=============================================================================================================================== //===============================================================================================================================
pgsql_query("UPDATE members SET last_login = now() WHERE id = %lu", out["member_id"].Long()); pgsql_query("UPDATE members SET last_login = now() WHERE id = %lu", out["member_id"].Long());
// account_email(ACCOUNT_LOGIN_ALERT,out,out); // ALERT CUSTOMER OF LOGIN //member_email_calls(ACCOUNT_LOGIN_ALERT,out,out); // ALERT CUSTOMER OF LOGIN
ret = PHP_LOGIN_OK; ret = PHP_LOGIN_OK;
} }
} else { } else {
jubabox/src/shared_tool/medTEmails.cc
+28 -98
View File
@@ -37,9 +37,9 @@ long member_email_calls(long action, CVars in, CVars &out) {
long ret = 0; long ret = 0;
const char * loc = getenv("REMOTE_ADDR"); const char * loc = getenv("REMOTE_ADDR");
C_CGI_Form form("", ""); C_CGI_Form form("", "");
// form.LetStr("subject", "KleenApp Email Test"); // form.LetStr("subject", "JubaBox Email Test");
form.LetStr("site_name", "KleenApp"); form.LetStr("site_name", "JubaBox");
form.LetStr("contactus", "https://www.kleenapp.co/"); form.LetStr("contactus", "https://www.jubabox.com/");
CGIList * inv_list = new CGIList(&form, "inv_items"); CGIList * inv_list = new CGIList(&form, "inv_items");
char listing_items[1024]; char listing_items[1024];
@@ -48,23 +48,18 @@ long member_email_calls(long action, CVars in, CVars &out) {
switch (action) { switch (action) {
case MEDTRANS_USER_NEWLUNDRYPICK: case USER_LOGIN:
if (load_db_record(x, "SELECT *,email as email2,now() AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) {
vars2form(x, form);
form.LetStr("subject", "JubaBox Account Access");
form.LetStr("email", x["email2"].c_str());
form.Email("USERS/user_login.mailfile");
}
break;
break;
case JUBABOX_BKO_ADDCARD:
logfmt(logINFO, "SEND ADD CARD EMAIL *****() %lu", in["card_id"].Long());
if (load_db_record(x, "SELECT c.description,c.digits,m.*,m.email AS member_email FROM members m LEFT JOIN creditcard c ON c.member_id=m.id WHERE c.id = %lu", in["card_id"].Long()))
{
vars2form(x, form);
form.LetStr("subject", "New Card Added");
form.LetStr("email", x["member_email"].c_str());
form.Email("USERS/member_card_added.mailfile");
}
break;
case JUBABOX_USER_CONFIRMPICKUP: case JUBABOX_USER_CONFIRMPICKUP:
if (load_db_record(x, "SELECT m.id AS member_id, a.agent_name,s.payment_id," if (load_db_record(x, "SELECT m.id AS member_id, a.agent_name,s.payment_id,"
@@ -132,20 +127,13 @@ long member_email_calls(long action, CVars in, CVars &out) {
case MEDTRANS_USER_LOGIN:
if (load_db_record(x, "SELECT *,email as email2,now() AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) {
vars2form(x, form);
form.LetStr("subject", "KleenApp Account Access");
form.LetStr("email", x["email2"].c_str());
form.Email("USERS/user_login.mailfile");
}
break;
case MEDTRANS_USER_CREATE: case MEDTRANS_USER_CREATE:
case JUBABOX_BKO_MEMBERADD: case JUBABOX_BKO_MEMBERADD:
if (load_db_record(x, "SELECT *,email as email2,now() AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) { if (load_db_record(x, "SELECT *,email as email2,now() AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) {
vars2form(x, form); vars2form(x, form);
form.LetStr("subject", "Welcome to KleenApp "); form.LetStr("subject", "Welcome to JubaBox ");
form.LetStr("email", x["email2"].c_str()); form.LetStr("email", x["email2"].c_str());
form.Email("USERS/user_welcome.mailfile"); form.Email("USERS/user_welcome.mailfile");
@@ -181,10 +169,10 @@ long agent_email_calls(long action, CVars in, CVars &out) {
char * server_name = getenv("SERVER_NAME"); char * server_name = getenv("SERVER_NAME");
const char * loc = getenv("REMOTE_ADDR"); const char * loc = getenv("REMOTE_ADDR");
C_CGI_Form form("", ""); C_CGI_Form form("", "");
// form.LetStr("subject", "KleenApp Email Test"); // form.LetStr("subject", "JubaBox Email Test");
char vname[100]; char vname[100];
form.LetStr("site_name", "KleenApp"); form.LetStr("site_name", "JubaBox");
form.LetStr("agent_site", "https://agent.medtransgo.com/"); form.LetStr("agent_site", "https://agent.medtransgo.com/");
logfmt(logINFO, "@@@@@@->AMEYE-1)"); logfmt(logINFO, "@@@@@@->AMEYE-1)");
@@ -194,64 +182,6 @@ long agent_email_calls(long action, CVars in, CVars &out) {
case MEDTRANS_TRANSP_SET_TRANSSTATUS:
if (load_db_record(x, "SELECT r.*,l.language,a.agent_id, a.driver,"
" TO_CHAR(r.service_date :: TIMESTAMP, 'Day Mon dd, yyyy HH:MI AM') AS long_date "
" FROM members_service_request r LEFT JOIN transport_assignment a ON a.id=r.transp_assign"
" LEFT JOIN languages l ON l.code = r.lang_code "
" WHERE r.id = %lu ", in["transport_id"].Long())) {
vars2form(x, form);
load_db_record(y, "SELECT email AS req_email,firstname AS req_firstname,lastname AS req_lastname FROM members WHERE id = %lu ", x["member_id"].Long());
vars2form(y, form);
if (x["driver"] != "" && x["driver"].Long() > 0) {
//
load_db_record(z, "SELECT firstname AS driver_firstname,lastname AS driver_lastname,email AS driver_email FROM transport_drivers WHERE id = %lu ", x["driver"].Long());
vars2form(z, form);
}
}
if (in["mode"].Long() == MODE_CONFIRM_ASSIGNMENT) {
logfmt(logINFO, "Ready to Send Confirm Email()");
}
if (in["mode"].Long() == MODE_ACTIVATE_ASSIGNMENT) {
logfmt(logINFO, "Ready to Send Driver Selected Email()");
form.LetStr("email", z["driver_email"].c_str());
form.Email("AGENTS/transport_assign_driver.mailfile"); // email to driver to know of assignment
}
break;
case MEDTRANS_PROVIDER_SETSTATUS:
/*
if (load_db_record(x, "SELECT r.*,l.language,a.agent_id, a.driver,"
" TO_CHAR(r.service_date :: TIMESTAMP, 'Day Mon dd, yyyy HH:MI AM') AS long_date "
" FROM members_service_request r LEFT JOIN transport_assignment a ON a.id=r.transp_assign"
" LEFT JOIN languages l ON l.code = r.lang_code "
" WHERE r.id = %lu ", in["transport_id"].Long())) {
vars2form(x, form);
load_db_record(y, "SELECT email AS req_email,firstname AS req_firstname,lastname AS req_lastname FROM members WHERE id = %lu ", x["member_id"].Long());
vars2form(y, form);
if (x["driver"] != "" && x["driver"].Long() > 0) {
//
load_db_record(z, "SELECT d.firstname AS driver_firstname,d.lastname AS driver_lastname,d.email AS driver_email, a.agent_name,a.email AS agent_email FROM transport_drivers d LEFT JOIN agents a ON a.id=d.agent_id WHERE d.id = %lu ", x["driver"].Long());
vars2form(z, form);
}
}
//pickup_assigned.mailfile
*/
break;
} }
//email_test(in, out); //email_test(in, out);
@@ -268,10 +198,10 @@ long provider_email_calls(long action, CVars in, CVars &out) {
char * server_name = getenv("SERVER_NAME"); char * server_name = getenv("SERVER_NAME");
const char * loc = getenv("REMOTE_ADDR"); const char * loc = getenv("REMOTE_ADDR");
C_CGI_Form form("", ""); C_CGI_Form form("", "");
// form.LetStr("subject", "KleenApp Email Test"); // form.LetStr("subject", "JubaBox Email Test");
char vname[100]; char vname[100];
form.LetStr("site_name", "KleenApp"); form.LetStr("site_name", "JubaBox");
form.LetStr("agent_site", "https://agent.medtransgo.com/"); form.LetStr("agent_site", "https://agent.medtransgo.com/");
logfmt(logINFO, "@@@@@@->AMEYE-1)"); logfmt(logINFO, "@@@@@@->AMEYE-1)");
@@ -303,7 +233,7 @@ long provider_email_calls(long action, CVars in, CVars &out) {
logfmt(logINFO, "@@@@@@->AMEYE-101)"); logfmt(logINFO, "@@@@@@->AMEYE-101)");
form.LetStr("confirm_link", in["service_id"].c_str()); form.LetStr("confirm_link", in["service_id"].c_str());
logfmt(logINFO, "@@@@@@->AMEYE-102)"); logfmt(logINFO, "@@@@@@->AMEYE-102)");
form.LetStr("server_link", "https://www.kleenapp.co//provider/processRequest?reqId="); form.LetStr("server_link", "https://www.JubaBox.co//provider/processRequest?reqId=");
logfmt(logINFO, "@@@@@@->AMEYE-103)"); logfmt(logINFO, "@@@@@@->AMEYE-103)");
form.LetStr("subject", "Laundry Pickup Assigned"); form.LetStr("subject", "Laundry Pickup Assigned");
form.LetStr("email", z["driver_email"].c_str()); form.LetStr("email", z["driver_email"].c_str());
@@ -348,9 +278,9 @@ long dailyReport() {
long ret = 0; long ret = 0;
const char * loc = getenv("REMOTE_ADDR"); const char * loc = getenv("REMOTE_ADDR");
C_CGI_Form form("", ""); C_CGI_Form form("", "");
form.LetStr("subject", "KleenApp Alert Email"); form.LetStr("subject", "JubaBox Alert Email");
out["alertrequest"] = CfgReadChar("alerts.request"); out["alertrequest"] = CfgReadChar("alerts.request");
form.LetStr("site_name", "KleenApp"); form.LetStr("site_name", "JubaBox");
CVars w, x, y, z; CVars w, x, y, z;
load_db_record(x, "SELECT TO_CHAR( now() :: DATE, 'Day Mon dd, yyyy') AS long_date, now()::date AS report_date, count(id) AS today_members_count FROM members WHERE added::date = now()::date;"); load_db_record(x, "SELECT TO_CHAR( now() :: DATE, 'Day Mon dd, yyyy') AS long_date, now()::date AS report_date, count(id) AS today_members_count FROM members WHERE added::date = now()::date;");
@@ -387,14 +317,14 @@ long alert_email_calls(long action, CVars in, CVars &out) {
long ret = 0; long ret = 0;
const char * loc = getenv("REMOTE_ADDR"); const char * loc = getenv("REMOTE_ADDR");
C_CGI_Form form("", ""); C_CGI_Form form("", "");
form.LetStr("subject", "KleenApp Alert Email"); form.LetStr("subject", "JubaBox Alert Email");
out["alertrequest"] = CfgReadChar("alerts.request"); out["alertrequest"] = CfgReadChar("alerts.request");
out["alertaccount"] = CfgReadChar("alerts.account"); out["alertaccount"] = CfgReadChar("alerts.account");
CGIList * inv_list = new CGIList( &form, "inv_items" ); CGIList * inv_list = new CGIList( &form, "inv_items" );
char listing_items[1024]; char listing_items[1024];
const PGresult *res; const PGresult *res;
form.LetStr("site_name", "KleenApp"); form.LetStr("site_name", "JubaBox");
switch (action) { switch (action) {
@@ -622,10 +552,10 @@ void commonItems(C_CGI_Form &form) {
char * server_name = getenv("SERVER_NAME"); char * server_name = getenv("SERVER_NAME");
form.LetStr("server_name", server_name); form.LetStr("server_name", server_name);
form.LetStr("site_name", "KleenApp"); form.LetStr("site_name", "JubaBox");
form.LetStr("facebook", "KleenApp"); form.LetStr("facebook", "JubaBox");
form.LetStr("twitter", "KleenApp"); form.LetStr("twitter", "JubaBox");
form.LetStr("contactus", "KleenApp"); form.LetStr("contactus", "JubaBox");
} }
long email_test(CVars in, CVars &out) { long email_test(CVars in, CVars &out) {
@@ -637,8 +567,8 @@ long email_test(CVars in, CVars &out) {
out["alertemail"] = CfgReadChar("alerts.system"); out["alertemail"] = CfgReadChar("alerts.system");
//form.LetStr( "site_name", "KleenApp" ); //form.LetStr( "site_name", "JubaBox" );
form.LetStr("subject", "KleenApp Email Test"); form.LetStr("subject", "JubaBox Email Test");
commonItems(form); commonItems(form);
jubabox/src/shared_tool/members.cc
+12 -8
View File
@@ -14,23 +14,27 @@
#include "members.h" #include "members.h"
#include "function_members.h" #include "function_members.h"
long members_calls(CVars in, CVars &out) { long members_calls(CVars in, CVars &out) {
long ret = PHP_API_BAD_PARAM; long ret = PHP_API_BAD_PARAM;
try { try {
long action = REQ_LONG(in, "action", 0, -1); long action = REQ_LONG(in, "action", 0, -1);
switch (action) { switch (action) {
case USER_LOGIN: case USER_LOGIN:
ret = medTMemberLogin(in, out); ret = medTMemberLogin(in, out);
break; break;
case USER_CREATE_ACCOUNT:
break;
case USER_VERIFY_ACCLINK:
break;
} }
} catch (bad_parameter) { } catch (bad_parameter) {
logfmt(logINFO, "ERROR CALL long members_calls(CVars in, CVars &out)"); logfmt(logINFO, "ERROR CALL long members_calls(CVars in, CVars &out)");
} }
return ret; return ret;
} }