首页 发现 帮助
注册 登录
Apq
/
SSPanel-Uim
镜像自地址 https://github.com/Anankke/SSPanel-Uim.git
1
0
派生 0
文件 工单管理 0 Wiki
浏览代码

fix: broken email style when send ann

M1Screw 2 年之前
父节点
327e926f65
当前提交
f32bde6ef4
共有 11 个文件被更改，包括 117 次插入 和 213 次删除
分列视图 显示文件统计
  1. 4 29
      resources/email/finance.tpl
  2. 20 0
      resources/email/footer.tpl
  3. 45 0
      resources/email/header.tpl
  4. 4 29
      resources/email/new_user.tpl
  5. 7 32
      resources/email/password_reset.tpl
  6. 4 29
      resources/email/test.tpl
  7. 5 30
      resources/email/traffic_report.tpl
  8. 5 30
      resources/email/verify_code.tpl
  9. 4 29
      resources/email/warn.tpl
  10. 12 3
      src/Controllers/Admin/AnnController.php
  11. 7 2
      src/Models/User.php

+ 4 - 29
resources/email/finance.tpl
查看文件 

@@ -1,11 +1,4 @@
 
-<html>
 
-<head>
 
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-    <meta name="viewport" content="width=device-width"/>
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-
 
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 
-</head>
 
+{include file='header.tpl'}
 
 
 <body style="background-color:#EEEEEE;">
 
     <div style="text-align: center">
 
@@ -15,7 +8,7 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
 
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
 
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
 
+                                <h2 class="bigTitle">
 
                                     {$title}
 
                                 </h2>
 
                             </div>
 
@@ -26,30 +19,12 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
 
                             <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
 
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
 
+                                <p class="midText">
 
                                     {$text}
 
                                 </p>
 
                             </div>
 
                         </div>
 
                     </div>
 
                 </div>
 
-                <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
 
-                    <div align="center" valign="top">
 
-                        <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
 
-                            <div>
 
-                                <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
 
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
 
-                                        <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
 
-                                        <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
 
-                                    </p>
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-        </div>
 
-    </div>
 
-</body>
 
 
-</html>
 
+{include file='footer.tpl'}

+ 20 - 0
resources/email/footer.tpl
查看文件 

@@ -0,0 +1,20 @@
 
+<div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
 
+    <div align="center" valign="top">
 
+        <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
 
+            <div>
 
+                <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
 
+                    <p class="smlText">
 
+                        <a href="{$config['baseUrl']}" style="color:#505050;text-decoration:none" target="_blank">{$config['appName']}</a> |
 
+                        <a href="{$config['baseUrl']}/user/edit" style="color:#505050;text-decoration:none" target="_blank">修改邮件接收设置</a>
 
+                    </p>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+</div>
 
+</div>
 
+</div>
 
+</div>
 
+</body>
 
+
 
+</html>

+ 45 - 0
resources/email/header.tpl
查看文件 

@@ -0,0 +1,45 @@
 
+<html>
 
+<head>
 
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
+    <meta name="viewport" content="width=device-width"/>
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
+
 
+    <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 
+
 
+    <style>
 
+        .bigTitle {
 
+            color:#000000;
 
+            font-family:'Open Sans', Tahoma, Verdana, sans-serif;
 
+            font-size:24px;
 
+            font-weight:600;
 
+            font-style:normal;
 
+            letter-spacing:normal;
 
+            line-height:34px;
 
+            text-align:center;
 
+            padding:0;
 
+            margin:0;
 
+        }
 
+
 
+        .midText {
 
+            color:#000000 !important;
 
+            font-family:'Open Sans', Tahoma, Verdana, sans-serif !important;
 
+            font-size:16px !important;
 
+            font-weight:400 !important;
 
+            line-height:22px !important;
 
+            text-align:center !important;
 
+            padding:0 !important;
 
+            margin:0 !important;
 
+        }
 
+
 
+        .smlText {
 
+            color:#313131;
 
+            font-family:'Open Sans', Tahoma, Verdana, sans-serif;
 
+            font-size:12px;
 
+            font-weight:400;
 
+            line-height:18px;
 
+            text-align:center;
 
+            margin:0;
 
+            padding:0;
 
+        }
 
+    </style>
 
+</head>

+ 4 - 29
resources/email/new_user.tpl
查看文件 

@@ -1,11 +1,4 @@
 
-<html>
 
-<head>
 
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-    <meta name="viewport" content="width=device-width"/>
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-
 
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 
-</head>
 
+{include file='header.tpl'}
 
 
 <body style="background-color:#EEEEEE;">
 
     <div style="text-align: center">
 
@@ -15,7 +8,7 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
 
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
 
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
 
+                                <h2 class="bigTitle">
 
                                     账户已经生成
 
                                 </h2>
 
                             </div>
 
@@ -26,30 +19,12 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
 
                             <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
 
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
 
+                                <p class="midText">
 
                                     {$text}
 
                                 </p>
 
                             </div>
 
                         </div>
 
                     </div>
 
                 </div>
 
-                <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
 
-                    <div align="center" valign="top">
 
-                        <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
 
-                            <div>
 
-                                <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
 
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
 
-                                        <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
 
-                                        <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
 
-                                    </p>
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-        </div>
 
-    </div>
 
-</body>
 
 
-</html>
 
+{include file='footer.tpl'}

+ 7 - 32
resources/email/password_reset.tpl
查看文件 

@@ -1,12 +1,4 @@
 
-<html>
 
-<head>
 
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-    <meta name="viewport" content="width=device-width"/>
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-
 
-    <link href="//fonts.googleapis.com/css?family=Lora" rel="stylesheet"/>
 
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 
-</head>
 
+{include file='header.tpl'}
 
 
 <body style="background-color:#EEEEEE;">
 
     <div style="text-align: center">
 
@@ -16,7 +8,7 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
 
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
 
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
 
+                                <h2 class="bigTitle">
 
                                     密码重置
 
                                 </h2>
 
                             </div>
 
@@ -27,31 +19,14 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
 
                             <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
 
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
 
-                                    你收到此邮件是因为你在 {$config['appName']} 系统申请了密码重置，如果非本人申请，请忽略此邮件。<br>
 
-                                    <a href="{$resetUrl}" style="color:#8D6CD1" target="_blank">点击此链接重置密码</a>
 
+                                <p class="midText">
 
+                                    你收到此邮件是因为你在 {$config['appName']} 系统申请了密码重置，如果非本人申请，请忽略此邮件。
 
+                                    <br><br>
 
+                                    <a href="{$resetUrl}" style="color:#505050" target="_blank">点击此链接重置密码</a>
 
                                 </p>
 
                             </div>
 
                         </div>
 
                     </div>
 
                 </div>
 
-                <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
 
-                    <div align="center" valign="top">
 
-                        <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
 
-                            <div>
 
-                                <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
 
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
 
-                                        <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
 
-                                        <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
 
-                                    </p>
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-        </div>
 
-    </div>
 
-</body>
 
 
-</html>
 
+{include file='footer.tpl'}

+ 4 - 29
resources/email/test.tpl
查看文件 

@@ -1,11 +1,4 @@
 
-<html>
 
-<head>
 
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-    <meta name="viewport" content="width=device-width"/>
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-
 
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 
-</head>
 
+{include file='header.tpl'}
 
 
 <body style="background-color:#EEEEEE;">
 
     <div style="text-align: center">
 
@@ -15,7 +8,7 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
 
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
 
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
 
+                                <h2 class="bigTitle">
 
                                     邮件发送测试
 
                                 </h2>
 
                             </div>
 
@@ -26,30 +19,12 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
 
                             <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
 
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
 
+                                <p class="midText">
 
                                     这是一封测试邮件。如果你能收到，说明邮件发送配置有效，可以正常工作。
 
                                 </p>
 
                             </div>
 
                         </div>
 
                     </div>
 
                 </div>
 
-                <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
 
-                    <div align="center" valign="top">
 
-                        <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
 
-                            <div>
 
-                                <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
 
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
 
-                                        <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
 
-                                        <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
 
-                                    </p>
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-        </div>
 
-    </div>
 
-</body>
 
 
-</html>
 
+{include file='footer.tpl'}

+ 5 - 30
resources/email/traffic_report.tpl
查看文件 

@@ -1,11 +1,4 @@
 
-<html>
 
-<head>
 
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-    <meta name="viewport" content="width=device-width"/>
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-
 
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 
-</head>
 
+{include file='header.tpl'}
 
 
 <body style="background-color:#EEEEEE;">
 
     <div style="text-align: center">
 
@@ -15,7 +8,7 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
 
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
 
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
 
+                                <h2 class="bigTitle">
 
                                     每日流量报告
 
                                 </h2>
 
                             </div>
 
@@ -26,7 +19,7 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
 
                             <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
 
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
 
+                                <p class="midText">
 
                                     用户名: {$user->user_name}
 
                                     <br>
 
                                     Email: {$user->email}
 
@@ -40,30 +33,12 @@
 
                                     今日使用流量: {$lastday_traffic}
 
                                     <br><br>
 
                                 </p>
 
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
 
+                                <p class="midText">
 
                                     {$text}
 
                                 </p>
 
                             </div>
 
                         </div>
 
                     </div>
 
                 </div>
 
-                <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
 
-                    <div align="center" valign="top">
 
-                        <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
 
-                            <div>
 
-                                <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
 
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
 
-                                        <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
 
-                                        <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
 
-                                    </p>
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-        </div>
 
-    </div>
 
-</body>
 
 
-</html>
 
+{include file='footer.tpl'}

+ 5 - 30
resources/email/verify_code.tpl
查看文件 

@@ -1,11 +1,4 @@
 
-<html>
 
-<head>
 
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-    <meta name="viewport" content="width=device-width"/>
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-
 
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 
-</head>
 
+{include file='header.tpl'}
 
 
 <body style="background-color:#EEEEEE;">
 
     <div style="text-align: center">
 
@@ -15,7 +8,7 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
 
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
 
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
 
+                                <h2 class="bigTitle">
 
                                     邮箱验证
 
                                 </h2>
 
                             </div>
 
@@ -26,8 +19,8 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
 
                             <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
 
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
 
-                                    你请求的邮箱验证代码为: <b style="color:#8D6CD1">{$code}</b> <br>
 
+                                <p class="midText">
 
+                                    你请求的邮箱验证代码为: <b style="color:#505050">{$code}</b> <br>
 
                                     本验证代码在 {$expire} 前有效。<br>
 
                                     如果此验证码非你本人所请求，请直接忽视。<br>
 
                                 </p>
 
@@ -35,23 +28,5 @@
 
                         </div>
 
                     </div>
 
                 </div>
 
-                <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
 
-                    <div align="center" valign="top">
 
-                        <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
 
-                            <div>
 
-                                <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
 
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
 
-                                        <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
 
-                                        <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
 
-                                    </p>
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-        </div>
 
-    </div>
 
-</body>
 
 
-</html>
 
+{include file='footer.tpl'}

+ 4 - 29
resources/email/warn.tpl
查看文件 

@@ -1,11 +1,4 @@
 
-<html>
 
-<head>
 
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-    <meta name="viewport" content="width=device-width"/>
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-
 
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 
-</head>
 
+{include file='header.tpl'}
 
 
 <body style="background-color:#EEEEEE;">
 
     <div style="text-align: center">
 
@@ -15,7 +8,7 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
 
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
 
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
 
+                                <h2 class="bigTitle">
 
                                     系统提示
 
                                 </h2>
 
                             </div>
 
@@ -26,30 +19,12 @@
 
                     <div align="center" valign="top">
 
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
 
                             <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
 
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
 
+                                <p class="midText">
 
                                     {$text}
 
                                 </p>
 
                             </div>
 
                         </div>
 
                     </div>
 
                 </div>
 
-                <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
 
-                    <div align="center" valign="top">
 
-                        <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
 
-                            <div>
 
-                                <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
 
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
 
-                                        <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
 
-                                        <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
 
-                                    </p>
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-        </div>
 
-    </div>
 
-</body>
 
 
-</html>
 
+{include file='footer.tpl'}

+ 12 - 3
src/Controllers/Admin/AnnController.php
查看文件 

@@ -14,6 +14,8 @@ use Slim\Http\Response;
 
 use Slim\Http\ServerRequest;
 
 use Telegram\Bot\Exceptions\TelegramSDKException;
 
 use function date;
 
+use function str_replace;
 
+use function strip_tags;
 
 use const PHP_EOL;
 
 
 final class AnnController extends BaseController
 
@@ -70,8 +72,15 @@ final class AnnController extends BaseController
 
         $email_notify_class = (int) $request->getParam('email_notify_class');
 
         $email_notify = $request->getParam('email_notify') === 'true' ? 1 : 0;
 
 
-        $content = (string) $request->getParam('content');
 
-        $subject = $_ENV['appName'] . ' - 公告';
 
+        $content = strip_tags(
 
+            str_replace(
 
+                ['<p>','</p>'],
 
+                ['','<br><br>'],
 
+                $request->getParam('content')
 
+            ),
 
+            ['br', 'a', 'strong']
 
+        );
 
+        $subject = $_ENV['appName'] . ' - 新公告发布';
 
 
         if ($content !== '') {
 
             $ann = new Ann();
 
@@ -86,7 +95,7 @@ final class AnnController extends BaseController
 
             }
 
         }
 
 
-        if ($email_notify === 1) {
 
+        if ($email_notify) {
 
             $users = User::where('class', '>=', $email_notify_class)
 
                 ->get();

+ 7 - 2
src/Models/User.php
查看文件 

@@ -509,8 +509,13 @@ final class User extends Model
 
     /**
 
      * 发送邮件
 
      */
 
-    public function sendMail(string $subject, string $template, array $array = [], array $files = [], $is_queue = false): bool
 
-    {
 
+    public function sendMail(
 
+        string $subject,
 
+        string $template,
 
+        array $array = [],
 
+        array $files = [],
 
+        $is_queue = false
 
+    ): bool {
 
         if ($is_queue) {
 
             $emailqueue = new EmailQueue();
 
             $emailqueue->to_email = $this->email;