From dd75bf9ad9d165fcd280264d8c28fe839324b0d7 Mon Sep 17 00:00:00 2001 From: Azareal Date: Wed, 6 Jun 2018 10:29:12 +1000 Subject: [PATCH] All the notices now use AddNotice. --- common/routes_common.go | 4 ++-- panel_routes.go | 2 +- routes/account.go | 8 ++++---- routes/panel/forums.go | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/routes_common.go b/common/routes_common.go index 79264882..bdc0a36c 100644 --- a/common/routes_common.go +++ b/common/routes_common.go @@ -206,10 +206,10 @@ func userCheck(w http.ResponseWriter, r *http.Request, user *User) (header *Head } if user.IsBanned { - header.NoticeList = append(header.NoticeList, GetNoticePhrase("account_banned")) + header.AddNotice("account_banned") } if user.Loggedin && !user.Active { - header.NoticeList = append(header.NoticeList, GetNoticePhrase("account_inactive")) + header.AddNotice("account_inactive") } if len(theme.Resources) > 0 { diff --git a/panel_routes.go b/panel_routes.go index ae78b417..9ae7ebf4 100644 --- a/panel_routes.go +++ b/panel_routes.go @@ -541,7 +541,7 @@ func routePanelUsersEdit(w http.ResponseWriter, r *http.Request, user common.Use } if r.FormValue("updated") == "1" { - header.NoticeList = append(header.NoticeList, common.GetNoticePhrase("panel_user_updated")) + header.AddNotice("panel_user_updated") } pi := common.PanelPage{&common.BasePanelPage{header, stats, "users", common.ReportForumID}, groupList, targetUser} diff --git a/routes/account.go b/routes/account.go index 0d907e87..7808d280 100644 --- a/routes/account.go +++ b/routes/account.go @@ -298,7 +298,7 @@ func AccountEditAvatar(w http.ResponseWriter, r *http.Request, user common.User) } header.Title = common.GetTitlePhrase("account_avatar") if r.FormValue("updated") == "1" { - header.NoticeList = append(header.NoticeList, common.GetNoticePhrase("account_avatar_updated")) + header.AddNotice("account_avatar_updated") } pi := common.Page{header, tList, nil} @@ -388,7 +388,7 @@ func AccountEditUsername(w http.ResponseWriter, r *http.Request, user common.Use } header.Title = common.GetTitlePhrase("account_username") if r.FormValue("updated") == "1" { - header.NoticeList = append(header.NoticeList, common.GetNoticePhrase("account_username_updated")) + header.AddNotice("account_username_updated") } pi := common.Page{header, tList, user.Name} @@ -441,10 +441,10 @@ func AccountEditEmail(w http.ResponseWriter, r *http.Request, user common.User) } if !common.Site.EnableEmails { - header.NoticeList = append(header.NoticeList, common.GetNoticePhrase("account_mail_disabled")) + header.AddNotice("account_mail_disabled") } if r.FormValue("verified") == "1" { - header.NoticeList = append(header.NoticeList, common.GetNoticePhrase("account_mail_verify_success")) + header.AddNotice("account_mail_verify_success") } pi := common.EmailListPage{header, emails, nil} diff --git a/routes/panel/forums.go b/routes/panel/forums.go index 424a0be5..8e2b4b76 100644 --- a/routes/panel/forums.go +++ b/routes/panel/forums.go @@ -39,11 +39,11 @@ func Forums(w http.ResponseWriter, r *http.Request, user common.User) common.Rou } if r.FormValue("created") == "1" { - header.NoticeList = append(header.NoticeList, common.GetNoticePhrase("panel_forum_created")) + header.AddNotice("panel_forum_created") } else if r.FormValue("deleted") == "1" { - header.NoticeList = append(header.NoticeList, common.GetNoticePhrase("panel_forum_deleted")) + header.AddNotice("panel_forum_deleted") } else if r.FormValue("updated") == "1" { - header.NoticeList = append(header.NoticeList, common.GetNoticePhrase("panel_forum_updated")) + header.AddNotice("panel_forum_updated") } pi := common.PanelPage{&common.BasePanelPage{header, stats, "forums", common.ReportForumID}, forumList, nil} @@ -183,7 +183,7 @@ func ForumsEdit(w http.ResponseWriter, r *http.Request, user common.User, sfid s } if r.FormValue("updated") == "1" { - header.NoticeList = append(header.NoticeList, common.GetNoticePhrase("panel_forum_updated")) + header.AddNotice("panel_forum_updated") } pi := common.PanelEditForumPage{&common.BasePanelPage{header, stats, "forums", common.ReportForumID}, forum.ID, forum.Name, forum.Desc, forum.Active, forum.Preset, gplist} @@ -350,7 +350,7 @@ func ForumsEditPermsAdvance(w http.ResponseWriter, r *http.Request, user common. addNameLangToggle("MoveTopic", forumPerms.MoveTopic) if r.FormValue("updated") == "1" { - header.NoticeList = append(header.NoticeList, common.GetNoticePhrase("panel_forums_perms_updated")) + header.AddNotice("panel_forums_perms_updated") } pi := common.PanelEditForumGroupPage{&common.BasePanelPage{header, stats, "forums", common.ReportForumID}, forum.ID, gid, forum.Name, forum.Desc, forum.Active, forum.Preset, formattedPermList}