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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-08-31 18:25:59 -04:00
parent a6059857be
commit 9ec5e63c07
4 changed files with 57 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/email/JOB/job_interest_client.mailfile
+6 -6
View File
@@ -56,7 +56,7 @@ body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px;
<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" />
<img class="fix" src="{{server_name}}/assets/images/wrenchboard-icon.gif" width="70" height="70" border="0" alt="WrenchBoard" />
</td>
</tr>
</table>
@@ -136,7 +136,7 @@ Title
Offer ID
</td>
<td class="bodycopy">
<a href ="https://{{server_name}}/eoffer?offerID={{offer_code}}">{{offer_code}}</a>
<a href ="{{server_name}}/eoffer?offerID={{offer_code}}">{{offer_code}}</a>
</td>
</tr>
@@ -197,7 +197,7 @@ Note that this task was posted in the public domain and the owner can select any
</tr>
<tr>
<td class="innerpadding borderbottom">
<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
<img class="fix" src="{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
</td>
</tr>
<tr>
@@ -218,7 +218,7 @@ Please contact us at https://www.wrenchboard.com/contact if you have any questi
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
<tr>
@@ -227,12 +227,12 @@ You received this email because a user sent a job to you from {{site_name}}. If
<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>
wrenchboard/email/JOB/job_interest_member.mailfile
+6 -8
View File
@@ -56,7 +56,7 @@ body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px;
<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" />
<img class="fix" src="{{server_name}}/assets/images/wrenchboard-icon.gif" width="70" height="70" border="0" alt="WrenchBoard" />
</td>
</tr>
</table>
@@ -135,7 +135,7 @@ Title
Offer ID
</td>
<td class="bodycopy">
<a href ="https://{{server_name}}/eoffer?offerID={{offer_code}}">{{offer_code}}</a>
<a href ="{{server_name}}/eoffer?offerID={{offer_code}}">{{offer_code}}</a>
</td>
</tr>
@@ -192,7 +192,7 @@ Detail
</tr>
<tr>
<td class="innerpadding borderbottom">
<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
<img class="fix" src="{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
</td>
</tr>
<tr>
@@ -213,7 +213,7 @@ Please contact us at https://www.wrenchboard.com/contact if you have any questi
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
<tr>
@@ -222,12 +222,12 @@ You received this email because a user sent a job to you from {{site_name}}. If
<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>
@@ -247,7 +247,5 @@ You received this email because a user sent a job to you from {{site_name}}. If
</tr>
</table>
<!--analytics-->
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
</body>
</html>
wrenchboard/email/JOB/job_interest_message.mailfile
+7 -7
View File
@@ -56,7 +56,7 @@ Subject: {{subject}}
<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" />
<img class="fix" src="{{server_name}}/assets/images/wrenchboard-icon.gif" width="70" height="70" border="0" alt="WrenchBoard" />
</td>
</tr>
</table>
@@ -101,7 +101,7 @@ Subject: {{subject}}
</tr>
<tr>
<td class="bodycopy">
You have received a messager from a <a href="https://{{server_name}}/eoffer?offerID={{offer_code}}">{{site_name}}</a> because of your interest in the task <b>" {{job_title}} "</b> at {{added}}.
You have received a messager from a <a href="{{server_name}}/eoffer?offerID={{offer_code}}">{{site_name}}</a> because of your interest in the task <b>" {{job_title}} "</b> at {{added}}.
</td>
</tr>
@@ -113,7 +113,7 @@ You have received a messager from a <a href="https://{{server_name}}/eoffer?offe
<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>
@@ -151,7 +151,7 @@ You have received a messager from a <a href="https://{{server_name}}/eoffer?offe
</tr>
<tr>
<td class="innerpadding borderbottom">
<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
<img class="fix" src="{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
</td>
</tr>
<tr>
@@ -172,7 +172,7 @@ You have received a messager from a <a href="https://{{server_name}}/eoffer?offe
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2022<br/>
You received this email because of your interest in a task @ {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
You received this email because of your interest in a task @ {{site_name}}. If you get this email in error, please <a href="{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
<tr>
@@ -181,12 +181,12 @@ You have received a messager from a <a href="https://{{server_name}}/eoffer?offe
<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>
wrenchboard/src/shared_tool/email.cc
+38 -8
View File
@@ -60,7 +60,10 @@ long SendmarketMessage(CVars in, CVars &out) {
form.LetStr("site_trade_name", "Connecting Opportunities");
vars2form(in, form);
in["server_name"] = "https://dashboard.wrenchboard.com";
in["server_name"] = CfgReadChar("system.server_name");
form.LetStr("server_name", in["server_name"].c_str());
// in["server_name"] = "https://dashboard.wrenchboard.com";
int c = 0;
@@ -141,8 +144,13 @@ long cron_email(long mailtype, CVars in, CVars &out) {
char late_subject[120];
const PGresult *res;
char * server_name = getenv("SERVER_NAME");
form.LetStr("server_name", server_name);
// char * server_name = getenv("SERVER_NAME");
// form.LetStr("server_name", server_name);
in["server_name"] = CfgReadChar("system.server_name");
form.LetStr("server_name", in["server_name"].c_str());
form.LetStr("site_name", "WrenchBoard");
form.LetStr("site_trade_name", "Connecting Opportunities");
@@ -157,7 +165,7 @@ long cron_email(long mailtype, CVars in, CVars &out) {
if (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;
@@ -237,8 +245,12 @@ long coupon_email(long mailtype, CVars in, CVars &out) {
char listing_items[1024];
const PGresult *res;
bool exclude_email = true;
char * server_name = getenv("SERVER_NAME");
form.LetStr("server_name", "https://dashboard.wrenchboard.com");
// char * server_name = getenv("SERVER_NAME");
// form.LetStr("server_name", "https://dashboard.wrenchboard.com");
in["server_name"] = CfgReadChar("system.server_name");
form.LetStr("server_name", in["server_name"].c_str());
form.LetStr("site_name", "WrenchBoard");
form.LetStr("site_trade_name", "Connecting Opportunities");
@@ -898,21 +910,39 @@ long getContractMemberClientEmail(long contract_id, CVars &out) {
}
long test_email(CVars in, CVars &out) {
CVars x;
CVars x,y,z;
C_CGI_Form form("", "");
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");
/*
if (load_db_record(x, "select p.*,m.firstname,m.lastname,m.email from password_reset p LEFT JOIN members m ON m.id =p.member_id WHERE p.id = 8 ")) {
vars2form(x, form);
}
form.LetStr("subject", "This is Test Email");
form.LetStr("email", in["email"].c_str());
form.Email("ALERT/template.mailfile");
*/
if (load_db_record(x, "SELECT o.*,to_char(o.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire2,j.title,j.description,j.timeline_days,j.price FROM members_jobs_offer o LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.id = %lu AND o.status >0", in["offer_id"].Long())) {
vars2form(x, form);
if (load_db_record(y, "SELECT email,balance,firstname FROM members WHERE id = %lu", x["member_id"].Long())) {
vars2form(y, form);
form.LetStr("subject", "Job Interest Recieved");
form.LetStr("email", "ameye+member@chiefsoft.com");
form.Email("JOB/job_interest_member.mailfile");
}
if (load_db_record(z, "SELECT mi.*,m.firstname,m.lastname,m.email from members_offer_interest mi LEFT JOIN members m ON m.id = mi.member_id WHERE mi.id = %lu", in["interest_id"].Long())) {
vars2form(z, form);
form.LetStr("subject", "Job Interest Sent");
form.LetStr("email", "ameye+client@chiefsoft.com");
form.Email("JOB/job_interest_client.mailfile");
}
}
return 0;
}