23a686fe96
Removed the Tempra Cursive Theme. You can now do bulk moderation actions with Shadow. Added: Argon2 as a dependency. The EmailStore. The ReportStore. The Copy method to *Setting. The AddColumn method to the query builder and adapters. The textarea setting type. More logging to better debug issues. The GetOffset method to the UserStore. Removed: Sortable from Code Climate's Analysis. MemberCheck and memberCheck as they're obsolete now. The obsolete url_tags setting. The BcryptGeneratePasswordNoSalt function. Some redundant fields from some of the page structs. Revamped: The Control Panel Setting List and Editor. Refactored: The password hashing logic to make it more amenable to multiple hashing algorithms. The email portion of the Account Manager. The Control Panel User List. The report system. simplePanelUserCheck and simpleUserCheck to remove the duplicated logic as the two do the exact same thing. Fixed: Missing slugs in the profile links in the User Manager. A few template initialisers potentially reducing the number of odd template edge cases. Some problems with the footer. Custom selection colour not applying to images on Shadow. The avatars of the bottom row of the topic list on Conflux leaking out. Other: Moved the startTime variable into package common and exported it. Moved the password hashing logic from user.go to auth.go Split common/themes.go into common/theme.go and common/theme_list.go Replaced the SettingLabels phrase category with the more generic SettingPhrases category. Moved a load of routes, including panel ones into the routes and panel packages. Hid the notifications link from the Account Menu. Moved more inline CSS into the CSS files and made things a little more flexible here and there. Continued work on PgSQL, still a ways away. Guests now have a default avatar like everyone else. Tweaked some of the font sizes on Cosora to make the text look a little nicer. Partially implemented the theme dock override logic. Partially implemented a "symlink" like feature for theme directories. ... And a bunch of other things I might have missed. You will need to run this update script / patcher for this commit. Warning: This is an "unstable commit", therefore some things may be a little less stable than I'd like. For instance, the Shadow Theme is a little broken in this commit.
189 lines
4.8 KiB
Go
189 lines
4.8 KiB
Go
package common
|
|
|
|
import (
|
|
"database/sql"
|
|
"errors"
|
|
"strconv"
|
|
"strings"
|
|
"sync/atomic"
|
|
|
|
"../query_gen/lib"
|
|
)
|
|
|
|
var SettingBox atomic.Value // An atomic value pointing to a SettingBox
|
|
|
|
// SettingMap is a map type specifically for holding the various settings admins set to toggle features on and off or to otherwise alter Gosora's behaviour from the Control Panel
|
|
type SettingMap map[string]interface{}
|
|
|
|
type SettingStore interface {
|
|
ParseSetting(sname string, scontent string, stype string, sconstraint string) string
|
|
BypassGet(name string) (*Setting, error)
|
|
BypassGetAll(name string) ([]*Setting, error)
|
|
}
|
|
|
|
type OptionLabel struct {
|
|
Label string
|
|
Value int
|
|
Selected bool
|
|
}
|
|
|
|
type Setting struct {
|
|
Name string
|
|
Content string
|
|
Type string
|
|
Constraint string
|
|
}
|
|
|
|
type SettingStmts struct {
|
|
getAll *sql.Stmt
|
|
get *sql.Stmt
|
|
update *sql.Stmt
|
|
}
|
|
|
|
var settingStmts SettingStmts
|
|
|
|
func init() {
|
|
SettingBox.Store(SettingMap(make(map[string]interface{})))
|
|
DbInits.Add(func(acc *qgen.Accumulator) error {
|
|
settingStmts = SettingStmts{
|
|
getAll: acc.Select("settings").Columns("name, content, type, constraints").Prepare(),
|
|
get: acc.Select("settings").Columns("content, type, constraints").Where("name = ?").Prepare(),
|
|
update: acc.Update("settings").Set("content = ?").Where("name = ?").Prepare(),
|
|
}
|
|
return acc.FirstError()
|
|
})
|
|
}
|
|
|
|
func (setting *Setting) Copy() (out *Setting) {
|
|
out = &Setting{Name: ""}
|
|
*out = *setting
|
|
return out
|
|
}
|
|
|
|
func LoadSettings() error {
|
|
var sBox = SettingMap(make(map[string]interface{}))
|
|
settings, err := sBox.BypassGetAll()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, setting := range settings {
|
|
err = sBox.ParseSetting(setting.Name, setting.Content, setting.Type, setting.Constraint)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
SettingBox.Store(sBox)
|
|
return nil
|
|
}
|
|
|
|
// nolint
|
|
var ErrNotInteger = errors.New("You were supposed to enter an integer x.x")
|
|
var ErrSettingNotInteger = errors.New("Only integers are allowed in this setting x.x")
|
|
var ErrBadConstraintNotInteger = errors.New("Invalid contraint! The constraint field wasn't an integer!")
|
|
var ErrBadSettingRange = errors.New("Only integers between a certain range are allowed in this setting")
|
|
|
|
// To avoid leaking internal state to the user
|
|
// TODO: We need to add some sort of DualError interface
|
|
func SafeSettingError(err error) bool {
|
|
return err == ErrNotInteger || err == ErrSettingNotInteger || err == ErrBadConstraintNotInteger || err == ErrBadSettingRange || err == ErrNoRows
|
|
}
|
|
|
|
// TODO: Add better support for HTML attributes (html-attribute). E.g. Meta descriptions.
|
|
func (sBox SettingMap) ParseSetting(sname string, scontent string, stype string, constraint string) (err error) {
|
|
var ssBox = map[string]interface{}(sBox)
|
|
switch stype {
|
|
case "bool":
|
|
ssBox[sname] = (scontent == "1")
|
|
case "int":
|
|
ssBox[sname], err = strconv.Atoi(scontent)
|
|
if err != nil {
|
|
return ErrNotInteger
|
|
}
|
|
case "int64":
|
|
ssBox[sname], err = strconv.ParseInt(scontent, 10, 64)
|
|
if err != nil {
|
|
return ErrNotInteger
|
|
}
|
|
case "list":
|
|
cons := strings.Split(constraint, "-")
|
|
if len(cons) < 2 {
|
|
return errors.New("Invalid constraint! The second field wasn't set!")
|
|
}
|
|
|
|
con1, err := strconv.Atoi(cons[0])
|
|
con2, err2 := strconv.Atoi(cons[1])
|
|
if err != nil || err2 != nil {
|
|
return ErrBadConstraintNotInteger
|
|
}
|
|
|
|
value, err := strconv.Atoi(scontent)
|
|
if err != nil {
|
|
return ErrSettingNotInteger
|
|
}
|
|
|
|
if value < con1 || value > con2 {
|
|
return ErrBadSettingRange
|
|
}
|
|
ssBox[sname] = value
|
|
default:
|
|
ssBox[sname] = scontent
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (sBox SettingMap) BypassGet(name string) (*Setting, error) {
|
|
setting := &Setting{Name: name}
|
|
err := settingStmts.get.QueryRow(name).Scan(&setting.Content, &setting.Type, &setting.Constraint)
|
|
return setting, err
|
|
}
|
|
|
|
func (sBox SettingMap) BypassGetAll() (settingList []*Setting, err error) {
|
|
rows, err := settingStmts.getAll.Query()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close()
|
|
|
|
for rows.Next() {
|
|
setting := &Setting{Name: ""}
|
|
err := rows.Scan(&setting.Name, &setting.Content, &setting.Type, &setting.Constraint)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
settingList = append(settingList, setting)
|
|
}
|
|
return settingList, rows.Err()
|
|
}
|
|
|
|
func (sBox SettingMap) Update(name string, content string) error {
|
|
setting, err := sBox.BypassGet(name)
|
|
if err == ErrNoRows {
|
|
return err
|
|
}
|
|
|
|
// TODO: Why is this here and not in a common function?
|
|
if setting.Type == "bool" {
|
|
if content == "on" || content == "1" {
|
|
content = "1"
|
|
} else {
|
|
content = "0"
|
|
}
|
|
}
|
|
|
|
// TODO: Make this a method or function?
|
|
_, err = settingStmts.update.Exec(content, name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = sBox.ParseSetting(name, content, setting.Type, setting.Constraint)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// TODO: Do a reload instead?
|
|
SettingBox.Store(sBox)
|
|
return nil
|
|
}
|