From 4b1efca26d1a697e63f5d0c815be28bd1e622d71 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sat, 5 Aug 2023 11:43:07 -0400
Subject: [PATCH] reset emsil

---
 .../email/ACCOUNT/member_resetpass.mailfile   | 55 +++++++++++--------
 wrenchboard/src/shared_tool/email.cc          |  4 ++
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/wrenchboard/email/ACCOUNT/member_resetpass.mailfile b/wrenchboard/email/ACCOUNT/member_resetpass.mailfile
index 4a5450e6..4dff2c19 100644
--- a/wrenchboard/email/ACCOUNT/member_resetpass.mailfile
+++ b/wrenchboard/email/ACCOUNT/member_resetpass.mailfile
@@ -9,18 +9,25 @@ Subject: {{site_name}} - Reset Password
 <style type="text/css">
 body {margin: 0; padding: 0; min-width: 100%!important;}
 img {height: auto;}
+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;}
+.cent{ text-align:center; }
 .borderbottom {border-bottom: 1px solid #f2eeed;}
-.subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
-.h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;}
+.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;}
 .bodycopy {font-size: 14px; line-height: 20px;}
-.button {text-align: center; font-size: 16px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
+.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;}
-.footer {padding: 20px 30px 15px 30px; bgcolor:#007bff; background-color:#007bff;}
-.footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;}
+.footer {padding: 20px 30px 15px 30px; bgcolor:#252f3e; background-color:#252f3e;}
+.footercopy { font-family: Circular, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif; font-size: 14px; font-weight:bolder; color: #ffffff;}
 .footercopy a {color: #ffffff; text-decoration: underline;}
 </style>
 </head>
@@ -103,15 +110,19 @@ img {height: auto;}
                     </td>
                   </tr>
                   <tr>
-                    <td style="padding: 20px 0 0 0;">
-                      <table class="buttonwrapper" bgcolor="#e05443" border="0" cellspacing="0" cellpadding="0">
-                        <tr>
-                          <td class="button" height="45" style="text-align:center;"	>
-                            <a href="{{server_name}}/complereset?passlink={{pass_link}}">Click to Reset Password</a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
+                      <td style="padding: 20px 0 0 0;">
+                          <table class="buttonwrapper" bgcolor="#e05443" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td class="button" height="45" style="text-align:center;"	>
+                                <a href="{{server_name}}/complereset?passlink={{pass_link}}">Click to Reset Password</a>
+                              </td>
+
+                            </tr>
+                          </table>
+                      </td>
+                      <td style="padding: 20px 0 0 0;">
+                          On mobile use code {{reset_pin}}
+                      </td>
                   </tr>
                 </table>
               </td>
@@ -137,13 +148,14 @@ img {height: auto;}
 {{server_name}}
         </td>
       </tr>
-      <tr>
+
+<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 subscribe to {{site_name}}. 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>
@@ -152,12 +164,12 @@ You received this email because you subscribe to {{site_name}}. If you get this
 <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>
@@ -178,7 +190,4 @@ You received this email because you subscribe to {{site_name}}. If you get this
 </table>
 
 </body>
-</html>
-
-
-
+</html>
\ No newline at end of file
diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc
index 4d6aef9d..ca6117b3 100644
--- a/wrenchboard/src/shared_tool/email.cc
+++ b/wrenchboard/src/shared_tool/email.cc
@@ -301,6 +301,10 @@ long account_email(long mailtype, CVars in, CVars &out) {
     form.LetStr("site_name", "WrenchBoard");
     form.LetStr("site_trade_name", "Connecting Opportunities");
 
+    CVars yr;
+    load_db_record(yr, "SELECT to_char(now(), 'yyyy') AS YYYY");
+    vars2form(yr, form);
+
 
     try {