Chiefsoft/CoreGrade
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2020-04-12 17:36:51 -04:00
parent 0e55c3b953
commit bf3e60730a
6 changed files with 617 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coregrade/email/complete_losspass.mailfile
+6 -10
View File
@@ -1,13 +1,12 @@
To: {{email}}
Subject: PayQuic - Password Reset for {{email}} with {{lost_added}}
Subject: CoreGrade - Password Reset for {{email}} Completed
<html>
<head>
</head>
<body>
<pre>
<table cellpadding="2" cellspacing="2" border="0" style="height:30px; width:400px; font-size:12px;color:#333333;width:100%;border-width: 0px;border-color: #9dcc7a;border-collapse: collapse;">
<tr><td><span align=center><img src="http://www.payquic.com/images/logo.png" alt="PayQuic"></span></td></tr>
<tr><td><span align=center><img src="https://{{server_name}}/images/coregrade.png" alt="CoreGrade"></span></td></tr>
<tr>
<td style="font-size:12px; text-alig:left;">
Dear {{firstname}}
@@ -19,18 +18,15 @@ As you requested, your password has been reset.
</td>
</tr>
<tr>
<td style="font-size:12px; text-alig:left;">
If it was not at your request, then please contact PayQuic support immediately.
For further support go to our website at www.PayQuic.com or call 08188697770 between the hours of 10:00 AM and 5:00 PM.
Thank you for choosing PayQuic.
PayQuic Team.
If it was not at your request, then please contact CoreGrade support immediately.
For further support go to our website at https://{{server_name}} or call 08188697770 between the hours of 10:00 AM and 5:00 PM.
Thank you for choosing CoreGrade.
CoreGrade Team.
</td>
</tr>
</table>
<br>
coregrade/email/start_losspass.mailfile
+1 -1
View File
@@ -9,7 +9,7 @@ Subject: CoreGrade - Password Reset for {{email}}
<table cellpadding="2" cellspacing="2" border="0" style="height:30px; width:400px; font-size:12px;color:#333333;width:100%;border-width: 0px;border-color: #9dcc7a;border-collapse: collapse;">
<tr><td><span align=center><img src="{{server_name}}/images/logo.png" alt="CoreGrade"></span></td></tr>
<tr><td><span align=center><img src="https://{{server_name}}/images/coregrade.png" alt="CoreGrade"></span></td></tr>
<tr>
<td style="font-size:12px; text-alig:left;">
Dear {{firstname}}
coregrade/src/shared_tool/account.cc
+7 -5
View File
@@ -269,20 +269,21 @@ long completePassReset(CVars in, CVars &out) {
logfmt(logINFO, "completePassReset()");
long ret = PHP_API_BAD_PARAM;
CVars x, y;
out["reset_complete"] = "0";
try {
REQ_STRING(in, "username", 2, 49, "(.*)");
REQ_STRING(in, "newpass", 5, 15, "(.*)");
REQ_LONG(in, "reset_pin", 0, -1);
REQ_STRING(in, "new_pass", 5, 15, "(.*)");
REQ_LONG(in, "reset_id", 0, -1);
REQ_STRING(in, "reset_key", 2, 49, "(.*)");
const char *loc = getenv("REMOTE_ADDR");
ret = load_db_record(out, "SELECT *,id AS reset_id FROM password_reset WHERE status=1 AND LOWER(username)=LOWER('%s') AND reset_pin='%lu' AND loc='%s' AND reset_key='%s'", in["username"].c_str(), in["reset_pin"].Long(), loc, in["reset_key"].c_str());
ret = load_db_record(out, "SELECT *,id AS reset_id FROM password_reset WHERE status=1 AND LOWER(username)=LOWER('%s') AND id='%lu' AND loc='%s' AND reset_key='%s'", in["username"].c_str(), in["reset_id"].Long(), loc, in["reset_key"].c_str());
if (ret && out["reset_id"].Long() > 0) {
char mcf[128];
int result = 0; //libscrypt_hash(mcf, in["password"].c_str(), SCRYPT_N, SCRYPT_r, SCRYPT_p);
int result = 100; //libscrypt_hash(mcf, in["password"].c_str(), SCRYPT_N, SCRYPT_r, SCRYPT_p);
if (result > 0) {
if (pgsql_query("UPDATE members SET password='%s' WHERE id =%lu", mcf, out["member_id"].Long()) >= 0) {
if (pgsql_query("UPDATE members SET password=md5('%s') WHERE id =%lu", in["new_pass"].c_str(), out["member_id"].Long()) >= 0) {
pgsql_query("UPDATE password_reset SET status = 5,reset_key=NULL WHERE id =%lu", out["reset_id"].Long());
ret = PHP_API_OK;
}
@@ -290,6 +291,7 @@ long completePassReset(CVars in, CVars &out) {
out["reset_key"] = "YOU WILL GET THIS IF PIN IS CORRECT IN CONFIRM"; //x["reset_key"];
out["mode"] = RESET_COMPLETE;
member_email_calls(in["action"].Long(), out, x); // note the use of out to send in
out["reset_complete"] = out["reset_id"];
} else {
logfmt(logINFO, "ERROR create hash using SCRYPT");
}
coregrade/src/shared_tool/email.cc
+43 -95
View File
@@ -187,7 +187,7 @@ long member_email_calls(long action, CVars in, CVars &out) {
break;
case RESET_COMPLETE:
form.Email("complete_losspass.mailfile");
break;
}
}
@@ -207,8 +207,7 @@ long member_email_calls(long action, CVars in, CVars &out) {
}
////TO_CHAR(r.service_date :: TIMESTAMP, 'Day Mon dd, yyyy HH:MI AM') AS long_date
long AccountPendingMail(CVars in)
{
long AccountPendingMail(CVars in) {
REQ_LONG(in, "pending_id", 1, -1);
CVars x;
CVars out;
@@ -218,8 +217,7 @@ long AccountPendingMail(CVars in)
form.LetStr("server_name", server_name);
form.LetStr("site_name", "CoreGrade");
if ( load_db_record( x, "SELECT * FROM members_pending WHERE id = %lu ", in["pending_id"].Long()) )
{
if (load_db_record(x, "SELECT * FROM members_pending WHERE id = %lu ", in["pending_id"].Long())) {
vars2form(x, form);
form.LetStr("email", x["email"].c_str());
form.Email("ACCOUNT/member_pending.mailfile");
@@ -227,8 +225,7 @@ long AccountPendingMail(CVars in)
return 0;
}
long WelcomeAccountMail(CVars in)
{
long WelcomeAccountMail(CVars in) {
REQ_LONG(in, "member_id", 1, -1);
CVars x;
CVars out;
@@ -238,8 +235,7 @@ long WelcomeAccountMail(CVars in)
form.LetStr("server_name", server_name);
form.LetStr("site_name", "CoreGrade");
if ( load_db_record( x, "SELECT * FROM members WHERE id = %lu ", in["member_id"].Long()) )
{
if (load_db_record(x, "SELECT * FROM members WHERE id = %lu ", in["member_id"].Long())) {
vars2form(x, form);
form.LetStr("email", x["email"].c_str());
form.Email("ACCOUNT/member_welcome.mailfile");
@@ -248,8 +244,7 @@ long WelcomeAccountMail(CVars in)
}
long CreateCoreGradeGroupMail(CVars in)
{
long CreateCoreGradeGroupMail(CVars in) {
REQ_LONG(in, "group_id", 1, -1);
CVars x;
CVars out;
@@ -259,8 +254,7 @@ long WelcomeAccountMail(CVars in)
form.LetStr("server_name", server_name);
form.LetStr("site_name", "CoreGrade");
if ( load_db_record( x, "select g.*,m.email,m.firstname,m.lastname from members_groups g LEFT JOIN members m ON m.id = g.member_id WHERE g.id = %lu ", in["group_id"].Long()) )
{
if (load_db_record(x, "select g.*,m.email,m.firstname,m.lastname from members_groups g LEFT JOIN members m ON m.id = g.member_id WHERE g.id = %lu ", in["group_id"].Long())) {
vars2form(x, form);
form.LetStr("email", x["email"].c_str());
form.Email("GROUP/group_added.mailfile");
@@ -268,8 +262,7 @@ long WelcomeAccountMail(CVars in)
return 0;
}
long GroupCreateMemberMail(CVars in)
{
long GroupCreateMemberMail(CVars in) {
REQ_LONG(in, "group_id", 1, -1);
REQ_LONG(in, "group_member_id", 1, -1);
CVars x;
@@ -280,8 +273,7 @@ long GroupCreateMemberMail(CVars in)
form.LetStr("server_name", server_name);
form.LetStr("site_name", "CoreGrade");
if ( load_db_record( x, "SELECT gm.*,m.*,e.email FROM group_members gm LEFT JOIN members_groups m ON m.id=gm.group_id LEFT JOIN members e ON e.id=gm.member_id WHERE gm.id = %lu", in["group_member_id"].Long()) )
{
if (load_db_record(x, "SELECT gm.*,m.*,e.email FROM group_members gm LEFT JOIN members_groups m ON m.id=gm.group_id LEFT JOIN members e ON e.id=gm.member_id WHERE gm.id = %lu", in["group_member_id"].Long())) {
vars2form(x, form);
form.LetStr("email", x["email"].c_str());
form.Email("GROUP/group_member_added.mailfile");
@@ -291,9 +283,7 @@ long GroupCreateMemberMail(CVars in)
}
//==============================================================================================================
long send_email(CVars in, CVars &out)
{
long send_email(CVars in, CVars &out) {
logfmt(logINFO, "send_email()");
long ret = PHP_API_BAD_PARAM;
try {
@@ -308,9 +298,7 @@ long send_email(CVars in, CVars &out)
return ret;
}
long EmailCustBalUpdt(CVars in)
{
long EmailCustBalUpdt(CVars in) {
REQ_LONG(in, "balance_update_id", 1, -1);
C_CGI_Form form("", "");
char * server_name = getenv("SERVER_NAME");
@@ -322,8 +310,7 @@ long EmailCustBalUpdt(CVars in)
return 0;
}
long SendPromoEmail(CVars in)
{
long SendPromoEmail(CVars in) {
long pmode = REQ_LONG(in, "pmode", 1, -1);
CVars x;
CVars out;
@@ -332,8 +319,7 @@ long SendPromoEmail(CVars in)
vars2form(in, form);
form.LetStr("email", in["email"].c_str());
switch( pmode )
{
switch (pmode) {
case 1:
form.Email("promo/promotion1.mailfile");
break;
@@ -349,16 +335,14 @@ long SendPromoEmail(CVars in)
return 0;
}
long SendBalanceRequestAlert(CVars in)
{
long SendBalanceRequestAlert(CVars in) {
REQ_LONG(in, "request_id", 1, -1);
CVars x;
CVars out;
C_CGI_Form form("", "");
out["topupemail"] = CfgReadChar("transnotif.topupemail");
if ( load_db_record( x, "SELECT a.*,a.amount*0.01 AS req_amount,c.*,a.ip AS ip_loc,u.name FROM customer_addbalance a LEFT JOIN customer c ON c.id=a.customer_id LEFT JOIN bko_users u ON u.id=a.csr_id WHERE a.id = '%lu' ", in["request_id"].Long()) )
{
if (load_db_record(x, "SELECT a.*,a.amount*0.01 AS req_amount,c.*,a.ip AS ip_loc,u.name FROM customer_addbalance a LEFT JOIN customer c ON c.id=a.customer_id LEFT JOIN bko_users u ON u.id=a.csr_id WHERE a.id = '%lu' ", in["request_id"].Long())) {
vars2form(x, form);
form.LetStr("email", out["topupemail"].c_str());
@@ -368,16 +352,14 @@ long SendBalanceRequestAlert(CVars in)
return 0;
}
long SendBalanceCompleteAlert(CVars in)
{
long SendBalanceCompleteAlert(CVars in) {
REQ_LONG(in, "request_id", 1, -1);
CVars x;
CVars out;
C_CGI_Form form("", "");
out["topupemail"] = CfgReadChar("transnotif.topupemail");
if ( load_db_record( x, "SELECT a.*,a.amount*0.01 AS req_amount,c.*,a.ip2 AS ip_loc,u.name,a.cur_balance*0.01 AS cur2, a.fin_balance*0.01 AS fin2 FROM customer_addbalance a LEFT JOIN customer c ON c.id=a.customer_id LEFT JOIN bko_users u ON u.id=a.csr_id WHERE a.id = '%lu' ", in["request_id"].Long()) )
{
if (load_db_record(x, "SELECT a.*,a.amount*0.01 AS req_amount,c.*,a.ip2 AS ip_loc,u.name,a.cur_balance*0.01 AS cur2, a.fin_balance*0.01 AS fin2 FROM customer_addbalance a LEFT JOIN customer c ON c.id=a.customer_id LEFT JOIN bko_users u ON u.id=a.csr_id WHERE a.id = '%lu' ", in["request_id"].Long())) {
vars2form(x, form);
form.LetStr("email", out["topupemail"].c_str());
form.Email("alerts/balancecomplete.mailfile");
@@ -386,12 +368,7 @@ long SendBalanceCompleteAlert(CVars in)
return 0;
}
long SystemStatus()
{
long SystemStatus() {
logfmt(logINFO, "SystemStatus()*************~************");
C_CGI_Form form("", "");
@@ -409,8 +386,7 @@ long SystemStatus()
return 0l;
}
long StartPassResetEmail(CVars in)
{
long StartPassResetEmail(CVars in) {
//customer_id
// reset_id
C_CGI_Form form("", "");
@@ -446,8 +422,7 @@ long StartPassResetEmail(CVars in)
//start_losspass.mailfile
}
long CompletePassResetEmail(CVars in)
{
long CompletePassResetEmail(CVars in) {
//customer_id
// reset_id
C_CGI_Form form("", "");
@@ -470,8 +445,7 @@ long CompletePassResetEmail(CVars in)
//start_losspass.mailfile
}
long CustomerAirSalePayment(CVars in)
{
long CustomerAirSalePayment(CVars in) {
/*
payquic_test=> select t.*,c.* from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id limit 1;
id | customer_id | orderid | description | amount | txnref | payref | retref | status | added | resp | recipient_no | completed | appramt | rspcode | id | username | firstname | lastname | email | pass
@@ -506,9 +480,7 @@ out["topupemail"] = CfgReadChar("transnotif.topupemail");
if (in["pmode"].Long() == PAY_MODE_BALANCE) // paying with balance
{
form.LetStr("paymode", "Payment with balance");
}
else
{
} else {
form.LetStr("paymode", "Payment with card");
}
@@ -528,8 +500,7 @@ out["topupemail"] = CfgReadChar("transnotif.topupemail");
}
long CustomerAirBonus(CVars in)
{
long CustomerAirBonus(CVars in) {
/*
payquic_test=> select t.*,c.* from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id limit 1;
id | customer_id | orderid | description | amount | txnref | payref | retref | status | added | resp | recipient_no | completed | appramt | rspcode | id | username | firstname | lastname | email | pass
@@ -556,9 +527,7 @@ out["topupemail"] = CfgReadChar("transnotif.topupemail");
if (in["pmode"].Long() == PAY_MODE_BALANCE) // paying with balance
{
form.LetStr("paymode", "Payment with balance");
}
else
{
} else {
form.LetStr("paymode", "Payment with card");
}
@@ -571,9 +540,7 @@ out["topupemail"] = CfgReadChar("transnotif.topupemail");
}
long CustomerAirSale(CVars in)
{
long CustomerAirSale(CVars in) {
/*
payquic_test=> select t.*,c.* from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id limit 1;
id | customer_id | orderid | description | amount | txnref | payref | retref | status | added | resp | recipient_no | completed | appramt | rspcode | id | username | firstname | lastname | email | pass
@@ -608,9 +575,7 @@ out["topupemail"] = CfgReadChar("transnotif.topupemail");
if (in["pmode"].Long() == PAY_MODE_BALANCE) // paying with balance
{
form.LetStr("paymode", "Payment with balance");
}
else
{
} else {
form.LetStr("paymode", "Payment with card");
}
@@ -623,9 +588,7 @@ out["topupemail"] = CfgReadChar("transnotif.topupemail");
}
long VirtualAirSaleCustomer(CVars in)
{
long VirtualAirSaleCustomer(CVars in) {
CVars out;
out["topupemail"] = CfgReadChar("transnotif.topupemail");
@@ -653,9 +616,7 @@ out["topupemail"] = CfgReadChar("transnotif.topupemail");
if (in["pmode"].Long() == PAY_MODE_BALANCE) // paying with balance
{
form.LetStr("paymode", "Payment with balance");
}
else
{
} else {
form.LetStr("paymode", "Payment with card");
}
@@ -670,13 +631,11 @@ out["topupemail"] = CfgReadChar("transnotif.topupemail");
}
void CustomerBalanceEmail(CVars in)
{
void CustomerBalanceEmail(CVars in) {
REQ_STRING(in, "orderid", 1, 50, "(.*)");
CVars x;
C_CGI_Form form("", "");
if ( load_db_record( x, "select c.*,t.*,t.added AS balance_date,appramt*0.01 AS appramt2,t.added AS trans_date,c.balance*0.01 AS balance2 from trans_balance_topup t LEFT JOIN customer c ON c.id = t.customer_id where t.orderid = '%s' AND completed IS NOT NULL", in["orderid"].c_str()) )
{
if (load_db_record(x, "select c.*,t.*,t.added AS balance_date,appramt*0.01 AS appramt2,t.added AS trans_date,c.balance*0.01 AS balance2 from trans_balance_topup t LEFT JOIN customer c ON c.id = t.customer_id where t.orderid = '%s' AND completed IS NOT NULL", in["orderid"].c_str())) {
vars2form(x, form);
form.Email("balance_updated.mailfile");
}
@@ -684,15 +643,12 @@ void CustomerBalanceEmail(CVars in)
}
long CustomerBalanceBonusEmail(CVars in)
{
long CustomerBalanceBonusEmail(CVars in) {
//REQ_STRING( in, "orderid", 1, 50, "(.*)");
REQ_LONG(in, "customer_id", 1, -1);
CVars x;
C_CGI_Form form("", "");
if ( load_db_record( x, "select * FROM customer WHERE id = %lu ", in["customer_id"].Long()) )
{
if (load_db_record(x, "select * FROM customer WHERE id = %lu ", in["customer_id"].Long())) {
vars2form(x, form);
form.Email("bonus_balance.mailfile");
}
@@ -700,21 +656,18 @@ long CustomerBalanceBonusEmail(CVars in)
return 0;
}
void PaymentAlert(CVars in)
{
void PaymentAlert(CVars in) {
}
void BalanceUpdateAlert(CVars in)
{
void BalanceUpdateAlert(CVars in) {
REQ_STRING(in, "orderid", 1, 50, "(.*)");
CVars x;
CVars out;
C_CGI_Form form("", "");
out["topupemail"] = CfgReadChar("transnotif.topupemail");
if ( load_db_record( x, "select c.*,t.*,t.added AS balance_date,appramt*0.01 AS appramt2 ,c.balance*0.01 AS balance2 from trans_balance_topup t LEFT JOIN customer c ON c.id = t.customer_id where t.orderid = '%s' AND completed IS NOT NULL", in["orderid"].c_str()) )
{
if (load_db_record(x, "select c.*,t.*,t.added AS balance_date,appramt*0.01 AS appramt2 ,c.balance*0.01 AS balance2 from trans_balance_topup t LEFT JOIN customer c ON c.id = t.customer_id where t.orderid = '%s' AND completed IS NOT NULL", in["orderid"].c_str())) {
vars2form(x, form);
@@ -728,8 +681,7 @@ void BalanceUpdateAlert(CVars in)
}
void CustomerEmailWelcome(CVars in)
{
void CustomerEmailWelcome(CVars in) {
long customer_id = in["user_id"].Long();
C_CGI_Form form("", "");
const char * server_name = getenv("SERVER_NAME");
@@ -740,8 +692,7 @@ void CustomerEmailWelcome(CVars in)
}
/*****************************************************************************/
long VirtualAirSaleAlert(CVars in)
{
long VirtualAirSaleAlert(CVars in) {
/*
payquic_test=> select t.*,c.* from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id limit 1;
id | customer_id | orderid | description | amount | txnref | payref | retref | status | added | resp | recipient_no | completed | appramt | rspcode | id | username | firstname | lastname | email | pass
@@ -780,13 +731,10 @@ out["topupemail"] = CfgReadChar("transnotif.topupemail");
if (in["pmode"].Long() == PAY_MODE_BALANCE) // paying with balance
{
form.LetStr("paymode", "Payment with balance");
}
else if ( in["pmode"].Long() == PAY_MODE_BONUS ) // paying bonus
} else if (in["pmode"].Long() == PAY_MODE_BONUS) // paying bonus
{
form.LetStr("paymode", "Bonus Payment");
}
else
{
} else {
form.LetStr("paymode", "Payment with card");
}
@@ -802,10 +750,10 @@ out["topupemail"] = CfgReadChar("transnotif.topupemail");
form.Email("virtualtopup.mailfile");
return 0l;
}
/*****************************************************************************/
void SendAccountCreateAlert(long customer_id)
{
void SendAccountCreateAlert(long customer_id) {
CVars out;
out["topupemail"] = CfgReadChar("transnotif.topupemail");
@@ -834,9 +782,9 @@ out["topupemail"] = CfgReadChar("transnotif.topupemail");
form.Email("alert_accountcreated.mailfile");
//alert_accountcreated.mailfile
}
/*****************************************************************************/
void vars2form( CVars &v, C_CGI_Form &form )
{
void vars2form(CVars &v, C_CGI_Form &form) {
CVars::const_iterator i;
for (i = v.begin(); i != v.end(); i++) {
char name[30];
www/application/controllers/Auth.php
+5 -4
View File
@@ -165,7 +165,7 @@ class Auth extends Start_Controller {
$data["error_message"] = '';
if ($_POST) {
$data['reset_key'] = trim($this->input->post('rlink'));
$data['reset_key'] = trim($this->input->post('reset_key'));
$data['reset_id'] = trim($this->input->post('reset_id'));
$data['username'] = trim($this->input->post('username'));
@@ -176,14 +176,15 @@ class Auth extends Start_Controller {
if ( strlen($data['pass1']) >7 && $data['pass1'] == $data['pass2']){
$allow_next = true;
$data["new_pass"] = $data['pass1'];
}
else{
$data["error_message"] = "Please enter a valis username to continue";
$data["error_message"] = "Please enter a valid password to continue";
}
//print_r( $data );
$data["mode"] = RESET_COMPLETE;
if ($data['reset_key'] != '' && isset($out["reset_id"]) && isset($out["reset_id"]) > 0 && $allow_next == true) {
if ($data['reset_key'] != '' && isset($data["reset_id"]) && isset($data["reset_id"]) > 0 && $allow_next == true) {
$this->coregrade_webapi(COREGRADE_START_RESET_PASSWORD, $data, $out);
// print_r($out);
www/application/views/home/home.php
+5 -4
View File
@@ -205,8 +205,9 @@
<li data-value="tutor"><span>Parents</span></li>
-->
</ul>
<p class="wow fadeIn">A Modern, intuitive, effective digital learning <p >experience that minimizes complexity and </p><p>enables personalized learning at a convenience.</p>
<p class="wow fadeIn">A Modern, intuitive, effective digital learning experience that minimizes complexity and enables personalized learning at a convenience.</p>
<p>
</p>
<p class="fade-text wow fadeIn">Let Us Be Your Companion <a href="#">Let‘s talk</a></p>
</div>
</div>
@@ -226,7 +227,7 @@
<li id="company">
<h2 class="lead2">CoreGrade Plus</h2>
<span class="price-tag">Contact Us</span>
<h4 class="sublead">Quality support that <br> drives success</h4>
<h4 class="sublead">Holistic learning that <br> lights up</h4>
<ul class="pricing-list">
<li><p>Everything Individual + </p></li>
<li><p>Integrations</p></li>
@@ -368,7 +369,7 @@
<div class="vr-title-area">
<h4>Contact Us</h4>
</div>
<h3>[]<span class="thin">CoreGrade</span></h3>
<h3><span class="thin">CoreGrade</span></h3>
<p>Email :support@coregrade.com</p>
<p>Phone : 404-858-7966</p>
<ul class="social-icon">