From bf3e60730acfe387f4f807fbfb764e624ab03b7e Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sun, 12 Apr 2020 17:36:51 -0400 Subject: [PATCH] fix --- coregrade/email/complete_losspass.mailfile | 16 +- coregrade/email/start_losspass.mailfile | 2 +- coregrade/src/shared_tool/account.cc | 12 +- coregrade/src/shared_tool/email.cc | 1238 ++++++++++---------- www/application/controllers/Auth.php | 9 +- www/application/views/home/home.php | 9 +- 6 files changed, 617 insertions(+), 669 deletions(-) diff --git a/coregrade/email/complete_losspass.mailfile b/coregrade/email/complete_losspass.mailfile index 9d2ed16..68cbfa1 100644 --- a/coregrade/email/complete_losspass.mailfile +++ b/coregrade/email/complete_losspass.mailfile @@ -1,13 +1,12 @@ To: {{email}} -Subject: PayQuic - Password Reset for {{email}} with {{lost_added}} +Subject: CoreGrade - Password Reset for {{email}} Completed 
-
 
-
+	
-
 	         
-
 
PayQuic
CoreGrade

 
		
 
 Dear {{firstname}}
@@ -19,18 +18,15 @@ As you requested, your password has been reset.
 
 							
 
		
 
-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.
 							
 

 

 
diff --git a/coregrade/email/start_losspass.mailfile b/coregrade/email/start_losspass.mailfile
index 1191d13..7b6c62b 100644
--- a/coregrade/email/start_losspass.mailfile
+++ b/coregrade/email/start_losspass.mailfile
@@ -9,7 +9,7 @@ Subject: CoreGrade - Password Reset for {{email}}
 
 
 
-
+
CoreGrade
CoreGrade

 
		
 
 Dear {{firstname}}
diff --git a/coregrade/src/shared_tool/account.cc b/coregrade/src/shared_tool/account.cc
index 4c19634..9b0b3c1 100644
--- a/coregrade/src/shared_tool/account.cc
+++ b/coregrade/src/shared_tool/account.cc
@@ -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");
             }
diff --git a/coregrade/src/shared_tool/email.cc b/coregrade/src/shared_tool/email.cc
index 183578b..0ed740b 100644
--- a/coregrade/src/shared_tool/email.cc
+++ b/coregrade/src/shared_tool/email.cc
@@ -8,9 +8,9 @@
 #include 
 #include "pgsql_wrapper.h"
 
-void vars2form( CVars &v, C_CGI_Form &form );
+void vars2form(CVars &v, C_CGI_Form &form);
 
-extern int mailsend(CVars in,CVars &out);
+extern int mailsend(CVars in, CVars &out);
 
 long carpool_email_calls(long email_action, CVars in, CVars &out) {
 
@@ -42,48 +42,48 @@ long carpool_email_calls(long email_action, CVars in, CVars &out) {
 
         switch (email_action) {
                 logfmt(logINFO, "carpool_email_calls() 00  - FAITH");
-/*
-            case SAVVY_BKO_CARPOOL_FRIENDMESSAGE:
-                logfmt(logINFO, "carpool_email_calls() 01");
-                if (load_db_record(x, "SELECT cf.email AS friend_email, cf.*,cp.member_id,m.firstname AS invite_firstname FROM members_carpool_friends cf LEFT JOIN members_carpool cp ON cp.id =cf.carpool_id LEFT JOIN members m ON m.id =cp.member_id WHERE cf.id =%lu ", in["carpool_friend_id"].Long())) {
+                /*
+                            case SAVVY_BKO_CARPOOL_FRIENDMESSAGE:
+                                logfmt(logINFO, "carpool_email_calls() 01");
+                                if (load_db_record(x, "SELECT cf.email AS friend_email, cf.*,cp.member_id,m.firstname AS invite_firstname FROM members_carpool_friends cf LEFT JOIN members_carpool cp ON cp.id =cf.carpool_id LEFT JOIN members m ON m.id =cp.member_id WHERE cf.id =%lu ", in["carpool_friend_id"].Long())) {
 
-                    snprintf(accept_link, sizeof (accept_link), "lmsg/carpool?pid=%s&ans=accept", x["link"].c_str());
-                    snprintf(reject_link, sizeof (reject_link), "lmsg/carpool?pid=%s&ans=reject", x["link"].c_str());
+                                    snprintf(accept_link, sizeof (accept_link), "lmsg/carpool?pid=%s&ans=accept", x["link"].c_str());
+                                    snprintf(reject_link, sizeof (reject_link), "lmsg/carpool?pid=%s&ans=reject", x["link"].c_str());
 
-                    form.LetStr("reject_link", reject_link);
-                    form.LetStr("accept_link", accept_link);
+                                    form.LetStr("reject_link", reject_link);
+                                    form.LetStr("accept_link", accept_link);
 
-                    logfmt(logINFO, "carpool_email_calls() 02");
-                    //  form.LetStr("msgid", "ABCDEFGHIJKLMNOPQRST");
-                    logfmt(logINFO, "carpool_email_calls() 03");
-                    vars2form(x, form);
-                    form.LetStr("subject", "Carpool Invitation");
-                    form.LetStr("email", x["friend_email"].c_str());
-                    form.Email("carpool/carpool_invite.mailfile");
-                }
-                break;
+                                    logfmt(logINFO, "carpool_email_calls() 02");
+                                    //  form.LetStr("msgid", "ABCDEFGHIJKLMNOPQRST");
+                                    logfmt(logINFO, "carpool_email_calls() 03");
+                                    vars2form(x, form);
+                                    form.LetStr("subject", "Carpool Invitation");
+                                    form.LetStr("email", x["friend_email"].c_str());
+                                    form.Email("carpool/carpool_invite.mailfile");
+                                }
+                                break;
 
-            case SAVVY_BKO_CARPOOL_FRIENDACCEPT:
-                logfmt(logINFO, "carpool_email_calls() 01");
-                if (load_db_record(x, "SELECT m.email AS sender_email, cf.*,cp.member_id,cf.firstname AS friend_firstname FROM members_carpool_friends cf LEFT JOIN members_carpool cp ON cp.id =cf.carpool_id LEFT JOIN members m ON m.id =cp.member_id WHERE cf.id =%lu ", in["carpool_friend_id"].Long())) {
+                            case SAVVY_BKO_CARPOOL_FRIENDACCEPT:
+                                logfmt(logINFO, "carpool_email_calls() 01");
+                                if (load_db_record(x, "SELECT m.email AS sender_email, cf.*,cp.member_id,cf.firstname AS friend_firstname FROM members_carpool_friends cf LEFT JOIN members_carpool cp ON cp.id =cf.carpool_id LEFT JOIN members m ON m.id =cp.member_id WHERE cf.id =%lu ", in["carpool_friend_id"].Long())) {
 
-                    snprintf(accept_link, sizeof (accept_link), "lmsg/carpool?pid=%s&ans=accept", x["link"].c_str());
-                    snprintf(reject_link, sizeof (reject_link), "lmsg/carpool?pid=%s&ans=reject", x["link"].c_str());
+                                    snprintf(accept_link, sizeof (accept_link), "lmsg/carpool?pid=%s&ans=accept", x["link"].c_str());
+                                    snprintf(reject_link, sizeof (reject_link), "lmsg/carpool?pid=%s&ans=reject", x["link"].c_str());
 
-                    form.LetStr("reject_link", reject_link);
-                    form.LetStr("accept_link", accept_link);
+                                    form.LetStr("reject_link", reject_link);
+                                    form.LetStr("accept_link", accept_link);
 
-                    logfmt(logINFO, "carpool_email_calls() 02");
-                    //  form.LetStr("msgid", "ABCDEFGHIJKLMNOPQRST");
-                    logfmt(logINFO, "carpool_email_calls() 03");
-                    vars2form(x, form);
-                    form.LetStr("subject", "Carpool Accepted");
-                    form.LetStr("email", x["sender_email"].c_str());
-                    //form.LetStr("email", "olu@float.sg");
-                    form.Email("carpool/carpool_accepted.mailfile");
-                }
-                break;
-                */
+                                    logfmt(logINFO, "carpool_email_calls() 02");
+                                    //  form.LetStr("msgid", "ABCDEFGHIJKLMNOPQRST");
+                                    logfmt(logINFO, "carpool_email_calls() 03");
+                                    vars2form(x, form);
+                                    form.LetStr("subject", "Carpool Accepted");
+                                    form.LetStr("email", x["sender_email"].c_str());
+                                    //form.LetStr("email", "olu@float.sg");
+                                    form.Email("carpool/carpool_accepted.mailfile");
+                                }
+                                break;
+                 */
         }
     } catch (bad_parameter) {
         logfmt(logINFO, "ERROR CALL long member_email_calls(CVars in, CVars &out)");
@@ -108,8 +108,8 @@ long member_email_calls(long action, CVars in, CVars &out) {
     out["facebook"] = CfgReadChar("system.facebook");
     out["twitter"] = CfgReadChar("system.twitter");
 
-    char * server_name = getenv( "SERVER_NAME" );
-    
+    char * server_name = getenv("SERVER_NAME");
+
     //https://www.float.sg/
 
     form.LetStr("site_name", "CoreGrade");
@@ -124,58 +124,58 @@ long member_email_calls(long action, CVars in, CVars &out) {
     try {
 
         switch (action) {
-/*
-            case SAVVY_USER_LOGINACCOUNT:
-                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", "Float Account Access");
-                    form.LetStr("email", x["email2"].c_str());
-                    // form.Email("member/user_login.mailfile");
-                }
-                break;
+                /*
+                            case SAVVY_USER_LOGINACCOUNT:
+                                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", "Float Account Access");
+                                    form.LetStr("email", x["email2"].c_str());
+                                    // form.Email("member/user_login.mailfile");
+                                }
+                                break;
 
-            case SAVVY_USER_CREATEACCOUNT:
+                            case SAVVY_USER_CREATEACCOUNT:
 
-                if (in["pending_id"].Long() > 0) {
-                    if (load_db_record(x, " SELECT * FROM members_pending WHERE id=%lu", in["pending_id"].Long()) > 0) {
-                        vars2form(x, form);
-                        form.LetStr("subject", "Confirm your Float Account");
-                        form.LetStr("email", x["email"].c_str());
-                        form.Email("member/user_pending.mailfile");
-                    }
-                } else {
-                    if (in["member_id"].Long() > 0) {
+                                if (in["pending_id"].Long() > 0) {
+                                    if (load_db_record(x, " SELECT * FROM members_pending WHERE id=%lu", in["pending_id"].Long()) > 0) {
+                                        vars2form(x, form);
+                                        form.LetStr("subject", "Confirm your Float Account");
+                                        form.LetStr("email", x["email"].c_str());
+                                        form.Email("member/user_pending.mailfile");
+                                    }
+                                } else {
+                                    if (in["member_id"].Long() > 0) {
 
-                        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", "Welcome to Float ");
-                            form.LetStr("email", x["email2"].c_str());
-                            form.Email("member/user_welcome.mailfile");
-                        }
-                    } // member created first time email only
-                }
-                break;
-            case FLOAT_SYSTEM_EMAIL_NOTIFICATION:
+                                        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", "Welcome to Float ");
+                                            form.LetStr("email", x["email2"].c_str());
+                                            form.Email("member/user_welcome.mailfile");
+                                        }
+                                    } // member created first time email only
+                                }
+                                break;
+                            case FLOAT_SYSTEM_EMAIL_NOTIFICATION:
 
-                if (load_db_record(x, "SELECT * FROM members_notification WHERE id =%lu ", in["notify_id"].Long())) {
-                    vars2form(x, form);
-                    form.LetStr("subject", "Float - Save Money and Time");
-                    form.LetStr("email", "olu@float.sg");
-                    form.LetStr("email", "ses66181@gmal.com");
-                    // form.LetStr("email", x["email2"].c_str());
-                    form.Email("member/user_notification.mailfile");
-                }
+                                if (load_db_record(x, "SELECT * FROM members_notification WHERE id =%lu ", in["notify_id"].Long())) {
+                                    vars2form(x, form);
+                                    form.LetStr("subject", "Float - Save Money and Time");
+                                    form.LetStr("email", "olu@float.sg");
+                                    form.LetStr("email", "ses66181@gmal.com");
+                                    // form.LetStr("email", x["email2"].c_str());
+                                    form.Email("member/user_notification.mailfile");
+                                }
 
 
-                break;
- */
+                                break;
+                 */
             case COREGRADE_START_RESET_PASSWORD:
-                 mode = REQ_LONG(in, "mode", 0, -1);
+                mode = REQ_LONG(in, "mode", 0, -1);
                 if (load_db_record(x, "SELECT m.firstname,p.*,m.email AS member_email, created AS lost_added FROM password_reset p LEFT JOIN members m ON m.id=p.member_id WHERE p.id=%lu ", in["reset_id"].Long())) {
                     vars2form(x, form);
                     form.LetStr("subject", "Reset Password");
                     form.LetStr("email", x["member_email"].c_str());
-                    form.LetStr( "server_name",  server_name );
+                    form.LetStr("server_name", server_name);
 
                     switch (mode) {
                         case RESET_START:
@@ -187,13 +187,13 @@ long member_email_calls(long action, CVars in, CVars &out) {
                             break;
 
                         case RESET_COMPLETE:
-
+                            form.Email("complete_losspass.mailfile");
                             break;
                     }
                 }
                 break;
 
-            
+
 
 
 
@@ -207,653 +207,601 @@ 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)
-{
-	REQ_LONG( in, "pending_id", 1, -1 );
-	CVars x;
-	CVars out; 
-	C_CGI_Form form("","");	
-	
-		char * server_name = getenv( "SERVER_NAME" );		
-		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()) ) 
-	{	
-	 vars2form( x, form );
-	 form.LetStr( "email",   x["email"].c_str() );
-	 form.Email( "ACCOUNT/member_pending.mailfile" );	
-	}
-  return 0;
+long AccountPendingMail(CVars in) {
+    REQ_LONG(in, "pending_id", 1, -1);
+    CVars x;
+    CVars out;
+    C_CGI_Form form("", "");
+
+    char * server_name = getenv("SERVER_NAME");
+    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())) {
+        vars2form(x, form);
+        form.LetStr("email", x["email"].c_str());
+        form.Email("ACCOUNT/member_pending.mailfile");
+    }
+    return 0;
 }
 
-long WelcomeAccountMail(CVars in)
-{
-	REQ_LONG( in, "member_id", 1, -1 );
-	CVars x;
-	CVars out; 
-	C_CGI_Form form("","");	
-	
-		char * server_name = getenv( "SERVER_NAME" );		
-		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()) ) 
-	{	
-	 vars2form( x, form );
-	 form.LetStr( "email",   x["email"].c_str() );
-	 form.Email( "ACCOUNT/member_welcome.mailfile" );	
-	}
-  return 0;
-	
+long WelcomeAccountMail(CVars in) {
+    REQ_LONG(in, "member_id", 1, -1);
+    CVars x;
+    CVars out;
+    C_CGI_Form form("", "");
+
+    char * server_name = getenv("SERVER_NAME");
+    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())) {
+        vars2form(x, form);
+        form.LetStr("email", x["email"].c_str());
+        form.Email("ACCOUNT/member_welcome.mailfile");
+    }
+    return 0;
+
 }
 
-  long CreateCoreGradeGroupMail(CVars in)
- {
- 	REQ_LONG( in, "group_id", 1, -1 );
-	CVars x;
-	CVars out; 
-	C_CGI_Form form("","");	
-	
-		char * server_name = getenv( "SERVER_NAME" );		
-		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()) ) 
-	{	
-	 vars2form( x, form );
-	 form.LetStr( "email",   x["email"].c_str() );
-	 form.Email( "GROUP/group_added.mailfile" );	
-	}
-   return 0;
- }
- 
-long GroupCreateMemberMail(CVars in)
- {
-  	REQ_LONG( in, "group_id", 1, -1 );
-	REQ_LONG( in, "group_member_id", 1, -1 );
-	CVars x;
-	CVars out; 
-	C_CGI_Form form("","");	
-	
-		char * server_name = getenv( "SERVER_NAME" );		
-		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()) ) 
-	{	
-	 vars2form( x, form );
-	 form.LetStr( "email",   x["email"].c_str() );
-	 form.Email( "GROUP/group_member_added.mailfile" );	
-	}
-   return 0;
- return 0;
- }
+long CreateCoreGradeGroupMail(CVars in) {
+    REQ_LONG(in, "group_id", 1, -1);
+    CVars x;
+    CVars out;
+    C_CGI_Form form("", "");
+
+    char * server_name = getenv("SERVER_NAME");
+    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())) {
+        vars2form(x, form);
+        form.LetStr("email", x["email"].c_str());
+        form.Email("GROUP/group_added.mailfile");
+    }
+    return 0;
+}
+
+long GroupCreateMemberMail(CVars in) {
+    REQ_LONG(in, "group_id", 1, -1);
+    REQ_LONG(in, "group_member_id", 1, -1);
+    CVars x;
+    CVars out;
+    C_CGI_Form form("", "");
+
+    char * server_name = getenv("SERVER_NAME");
+    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())) {
+        vars2form(x, form);
+        form.LetStr("email", x["email"].c_str());
+        form.Email("GROUP/group_member_added.mailfile");
+    }
+    return 0;
+    return 0;
+}
 //==============================================================================================================
 
-
-long send_email(CVars in, CVars &out)
-{
- logfmt( logINFO, "send_email()" );
- long ret = PHP_API_BAD_PARAM;
- try {
-  REQ_LONG( in, "whattodo", 1, -1 );
-  switch(in["whattodo"].Long()) {
-   default: logfmt( logINFO, "Not implemented" );
-  }
- } catch(bad_parameter) {
-  out["status"] = "Unknow action supplied";
- }
- logfmt( logINFO, "/send_email()" );
- return ret;
+long send_email(CVars in, CVars &out) {
+    logfmt(logINFO, "send_email()");
+    long ret = PHP_API_BAD_PARAM;
+    try {
+        REQ_LONG(in, "whattodo", 1, -1);
+        switch (in["whattodo"].Long()) {
+            default: logfmt(logINFO, "Not implemented");
+        }
+    } catch (bad_parameter) {
+        out["status"] = "Unknow action supplied";
+    }
+    logfmt(logINFO, "/send_email()");
+    return ret;
 }
 
+long EmailCustBalUpdt(CVars in) {
+    REQ_LONG(in, "balance_update_id", 1, -1);
+    C_CGI_Form form("", "");
+    char * server_name = getenv("SERVER_NAME");
+    CVars x;
 
-long EmailCustBalUpdt(CVars in)
-{
- REQ_LONG( in, "balance_update_id", 1, -1 );
- C_CGI_Form form("","");
- char * server_name = getenv( "SERVER_NAME" );
- CVars x;
-
- vars2form( x, form );
- form.LetStr( "site",  server_name );
- form.Email( "test.mailfile" );
- return 0;
+    vars2form(x, form);
+    form.LetStr("site", server_name);
+    form.Email("test.mailfile");
+    return 0;
 }
 
-long SendPromoEmail(CVars in)
-{
-	long pmode = REQ_LONG( in, "pmode", 1, -1 );
-	CVars x;
-	CVars out; 
-	C_CGI_Form form("","");
+long SendPromoEmail(CVars in) {
+    long pmode = REQ_LONG(in, "pmode", 1, -1);
+    CVars x;
+    CVars out;
+    C_CGI_Form form("", "");
 
-	vars2form( in, form );	
-	form.LetStr( "email",   in["email"].c_str() );
-	
-	 switch( pmode )
-    {  
-	case 1:
-	  form.Email( "promo/promotion1.mailfile" );
-	break;
-	
-	case 2:
-	  form.Email( "promo/promotion2.mailfile" );
-	break;
-	
-	}
-	
+    vars2form(in, form);
+    form.LetStr("email", in["email"].c_str());
 
-	
-  return 0;
+    switch (pmode) {
+        case 1:
+            form.Email("promo/promotion1.mailfile");
+            break;
+
+        case 2:
+            form.Email("promo/promotion2.mailfile");
+            break;
+
+    }
+
+
+
+    return 0;
 }
 
-long SendBalanceRequestAlert(CVars in)
-{
-	REQ_LONG( in, "request_id", 1, -1 );
-	CVars x;
-	CVars out; 
-		C_CGI_Form form("","");
-	out["topupemail"]  = CfgReadChar("transnotif.topupemail");
+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()) ) 
-	{
-	
-	 vars2form( x, form );	
-	 form.LetStr( "email",   out["topupemail"].c_str() );
-	 form.Email( "alerts/balancereq.mailfile" );
-	
-	}
-  return 0;
+    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());
+        form.Email("alerts/balancereq.mailfile");
+
+    }
+    return 0;
 }
 
-long SendBalanceCompleteAlert(CVars in)
-{
-	REQ_LONG( in, "request_id", 1, -1 );
-	CVars x;
-	CVars out; 
-	C_CGI_Form form("","");
-	out["topupemail"]  = CfgReadChar("transnotif.topupemail");
+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()) ) 
-	{	
-	 vars2form( x, form );
-	 form.LetStr( "email",   out["topupemail"].c_str() );
-	 form.Email( "alerts/balancecomplete.mailfile" );
-	
-	}
-  return 0;
+    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");
+
+    }
+    return 0;
 }
 
+long SystemStatus() {
+    logfmt(logINFO, "SystemStatus()*************~************");
 
+    C_CGI_Form form("", "");
+    const char * server_name = getenv("SERVER_NAME");
+    CVars x;
 
+    vars2form(x, form);
+    form.LetStr("site", server_name);
 
+    form.LetStr("message", server_name);
+    form.LetStr("email", "ses66181@gmail.com");
+    // form.LetStr( "email",  "acidumirae@gmail.com" );
 
-long SystemStatus()
-{
- logfmt( logINFO, "SystemStatus()*************~************");
-
- C_CGI_Form form("","");
- const char * server_name = getenv( "SERVER_NAME" );
- CVars x;
-
- vars2form( x, form );
- form.LetStr( "site",  server_name );
- 
- form.LetStr( "message",  server_name );
- form.LetStr( "email",  "ses66181@gmail.com" );
-// form.LetStr( "email",  "acidumirae@gmail.com" );
-
- form.Email( "test.mailfile" );
- return 0l;
+    form.Email("test.mailfile");
+    return 0l;
 }
 
-long StartPassResetEmail(CVars in)
-{
-//customer_id
-// reset_id 
-	C_CGI_Form form("","");
-	const char * server_name = getenv( "SERVER_NAME" );
-	CVars out; 
-	CVars x;
-	load_db_record( x, "SELECT * FROM customer WHERE id = %lu",in["customer_id"].Long() ) ;
-	vars2form( x, form );
+long StartPassResetEmail(CVars in) {
+    //customer_id
+    // reset_id 
+    C_CGI_Form form("", "");
+    const char * server_name = getenv("SERVER_NAME");
+    CVars out;
+    CVars x;
+    load_db_record(x, "SELECT * FROM customer WHERE id = %lu", in["customer_id"].Long());
+    vars2form(x, form);
 
-		
-	form.LetStr( "site",  server_name );
-		/*
-		CREATE TABLE lostpass (
-		 id serial NOT NULL,
-		 customer_id INT REFERENCES customer(id),
-		 added TIMESTAMP DEFAULT NOW(),
-		 updated TIMESTAMP DEFAULT NOW(),
-		 loc INET,
-		 reset_link VARCHAR(200) NOT NULL,
-		 expire TIMESTAMP ,
-		 status integer DEFAULT 1  
-		);
-		*/
-    load_db_record( out, "SELECT added AS lost_added,* FROM lostpass WHERE id = %lu",in["reset_id"].Long() ) ;
-	vars2form( out, form );
-	
-	
-	form.LetStr( "email",   x["email"].c_str() );
-	form.Email( "start_losspass.mailfile" );  //customer notification
-	
-	
- return 0;
- //start_losspass.mailfile
+
+    form.LetStr("site", server_name);
+    /*
+    CREATE TABLE lostpass (
+     id serial NOT NULL,
+     customer_id INT REFERENCES customer(id),
+     added TIMESTAMP DEFAULT NOW(),
+     updated TIMESTAMP DEFAULT NOW(),
+     loc INET,
+     reset_link VARCHAR(200) NOT NULL,
+     expire TIMESTAMP ,
+     status integer DEFAULT 1  
+    );
+     */
+    load_db_record(out, "SELECT added AS lost_added,* FROM lostpass WHERE id = %lu", in["reset_id"].Long());
+    vars2form(out, form);
+
+
+    form.LetStr("email", x["email"].c_str());
+    form.Email("start_losspass.mailfile"); //customer notification
+
+
+    return 0;
+    //start_losspass.mailfile
 }
 
-long CompletePassResetEmail(CVars in)
-{
-//customer_id
-// reset_id 
-	C_CGI_Form form("","");
-	const char * server_name = getenv( "SERVER_NAME" );
-	CVars out; 
-	CVars x;
-	load_db_record( x, "SELECT * FROM customer WHERE id = %lu",in["customer_id"].Long() ) ;
-	vars2form( x, form );
+long CompletePassResetEmail(CVars in) {
+    //customer_id
+    // reset_id 
+    C_CGI_Form form("", "");
+    const char * server_name = getenv("SERVER_NAME");
+    CVars out;
+    CVars x;
+    load_db_record(x, "SELECT * FROM customer WHERE id = %lu", in["customer_id"].Long());
+    vars2form(x, form);
 
-		
-	form.LetStr( "site",  server_name );
 
-	
-	
-	form.LetStr( "email",   x["email"].c_str() );
-	form.Email( "complete_losspass.mailfile" );  //customer notification
-	
-	
- return 0;
- //start_losspass.mailfile
+    form.LetStr("site", server_name);
+
+
+
+    form.LetStr("email", x["email"].c_str());
+    form.Email("complete_losspass.mailfile"); //customer notification
+
+
+    return 0;
+    //start_losspass.mailfile
 }
 
-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
-               | status |           added            | balance 
-----+-------------+------------+-------------+--------+--------+--------+--------+--------+----------------------------+------+--------------+-----------+---------+---------+----+--------------------+-----------+----------+--------------------+-------------------
----------------+--------+----------------------------+---------
-  2 |           1 | 1452581056 | 08174596143 |   1000 |        |        |        |      1 | 2014-09-15 21:00:39.921535 |      | 08174596144  |           |       0 |         |  1 | ses66181@gmail.com | Olu       | Amey     | ses66181@gmail.com | d0fbea2563b377ea70
-74bced45c88dcb |      1 | 2014-07-09 13:52:02.478932 |  189700
-(1 row)
+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
+                   | status |           added            | balance 
+    ----+-------------+------------+-------------+--------+--------+--------+--------+--------+----------------------------+------+--------------+-----------+---------+---------+----+--------------------+-----------+----------+--------------------+-------------------
+    ---------------+--------+----------------------------+---------
+      2 |           1 | 1452581056 | 08174596143 |   1000 |        |        |        |      1 | 2014-09-15 21:00:39.921535 |      | 08174596144  |           |       0 |         |  1 | ses66181@gmail.com | Olu       | Amey     | ses66181@gmail.com | d0fbea2563b377ea70
+    74bced45c88dcb |      1 | 2014-07-09 13:52:02.478932 |  189700
+    (1 row)
 
-*/
-CVars out; 
-out["topupemail"]  = CfgReadChar("transnotif.topupemail");
+     */
+    CVars out;
+    out["topupemail"] = CfgReadChar("transnotif.topupemail");
 
- logfmt( logINFO, "SystemStatus()*************~************");
+    logfmt(logINFO, "SystemStatus()*************~************");
 
-    C_CGI_Form form("","");
-    const char * server_name = getenv( "SERVER_NAME" );
-	CVars x,y;
-	load_db_record( x, "select t.*,c.*,c.loc AS loc_c,c.balance*0.01 AS balance2,t.amount AS amount2,c.email AS email2,t.added AS trans_date from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id WHERE t.orderid='%s'",in["orderid"].c_str() ) ;
-    vars2form( x, form );
+    C_CGI_Form form("", "");
+    const char * server_name = getenv("SERVER_NAME");
+    CVars x, y;
+    load_db_record(x, "select t.*,c.*,c.loc AS loc_c,c.balance*0.01 AS balance2,t.amount AS amount2,c.email AS email2,t.added AS trans_date from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id WHERE t.orderid='%s'", in["orderid"].c_str());
+    vars2form(x, form);
 
-	load_db_record( y, "SELECT country_code,country_name,continent_code,continent_name FROM ipligence2 WHERE ip_from <= ip2int('%s') AND ip_to>=ip2int('%s') LIMIT 1",x["loc_c"].c_str(),x["loc_c"].c_str());
-	/*
-	country_code | country_name  | continent_code | continent_name
-	--------------+---------------+----------------+----------------
-	US           | UNITED STATES | NA             | NORTH AMERICA
-	*/	   
-	vars2form( y, form );
-	  
-	
-			if ( in["pmode"].Long() == PAY_MODE_BALANCE )  // paying with balance
-			{
-                   form.LetStr( "paymode",  "Payment with balance" );
-			}
-			else
-			{
-                    form.LetStr( "paymode",  "Payment with card" );
-			}
-					   
-	
-	form.LetStr( "site",  server_name );
-    form.LetStr( "email",   x["email2"].c_str() );
-	form.Email( "topup_payment.mailfile" );  //customer notification
-	
-	
-	
-	 form.LetStr( "email",   out["topupemail"].c_str() );
-	form.Email( "topup_payment_alert.mailfile" );  //customer notification
-	
-	
- return 0l;
+    load_db_record(y, "SELECT country_code,country_name,continent_code,continent_name FROM ipligence2 WHERE ip_from <= ip2int('%s') AND ip_to>=ip2int('%s') LIMIT 1", x["loc_c"].c_str(), x["loc_c"].c_str());
+    /*
+    country_code | country_name  | continent_code | continent_name
+    --------------+---------------+----------------+----------------
+    US           | UNITED STATES | NA             | NORTH AMERICA
+     */
+    vars2form(y, form);
+
+
+    if (in["pmode"].Long() == PAY_MODE_BALANCE) // paying with balance
+    {
+        form.LetStr("paymode", "Payment with balance");
+    } else {
+        form.LetStr("paymode", "Payment with card");
+    }
+
+
+    form.LetStr("site", server_name);
+    form.LetStr("email", x["email2"].c_str());
+    form.Email("topup_payment.mailfile"); //customer notification
+
+
+
+    form.LetStr("email", out["topupemail"].c_str());
+    form.Email("topup_payment_alert.mailfile"); //customer notification
+
+
+    return 0l;
 
 
 }
 
-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
-               | status |           added            | balance 
-----+-------------+------------+-------------+--------+--------+--------+--------+--------+----------------------------+------+--------------+-----------+---------+---------+----+--------------------+-----------+----------+--------------------+-------------------
----------------+--------+----------------------------+---------
-  2 |           1 | 1452581056 | 08174596143 |   1000 |        |        |        |      1 | 2014-09-15 21:00:39.921535 |      | 08174596144  |           |       0 |         |  1 | ses66181@gmail.com | Olu       | Amey     | ses66181@gmail.com | d0fbea2563b377ea70
-74bced45c88dcb |      1 | 2014-07-09 13:52:02.478932 |  189700
-(1 row)
+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
+                   | status |           added            | balance 
+    ----+-------------+------------+-------------+--------+--------+--------+--------+--------+----------------------------+------+--------------+-----------+---------+---------+----+--------------------+-----------+----------+--------------------+-------------------
+    ---------------+--------+----------------------------+---------
+      2 |           1 | 1452581056 | 08174596143 |   1000 |        |        |        |      1 | 2014-09-15 21:00:39.921535 |      | 08174596144  |           |       0 |         |  1 | ses66181@gmail.com | Olu       | Amey     | ses66181@gmail.com | d0fbea2563b377ea70
+    74bced45c88dcb |      1 | 2014-07-09 13:52:02.478932 |  189700
+    (1 row)
 
-*/
-CVars out; 
-out["topupemail"]  = CfgReadChar("transnotif.topupemail");
+     */
+    CVars out;
+    out["topupemail"] = CfgReadChar("transnotif.topupemail");
 
- logfmt( logINFO, "SystemStatus()*************~************");
+    logfmt(logINFO, "SystemStatus()*************~************");
 
-    C_CGI_Form form("","");
-    const char * server_name = getenv( "SERVER_NAME" );
-	CVars x;
-	load_db_record( x, "select t.*,c.*,c.balance*0.01 AS balance2,t.amount AS amount2,c.email AS email2,t.added AS trans_date from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id WHERE t.orderid='%s'",in["orderid"].c_str() ) ;
-    vars2form( x, form );
+    C_CGI_Form form("", "");
+    const char * server_name = getenv("SERVER_NAME");
+    CVars x;
+    load_db_record(x, "select t.*,c.*,c.balance*0.01 AS balance2,t.amount AS amount2,c.email AS email2,t.added AS trans_date from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id WHERE t.orderid='%s'", in["orderid"].c_str());
+    vars2form(x, form);
 
-	
-			if ( in["pmode"].Long() == PAY_MODE_BALANCE )  // paying with balance
-			{
-                   form.LetStr( "paymode",  "Payment with balance" );
-			}
-			else
-			{
-                    form.LetStr( "paymode",  "Payment with card" );
-			}
-					   
-	
-	form.LetStr( "site",  server_name );
-    form.LetStr( "email",   x["email2"].c_str() );
-	form.Email( "topup_bonus_completed.mailfile" );  //customer notification
- return 0l;
+
+    if (in["pmode"].Long() == PAY_MODE_BALANCE) // paying with balance
+    {
+        form.LetStr("paymode", "Payment with balance");
+    } else {
+        form.LetStr("paymode", "Payment with card");
+    }
+
+
+    form.LetStr("site", server_name);
+    form.LetStr("email", x["email2"].c_str());
+    form.Email("topup_bonus_completed.mailfile"); //customer notification
+    return 0l;
 
 
 }
 
+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
+                   | status |           added            | balance 
+    ----+-------------+------------+-------------+--------+--------+--------+--------+--------+----------------------------+------+--------------+-----------+---------+---------+----+--------------------+-----------+----------+--------------------+-------------------
+    ---------------+--------+----------------------------+---------
+      2 |           1 | 1452581056 | 08174596143 |   1000 |        |        |        |      1 | 2014-09-15 21:00:39.921535 |      | 08174596144  |           |       0 |         |  1 | ses66181@gmail.com | Olu       | Amey     | ses66181@gmail.com | d0fbea2563b377ea70
+    74bced45c88dcb |      1 | 2014-07-09 13:52:02.478932 |  189700
+    (1 row)
 
-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
-               | status |           added            | balance 
-----+-------------+------------+-------------+--------+--------+--------+--------+--------+----------------------------+------+--------------+-----------+---------+---------+----+--------------------+-----------+----------+--------------------+-------------------
----------------+--------+----------------------------+---------
-  2 |           1 | 1452581056 | 08174596143 |   1000 |        |        |        |      1 | 2014-09-15 21:00:39.921535 |      | 08174596144  |           |       0 |         |  1 | ses66181@gmail.com | Olu       | Amey     | ses66181@gmail.com | d0fbea2563b377ea70
-74bced45c88dcb |      1 | 2014-07-09 13:52:02.478932 |  189700
-(1 row)
+     */
+    CVars out;
+    out["topupemail"] = CfgReadChar("transnotif.topupemail");
 
-*/
-CVars out; 
-out["topupemail"]  = CfgReadChar("transnotif.topupemail");
+    logfmt(logINFO, "SystemStatus()*************~************");
 
- logfmt( logINFO, "SystemStatus()*************~************");
+    C_CGI_Form form("", "");
+    const char * server_name = getenv("SERVER_NAME");
+    CVars x, y;
+    load_db_record(x, "select t.*,c.*,c.loc AS loc_c,c.balance*0.01 AS balance2,t.amount AS amount2,c.email AS email2,t.added AS trans_date from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id WHERE t.orderid='%s'", in["orderid"].c_str());
+    vars2form(x, form);
 
-    C_CGI_Form form("","");
-    const char * server_name = getenv( "SERVER_NAME" );
-	CVars x,y;
-	load_db_record( x, "select t.*,c.*,c.loc AS loc_c,c.balance*0.01 AS balance2,t.amount AS amount2,c.email AS email2,t.added AS trans_date from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id WHERE t.orderid='%s'",in["orderid"].c_str() ) ;
-    vars2form( x, form );
+    load_db_record(y, "SELECT country_code,country_name,continent_code,continent_name FROM ipligence2 WHERE ip_from <= ip2int('%s') AND ip_to>=ip2int('%s') LIMIT 1", x["loc_c"].c_str(), x["loc_c"].c_str());
+    /*
+    country_code | country_name  | continent_code | continent_name
+    --------------+---------------+----------------+----------------
+    US           | UNITED STATES | NA             | NORTH AMERICA
+     */
+    vars2form(y, form);
 
- load_db_record( y, "SELECT country_code,country_name,continent_code,continent_name FROM ipligence2 WHERE ip_from <= ip2int('%s') AND ip_to>=ip2int('%s') LIMIT 1",x["loc_c"].c_str(),x["loc_c"].c_str());
-	/*
-	country_code | country_name  | continent_code | continent_name
-	--------------+---------------+----------------+----------------
-	US           | UNITED STATES | NA             | NORTH AMERICA
-	*/	   
-	vars2form( y, form );
-	
-	
-			if ( in["pmode"].Long() == PAY_MODE_BALANCE )  // paying with balance
-			{
-                   form.LetStr( "paymode",  "Payment with balance" );
-			}
-			else
-			{
-                    form.LetStr( "paymode",  "Payment with card" );
-			}
-					   
-	
-	form.LetStr( "site",  server_name );
-    form.LetStr( "email",   x["email2"].c_str() );
-	form.Email( "topup_completed.mailfile" );  //customer notification
- return 0l;
+
+    if (in["pmode"].Long() == PAY_MODE_BALANCE) // paying with balance
+    {
+        form.LetStr("paymode", "Payment with balance");
+    } else {
+        form.LetStr("paymode", "Payment with card");
+    }
+
+
+    form.LetStr("site", server_name);
+    form.LetStr("email", x["email2"].c_str());
+    form.Email("topup_completed.mailfile"); //customer notification
+    return 0l;
 
 
 }
 
+long VirtualAirSaleCustomer(CVars in) {
 
-long VirtualAirSaleCustomer(CVars in)
-{
+    CVars out;
+    out["topupemail"] = CfgReadChar("transnotif.topupemail");
 
-CVars out; 
-out["topupemail"]  = CfgReadChar("transnotif.topupemail");
+    logfmt(logINFO, "SystemStatus()*************~************");
 
- logfmt( logINFO, "SystemStatus()*************~************");
+    C_CGI_Form form("", "");
+    const char * server_name = getenv("SERVER_NAME");
+    CVars x, y;
+    load_db_record(x, "select t.*,c.*,c.loc AS loc_c,c.balance*0.01 AS balance2,t.amount AS amount2,c.email AS email2,t.added AS trans_date from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id WHERE t.orderid='%s'", in["orderid"].c_str());
+    vars2form(x, form);
 
-    C_CGI_Form form("","");
-    const char * server_name = getenv( "SERVER_NAME" );
-	CVars x,y;
-	load_db_record( x, "select t.*,c.*,c.loc AS loc_c,c.balance*0.01 AS balance2,t.amount AS amount2,c.email AS email2,t.added AS trans_date from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id WHERE t.orderid='%s'",in["orderid"].c_str() ) ;
-    vars2form( x, form );
+    load_db_record(y, "SELECT country_code,country_name,continent_code,continent_name FROM ipligence2 WHERE ip_from <= ip2int('%s') AND ip_to>=ip2int('%s') LIMIT 1", x["loc_c"].c_str(), x["loc_c"].c_str());
+    /*
+    country_code | country_name  | continent_code | continent_name
+    --------------+---------------+----------------+----------------
+    US           | UNITED STATES | NA             | NORTH AMERICA
+     */
+    vars2form(y, form);
 
-	load_db_record( y, "SELECT country_code,country_name,continent_code,continent_name FROM ipligence2 WHERE ip_from <= ip2int('%s') AND ip_to>=ip2int('%s') LIMIT 1",x["loc_c"].c_str(),x["loc_c"].c_str());
-	/*
-	country_code | country_name  | continent_code | continent_name
-	--------------+---------------+----------------+----------------
-	US           | UNITED STATES | NA             | NORTH AMERICA
-	*/	   
-	vars2form( y, form );
-	
-	CVars z;
-	load_db_record( z, "SELECT t.paymentcode,i.responsecode,i.transactionref FROM interswitch_bill_payment_advice t LEFT JOIN interswitch_transaction i ON i.detail_id=t.id WHERE t.order_id ='%s'",x["orderid"].c_str());
-	vars2form( z, form );
-	
-			if ( in["pmode"].Long() == PAY_MODE_BALANCE )  // paying with balance
-			{
-                   form.LetStr( "paymode",  "Payment with balance" );
-			}
-			else
-			{
-                    form.LetStr( "paymode",  "Payment with card" );
-			}
-					   
-	
- form.LetStr( "site",  server_name );
- 
- form.LetStr( "message",  server_name );
- form.LetStr( "email",   out["topupemail"].c_str() );
- form.Email( "virtualtopup.mailfile" );  // this is alert
- return 0l;
+    CVars z;
+    load_db_record(z, "SELECT t.paymentcode,i.responsecode,i.transactionref FROM interswitch_bill_payment_advice t LEFT JOIN interswitch_transaction i ON i.detail_id=t.id WHERE t.order_id ='%s'", x["orderid"].c_str());
+    vars2form(z, form);
+
+    if (in["pmode"].Long() == PAY_MODE_BALANCE) // paying with balance
+    {
+        form.LetStr("paymode", "Payment with balance");
+    } else {
+        form.LetStr("paymode", "Payment with card");
+    }
+
+
+    form.LetStr("site", server_name);
+
+    form.LetStr("message", server_name);
+    form.LetStr("email", out["topupemail"].c_str());
+    form.Email("virtualtopup.mailfile"); // this is alert
+    return 0l;
 
 
 }
 
-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()) ) 
-	{
-		 vars2form( x, form );
-		 form.Email( "balance_updated.mailfile" );
-	}
+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())) {
+        vars2form(x, form);
+        form.Email("balance_updated.mailfile");
+    }
 
-	
-}
-
-
-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()) ) 
-	{
-		 vars2form( x, form );
-		 form.Email( "bonus_balance.mailfile" );
-	}
-
-	return 0;
-}
-
-void  PaymentAlert(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");
+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())) {
+        vars2form(x, form);
+        form.Email("bonus_balance.mailfile");
+    }
 
-	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 );
-	
-	
-	 form.LetStr( "email",   out["topupemail"].c_str() );
-	 form.Email( "alert_balance_updated.mailfile" );
-	
-	}
-
-	
-	
+    return 0;
 }
 
-void  CustomerEmailWelcome(CVars in)
-{
-    long customer_id  = in["user_id"].Long();
-	C_CGI_Form form("","");
-	const char * server_name = getenv( "SERVER_NAME" );     
-	CVars x;
-	load_db_record( x, "select *,email as email2 from customer   WHERE id =%lu ",customer_id ) ;
-    vars2form( x, form );
-	form.Email( "welcome.mailfile" );
+void PaymentAlert(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())) {
+
+        vars2form(x, form);
+
+
+        form.LetStr("email", out["topupemail"].c_str());
+        form.Email("alert_balance_updated.mailfile");
+
+    }
+
+
+
+}
+
+void CustomerEmailWelcome(CVars in) {
+    long customer_id = in["user_id"].Long();
+    C_CGI_Form form("", "");
+    const char * server_name = getenv("SERVER_NAME");
+    CVars x;
+    load_db_record(x, "select *,email as email2 from customer   WHERE id =%lu ", customer_id);
+    vars2form(x, form);
+    form.Email("welcome.mailfile");
 }
 
 /*****************************************************************************/
-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
-               | status |           added            | balance 
-----+-------------+------------+-------------+--------+--------+--------+--------+--------+----------------------------+------+--------------+-----------+---------+---------+----+--------------------+-----------+----------+--------------------+-------------------
----------------+--------+----------------------------+---------
-  2 |           1 | 1452581056 | 08174596143 |   1000 |        |        |        |      1 | 2014-09-15 21:00:39.921535 |      | 08174596144  |           |       0 |         |  1 | ses66181@gmail.com | Olu       | Amey     | ses66181@gmail.com | d0fbea2563b377ea70
-74bced45c88dcb |      1 | 2014-07-09 13:52:02.478932 |  189700
-(1 row)
+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
+                   | status |           added            | balance 
+    ----+-------------+------------+-------------+--------+--------+--------+--------+--------+----------------------------+------+--------------+-----------+---------+---------+----+--------------------+-----------+----------+--------------------+-------------------
+    ---------------+--------+----------------------------+---------
+      2 |           1 | 1452581056 | 08174596143 |   1000 |        |        |        |      1 | 2014-09-15 21:00:39.921535 |      | 08174596144  |           |       0 |         |  1 | ses66181@gmail.com | Olu       | Amey     | ses66181@gmail.com | d0fbea2563b377ea70
+    74bced45c88dcb |      1 | 2014-07-09 13:52:02.478932 |  189700
+    (1 row)
 
-*/
-CVars out; 
-out["topupemail"]  = CfgReadChar("transnotif.topupemail");
+     */
+    CVars out;
+    out["topupemail"] = CfgReadChar("transnotif.topupemail");
 
- logfmt( logINFO, "SystemStatus()*************~************");
+    logfmt(logINFO, "SystemStatus()*************~************");
 
-    C_CGI_Form form("","");
-    const char * server_name = getenv( "SERVER_NAME" );
-	CVars x,y;
-	load_db_record( x, "select t.*,c.*,c.loc as loc_c,c.balance*0.01 AS balance2,t.amount AS amount2,c.email AS email2 from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id WHERE t.orderid='%s'",in["orderid"].c_str() ) ;
-    vars2form( x, form );
+    C_CGI_Form form("", "");
+    const char * server_name = getenv("SERVER_NAME");
+    CVars x, y;
+    load_db_record(x, "select t.*,c.*,c.loc as loc_c,c.balance*0.01 AS balance2,t.amount AS amount2,c.email AS email2 from trans_notification t LEFT JOIN customer c ON c.id = t.customer_id WHERE t.orderid='%s'", in["orderid"].c_str());
+    vars2form(x, form);
 
-	
-	load_db_record( y, "SELECT country_code,country_name,continent_code,continent_name FROM ipligence2 WHERE ip_from <= ip2int('%s') AND ip_to>=ip2int('%s') LIMIT 1",x["loc_c"].c_str(),x["loc_c"].c_str());
-	/*
-	country_code | country_name  | continent_code | continent_name
-	--------------+---------------+----------------+----------------
-	US           | UNITED STATES | NA             | NORTH AMERICA
-	*/	   
-	vars2form( y, form );
-	
-	CVars z;
-    load_db_record( z, "SELECT t.paymentcode,i.responsecode,i.transactionref FROM interswitch_bill_payment_advice t LEFT JOIN interswitch_transaction i ON i.detail_id=t.id WHERE t.order_id ='%s'",x["orderid"].c_str());
-	vars2form( z, form );
-	
-			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
-			{
-			  form.LetStr( "paymode",  "Bonus Payment" );
-			}
-			else
-			{
-                    form.LetStr( "paymode",  "Payment with card" );
-			}
-					   
-	
- form.LetStr( "site",  server_name );
- 
- form.LetStr( "message",  server_name );
- //form.LetStr( "email",  "ses66181@gmail.com,oladeji@gmail.com" );
-  form.LetStr( "email",   out["topupemail"].c_str() );
 
-// form.LetStr( "email",  "acidumirae@gmail.com" );
+    load_db_record(y, "SELECT country_code,country_name,continent_code,continent_name FROM ipligence2 WHERE ip_from <= ip2int('%s') AND ip_to>=ip2int('%s') LIMIT 1", x["loc_c"].c_str(), x["loc_c"].c_str());
+    /*
+    country_code | country_name  | continent_code | continent_name
+    --------------+---------------+----------------+----------------
+    US           | UNITED STATES | NA             | NORTH AMERICA
+     */
+    vars2form(y, form);
 
- form.Email( "virtualtopup.mailfile" );
- return 0l;
-}
-/*****************************************************************************/
-
-void SendAccountCreateAlert(long customer_id)
-{
-
-CVars out; 
-out["topupemail"]  = CfgReadChar("transnotif.topupemail");
-
- logfmt( logINFO, "SystemStatus()*************~************");
-
-    C_CGI_Form form("","");
-    const char * server_name = getenv( "SERVER_NAME" );
-	CVars x,y;
-	load_db_record( x, "SELECT *,email as email2,balance*0.01 AS balance2,dollar_balance*0.01 AS dollar_balance2 from customer   WHERE id =%lu ",customer_id ) ;
-    vars2form( x, form );
-	
-    load_db_record( y, "SELECT country_code,country_name,continent_code,continent_name FROM ipligence2 WHERE ip_from <= ip2int('%s') AND ip_to>=ip2int('%s') LIMIT 1",x["loc"].c_str(),x["loc"].c_str());
- /*
- country_code | country_name  | continent_code | continent_name
---------------+---------------+----------------+----------------
- US           | UNITED STATES | NA             | NORTH AMERICA
-*/	   
-	  vars2form( y, form );
-	form.LetStr( "site",  server_name );
-	form.LetStr( "message",  server_name );
-	form.LetStr( "email",   out["topupemail"].c_str() );
-
-// form.LetStr( "email",  "acidumirae@gmail.com" );
-
- form.Email( "alert_accountcreated.mailfile" );
-//alert_accountcreated.mailfile
-}
-/*****************************************************************************/
-void vars2form( CVars &v, C_CGI_Form &form )
-{
-	CVars::const_iterator i;
-	for ( i=v.begin(); i != v.end(); i++ ) {
-		char name[30];
-		strsafecpy( name, i->first.c_str(), sizeof(name) );
-		// &fee, tax, total
-		if ( strcasecmp( name, "tax" )==0 ||
-			 strcasecmp( name, "total" )==0 ||
-			 strcasecmp( name, "price" )==0 ||
-			 strcasecmp( name, "amount" )==0 ||
-			 strcasecmp( name, "shipping" )==0 ||
-			 strcasecmp( name, "subtotal" )==0 ||
-			( strlen(name)>=3 && strcasecmp( &name[strlen(name)-3], "fee" )==0 )) {
-			form.LetStrf( name, "%.2f", i->second.Long()/100.0 );
-		} else {
-			form.LetStr( i->first.c_str(), i->second.c_str() );
-		}
-	}
+    CVars z;
+    load_db_record(z, "SELECT t.paymentcode,i.responsecode,i.transactionref FROM interswitch_bill_payment_advice t LEFT JOIN interswitch_transaction i ON i.detail_id=t.id WHERE t.order_id ='%s'", x["orderid"].c_str());
+    vars2form(z, form);
+
+    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
+    {
+        form.LetStr("paymode", "Bonus Payment");
+    } else {
+        form.LetStr("paymode", "Payment with card");
+    }
+
+
+    form.LetStr("site", server_name);
+
+    form.LetStr("message", server_name);
+    //form.LetStr( "email",  "ses66181@gmail.com,oladeji@gmail.com" );
+    form.LetStr("email", out["topupemail"].c_str());
+
+    // form.LetStr( "email",  "acidumirae@gmail.com" );
+
+    form.Email("virtualtopup.mailfile");
+    return 0l;
+}
+
+/*****************************************************************************/
+
+void SendAccountCreateAlert(long customer_id) {
+
+    CVars out;
+    out["topupemail"] = CfgReadChar("transnotif.topupemail");
+
+    logfmt(logINFO, "SystemStatus()*************~************");
+
+    C_CGI_Form form("", "");
+    const char * server_name = getenv("SERVER_NAME");
+    CVars x, y;
+    load_db_record(x, "SELECT *,email as email2,balance*0.01 AS balance2,dollar_balance*0.01 AS dollar_balance2 from customer   WHERE id =%lu ", customer_id);
+    vars2form(x, form);
+
+    load_db_record(y, "SELECT country_code,country_name,continent_code,continent_name FROM ipligence2 WHERE ip_from <= ip2int('%s') AND ip_to>=ip2int('%s') LIMIT 1", x["loc"].c_str(), x["loc"].c_str());
+    /*
+    country_code | country_name  | continent_code | continent_name
+   --------------+---------------+----------------+----------------
+    US           | UNITED STATES | NA             | NORTH AMERICA
+     */
+    vars2form(y, form);
+    form.LetStr("site", server_name);
+    form.LetStr("message", server_name);
+    form.LetStr("email", out["topupemail"].c_str());
+
+    // form.LetStr( "email",  "acidumirae@gmail.com" );
+
+    form.Email("alert_accountcreated.mailfile");
+    //alert_accountcreated.mailfile
+}
+
+/*****************************************************************************/
+void vars2form(CVars &v, C_CGI_Form &form) {
+    CVars::const_iterator i;
+    for (i = v.begin(); i != v.end(); i++) {
+        char name[30];
+        strsafecpy(name, i->first.c_str(), sizeof (name));
+        // &fee, tax, total
+        if (strcasecmp(name, "tax") == 0 ||
+                strcasecmp(name, "total") == 0 ||
+                strcasecmp(name, "price") == 0 ||
+                strcasecmp(name, "amount") == 0 ||
+                strcasecmp(name, "shipping") == 0 ||
+                strcasecmp(name, "subtotal") == 0 ||
+                (strlen(name) >= 3 && strcasecmp(&name[strlen(name) - 3], "fee") == 0)) {
+            form.LetStrf(name, "%.2f", i->second.Long() / 100.0);
+        } else {
+            form.LetStr(i->first.c_str(), i->second.c_str());
+        }
+    }
 }
 /*****************************************************************************/
 
diff --git a/www/application/controllers/Auth.php b/www/application/controllers/Auth.php
index 8d77111..a7eda05 100644
--- a/www/application/controllers/Auth.php
+++ b/www/application/controllers/Auth.php
@@ -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);
diff --git a/www/application/views/home/home.php b/www/application/views/home/home.php
index 7a648e4..e520eb9 100644
--- a/www/application/views/home/home.php
+++ b/www/application/views/home/home.php
@@ -205,8 +205,9 @@
                                 
  • Parents
    • 
                                 -->
                             
-                            
    A Modern, intuitive, effective digital learning 
    experience that minimizes complexity and 
    enables personalized learning at a convenience.
    
-							
+                            
    A Modern, intuitive, effective digital learning experience that minimizes complexity and enables personalized learning at a convenience.
    
+							
    
+							
    
                             
    Let Us Be Your Companion Let‘s talk
    
                         
                     
@@ -226,7 +227,7 @@
                             
  • 
                                 
    CoreGrade Plus
    
                                 Contact Us
-                                
    Quality support that 
     drives success
    
+                                
    Holistic learning that 
     lights up
    
                                 
      
                                      
    • Everything Individual + 
      • 
                                     
    • Integrations
      • 
@@ -368,7 +369,7 @@
                                 
      
                                     
      Contact Us
      
                                 
      
-                                
      []CoreGrade
      
+                                
      CoreGrade
      
                                 
      Email :support@coregrade.com
      
                                 
      Phone : 404-858-7966