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

email fix

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2023-09-30 12:26:10 -04:00
parent e2cdf4f413
commit f6854ea17a
3 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/email/ALERT/alert_daily_stats.mailfile
+14 -34
View File
@@ -8,11 +8,11 @@ Subject: System Alert-WrenchBoard Report {{site_name}}
<style type="text/css">
body {margin: 0; padding: 0; min-width: 100%!important;}
img {height: auto;}
hr{
height: 1px;
background-color: #f1fcff;
border: none;
}
hr{
height: 1px;
background-color: #f1fcff;
border: none;
}
.content {width: 100%; max-width: 600px;}
.header {padding: 10px 10px 10px 10px;}
.innerpadding {padding: 10px 10px 10px 10px;}
@@ -21,7 +21,7 @@ img {height: auto;}
.ls1{ border-color: aliceblue; color: aliceblue;}
.subhead {font-size: 12px; color: #ffffff; font-family: Circular, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif; letter-spacing: 3px;}
.h1, .h2, .bodycopy {color: #153643; font-family: Circular, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif;}
.h1 {font-size: 33px; line-height: 38px; font-weight: bold;}
.h1 {font-size: 16px; line-height: 16px; font-weight: bold;}
.bodycopy {font-size: 14px; line-height: 20px;}
.button {text-align: center; font-size: 16px; font-family: Circular, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
.button a {color: #ffffff; text-decoration: none;}
@@ -55,7 +55,8 @@ img {height: auto;}
<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>
<a href="https://www.wrenchboard.com/"><img src="https://www.wrenchboard.com/assets/images/wrenchboard-logo-text.png" style="width: 200px; height:auto;" alt="WrenchBoard"></a>
</td>
</tr>
<tr>
@@ -105,23 +106,6 @@ img {height: auto;}
<td class="bodycopy"><h1>{{count_mobile_login}}</h1></td>
</tr>
<tr class="trColor">
<td class="left" style="width:250px">-------------------</span></td>
<td class="bodycopy"><h1>-----</h1></td>
</tr>
<tr>
<td class="left" style="width:250px">--------<span>--------</span></td>
<td class="bodycopy"><h1>-----</h1></td>
</tr>
<tr class="trColor">
<td class="left" style="width:250px">-------------------</span></td>
<td class="bodycopy"><h1>-----</h1></td>
</tr>
<tr>
<td class="left" style="width:250px">--------<span>--------</span></td>
<td class="bodycopy"><h1>-----</h1></td>
</tr>
</table>
@@ -140,18 +124,13 @@ img {height: auto;}
</td>
</tr>
<tr><td>
<tr>
<td>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="footer">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2022<br/>
You received this email because you are a member of {{site_name}} support team. If you get this email in error, please <a href="https://{{server_name}}/contact" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
&reg; {{site_name}} {{YYYY}}<br/>
You received this email because you subscribe to {{site_name}}. If you get this email in error, please <a href="{{main_site_url}}contact" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
<tr>
@@ -160,12 +139,12 @@ You received this email because you are a member of {{site_name}} support team.
<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="https://twitter.com/wrenchboard">
<img src="https://{{server_name}}/assets/images/brands/twitter.png" width="37" height="37" alt="Twitter" border="0" />
<a href="http://www.twitter.com/">
<img src="{{server_name}}/assets/images/brands/twitter.png" width="37" height="37" alt="Twitter" border="0" />
</a>
</td>
</tr>
@@ -184,5 +163,6 @@ You received this email because you are a member of {{site_name}} support team.
</td>
</tr>
</table>
</body>
</html>
wrenchboard/src/shared_tool/email.cc
+4 -2
View File
@@ -22,6 +22,10 @@ long alert_email(long mailtype, CVars in, CVars &out) {
out["alertemail"] = CfgReadChar("transnotif.contact");
out["signupreport"] = CfgReadChar("transnotif.signupreport");
CVars yr;
load_db_record(yr, "SELECT to_char(now(), 'yyyy') AS YYYY");
vars2form(yr, form);
char * server_name = getenv("SERVER_NAME");
form.LetStr("server_name", server_name);
form.LetStr("site_name", "WrenchBoard");
@@ -29,11 +33,9 @@ long alert_email(long mailtype, CVars in, CVars &out) {
switch (mailtype) {
case WRB_CRONJOB_SIGNUP_ALERT:
vars2form(in, form);
form.LetStr("email", out["signupreport"]);
form.Email("ALERT/alert_daily_stats.mailfile");
break;
www-api/app/Controllers/WrenchCrons.php
+1 -1
View File
@@ -40,7 +40,7 @@ class WrenchCrons extends BaseController
$in['call_action'] = WRB_CRONJOB_OFFER_REFUND_ALERT;
$in['one_limit'] = 1;
$ret = $wrenchboard->wrenchboard_api($in, $out);
$out['internal_return'] = $ret;
log_message('critical', "WrenchCrons ===> 0001");