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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-02-03 19:47:27 -05:00
parent e122fb93fc
commit 54296bf7d6
2 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/email/ACCOUNT/member_welcome.mailfile
+1 -29
View File
@@ -50,35 +50,7 @@ img {height: auto;}
</td> </td>
</tr> </tr>
</table> </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: 600px;">
<tr>
<td height="30" border="0" style="text-align:center;">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td style="padding: 1px 0 1px 0; text-align:center;">
<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
</td>
</tr>
<tr>
<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> </td>
</tr> </tr>
<tr> <tr>
wrenchboard/src/shared_tool/email.cc
+9 -9
View File
@@ -1001,7 +1001,7 @@ long WelcomeAccountMail(CVars in) // TESTED
C_CGI_Form form("", ""); C_CGI_Form form("", "");
char * server_name = getenv("SERVER_NAME"); char * server_name = getenv("SERVER_NAME");
form.LetStr("server_name", server_name); form.LetStr("server_name", "https://dashboard.wrenchboard.com");
form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_name", "WrenchBoard");
if (load_db_record(x, "SELECT * FROM members WHERE id = %lu ", in["member_id"].Long())) { if (load_db_record(x, "SELECT * FROM members WHERE id = %lu ", in["member_id"].Long())) {
@@ -1027,7 +1027,7 @@ long JobAddedMail(CVars in) //TESTED
C_CGI_Form form("", ""); C_CGI_Form form("", "");
char * server_name = getenv("SERVER_NAME"); char * server_name = getenv("SERVER_NAME");
form.LetStr("server_name", server_name); form.LetStr("server_name", "https://dashboard.wrenchboard.com");
form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_name", "WrenchBoard");
if (load_db_record(x, "SELECT j.*,j.title as title2,m.email,m.firstname FROM members_jobs j LEFT JOIN members m ON m.id = j.member_id WHERE j.id = %lu AND j.member_id = %lu", in["job_id"].Long(), in["member_id"].Long())) { if (load_db_record(x, "SELECT j.*,j.title as title2,m.email,m.firstname FROM members_jobs j LEFT JOIN members m ON m.id = j.member_id WHERE j.id = %lu AND j.member_id = %lu", in["job_id"].Long(), in["member_id"].Long())) {
@@ -1040,7 +1040,7 @@ long JobAddedMail(CVars in) //TESTED
vars2form(x, form2); vars2form(x, form2);
out["alertemail"] = CfgReadChar("transnotif.contact"); out["alertemail"] = CfgReadChar("transnotif.contact");
char * server_name = getenv("SERVER_NAME"); char * server_name = getenv("SERVER_NAME");
form2.LetStr("server_name", server_name); form2.LetStr("server_name", "https://dashboard.wrenchboard.com");
form2.LetStr("site_name", "WrenchBoard"); form2.LetStr("site_name", "WrenchBoard");
in["title"] = "Job Added Alert"; in["title"] = "Job Added Alert";
in["message"] = "Job Added Alert"; in["message"] = "Job Added Alert";
@@ -1063,7 +1063,7 @@ long CreateWrenchBoardGroupMail(CVars in) {
C_CGI_Form form("", ""); C_CGI_Form form("", "");
char * server_name = getenv("SERVER_NAME"); char * server_name = getenv("SERVER_NAME");
form.LetStr("server_name", server_name); form.LetStr("server_name", "https://dashboard.wrenchboard.com");
form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_name", "WrenchBoard");
if (load_db_record(x, "select g.*,m.email,m.firstname,m.lastname from members_groups g LEFT JOIN members m ON m.id = g.member_id WHERE g.id = %lu ", in["group_id"].Long())) { if (load_db_record(x, "select g.*,m.email,m.firstname,m.lastname from members_groups g LEFT JOIN members m ON m.id = g.member_id WHERE g.id = %lu ", in["group_id"].Long())) {
@@ -1082,7 +1082,7 @@ long GroupCreateMemberMail(CVars in) {
C_CGI_Form form("", ""); C_CGI_Form form("", "");
char * server_name = getenv("SERVER_NAME"); char * server_name = getenv("SERVER_NAME");
form.LetStr("server_name", server_name); form.LetStr("server_name", "https://dashboard.wrenchboard.com");
form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_name", "WrenchBoard");
if (load_db_record(x, "SELECT gm.*,m.*,e.email FROM group_members gm LEFT JOIN members_groups m ON m.id=gm.group_id LEFT JOIN members e ON e.id=gm.member_id WHERE gm.id = %lu", in["group_member_id"].Long())) { if (load_db_record(x, "SELECT gm.*,m.*,e.email FROM group_members gm LEFT JOIN members_groups m ON m.id=gm.group_id LEFT JOIN members e ON e.id=gm.member_id WHERE gm.id = %lu", in["group_member_id"].Long())) {
@@ -1117,7 +1117,7 @@ long EmailCustBalUpdt(CVars in) {
CVars x; CVars x;
vars2form(x, form); vars2form(x, form);
form.LetStr("site", server_name); form.LetStr("server_name", "https://dashboard.wrenchboard.com");
form.Email("test.mailfile"); form.Email("test.mailfile");
return 0; return 0;
} }
@@ -1209,7 +1209,7 @@ long StartPassResetEmail(CVars in) {
vars2form(x, form); vars2form(x, form);
form.LetStr("site", server_name); form.LetStr("server_name", "https://dashboard.wrenchboard.com");
/* /*
CREATE TABLE lostpass ( CREATE TABLE lostpass (
id serial NOT NULL, id serial NOT NULL,
@@ -1245,7 +1245,7 @@ long CompletePassResetEmail(CVars in) {
vars2form(x, form); vars2form(x, form);
form.LetStr("site", server_name); form.LetStr("server_name", "https://dashboard.wrenchboard.com");
@@ -1296,7 +1296,7 @@ long CustomerAirSalePayment(CVars in) {
form.LetStr("paymode", "Payment with card"); form.LetStr("paymode", "Payment with card");
} }
form.LetStr("server_name", "https://dashboard.wrenchboard.com");
form.LetStr("site", server_name); form.LetStr("site", server_name);
form.LetStr("email", x["email2"].c_str()); form.LetStr("email", x["email2"].c_str());
form.Email("topup_payment.mailfile"); //customer notification form.Email("topup_payment.mailfile"); //customer notification