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.
267 lines
8.5 KiB
Go
267 lines
8.5 KiB
Go
/* Copyright Azareal 2016 - 2019 */
|
|
package common
|
|
|
|
import (
|
|
//"fmt"
|
|
"bytes"
|
|
"errors"
|
|
"io"
|
|
"io/ioutil"
|
|
"log"
|
|
"mime"
|
|
"net/http"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"text/template"
|
|
)
|
|
|
|
type Theme struct {
|
|
Path string // Redirect this file to another folder
|
|
|
|
Name string
|
|
FriendlyName string
|
|
Version string
|
|
Creator string
|
|
FullImage string
|
|
MobileFriendly bool
|
|
Disabled bool
|
|
HideFromThemes bool
|
|
BgAvatars bool // For profiles, at the moment
|
|
ForkOf string
|
|
Tag string
|
|
URL string
|
|
Docks []string // Allowed Values: leftSidebar, rightSidebar, footer
|
|
Settings map[string]ThemeSetting
|
|
Templates []TemplateMapping
|
|
TemplatesMap map[string]string
|
|
TmplPtr map[string]interface{}
|
|
Resources []ThemeResource
|
|
ResourceTemplates *template.Template
|
|
|
|
// Dock intercepters
|
|
// TODO: Implement this
|
|
MapTmplToDock map[string]ThemeMapTmplToDock // map[dockName]data
|
|
RunOnDock func(string) string //(dock string) (sbody string)
|
|
|
|
// This variable should only be set and unset by the system, not the theme meta file
|
|
Active bool
|
|
}
|
|
|
|
type ThemeSetting struct {
|
|
FriendlyName string
|
|
Options []string
|
|
}
|
|
|
|
type TemplateMapping struct {
|
|
Name string
|
|
Source string
|
|
//When string
|
|
}
|
|
|
|
type ThemeResource struct {
|
|
Name string
|
|
Location string
|
|
Loggedin bool // Only serve this resource to logged in users
|
|
}
|
|
|
|
type ThemeMapTmplToDock struct {
|
|
//Name string
|
|
File string
|
|
}
|
|
|
|
// TODO: It might be unsafe to call the template parsing functions with fsnotify, do something more concurrent
|
|
func (theme *Theme) LoadStaticFiles() error {
|
|
theme.ResourceTemplates = template.New("")
|
|
template.Must(theme.ResourceTemplates.ParseGlob("./themes/" + theme.Name + "/public/*.css"))
|
|
|
|
// It should be safe for us to load the files for all the themes in memory, as-long as the admin hasn't setup a ridiculous number of themes
|
|
return theme.AddThemeStaticFiles()
|
|
}
|
|
|
|
func (theme *Theme) AddThemeStaticFiles() error {
|
|
phraseMap := GetTmplPhrases()
|
|
// TODO: Use a function instead of a closure to make this more testable? What about a function call inside the closure to take the theme variable into account?
|
|
return filepath.Walk("./themes/"+theme.Name+"/public", func(path string, f os.FileInfo, err error) error {
|
|
DebugLog("Attempting to add static file '" + path + "' for default theme '" + theme.Name + "'")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if f.IsDir() {
|
|
return nil
|
|
}
|
|
|
|
path = strings.Replace(path, "\\", "/", -1)
|
|
data, err := ioutil.ReadFile(path)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var ext = filepath.Ext(path)
|
|
if ext == ".css" && len(data) != 0 {
|
|
var b bytes.Buffer
|
|
var pieces = strings.Split(path, "/")
|
|
var filename = pieces[len(pieces)-1]
|
|
err = theme.ResourceTemplates.ExecuteTemplate(&b, filename, CSSData{Phrases: phraseMap})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
data = b.Bytes()
|
|
}
|
|
|
|
path = strings.TrimPrefix(path, "themes/"+theme.Name+"/public")
|
|
gzipData := compressBytesGzip(data)
|
|
StaticFiles.Set("/static/"+theme.Name+path, SFile{data, gzipData, 0, int64(len(data)), int64(len(gzipData)), mime.TypeByExtension(ext), f, f.ModTime().UTC().Format(http.TimeFormat)})
|
|
|
|
DebugLog("Added the '/" + theme.Name + path + "' static file for theme " + theme.Name + ".")
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func (theme *Theme) MapTemplates() {
|
|
if theme.Templates != nil {
|
|
for _, themeTmpl := range theme.Templates {
|
|
if themeTmpl.Name == "" {
|
|
LogError(errors.New("Invalid destination template name"))
|
|
}
|
|
if themeTmpl.Source == "" {
|
|
LogError(errors.New("Invalid source template name"))
|
|
}
|
|
|
|
// `go generate` is one possibility for letting plugins inject custom page structs, but it would simply add another step of compilation. It might be simpler than the current build process from the perspective of the administrator?
|
|
|
|
destTmplPtr, ok := TmplPtrMap[themeTmpl.Name]
|
|
if !ok {
|
|
return
|
|
}
|
|
sourceTmplPtr, ok := TmplPtrMap[themeTmpl.Source]
|
|
if !ok {
|
|
LogError(errors.New("The source template doesn't exist!"))
|
|
}
|
|
|
|
switch dTmplPtr := destTmplPtr.(type) {
|
|
case *func(CustomPagePage, io.Writer) error:
|
|
switch sTmplPtr := sourceTmplPtr.(type) {
|
|
case *func(CustomPagePage, io.Writer) error:
|
|
//overridenTemplates[themeTmpl.Name] = d_tmpl_ptr
|
|
overridenTemplates[themeTmpl.Name] = true
|
|
*dTmplPtr = *sTmplPtr
|
|
default:
|
|
LogError(errors.New("The source and destination templates are incompatible"))
|
|
}
|
|
case *func(TopicPage, io.Writer) error:
|
|
switch sTmplPtr := sourceTmplPtr.(type) {
|
|
case *func(TopicPage, io.Writer) error:
|
|
//overridenTemplates[themeTmpl.Name] = d_tmpl_ptr
|
|
overridenTemplates[themeTmpl.Name] = true
|
|
*dTmplPtr = *sTmplPtr
|
|
default:
|
|
LogError(errors.New("The source and destination templates are incompatible"))
|
|
}
|
|
case *func(TopicListPage, io.Writer) error:
|
|
switch sTmplPtr := sourceTmplPtr.(type) {
|
|
case *func(TopicListPage, io.Writer) error:
|
|
//overridenTemplates[themeTmpl.Name] = d_tmpl_ptr
|
|
overridenTemplates[themeTmpl.Name] = true
|
|
*dTmplPtr = *sTmplPtr
|
|
default:
|
|
LogError(errors.New("The source and destination templates are incompatible"))
|
|
}
|
|
case *func(ForumPage, io.Writer) error:
|
|
switch sTmplPtr := sourceTmplPtr.(type) {
|
|
case *func(ForumPage, io.Writer) error:
|
|
//overridenTemplates[themeTmpl.Name] = d_tmpl_ptr
|
|
overridenTemplates[themeTmpl.Name] = true
|
|
*dTmplPtr = *sTmplPtr
|
|
default:
|
|
LogError(errors.New("The source and destination templates are incompatible"))
|
|
}
|
|
case *func(ForumsPage, io.Writer) error:
|
|
switch sTmplPtr := sourceTmplPtr.(type) {
|
|
case *func(ForumsPage, io.Writer) error:
|
|
//overridenTemplates[themeTmpl.Name] = d_tmpl_ptr
|
|
overridenTemplates[themeTmpl.Name] = true
|
|
*dTmplPtr = *sTmplPtr
|
|
default:
|
|
LogError(errors.New("The source and destination templates are incompatible"))
|
|
}
|
|
case *func(ProfilePage, io.Writer) error:
|
|
switch sTmplPtr := sourceTmplPtr.(type) {
|
|
case *func(ProfilePage, io.Writer) error:
|
|
//overridenTemplates[themeTmpl.Name] = d_tmpl_ptr
|
|
overridenTemplates[themeTmpl.Name] = true
|
|
*dTmplPtr = *sTmplPtr
|
|
default:
|
|
LogError(errors.New("The source and destination templates are incompatible"))
|
|
}
|
|
case *func(CreateTopicPage, io.Writer) error:
|
|
switch sTmplPtr := sourceTmplPtr.(type) {
|
|
case *func(CreateTopicPage, io.Writer) error:
|
|
//overridenTemplates[themeTmpl.Name] = d_tmpl_ptr
|
|
overridenTemplates[themeTmpl.Name] = true
|
|
*dTmplPtr = *sTmplPtr
|
|
default:
|
|
LogError(errors.New("The source and destination templates are incompatible"))
|
|
}
|
|
case *func(IPSearchPage, io.Writer) error:
|
|
switch sTmplPtr := sourceTmplPtr.(type) {
|
|
case *func(IPSearchPage, io.Writer) error:
|
|
//overridenTemplates[themeTmpl.Name] = d_tmpl_ptr
|
|
overridenTemplates[themeTmpl.Name] = true
|
|
*dTmplPtr = *sTmplPtr
|
|
default:
|
|
LogError(errors.New("The source and destination templates are incompatible"))
|
|
}
|
|
case *func(AccountDashPage, io.Writer) error:
|
|
switch sTmplPtr := sourceTmplPtr.(type) {
|
|
case *func(AccountDashPage, io.Writer) error:
|
|
//overridenTemplates[themeTmpl.Name] = d_tmpl_ptr
|
|
overridenTemplates[themeTmpl.Name] = true
|
|
*dTmplPtr = *sTmplPtr
|
|
default:
|
|
LogError(errors.New("The source and destination templates are incompatible"))
|
|
}
|
|
case *func(ErrorPage, io.Writer) error:
|
|
switch sTmplPtr := sourceTmplPtr.(type) {
|
|
case *func(ErrorPage, io.Writer) error:
|
|
//overridenTemplates[themeTmpl.Name] = d_tmpl_ptr
|
|
overridenTemplates[themeTmpl.Name] = true
|
|
*dTmplPtr = *sTmplPtr
|
|
default:
|
|
LogError(errors.New("The source and destination templates are incompatible"))
|
|
}
|
|
case *func(Page, io.Writer) error:
|
|
switch sTmplPtr := sourceTmplPtr.(type) {
|
|
case *func(Page, io.Writer) error:
|
|
//overridenTemplates[themeTmpl.Name] = d_tmpl_ptr
|
|
overridenTemplates[themeTmpl.Name] = true
|
|
*dTmplPtr = *sTmplPtr
|
|
default:
|
|
LogError(errors.New("The source and destination templates are incompatible"))
|
|
}
|
|
default:
|
|
log.Print("themeTmpl.Name: ", themeTmpl.Name)
|
|
log.Print("themeTmpl.Source: ", themeTmpl.Source)
|
|
LogError(errors.New("Unknown destination template type!"))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func (theme Theme) HasDock(name string) bool {
|
|
for _, dock := range theme.Docks {
|
|
if dock == name {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (theme Theme) BuildDock(dock string) (sbody string) {
|
|
runOnDock := theme.RunOnDock
|
|
if runOnDock != nil {
|
|
return runOnDock(dock)
|
|
}
|
|
return ""
|
|
}
|