WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-08-20 20:48:11 -04:00
parent a98c7095b3
commit 6eb90c9e22
5 changed files with 67 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/email/ACCOUNT/member_refer_individual.mailfile
+17 -47
View File
@@ -10,7 +10,7 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show
body {margin: 0; padding: 0; min-width: 100%!important;}
img {height: auto;}
.content {width: 100%; max-width: 600px;}
.header {padding: 40px 30px 20px 30px;}
.header {padding: 20px 30px 20px 20px;}
.innerpadding {padding: 30px 30px 30px 30px;}
.borderbottom {border-bottom: 1px solid #f2eeed;}
.subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
@@ -32,11 +32,6 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show
body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px; background: #2f3942; border-radius: 5px; text-decoration: none!important; font-weight: bold;}
}
/*@media only screen and (min-device-width: 601px) {
.content {width: 600px !important;}
.col425 {width: 425px!important;}
.col380 {width: 380px!important;}
}*/
</style>
</head>
@@ -53,42 +48,20 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show
<table bgcolor="#ffffff" class="content" align="center" cellpadding="0" cellspacing="0" border="0">
<tr>
<td bgcolor="#c7d8a7" class="header">
<table width="70" align="left" border="0" cellpadding="0" cellspacing="0">
<tr>
<td height="70" style="padding: 0 20px 20px 0;">
<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard-icon.gif" width="70" height="70" border="0" alt="WrenchBoard" />
</td>
</tr>
</table>
<!--[if (gte mso 9)|(IE)]>
<table width="425" align="left" cellpadding="0" cellspacing="0" border="0">
<tr>
<td>
<![endif]-->
<table class="col425" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 425px;">
<tr>
<td height="50">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="h1" style="padding: 5px 0 0 0;">
{{site_name}}
<td class="h1" style="padding: 5px 0 0 0; text-align:center;">
<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a>
</td>
</tr>
<tr>
<td class="subhead" style="padding: 0 0 0 3px;">
<td class="subhead" style="padding: 0 0 0 3px; text-align:center;">
{{site_trade_name}}
</td>
</tr>
</table>
</td>
</tr>
</table>
<!--[if (gte mso 9)|(IE)]>
</td>
</tr>
</table>
<![endif]-->
</td>
</tr>
<tr>
@@ -101,7 +74,7 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show
</tr>
<tr>
<td class="bodycopy">
{{send_firstname}} {{send_lastname}} will like to share <a href="https://{{server_name}}/invite?refer_link={{refer_link}}">{{site_name}}!</a>. <a href="https://{{server_name}}/invite?refer_link={{refer_link}}">{{site_name}}</a> connects your skills with people that need your service and also allow you to find people that can assist you on those jobs you need hands on.
{{send_firstname}} {{send_lastname}} will like to share <a href="{{server_name}}/invite?refer_link={{refer_link}}">{{site_name}}!</a>. <a href="{{server_name}}/invite?refer_link={{refer_link}}">{{site_name}}</a> connects your skills with people that need your service and also allow you to find people that can assist you on those jobs you need hands on.
</td>
</tr>
</table>
@@ -112,7 +85,7 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show
<table width="115" align="left" border="0" cellpadding="0" cellspacing="0">
<tr>
<td height="115" style="padding: 0 20px 20px 0;">
<img class="fix" src="https://{{server_name}}/assets/images/article1.png" width="115" height="115" border="0" alt="" />
<img class="fix" src="{{server_name}}/assets/images/article1.png" width="115" height="115" border="0" alt="" />
</td>
</tr>
</table>
@@ -127,7 +100,7 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="bodycopy">
<b>Invitation Link :</b><br> https://{{server_name}}/invite?refer_link={{refer_link}}
<b>Invitation Link :</b><br> {{server_name}}/invite?refer_link={{refer_link}}
</td>
</tr>
@@ -136,7 +109,7 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show
<table class="buttonwrapper" bgcolor="#e05443" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="button" height="45">
<a href="https://{{server_name}}/invite?refer_link={{refer_link}}">Invitation Link</a>
<a href="{{server_name}}/invite?refer_link={{refer_link}}">Invitation Link</a>
</td>
</tr>
</table>
@@ -155,12 +128,12 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show
</tr>
<tr>
<td class="borderbottom">
<a href="https://{{server_name}}/invite?refer_link={{refer_link}}"> <img class="fix" src="https://{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" /></a>
<a href="{{server_name}}/invite?refer_link={{refer_link}}"> <img class="fix" src="{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" /></a>
</td>
</tr>
<tr>
<td class="innerpadding bodycopy">
With <a href="https://{{server_name}}/invite?refer_link={{refer_link}}">{{site_name}}</a>, you can enjoy free coordinated skills training section. Empower yourself and be around those that work with latest to update your knowledge.
<td class="innerpadding bodycopy">
</td>
</tr>
<tr>
@@ -175,8 +148,8 @@ With <a href="https://{{server_name}}/invite?refer_link={{refer_link}}">{{site_n
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2017<br/>
You received this email because a subscriber, {{send_firstname}} {{send_lastname}}, to {{site_name}} refer you, . If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
&reg; {{site_name}} {{yyyy}} <br/>
You received this email because a subscriber, {{send_firstname}} {{send_lastname}}, to {{site_name}} refer you, . If you get this email in error, please <a href="https://www.wrenchboard.com/contact" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
<tr>
@@ -185,12 +158,12 @@ With <a href="https://{{server_name}}/invite?refer_link={{refer_link}}">{{site_n
<tr>
<td width="37" style="text-align: center; padding: 0 10px 0 10px;">
<a href="https://www.facebook.com/wrenchboard/">
<img src="https://{{server_name}}/assets/images/brands/facebook.png" width="37" height="37" alt="Facebook" border="0" />
<img src="{{server_name}}/assets/images/brands/facebook.png" width="37" height="37" alt="Facebook" border="0" />
</a>
</td>
<td width="37" style="text-align: center; padding: 0 10px 0 10px;">
<a href="http://www.twitter.com/">
<img src="https://{{server_name}}/assets/images/brands/twitter.png" width="37" height="37" alt="Twitter" border="0" />
<img src="{{server_name}}/assets/images/brands/twitter.png" width="37" height="37" alt="Twitter" border="0" />
</a>
</td>
</tr>
@@ -209,9 +182,6 @@ With <a href="https://{{server_name}}/invite?refer_link={{refer_link}}">{{site_n
</td>
</tr>
</table>
<!--analytics-->
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
</body>
</html>
wrenchboard/etc/wrenchboard_api.conf
+1
View File
@@ -13,6 +13,7 @@ system:
site_apple_app = "https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls=1&mt=8";
site_andriod_app = "https://play.google.com/store/apps/details?id=com.wrenchboard.users";
upload_size_limit = "3145728";
server_name = "https://oameye.work.wrenchboard.com";
};
flutterwave:
wrenchboard/src/include/wrenchboard_api.h
+5 -1
View File
@@ -167,6 +167,8 @@ enum { PARTNER_STRIPE };
#define WRENCHBOARD_SEND_CONTACTUS 11030
#define WRENCHBOARD_ACCOUNT_SENDREFER 11032
#define WRENCHBOARD_ACCOUNT_REFERLINK 11033
#define WRENCHBOARD_ACCOUNT_REFRESENDLNK 11133
#define WRENCHBOARD_SESSION_VERIFY 11034
#define WRENCHBOARD_UPDATE_PROFILE 11035
#define WRENCHBOARD_ACCOUNT_TERMS 11036
@@ -174,7 +176,7 @@ enum { PARTNER_STRIPE };
#define WRENCHBOARD_ACCOUNT_SAVESKILL 11038
#define WRENCHBOARD_ACCOUNT_DELSKILL 11039
#define WRENCHBOARD_LOG_MEMBER 11040
#define WRENCHBOARD_LOG_MEMBER 11040
#define WRENCHBOARD_DELETE_RECACC 11041
#define WRENCHBOARD_SAVE_GALLERY 11042
@@ -193,6 +195,8 @@ enum { PARTNER_STRIPE };
#define WRENCHBOARD_ACCOUNT_PREPARE_TOPUP 11062
#define WRENCHBOARD_ACCOUNT_COMPLETE_TOPUP 11063
#define WRENCHBOARD_USER_DELETEACC 11990
#define WRENCHBOARD_ACCOUNT_END 11999
//**************************************************************
wrenchboard/src/shared_tool/account.cc
+27
View File
@@ -115,6 +115,7 @@ long WrenchReturnPendingJobList(CVars in, CVars &out);
long WrenchBoardMobileSendUserWallet(CVars in, CVars &out);
long WrenchBoardStartBalanceTopup(CVars in, CVars &out);
long WrenchBoardCompleteBalanceTopup(CVars in, CVars &out);
long WrenchResendSendReferLoadLink(CVars in, CVars &out);
long test() {
FILE* oldFile = Output2FILE::Stream();
@@ -258,6 +259,11 @@ long account_calls(CVars in, CVars &out) {
case WRENCHBOARD_ACCOUNT_REFERLINK:
return WrenchSendReferLoadLink(in, out);
break;
case WRENCHBOARD_ACCOUNT_REFRESENDLNK:
return WrenchResendSendReferLoadLink(in, out);
break;
case WRENCHBOARD_SESSION_VERIFY:
return VerifySession(in, out);
break;
@@ -1136,6 +1142,27 @@ long WrenchUpdateProfile(CVars in, CVars &out) {
return ret;
}
long WrenchResendSendReferLoadLink(CVars in, CVars &out) {
logfmt(logINFO, "long WrenchResendSendReferLoadLink(CVars in, CVars out)");
long ret = PHP_API_BAD_PARAM;
try {
REQ_STRING(in, "uid", 3, 45, "(.*)");
if (load_db_record(out, "SELECT id AS refer_id, * FROM members_refer_friend WHERE status<>5 AND uid ='%s'", in["uid"].c_str()) > 0)
{
in["refer_id"] = out["refer_id"];
in["refer_id"].set_valid(true);
account_email(ACCOUNT_SEND_REFEREMAIL, in, out);
out["status"] = "Refer message sent";
ret = PHP_API_OK;
}
} catch (bad_parameter) {
out["status"] = "Invalid Parameters";
}
logfmt(logINFO, "/long WrenchResendSendReferLoadLink(CVars in, CVars out)");
return ret;
}
long WrenchSendReferLoadLink(CVars in, CVars &out) {
logfmt(logINFO, "long WrenchSendReferLoadLink(CVars in, CVars out)");
long ret = PHP_API_BAD_PARAM;
wrenchboard/src/shared_tool/email.cc
+17 -9
View File
@@ -283,7 +283,9 @@ long account_email(long mailtype, CVars in, CVars &out) {
const PGresult *res;
bool exclude_email = true;
char * server_name = getenv("SERVER_NAME");
form.LetStr("server_name", "https://dashboard.wrenchboard.com");
out["server_name"] = CfgReadChar("system.server_name");
form.LetStr("server_name", out["server_name"].c_str());
form.LetStr("site_name", "WrenchBoard");
form.LetStr("site_trade_name", "Connecting Opportunities");
@@ -297,7 +299,7 @@ long account_email(long mailtype, CVars in, CVars &out) {
case ACCOUNT_SEND_REFEREMAIL:
REQ_LONG(in, "refer_id", 1, -1);
if (load_db_record(x, "SELECT r.*,m.firstname AS send_firstname,m.lastname AS send_lastname FROM members_refer_friend r LEFT JOIN members m ON m.id = r.member_id WHERE r.id = %lu ", in["refer_id"].Long())) {
if (load_db_record(x, "SELECT r.*,m.firstname AS send_firstname,m.lastname AS send_lastname,date_part('year',now()) AS yyyy FROM members_refer_friend r LEFT JOIN members m ON m.id = r.member_id WHERE r.id = %lu ", in["refer_id"].Long())) {
vars2form(x, form);
form.LetStr("email", x["email"].c_str());
form.Email("ACCOUNT/member_refer_individual.mailfile");
@@ -333,7 +335,7 @@ long account_email(long mailtype, CVars in, CVars &out) {
if (!exclude_email && load_db_record(x, "SELECT *,email as email2,to_char(last_login, 'Day Mon dd, yyyy HH:MI AM') AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) {
in["server_name"] = "https://dashboard.wrenchboard.com";
//in["server_name"] = "https://dashboard.wrenchboard.com";
int c = 0;
@@ -361,7 +363,7 @@ long account_email(long mailtype, CVars in, CVars &out) {
CVars rec;
map_to_cvars(f, rec);
sprintf(listing_items, "<TR><td style='background-color:#%s; font-size:12px;'><a href='%s/plb/viewjob/%s'>%s</a> - %s<br><b>Duration:</b>%s Day(s)</td></TR>", in["color"].c_str(), in["server_name"].c_str(), rec["offer_code"].c_str(), rec["title"].c_str(), rec["description"].c_str(), rec["timeline_days"].c_str());
sprintf(listing_items, "<TR><td style='background-color:#%s; font-size:12px;'><a href='%s/plb/viewjob/%s'>%s</a> - %s<br><b>Duration:</b>%s Day(s)</td></TR>", in["color"].c_str(), out["server_name"].c_str(), rec["offer_code"].c_str(), rec["title"].c_str(), rec["description"].c_str(), rec["timeline_days"].c_str());
inv_list->LetStr("pin", listing_items);
inv_list->CloseElement();
//<hr size=1 color=#FF0000>
@@ -387,7 +389,7 @@ long account_email(long mailtype, CVars in, CVars &out) {
" FROM password_reset p "
" LEFT JOIN members m ON m.id =p.member_id WHERE p.id = %lu ", in["password_reset_id"].Long())) {
vars2form(x, form);
form.LetStr("server_name", server_name);
form.LetStr("server_name", out["server_name"].c_str());
form.Email("ACCOUNT/member_resetpass.mailfile");
}
break;
@@ -436,8 +438,11 @@ long job_email(long mailtype, CVars in, CVars &out) {
char listing_items[1024];
const PGresult *res;
char * server_name = getenv("SERVER_NAME");
form.LetStr("server_name", server_name);
char * server_name; // = getenv("SERVER_NAME");
out["server_name"] = CfgReadChar("system.server_name");
sprintf(server_name, "%s", out["server_name"].c_str());
form.LetStr("server_name", out["server_name"].c_str());
form.LetStr("site_name", "WrenchBoard");
form.LetStr("site_trade_name", "Connecting Opportunities");
switch (mailtype) {
@@ -719,8 +724,11 @@ long sendmoney_email(long mailtype, CVars in, CVars &out) {
CVars x, y, z;
C_CGI_Form form("", "");
char * server_name = getenv("SERVER_NAME");
form.LetStr("server_name", server_name);
char * server_name; // = getenv("SERVER_NAME");
out["server_name"] = CfgReadChar("system.server_name");
sprintf(server_name, "%s", out["server_name"].c_str());
form.LetStr("server_name", out["server_name"].c_str());
form.LetStr("site_name", "WrenchBoard");
form.LetStr("site_trade_name", "Connecting Opportunities");