From 01329fe476be3899b0a513c6e89f9614af294778 Mon Sep 17 00:00:00 2001 From: shy Date: Thu, 18 Jan 2024 00:11:52 +0800 Subject: [PATCH] add some --- base/aaa/email.go | 2 +- base/aaa/offer.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/base/aaa/email.go b/base/aaa/email.go index 3fee77e5..1cb727a1 100644 --- a/base/aaa/email.go +++ b/base/aaa/email.go @@ -61,7 +61,7 @@ func init() { func SendEmail(m *ice.Message, from, to, cc string, arg ...string) { m.Option(ice.MSG_USERHOST, strings.Split(m.Option(ice.MSG_USERHOST), "://")[1]) m.Cmdy(EMAIL, SEND, kit.Select(mdb.Config(m, EMAIL), from), kit.Select(m.Option(EMAIL), to), cc, - kit.Select(ice.Render(m, ice.RENDER_TEMPLATE, "subject.html"), arg, 0), + strings.TrimSpace(kit.Select(ice.Render(m, ice.RENDER_TEMPLATE, "subject.html"), arg, 0)), kit.Select(ice.Render(m, ice.RENDER_TEMPLATE, "content.html"), arg, 1), ) } diff --git a/base/aaa/offer.go b/base/aaa/offer.go index 3e96d962..f716bcf4 100644 --- a/base/aaa/offer.go +++ b/base/aaa/offer.go @@ -33,7 +33,6 @@ func init() { msg := mdb.HashSelect(m.Spawn(), m.Option(mdb.HASH)) if ls := kit.Split(msg.Append(EMAIL), mdb.AT); !m.Warn(msg.Length() == 0 || len(ls) < 2, ice.ErrNotValid, m.Option(mdb.HASH)) { ice.Info.AdminCmd(m.Spawn(), USER, mdb.CREATE, USERNICK, ls[0], USERNAME, msg.Append(EMAIL), USERZONE, ls[1]) - // m.Cmd(USER, mdb.CREATE, USERNICK, ls[0], USERNAME, msg.Append(EMAIL), USERZONE, ls[1]) m.ProcessLocation(m.MergePod("", ice.MSG_SESSID, SessValid(m.Options(ice.MSG_USERNAME, msg.Append(EMAIL))))) mdb.HashModify(m, m.OptionSimple(mdb.HASH), mdb.STATUS, ACCEPT) } @@ -42,7 +41,7 @@ func init() { if !m.Warn(len(arg) == 0 && m.Option(ice.MSG_USERROLE) == VOID, ice.ErrNotRight) { kit.If(mdb.HashSelect(m, arg...).FieldsIsDetail(), func() { m.Option(ice.MSG_USERHOST, strings.Split(m.Option(ice.MSG_USERHOST), "://")[1]) - m.SetAppend().EchoInfoButton(ice.Render(m, ice.RENDER_TEMPLATE, SUBJECT_HTML), ACCEPT) + m.SetAppend().EchoInfoButton(ice.Info.Template(m, SUBJECT_HTML), ACCEPT) }) } }},