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.
480 lines
14 KiB
Go
480 lines
14 KiB
Go
package common
|
|
|
|
import (
|
|
"html/template"
|
|
"io"
|
|
"log"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"./alerts"
|
|
"./templates"
|
|
)
|
|
|
|
var Ctemplates []string
|
|
var Templates = template.New("")
|
|
var PrebuildTmplList []func(User, *Header) CTmpl
|
|
|
|
type CTmpl struct {
|
|
Name string
|
|
Filename string
|
|
Path string
|
|
StructName string
|
|
Data interface{}
|
|
Imports []string
|
|
}
|
|
|
|
// TODO: Stop duplicating these bits of code
|
|
// nolint
|
|
func interpretedTopicTemplate(pi TopicPage, w io.Writer) error {
|
|
mapping, ok := Themes[DefaultThemeBox.Load().(string)].TemplatesMap["topic"]
|
|
if !ok {
|
|
mapping = "topic"
|
|
}
|
|
return Templates.ExecuteTemplate(w, mapping+".html", pi)
|
|
}
|
|
|
|
// nolint
|
|
var Template_topic_handle = interpretedTopicTemplate
|
|
var Template_topic_alt_handle = interpretedTopicTemplate
|
|
|
|
// nolint
|
|
var Template_topics_handle = func(pi TopicListPage, w io.Writer) error {
|
|
mapping, ok := Themes[DefaultThemeBox.Load().(string)].TemplatesMap["topics"]
|
|
if !ok {
|
|
mapping = "topics"
|
|
}
|
|
return Templates.ExecuteTemplate(w, mapping+".html", pi)
|
|
}
|
|
|
|
// nolint
|
|
var Template_forum_handle = func(pi ForumPage, w io.Writer) error {
|
|
mapping, ok := Themes[DefaultThemeBox.Load().(string)].TemplatesMap["forum"]
|
|
if !ok {
|
|
mapping = "forum"
|
|
}
|
|
return Templates.ExecuteTemplate(w, mapping+".html", pi)
|
|
}
|
|
|
|
// nolint
|
|
var Template_forums_handle = func(pi ForumsPage, w io.Writer) error {
|
|
mapping, ok := Themes[DefaultThemeBox.Load().(string)].TemplatesMap["forums"]
|
|
if !ok {
|
|
mapping = "forums"
|
|
}
|
|
return Templates.ExecuteTemplate(w, mapping+".html", pi)
|
|
}
|
|
|
|
// nolint
|
|
var Template_profile_handle = func(pi ProfilePage, w io.Writer) error {
|
|
mapping, ok := Themes[DefaultThemeBox.Load().(string)].TemplatesMap["profile"]
|
|
if !ok {
|
|
mapping = "profile"
|
|
}
|
|
return Templates.ExecuteTemplate(w, mapping+".html", pi)
|
|
}
|
|
|
|
// nolint
|
|
var Template_create_topic_handle = func(pi CreateTopicPage, w io.Writer) error {
|
|
mapping, ok := Themes[DefaultThemeBox.Load().(string)].TemplatesMap["create_topic"]
|
|
if !ok {
|
|
mapping = "create_topic"
|
|
}
|
|
return Templates.ExecuteTemplate(w, mapping+".html", pi)
|
|
}
|
|
|
|
// nolint
|
|
var Template_login_handle = func(pi Page, w io.Writer) error {
|
|
mapping, ok := Themes[DefaultThemeBox.Load().(string)].TemplatesMap["login"]
|
|
if !ok {
|
|
mapping = "login"
|
|
}
|
|
return Templates.ExecuteTemplate(w, mapping+".html", pi)
|
|
}
|
|
|
|
// nolint
|
|
var Template_register_handle = func(pi Page, w io.Writer) error {
|
|
mapping, ok := Themes[DefaultThemeBox.Load().(string)].TemplatesMap["register"]
|
|
if !ok {
|
|
mapping = "register"
|
|
}
|
|
return Templates.ExecuteTemplate(w, mapping+".html", pi)
|
|
}
|
|
|
|
// nolint
|
|
var Template_error_handle = func(pi ErrorPage, w io.Writer) error {
|
|
mapping, ok := Themes[DefaultThemeBox.Load().(string)].TemplatesMap["error"]
|
|
if !ok {
|
|
mapping = "error"
|
|
}
|
|
return Templates.ExecuteTemplate(w, mapping+".html", pi)
|
|
}
|
|
|
|
// nolint
|
|
var Template_ip_search_handle = func(pi IPSearchPage, w io.Writer) error {
|
|
mapping, ok := Themes[DefaultThemeBox.Load().(string)].TemplatesMap["ip_search"]
|
|
if !ok {
|
|
mapping = "ip_search"
|
|
}
|
|
return Templates.ExecuteTemplate(w, mapping+".html", pi)
|
|
}
|
|
|
|
// ? - Add template hooks?
|
|
func CompileTemplates() error {
|
|
var config tmpl.CTemplateConfig
|
|
config.Minify = Config.MinifyTemplates
|
|
config.SuperDebug = Dev.TemplateDebug
|
|
|
|
c := tmpl.NewCTemplateSet()
|
|
c.SetConfig(config)
|
|
c.SetBaseImportMap(map[string]string{
|
|
"io": "io",
|
|
"./common": "./common",
|
|
})
|
|
|
|
// Schemas to train the template compiler on what to expect
|
|
// TODO: Add support for interface{}s
|
|
user := User{62, BuildProfileURL("fake-user", 62), "Fake User", "compiler@localhost", 0, false, false, false, false, false, false, GuestPerms, make(map[string]bool), "", false, BuildAvatar(62, ""), "", "", "", "", 0, 0, 0, "0.0.0.0.0", 0}
|
|
// TODO: Do a more accurate level calculation for this?
|
|
user2 := User{1, BuildProfileURL("admin-alice", 1), "Admin Alice", "alice@localhost", 1, true, true, true, true, false, false, AllPerms, make(map[string]bool), "", true, BuildAvatar(1, ""), "", "", "", "", 58, 1000, 0, "127.0.0.1", 0}
|
|
user3 := User{2, BuildProfileURL("admin-fred", 62), "Admin Fred", "fred@localhost", 1, true, true, true, true, false, false, AllPerms, make(map[string]bool), "", true, BuildAvatar(2, ""), "", "", "", "", 42, 900, 0, "::1", 0}
|
|
header := &Header{
|
|
Site: Site,
|
|
Settings: SettingBox.Load().(SettingMap),
|
|
Themes: Themes,
|
|
Theme: Themes[DefaultThemeBox.Load().(string)],
|
|
CurrentUser: user,
|
|
NoticeList: []string{"test"},
|
|
Stylesheets: []string{"panel"},
|
|
Scripts: []string{"whatever"},
|
|
Widgets: PageWidgets{
|
|
LeftSidebar: template.HTML("lalala"),
|
|
},
|
|
}
|
|
|
|
var header2 = &Header{Site: Site}
|
|
*header2 = *header
|
|
header2.CurrentUser = user2
|
|
|
|
var header3 = &Header{Site: Site}
|
|
*header3 = *header
|
|
header3.CurrentUser = user3
|
|
|
|
log.Print("Compiling the templates")
|
|
|
|
var now = time.Now()
|
|
poll := Poll{ID: 1, Type: 0, Options: map[int]string{0: "Nothing", 1: "Something"}, Results: map[int]int{0: 5, 1: 2}, QuickOptions: []PollOption{
|
|
PollOption{0, "Nothing"},
|
|
PollOption{1, "Something"},
|
|
}, VoteCount: 7}
|
|
topic := TopicUser{1, "blah", "Blah", "Hey there!", 0, false, false, now, RelativeTime(now), now, RelativeTime(now), 0, "", "127.0.0.1", 0, 1, "classname", poll.ID, "weird-data", BuildProfileURL("fake-user", 62), "Fake User", Config.DefaultGroup, "", 0, "", "", "", "", "", 58, false}
|
|
var replyList []ReplyUser
|
|
replyList = append(replyList, ReplyUser{0, 0, "Yo!", "Yo!", 0, "alice", "Alice", Config.DefaultGroup, now, RelativeTime(now), 0, 0, "", "", 0, "", "", "", "", 0, "127.0.0.1", false, 1, "", ""})
|
|
|
|
var varList = make(map[string]tmpl.VarItem)
|
|
header.Title = "Topic Name"
|
|
tpage := TopicPage{header, replyList, topic, poll, 1, 1}
|
|
topicIDTmpl, err := c.Compile("topic.html", "templates/", "common.TopicPage", tpage, varList)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
topicIDAltTmpl, err := c.Compile("topic_alt.html", "templates/", "common.TopicPage", tpage, varList)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
varList = make(map[string]tmpl.VarItem)
|
|
header.Title = "User 526"
|
|
ppage := ProfilePage{header, replyList, user}
|
|
profileTmpl, err := c.Compile("profile.html", "templates/", "common.ProfilePage", ppage, varList)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// TODO: Use a dummy forum list to avoid o(n) problems
|
|
var forumList []Forum
|
|
forums, err := Forums.GetAll()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, forum := range forums {
|
|
forumList = append(forumList, *forum)
|
|
}
|
|
varList = make(map[string]tmpl.VarItem)
|
|
header.Title = "Forum List"
|
|
forumsPage := ForumsPage{header, forumList}
|
|
forumsTmpl, err := c.Compile("forums.html", "templates/", "common.ForumsPage", forumsPage, varList)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var topicsList []*TopicsRow
|
|
topicsList = append(topicsList, &TopicsRow{1, "topic-title", "Topic Title", "The topic content.", 1, false, false, "Date", time.Now(), "Date", user3.ID, 1, "", "127.0.0.1", 0, 1, "classname", "", &user2, "", 0, &user3, "General", "/forum/general.2"})
|
|
header2.Title = "Topic List"
|
|
topicListPage := TopicListPage{header, topicsList, forumList, Config.DefaultForum, Paginator{[]int{1}, 1, 1}}
|
|
topicListTmpl, err := c.Compile("topics.html", "templates/", "common.TopicListPage", topicListPage, varList)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
forumItem := BlankForum(1, "general-forum.1", "General Forum", "Where the general stuff happens", true, "all", 0, "", 0)
|
|
header.Title = "General Forum"
|
|
forumPage := ForumPage{header, topicsList, forumItem, Paginator{[]int{1}, 1, 1}}
|
|
forumTmpl, err := c.Compile("forum.html", "templates/", "common.ForumPage", forumPage, varList)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
header.Title = "Login Page"
|
|
loginPage := Page{header, tList, nil}
|
|
loginTmpl, err := c.Compile("login.html", "templates/", "common.Page", loginPage, varList)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
header.Title = "Registration Page"
|
|
registerPage := Page{header, tList, "nananana"}
|
|
registerTmpl, err := c.Compile("register.html", "templates/", "common.Page", registerPage, varList)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
header.Title = "Error"
|
|
errorPage := ErrorPage{header, "A problem has occurred in the system."}
|
|
errorTmpl, err := c.Compile("error.html", "templates/", "common.ErrorPage", errorPage, varList)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var ipUserList = make(map[int]*User)
|
|
ipUserList[1] = &user2
|
|
header.Title = "IP Search"
|
|
ipSearchPage := IPSearchPage{header2, ipUserList, "::1"}
|
|
ipSearchTmpl, err := c.Compile("ip_search.html", "templates/", "common.IPSearchPage", ipSearchPage, varList)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var wg sync.WaitGroup
|
|
var writeTemplate = func(name string, content string) {
|
|
log.Print("Writing template '" + name + "'")
|
|
if content == "" {
|
|
log.Fatal("No content body")
|
|
}
|
|
|
|
wg.Add(1)
|
|
go func() {
|
|
err := writeFile("./template_"+name+".go", content)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
wg.Done()
|
|
}()
|
|
}
|
|
|
|
// Let plugins register their own templates
|
|
DebugLog("Registering the templates for the plugins")
|
|
config = c.GetConfig()
|
|
config.SkipHandles = true
|
|
c.SetConfig(config)
|
|
for _, tmplfunc := range PrebuildTmplList {
|
|
tmplItem := tmplfunc(user, header)
|
|
varList = make(map[string]tmpl.VarItem)
|
|
compiledTmpl, err := c.Compile(tmplItem.Filename, tmplItem.Path, tmplItem.StructName, tmplItem.Data, varList, tmplItem.Imports...)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
writeTemplate(tmplItem.Name, compiledTmpl)
|
|
}
|
|
|
|
log.Print("Writing the templates")
|
|
writeTemplate("topic", topicIDTmpl)
|
|
writeTemplate("topic_alt", topicIDAltTmpl)
|
|
writeTemplate("profile", profileTmpl)
|
|
writeTemplate("forums", forumsTmpl)
|
|
writeTemplate("topics", topicListTmpl)
|
|
writeTemplate("forum", forumTmpl)
|
|
writeTemplate("login", loginTmpl)
|
|
writeTemplate("register", registerTmpl)
|
|
writeTemplate("ip_search", ipSearchTmpl)
|
|
writeTemplate("error", errorTmpl)
|
|
writeTemplateList(c, &wg, "./")
|
|
return nil
|
|
}
|
|
|
|
func CompileJSTemplates() error {
|
|
log.Print("Compiling the JS templates")
|
|
var config tmpl.CTemplateConfig
|
|
config.Minify = Config.MinifyTemplates
|
|
config.SuperDebug = Dev.TemplateDebug
|
|
config.SkipHandles = true
|
|
config.SkipInitBlock = true
|
|
config.PackageName = "tmpl"
|
|
|
|
c := tmpl.NewCTemplateSet()
|
|
c.SetConfig(config)
|
|
c.SetBaseImportMap(map[string]string{
|
|
"io": "io",
|
|
"../common/alerts": "../common/alerts",
|
|
})
|
|
var varList = make(map[string]tmpl.VarItem)
|
|
|
|
// TODO: Check what sort of path is sent exactly and use it here
|
|
alertItem := alerts.AlertItem{Avatar: "", ASID: 1, Path: "/", Message: "uh oh, something happened"}
|
|
alertTmpl, err := c.Compile("alert.html", "templates/", "alerts.AlertItem", alertItem, varList)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var dirPrefix = "./tmpl_client/"
|
|
var wg sync.WaitGroup
|
|
var writeTemplate = func(name string, content string) {
|
|
log.Print("Writing template '" + name + "'")
|
|
if content == "" {
|
|
log.Fatal("No content body")
|
|
}
|
|
|
|
wg.Add(1)
|
|
go func() {
|
|
err := writeFile(dirPrefix+"template_"+name+".go", content)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
wg.Done()
|
|
}()
|
|
}
|
|
writeTemplate("alert", alertTmpl)
|
|
writeTemplateList(c, &wg, dirPrefix)
|
|
return nil
|
|
}
|
|
|
|
func writeTemplateList(c *tmpl.CTemplateSet, wg *sync.WaitGroup, prefix string) {
|
|
log.Print("Writing template list")
|
|
wg.Add(1)
|
|
go func() {
|
|
out := "package " + c.GetConfig().PackageName + "\n\n"
|
|
var getterstr = "\n// nolint\nGetFrag = func(name string) [][]byte {\nswitch(name) {\n"
|
|
for templateName, count := range c.TemplateFragmentCount {
|
|
out += "var " + templateName + "_frags = make([][]byte," + strconv.Itoa(count) + ")\n"
|
|
getterstr += "\tcase \"" + templateName + "\":\n"
|
|
getterstr += "\treturn " + templateName + "_frags\n"
|
|
}
|
|
getterstr += "}\nreturn nil\n}\n"
|
|
out += "\n// nolint\nfunc init() {\n" + c.FragOut + "\n" + getterstr + "}\n"
|
|
err := writeFile(prefix+"template_list.go", out)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
wg.Done()
|
|
}()
|
|
wg.Wait()
|
|
}
|
|
|
|
func arithToInt64(in interface{}) (out int64) {
|
|
switch in := in.(type) {
|
|
case int64:
|
|
out = in
|
|
case int32:
|
|
out = int64(in)
|
|
case int:
|
|
out = int64(in)
|
|
case uint32:
|
|
out = int64(in)
|
|
case uint16:
|
|
out = int64(in)
|
|
case uint8:
|
|
out = int64(in)
|
|
case uint:
|
|
out = int64(in)
|
|
}
|
|
return out
|
|
}
|
|
|
|
func arithDuoToInt64(left interface{}, right interface{}) (leftInt int64, rightInt int64) {
|
|
return arithToInt64(left), arithToInt64(right)
|
|
}
|
|
|
|
func InitTemplates() error {
|
|
DebugLog("Initialising the template system")
|
|
// TODO: Add support for floats
|
|
fmap := make(map[string]interface{})
|
|
fmap["add"] = func(left interface{}, right interface{}) interface{} {
|
|
leftInt, rightInt := arithDuoToInt64(left, right)
|
|
return leftInt + rightInt
|
|
}
|
|
|
|
fmap["subtract"] = func(left interface{}, right interface{}) interface{} {
|
|
leftInt, rightInt := arithDuoToInt64(left, right)
|
|
return leftInt - rightInt
|
|
}
|
|
|
|
fmap["multiply"] = func(left interface{}, right interface{}) interface{} {
|
|
leftInt, rightInt := arithDuoToInt64(left, right)
|
|
return leftInt * rightInt
|
|
}
|
|
|
|
fmap["divide"] = func(left interface{}, right interface{}) interface{} {
|
|
leftInt, rightInt := arithDuoToInt64(left, right)
|
|
if leftInt == 0 || rightInt == 0 {
|
|
return 0
|
|
}
|
|
return leftInt / rightInt
|
|
}
|
|
|
|
fmap["dock"] = func(dock interface{}, headerInt interface{}) interface{} {
|
|
return template.HTML(BuildWidget(dock.(string), headerInt.(*Header)))
|
|
}
|
|
|
|
fmap["lang"] = func(phraseNameInt interface{}) interface{} {
|
|
phraseName, ok := phraseNameInt.(string)
|
|
if !ok {
|
|
panic("phraseNameInt is not a string")
|
|
}
|
|
// TODO: Log non-existent phrases?
|
|
return GetTmplPhrase(phraseName)
|
|
}
|
|
|
|
fmap["scope"] = func(name interface{}) interface{} {
|
|
return ""
|
|
}
|
|
|
|
// The interpreted templates...
|
|
DebugLog("Loading the template files...")
|
|
Templates.Funcs(fmap)
|
|
templateFiles, err := filepath.Glob("templates/*.html")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var templateFileMap = make(map[string]int)
|
|
for index, path := range templateFiles {
|
|
path = strings.Replace(path, "\\", "/", -1)
|
|
log.Print("templateFile: ", path)
|
|
templateFileMap[path] = index
|
|
}
|
|
|
|
overrideFiles, err := filepath.Glob("templates/overrides/*.html")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for _, path := range overrideFiles {
|
|
path = strings.Replace(path, "\\", "/", -1)
|
|
log.Print("overrideFile: ", path)
|
|
index, ok := templateFileMap["templates/"+strings.TrimPrefix(path, "templates/overrides/")]
|
|
if !ok {
|
|
log.Print("not ok: templates/" + strings.TrimPrefix(path, "templates/overrides/"))
|
|
templateFiles = append(templateFiles, path)
|
|
continue
|
|
}
|
|
templateFiles[index] = path
|
|
}
|
|
template.Must(Templates.ParseFiles(templateFiles...))
|
|
template.Must(Templates.ParseGlob("pages/*"))
|
|
|
|
return nil
|
|
}
|