f8f46b3c48
Added the Account Dashboard and merged a few account views into it. BREAKING CHANGE: We now use config/config.json instead of config/config.go, be sure to setup one of these files, you can config_default.json as an example of what a config.json should look like. If you don't have an existing installation, you can just rely on the installer to do this for you. CSS Changes (does not include Nox Theme): Sidebar should no longer show up in the account manager in some odd situations or themes. Made a few CSS rules more generic. Forms have a new look in Cosora now. Config Changes: Removed the DefaultRoute config field. Added the DefaultPath config field. Added the MaxRequestSizeStr config field to make it easier for users to input custom max request sizes without having to use a calculator or figure out how many bytes there are in a megabyte. Removed the CacheTopicUser config field. Added the UserCache config field. Added the TopicCache config field Phrases: Removed ten english phrases. Added 21 english phrases. Changed eleven english phrases. Removed some duplicate indices in the english phrase pack. Removed some old benchmark code. Tweaked some things to make the linter happy. Added comments for all the MemoryUserCache and MemoryTopicCache methods. Added a comment for the null caches, consult the other caches for further information on the methods. Added a client-side check to make sure the user doesn't upload too much data in a single post. The server already did this, but it might be a while before feedback arrives from it. Simplified a lot of the control panel route code with the buildBasePage function. Renamed /user/edit/critical/ to /user/edit/password/ Renamed /user/edit/critical/submit/ to /user/edit/password/submit/ Made some small improvements to SEO with a couple of meta tags. Renamed some of the control panel templates so that they use _ instead of -. Fixed a bug where notices were being moved to the wrong place in some areas in Cosora. Added the writeJsonError function to help abstract writing json errors. Moved routePanelUsers to panel.Users Moved routePanelUsersEdit to panel.UsersEdit Moved routePanelUsersEditSubmit to panel.UsersEditSubmit Renamed routes.AccountEditCritical to routes.AccountEditPassword Renamed routes.AccountEditCriticalSubmit to routes.AccountEditPasswordSubmit Removed the routes.AccountEditAvatar and routes.AccountEditUsername routes. Fixed a data race in MemoryTopicCache.Add which could lead to the capacity limit being bypassed. Tweaked MemoryTopicCache.AddUnsafe under the assumption that it's not going to be safe anyway, but we might as-well try in case this call is properly synchronised. Fixed a data race in MemoryTopicCache.Remove which could lead to the length counter being decremented twice. Tweaked the behaviour of MemoryTopicCache.RemoveUnsafe to mirror that of Remove. Fixed a data race in MemoryUserCache.Add which could lead to the capacity limit being bypassed. User can no longer change their usernames to blank. Made a lot of progress on the Nox theme. Added modified FA5 SVGs as a dependency for Nox. Be sure to run the patcher or update script and don't forget to create a customised config/config.json file.
415 lines
7.1 KiB
Go
415 lines
7.1 KiB
Go
package common
|
|
|
|
import (
|
|
"html/template"
|
|
"net/http"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// TODO: Allow resources in spots other than /static/ and possibly even external domains (e.g. CDNs)
|
|
// TODO: Preload Trumboyg on Cosora on the forum list
|
|
type Header struct {
|
|
Title string
|
|
NoticeList []string
|
|
Scripts []string
|
|
//PreloadScripts []string
|
|
Stylesheets []string
|
|
Widgets PageWidgets
|
|
Site *site
|
|
Settings SettingMap
|
|
Themes map[string]*Theme // TODO: Use a slice containing every theme instead of the main map for speed?
|
|
Theme *Theme
|
|
//TemplateName string // TODO: Use this to move template calls to the router rather than duplicating them over and over and over?
|
|
CurrentUser User // TODO: Deprecate CurrentUser on the page structs and use a pointer here
|
|
Zone string
|
|
MetaDesc string
|
|
Writer http.ResponseWriter
|
|
ExtData ExtData
|
|
}
|
|
|
|
func (header *Header) AddScript(name string) {
|
|
header.Scripts = append(header.Scripts, name)
|
|
}
|
|
|
|
/*func (header *Header) PreloadScript(name string) {
|
|
header.PreloadScripts = append(header.PreloadScripts, name)
|
|
}*/
|
|
|
|
func (header *Header) AddSheet(name string) {
|
|
header.Stylesheets = append(header.Stylesheets, name)
|
|
}
|
|
|
|
func (header *Header) AddNotice(name string) {
|
|
header.NoticeList = append(header.NoticeList, GetNoticePhrase(name))
|
|
}
|
|
|
|
// TODO: Add this to routes which don't use templates. E.g. Json APIs.
|
|
type HeaderLite struct {
|
|
Site *site
|
|
Settings SettingMap
|
|
ExtData ExtData
|
|
}
|
|
|
|
type PageWidgets struct {
|
|
LeftSidebar template.HTML
|
|
RightSidebar template.HTML
|
|
}
|
|
|
|
// TODO: Add a ExtDataHolder interface with methods for manipulating the contents?
|
|
// ? - Could we use a sync.Map instead?
|
|
type ExtData struct {
|
|
Items map[string]interface{} // Key: pluginname
|
|
sync.RWMutex
|
|
}
|
|
|
|
type Page struct {
|
|
*Header
|
|
ItemList []interface{}
|
|
Something interface{}
|
|
}
|
|
|
|
type SimplePage struct {
|
|
*Header
|
|
}
|
|
|
|
type ErrorPage struct {
|
|
*Header
|
|
Message string
|
|
}
|
|
|
|
type Paginator struct {
|
|
PageList []int
|
|
Page int
|
|
LastPage int
|
|
}
|
|
|
|
type CustomPagePage struct {
|
|
*Header
|
|
Page *CustomPage
|
|
}
|
|
|
|
type TopicPage struct {
|
|
*Header
|
|
ItemList []ReplyUser
|
|
Topic TopicUser
|
|
Poll Poll
|
|
Page int
|
|
LastPage int
|
|
}
|
|
|
|
type TopicListPage struct {
|
|
*Header
|
|
TopicList []*TopicsRow
|
|
ForumList []Forum
|
|
DefaultForum int
|
|
Paginator
|
|
}
|
|
|
|
type ForumPage struct {
|
|
*Header
|
|
ItemList []*TopicsRow
|
|
Forum *Forum
|
|
Paginator
|
|
}
|
|
|
|
type ForumsPage struct {
|
|
*Header
|
|
ItemList []Forum
|
|
}
|
|
|
|
type ProfilePage struct {
|
|
*Header
|
|
ItemList []ReplyUser
|
|
ProfileOwner User
|
|
}
|
|
|
|
type CreateTopicPage struct {
|
|
*Header
|
|
ItemList []Forum
|
|
FID int
|
|
}
|
|
|
|
type IPSearchPage struct {
|
|
*Header
|
|
ItemList map[int]*User
|
|
IP string
|
|
}
|
|
|
|
type EmailListPage struct {
|
|
*Header
|
|
ItemList []Email
|
|
Something interface{}
|
|
}
|
|
|
|
type AccountDashPage struct {
|
|
*Header
|
|
MFASetup bool
|
|
}
|
|
|
|
type PanelStats struct {
|
|
Users int
|
|
Groups int
|
|
Forums int
|
|
Pages int
|
|
Settings int
|
|
WordFilters int
|
|
Themes int
|
|
Reports int
|
|
}
|
|
|
|
type BasePanelPage struct {
|
|
*Header
|
|
Stats PanelStats
|
|
Zone string
|
|
ReportForumID int
|
|
}
|
|
|
|
type PanelPage struct {
|
|
*BasePanelPage
|
|
ItemList []interface{}
|
|
Something interface{}
|
|
}
|
|
|
|
type GridElement struct {
|
|
ID string
|
|
Body string
|
|
Order int // For future use
|
|
Class string
|
|
Background string
|
|
TextColour string
|
|
Note string
|
|
}
|
|
|
|
type PanelDashboardPage struct {
|
|
*BasePanelPage
|
|
GridItems []GridElement
|
|
}
|
|
|
|
type PanelSetting struct {
|
|
*Setting
|
|
FriendlyName string
|
|
}
|
|
|
|
type PanelSettingPage struct {
|
|
*BasePanelPage
|
|
ItemList []OptionLabel
|
|
Setting *PanelSetting
|
|
}
|
|
|
|
type PanelCustomPagesPage struct {
|
|
*BasePanelPage
|
|
ItemList []*CustomPage
|
|
Paginator
|
|
}
|
|
|
|
type PanelCustomPageEditPage struct {
|
|
*BasePanelPage
|
|
Page *CustomPage
|
|
}
|
|
|
|
type PanelTimeGraph struct {
|
|
Series []int64 // The counts on the left
|
|
Labels []int64 // unixtimes for the bottom, gets converted into 1:00, 2:00, etc. with JS
|
|
}
|
|
|
|
type PanelAnalyticsItem struct {
|
|
Time int64
|
|
Count int64
|
|
}
|
|
|
|
type PanelAnalyticsPage struct {
|
|
*BasePanelPage
|
|
PrimaryGraph PanelTimeGraph
|
|
ViewItems []PanelAnalyticsItem
|
|
TimeRange string
|
|
}
|
|
|
|
type PanelAnalyticsRoutesItem struct {
|
|
Route string
|
|
Count int
|
|
}
|
|
|
|
type PanelAnalyticsRoutesPage struct {
|
|
*BasePanelPage
|
|
ItemList []PanelAnalyticsRoutesItem
|
|
TimeRange string
|
|
}
|
|
|
|
type PanelAnalyticsAgentsItem struct {
|
|
Agent string
|
|
FriendlyAgent string
|
|
Count int
|
|
}
|
|
|
|
type PanelAnalyticsAgentsPage struct {
|
|
*BasePanelPage
|
|
ItemList []PanelAnalyticsAgentsItem
|
|
TimeRange string
|
|
}
|
|
|
|
type PanelAnalyticsRoutePage struct {
|
|
*BasePanelPage
|
|
Route string
|
|
PrimaryGraph PanelTimeGraph
|
|
ViewItems []PanelAnalyticsItem
|
|
TimeRange string
|
|
}
|
|
|
|
type PanelAnalyticsAgentPage struct {
|
|
*BasePanelPage
|
|
Agent string
|
|
FriendlyAgent string
|
|
PrimaryGraph PanelTimeGraph
|
|
TimeRange string
|
|
}
|
|
|
|
type PanelThemesPage struct {
|
|
*BasePanelPage
|
|
PrimaryThemes []*Theme
|
|
VariantThemes []*Theme
|
|
}
|
|
|
|
type PanelMenuListItem struct {
|
|
Name string
|
|
ID int
|
|
ItemCount int
|
|
}
|
|
|
|
type PanelMenuListPage struct {
|
|
*BasePanelPage
|
|
ItemList []PanelMenuListItem
|
|
}
|
|
|
|
type PanelMenuPage struct {
|
|
*BasePanelPage
|
|
MenuID int
|
|
ItemList []MenuItem
|
|
}
|
|
|
|
type PanelMenuItemPage struct {
|
|
*BasePanelPage
|
|
Item MenuItem
|
|
}
|
|
|
|
type PanelUserPage struct {
|
|
*BasePanelPage
|
|
ItemList []*User
|
|
Paginator
|
|
}
|
|
|
|
type PanelGroupPage struct {
|
|
*BasePanelPage
|
|
ItemList []GroupAdmin
|
|
Paginator
|
|
}
|
|
|
|
type PanelEditGroupPage struct {
|
|
*BasePanelPage
|
|
ID int
|
|
Name string
|
|
Tag string
|
|
Rank string
|
|
DisableRank bool
|
|
}
|
|
|
|
type GroupForumPermPreset struct {
|
|
Group *Group
|
|
Preset string
|
|
}
|
|
|
|
type PanelEditForumPage struct {
|
|
*BasePanelPage
|
|
ID int
|
|
Name string
|
|
Desc string
|
|
Active bool
|
|
Preset string
|
|
Groups []GroupForumPermPreset
|
|
}
|
|
|
|
type NameLangToggle struct {
|
|
Name string
|
|
LangStr string
|
|
Toggle bool
|
|
}
|
|
|
|
type PanelEditForumGroupPage struct {
|
|
*BasePanelPage
|
|
ForumID int
|
|
GroupID int
|
|
Name string
|
|
Desc string
|
|
Active bool
|
|
Preset string
|
|
Perms []NameLangToggle
|
|
}
|
|
|
|
type PanelEditGroupPermsPage struct {
|
|
*BasePanelPage
|
|
ID int
|
|
Name string
|
|
LocalPerms []NameLangToggle
|
|
GlobalPerms []NameLangToggle
|
|
}
|
|
|
|
type BackupItem struct {
|
|
SQLURL string
|
|
|
|
// TODO: Add an easier to parse format here for Gosora to be able to more easily reimport portions of the dump and to strip unnecessary data (e.g. table defs and parsed post data)
|
|
|
|
Timestamp time.Time
|
|
}
|
|
|
|
type PanelBackupPage struct {
|
|
*BasePanelPage
|
|
Backups []BackupItem
|
|
}
|
|
|
|
type PageLogItem struct {
|
|
Action template.HTML
|
|
IPAddress string
|
|
DoneAt string
|
|
}
|
|
|
|
type PanelLogsPage struct {
|
|
*BasePanelPage
|
|
Logs []PageLogItem
|
|
Paginator
|
|
}
|
|
|
|
type PageRegLogItem struct {
|
|
RegLogItem
|
|
ParsedReason string
|
|
}
|
|
|
|
type PanelRegLogsPage struct {
|
|
*BasePanelPage
|
|
Logs []PageRegLogItem
|
|
Paginator
|
|
}
|
|
|
|
type PanelDebugPage struct {
|
|
*BasePanelPage
|
|
GoVersion string
|
|
DBVersion string
|
|
Uptime string
|
|
OpenConns int
|
|
DBAdapter string
|
|
}
|
|
|
|
type PageSimple struct {
|
|
Title string
|
|
Something interface{}
|
|
}
|
|
|
|
type AreYouSure struct {
|
|
URL string
|
|
Message string
|
|
}
|
|
|
|
// TODO: Write a test for this
|
|
func DefaultHeader(w http.ResponseWriter, user User) *Header {
|
|
return &Header{Site: Site, Theme: Themes[fallbackTheme], CurrentUser: user, Writer: w}
|
|
}
|