a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shorten more things.

This commit is contained in:
Azareal 2019-09-01 08:59:00 +10:00
parent f1bebb7326
commit 218e177a29
15 changed files with 227 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
common/routes_common.go
View File

@ -74,23 +74,23 @@ func forumUserCheck(header *Header, w http.ResponseWriter, r *http.Request, user
} }
// TODO: Put this on the user instance? Do we really want forum specific logic in there? Maybe, a method which spits a new pointer with the same contents as user? // TODO: Put this on the user instance? Do we really want forum specific logic in there? Maybe, a method which spits a new pointer with the same contents as user?
func cascadeForumPerms(fperms *ForumPerms, user *User) { func cascadeForumPerms(fp *ForumPerms, u *User) {
if fperms.Overrides && !user.IsSuperAdmin { if fp.Overrides && !u.IsSuperAdmin {
user.Perms.ViewTopic = fperms.ViewTopic u.Perms.ViewTopic = fp.ViewTopic
user.Perms.LikeItem = fperms.LikeItem u.Perms.LikeItem = fp.LikeItem
user.Perms.CreateTopic = fperms.CreateTopic u.Perms.CreateTopic = fp.CreateTopic
user.Perms.EditTopic = fperms.EditTopic u.Perms.EditTopic = fp.EditTopic
user.Perms.DeleteTopic = fperms.DeleteTopic u.Perms.DeleteTopic = fp.DeleteTopic
user.Perms.CreateReply = fperms.CreateReply u.Perms.CreateReply = fp.CreateReply
user.Perms.EditReply = fperms.EditReply u.Perms.EditReply = fp.EditReply
user.Perms.DeleteReply = fperms.DeleteReply u.Perms.DeleteReply = fp.DeleteReply
user.Perms.PinTopic = fperms.PinTopic u.Perms.PinTopic = fp.PinTopic
user.Perms.CloseTopic = fperms.CloseTopic u.Perms.CloseTopic = fp.CloseTopic
user.Perms.MoveTopic = fperms.MoveTopic u.Perms.MoveTopic = fp.MoveTopic
if len(fperms.ExtData) != 0 { if len(fp.ExtData) != 0 {
for name, perm := range fperms.ExtData { for name, perm := range fp.ExtData {
user.PluginPerms[name] = perm u.PluginPerms[name] = perm
} }
} }
} }
@ -151,7 +151,8 @@ func panelUserCheck(w http.ResponseWriter, r *http.Request, user *User) (header
stats.Themes = len(Themes) stats.Themes = len(Themes)
stats.Reports = 0 // TODO: Do the report count. Only show open threads? stats.Reports = 0 // TODO: Do the report count. Only show open threads?
var addPreScript = func(name string) { addPreScript := func(name string) {
// TODO: Optimise this by removing a superfluous string alloc
var tname string var tname string
if theme.OverridenMap != nil { if theme.OverridenMap != nil {
_, ok := theme.OverridenMap[name] _, ok := theme.OverridenMap[name]
@ -212,6 +213,7 @@ func userCheck(w http.ResponseWriter, r *http.Request, user *User) (header *Head
Writer: w, Writer: w,
IsoCode: phrases.GetLangPack().IsoCode, IsoCode: phrases.GetLangPack().IsoCode,
} }
// TODO: Optimise this by avoiding accessing a map string index
header.GoogSiteVerify = header.Settings["google_site_verify"].(string) header.GoogSiteVerify = header.Settings["google_site_verify"].(string)
if user.IsBanned { if user.IsBanned {
@ -256,7 +258,8 @@ func PrepResources(user *User, header *Header, theme *Theme) {
} }
} }
var addPreScript = func(name string) { addPreScript := func(name string) {
// TODO: Optimise this by removing a superfluous string alloc
var tname string var tname string
if theme.OverridenMap != nil { if theme.OverridenMap != nil {
//fmt.Printf("name %+v\n", name) //fmt.Printf("name %+v\n", name)
@ -471,6 +474,7 @@ func NoSessionMismatch(w http.ResponseWriter, r *http.Request, user User) RouteE
if err != nil { if err != nil {
return LocalError("Bad Form", w, r, user) return LocalError("Bad Form", w, r, user)
} }
// TODO: Try to eliminate some of these allocations
sess := []byte(user.Session) sess := []byte(user.Session)
if len(sess) == 0 { if len(sess) == 0 {
return SecurityError(w, r, user) return SecurityError(w, r, user)
@ -501,6 +505,7 @@ func HandleUploadRoute(w http.ResponseWriter, r *http.Request, user User, maxFil
} }
func NoUploadSessionMismatch(w http.ResponseWriter, r *http.Request, user User) RouteError { func NoUploadSessionMismatch(w http.ResponseWriter, r *http.Request, user User) RouteError {
// TODO: Try to eliminate some of these allocations
sess := []byte(user.Session) sess := []byte(user.Session)
if len(sess) == 0 { if len(sess) == 0 {
return SecurityError(w, r, user) return SecurityError(w, r, user)

188
common/user.go
View File

@ -57,13 +57,13 @@ type User struct {
TempGroup int TempGroup int
} }
func (user *User) WebSockets() *WsJSONUser { func (u *User) WebSockets() *WsJSONUser {
var groupID = user.Group groupID := u.Group
if user.TempGroup != 0 { if u.TempGroup != 0 {
groupID = user.TempGroup groupID = u.TempGroup
} }
// TODO: Do we want to leak the user's permissions? Users will probably be able to see their status from the group tags, but still // TODO: Do we want to leak the user's permissions? Users will probably be able to see their status from the group tags, but still
return &WsJSONUser{user.ID, user.Link, user.Name, groupID, user.IsMod, user.Avatar, user.MicroAvatar, user.Level, user.Score, user.Liked} return &WsJSONUser{u.ID, u.Link, u.Name, groupID, u.IsMod, u.Avatar, u.MicroAvatar, u.Level, u.Score, u.Liked}
} }
// Use struct tags to avoid having to define this? It really depends on the circumstances, sometimes we want the whole thing, sometimes... not. // Use struct tags to avoid having to define this? It really depends on the circumstances, sometimes we want the whole thing, sometimes... not.
@ -80,12 +80,12 @@ type WsJSONUser struct {
Liked int Liked int
} }
func (user *User) Me() *MeUser { func (u *User) Me() *MeUser {
var groupID = user.Group groupID := u.Group
if user.TempGroup != 0 { if u.TempGroup != 0 {
groupID = user.TempGroup groupID = u.TempGroup
} }
return &MeUser{user.ID, user.Link, user.Name, groupID, user.Active, user.IsMod, user.IsSuperMod, user.IsAdmin, user.IsBanned, user.Session, user.Avatar, user.MicroAvatar, user.Tag, user.Level, user.Score, user.Liked} return &MeUser{u.ID, u.Link, u.Name, groupID, u.Active, u.IsMod, u.IsSuperMod, u.IsAdmin, u.IsBanned, u.Session, u.Avatar, u.MicroAvatar, u.Tag, u.Level, u.Score, u.Liked}
} }
// For when users need to see their own data, I've omitted some redundancies and less useful items, so we don't wind up sending them on every request // For when users need to see their own data, I've omitted some redundancies and less useful items, so we don't wind up sending them on every request
@ -104,7 +104,7 @@ type MeUser struct {
//Perms Perms //Perms Perms
//PluginPerms map[string]bool //PluginPerms map[string]bool
Session string S string // Session
Avatar string Avatar string
MicroAvatar string MicroAvatar string
Tag string Tag string
@ -170,53 +170,53 @@ func init() {
}) })
} }
func (user *User) Init() { func (u *User) Init() {
user.Avatar, user.MicroAvatar = BuildAvatar(user.ID, user.RawAvatar) u.Avatar, u.MicroAvatar = BuildAvatar(u.ID, u.RawAvatar)
user.Link = BuildProfileURL(NameToSlug(user.Name), user.ID) u.Link = BuildProfileURL(NameToSlug(u.Name), u.ID)
user.Tag = Groups.DirtyGet(user.Group).Tag u.Tag = Groups.DirtyGet(u.Group).Tag
user.InitPerms() u.InitPerms()
} }
// TODO: Refactor this idiom into something shorter, maybe with a NullUserCache when one isn't set? // TODO: Refactor this idiom into something shorter, maybe with a NullUserCache when one isn't set?
func (user *User) CacheRemove() { func (u *User) CacheRemove() {
ucache := Users.GetCache() ucache := Users.GetCache()
if ucache != nil { if ucache != nil {
ucache.Remove(user.ID) ucache.Remove(u.ID)
} }
TopicListThaw.Thaw() TopicListThaw.Thaw()
} }
func (user *User) Ban(duration time.Duration, issuedBy int) error { func (u *User) Ban(duration time.Duration, issuedBy int) error {
return user.ScheduleGroupUpdate(BanGroup, issuedBy, duration) return u.ScheduleGroupUpdate(BanGroup, issuedBy, duration)
} }
func (user *User) Unban() error { func (u *User) Unban() error {
return user.RevertGroupUpdate() return u.RevertGroupUpdate()
} }
func (user *User) deleteScheduleGroupTx(tx *sql.Tx) error { func (u *User) deleteScheduleGroupTx(tx *sql.Tx) error {
deleteScheduleGroupStmt, err := qgen.Builder.SimpleDeleteTx(tx, "users_groups_scheduler", "uid = ?") deleteScheduleGroupStmt, err := qgen.Builder.SimpleDeleteTx(tx, "users_groups_scheduler", "uid = ?")
if err != nil { if err != nil {
return err return err
} }
_, err = deleteScheduleGroupStmt.Exec(user.ID) _, err = deleteScheduleGroupStmt.Exec(u.ID)
return err return err
} }
func (user *User) setTempGroupTx(tx *sql.Tx, tempGroup int) error { func (u *User) setTempGroupTx(tx *sql.Tx, tempGroup int) error {
setTempGroupStmt, err := qgen.Builder.SimpleUpdateTx(tx, "users", "temp_group = ?", "uid = ?") setTempGroupStmt, err := qgen.Builder.SimpleUpdateTx(tx, "users", "temp_group = ?", "uid = ?")
if err != nil { if err != nil {
return err return err
} }
_, err = setTempGroupStmt.Exec(tempGroup, user.ID) _, err = setTempGroupStmt.Exec(tempGroup, u.ID)
return err return err
} }
// Make this more stateless? // Make this more stateless?
func (user *User) ScheduleGroupUpdate(gid int, issuedBy int, duration time.Duration) error { func (u *User) ScheduleGroupUpdate(gid int, issuedBy int, duration time.Duration) error {
var temporary bool var temp bool
if duration.Nanoseconds() != 0 { if duration.Nanoseconds() != 0 {
temporary = true temp = true
} }
revertAt := time.Now().Add(duration) revertAt := time.Now().Add(duration)
@ -226,7 +226,7 @@ func (user *User) ScheduleGroupUpdate(gid int, issuedBy int, duration time.Durat
} }
defer tx.Rollback() defer tx.Rollback()
err = user.deleteScheduleGroupTx(tx) err = u.deleteScheduleGroupTx(tx)
if err != nil { if err != nil {
return err return err
} }
@ -235,85 +235,85 @@ func (user *User) ScheduleGroupUpdate(gid int, issuedBy int, duration time.Durat
if err != nil { if err != nil {
return err return err
} }
_, err = createScheduleGroupTx.Exec(user.ID, gid, issuedBy, revertAt, temporary) _, err = createScheduleGroupTx.Exec(u.ID, gid, issuedBy, revertAt, temp)
if err != nil { if err != nil {
return err return err
} }
err = user.setTempGroupTx(tx, gid) err = u.setTempGroupTx(tx, gid)
if err != nil { if err != nil {
return err return err
} }
err = tx.Commit() err = tx.Commit()
user.CacheRemove() u.CacheRemove()
return err return err
} }
func (user *User) RevertGroupUpdate() error { func (u *User) RevertGroupUpdate() error {
tx, err := qgen.Builder.Begin() tx, err := qgen.Builder.Begin()
if err != nil { if err != nil {
return err return err
} }
defer tx.Rollback() defer tx.Rollback()
err = user.deleteScheduleGroupTx(tx) err = u.deleteScheduleGroupTx(tx)
if err != nil { if err != nil {
return err return err
} }
err = user.setTempGroupTx(tx, 0) err = u.setTempGroupTx(tx, 0)
if err != nil { if err != nil {
return err return err
} }
err = tx.Commit() err = tx.Commit()
user.CacheRemove() u.CacheRemove()
return err return err
} }
// TODO: Use a transaction here // TODO: Use a transaction here
// ? - Add a Deactivate method? Not really needed, if someone's been bad you could do a ban, I guess it might be useful, if someone says that email x isn't actually owned by the user in question? // ? - Add a Deactivate method? Not really needed, if someone's been bad you could do a ban, I guess it might be useful, if someone says that email x isn't actually owned by the user in question?
func (user *User) Activate() (err error) { func (u *User) Activate() (err error) {
_, err = userStmts.activate.Exec(user.ID) _, err = userStmts.activate.Exec(u.ID)
if err != nil { if err != nil {
return err return err
} }
_, err = userStmts.changeGroup.Exec(Config.DefaultGroup, user.ID) _, err = userStmts.changeGroup.Exec(Config.DefaultGroup, u.ID)
user.CacheRemove() u.CacheRemove()
return err return err
} }
// TODO: Write tests for this // TODO: Write tests for this
// TODO: Delete this user's content too? // TODO: Delete this user's content too?
// TODO: Expose this to the admin? // TODO: Expose this to the admin?
func (user *User) Delete() error { func (u *User) Delete() error {
_, err := userStmts.delete.Exec(user.ID) _, err := userStmts.delete.Exec(u.ID)
if err != nil { if err != nil {
return err return err
} }
user.CacheRemove() u.CacheRemove()
return err return nil
} }
func (user *User) bindStmt(stmt *sql.Stmt, params ...interface{}) (err error) { func (u *User) bindStmt(stmt *sql.Stmt, params ...interface{}) (err error) {
params = append(params, user.ID) params = append(params, u.ID)
_, err = stmt.Exec(params...) _, err = stmt.Exec(params...)
user.CacheRemove() u.CacheRemove()
return err return err
} }
func (user *User) ChangeName(username string) (err error) { func (u *User) ChangeName(name string) (err error) {
return user.bindStmt(userStmts.setUsername, username) return u.bindStmt(userStmts.setUsername, name)
} }
func (user *User) ChangeAvatar(avatar string) (err error) { func (u *User) ChangeAvatar(avatar string) (err error) {
return user.bindStmt(userStmts.setAvatar, avatar) return u.bindStmt(userStmts.setAvatar, avatar)
} }
// TODO: Abstract this with an interface so we can scale this with an actual dedicated queue in a real cluster // TODO: Abstract this with an interface so we can scale this with an actual dedicated queue in a real cluster
func (user *User) ScheduleAvatarResize() (err error) { func (u *User) ScheduleAvatarResize() (err error) {
_, err = userStmts.scheduleAvatarResize.Exec(user.ID) _, err = userStmts.scheduleAvatarResize.Exec(u.ID)
if err != nil { if err != nil {
// TODO: Do a more generic check so that we're not as tied to MySQL // TODO: Do a more generic check so that we're not as tied to MySQL
me, ok := err.(*mysql.MySQLError) me, ok := err.(*mysql.MySQLError)
@ -328,29 +328,29 @@ func (user *User) ScheduleAvatarResize() (err error) {
return nil return nil
} }
func (user *User) ChangeGroup(group int) (err error) { func (u *User) ChangeGroup(group int) (err error) {
return user.bindStmt(userStmts.changeGroup, group) return u.bindStmt(userStmts.changeGroup, group)
} }
// ! Only updates the database not the *User for safety reasons // ! Only updates the database not the *User for safety reasons
func (user *User) UpdateIP(host string) error { func (u *User) UpdateIP(host string) error {
_, err := userStmts.updateLastIP.Exec(host, user.ID) _, err := userStmts.updateLastIP.Exec(host, u.ID)
ucache := Users.GetCache() ucache := Users.GetCache()
if ucache != nil { if ucache != nil {
ucache.Remove(user.ID) ucache.Remove(u.ID)
} }
return err return err
} }
func (user *User) Update(newname string, newemail string, newgroup int) (err error) { func (u *User) Update(newname string, newemail string, newgroup int) (err error) {
return user.bindStmt(userStmts.update, newname, newemail, newgroup) return u.bindStmt(userStmts.update, newname, newemail, newgroup)
} }
func (user *User) IncreasePostStats(wcount int, topic bool) (err error) { func (u *User) IncreasePostStats(wcount int, topic bool) (err error) {
var mod int var mod int
baseScore := 1 baseScore := 1
if topic { if topic {
_, err = userStmts.incrementTopics.Exec(1, user.ID) _, err = userStmts.incrementTopics.Exec(1, u.ID)
if err != nil { if err != nil {
return err return err
} }
@ -359,34 +359,34 @@ func (user *User) IncreasePostStats(wcount int, topic bool) (err error) {
settings := SettingBox.Load().(SettingMap) settings := SettingBox.Load().(SettingMap)
if wcount >= settings["megapost_min_words"].(int) { if wcount >= settings["megapost_min_words"].(int) {
_, err = userStmts.incrementMegaposts.Exec(1, 1, 1, user.ID) _, err = userStmts.incrementMegaposts.Exec(1, 1, 1, u.ID)
mod = 4 mod = 4
} else if wcount >= settings["bigpost_min_words"].(int) { } else if wcount >= settings["bigpost_min_words"].(int) {
_, err = userStmts.incrementBigposts.Exec(1, 1, user.ID) _, err = userStmts.incrementBigposts.Exec(1, 1, u.ID)
mod = 1 mod = 1
} else { } else {
_, err = userStmts.incrementPosts.Exec(1, user.ID) _, err = userStmts.incrementPosts.Exec(1, u.ID)
} }
if err != nil { if err != nil {
return err return err
} }
_, err = userStmts.incrementScore.Exec(baseScore+mod, user.ID) _, err = userStmts.incrementScore.Exec(baseScore+mod, u.ID)
if err != nil { if err != nil {
return err return err
} }
//log.Print(user.Score + base_score + mod) //log.Print(u.Score + baseScore + mod)
//log.Print(getLevel(user.Score + base_score + mod)) //log.Print(getLevel(u.Score + baseScore + mod))
// TODO: Use a transaction to prevent level desyncs? // TODO: Use a transaction to prevent level desyncs?
_, err = userStmts.updateLevel.Exec(GetLevel(user.Score+baseScore+mod), user.ID) _, err = userStmts.updateLevel.Exec(GetLevel(u.Score+baseScore+mod), u.ID)
return err return err
} }
func (user *User) DecreasePostStats(wcount int, topic bool) (err error) { func (u *User) DecreasePostStats(wcount int, topic bool) (err error) {
var mod int var mod int
baseScore := -1 baseScore := -1
if topic { if topic {
_, err = userStmts.incrementTopics.Exec(-1, user.ID) _, err = userStmts.incrementTopics.Exec(-1, u.ID)
if err != nil { if err != nil {
return err return err
} }
@ -395,56 +395,56 @@ func (user *User) DecreasePostStats(wcount int, topic bool) (err error) {
settings := SettingBox.Load().(SettingMap) settings := SettingBox.Load().(SettingMap)
if wcount >= settings["megapost_min_words"].(int) { if wcount >= settings["megapost_min_words"].(int) {
_, err = userStmts.incrementMegaposts.Exec(-1, -1, -1, user.ID) _, err = userStmts.incrementMegaposts.Exec(-1, -1, -1, u.ID)
mod = 4 mod = 4
} else if wcount >= settings["bigpost_min_words"].(int) { } else if wcount >= settings["bigpost_min_words"].(int) {
_, err = userStmts.incrementBigposts.Exec(-1, -1, user.ID) _, err = userStmts.incrementBigposts.Exec(-1, -1, u.ID)
mod = 1 mod = 1
} else { } else {
_, err = userStmts.incrementPosts.Exec(-1, user.ID) _, err = userStmts.incrementPosts.Exec(-1, u.ID)
} }
if err != nil { if err != nil {
return err return err
} }
_, err = userStmts.incrementScore.Exec(baseScore-mod, user.ID) _, err = userStmts.incrementScore.Exec(baseScore-mod, u.ID)
if err != nil { if err != nil {
return err return err
} }
// TODO: Use a transaction to prevent level desyncs? // TODO: Use a transaction to prevent level desyncs?
_, err = userStmts.updateLevel.Exec(GetLevel(user.Score-baseScore-mod), user.ID) _, err = userStmts.updateLevel.Exec(GetLevel(u.Score-baseScore-mod), u.ID)
return err return err
} }
// Copy gives you a non-pointer concurrency safe copy of the user // Copy gives you a non-pointer concurrency safe copy of the user
func (user *User) Copy() User { func (u *User) Copy() User {
return *user return *u
} }
// TODO: Write unit tests for this // TODO: Write unit tests for this
func (user *User) InitPerms() { func (u *User) InitPerms() {
if user.TempGroup != 0 { if u.TempGroup != 0 {
user.Group = user.TempGroup u.Group = u.TempGroup
} }
group := Groups.DirtyGet(user.Group) group := Groups.DirtyGet(u.Group)
if user.IsSuperAdmin { if u.IsSuperAdmin {
user.Perms = AllPerms u.Perms = AllPerms
user.PluginPerms = AllPluginPerms u.PluginPerms = AllPluginPerms
} else { } else {
user.Perms = group.Perms u.Perms = group.Perms
user.PluginPerms = group.PluginPerms u.PluginPerms = group.PluginPerms
} }
/*if len(group.CanSee) == 0 { /*if len(group.CanSee) == 0 {
panic("should not be zero") panic("should not be zero")
}*/ }*/
user.IsAdmin = user.IsSuperAdmin || group.IsAdmin u.IsAdmin = u.IsSuperAdmin || group.IsAdmin
user.IsSuperMod = user.IsAdmin || group.IsMod u.IsSuperMod = u.IsAdmin || group.IsMod
user.IsMod = user.IsSuperMod u.IsMod = u.IsSuperMod
user.IsBanned = group.IsBanned u.IsBanned = group.IsBanned
if user.IsBanned && user.IsSuperMod { if u.IsBanned && u.IsSuperMod {
user.IsBanned = false u.IsBanned = false
} }
} }

6
public/global.js
View File

@ -725,7 +725,7 @@ function mainInit(){
let formAction = $(this).closest('a').attr("href"); let formAction = $(this).closest('a').attr("href");
$.ajax({ $.ajax({
url: formAction + "?session=" + me.User.Session, url: formAction + "?s=" + me.User.S,
type: "POST", type: "POST",
dataType: "json", dataType: "json",
error: ajaxError, error: ajaxError,
@ -793,7 +793,7 @@ function mainInit(){
var formAction = $(this).closest('a').attr("href"); var formAction = $(this).closest('a').attr("href");
//console.log("Form Action:", formAction); //console.log("Form Action:", formAction);
//console.log(outData); //console.log(outData);
$.ajax({ url: formAction + "?session=" + me.User.Session, type:"POST", dataType:"json", data: outData, error: ajaxError }); $.ajax({ url: formAction + "?s=" + me.User.S, type:"POST", dataType:"json", data: outData, error: ajaxError });
blockParent.find('.hide_on_edit').removeClass("edit_opened"); blockParent.find('.hide_on_edit').removeClass("edit_opened");
blockParent.find('.show_on_edit').removeClass("edit_opened"); blockParent.find('.show_on_edit').removeClass("edit_opened");
}); });
@ -853,7 +853,7 @@ function mainInit(){
$("#themeSelectorSelect").change(function(){ $("#themeSelectorSelect").change(function(){
console.log("Changing the theme to " + this.options[this.selectedIndex].getAttribute("val")); console.log("Changing the theme to " + this.options[this.selectedIndex].getAttribute("val"));
$.ajax({ $.ajax({
url: this.form.getAttribute("action") + "?session=" + me.User.Session, url: this.form.getAttribute("action") + "?s=" + me.User.S,
type: "POST", type: "POST",
dataType: "json", dataType: "json",
data: { "newTheme": this.options[this.selectedIndex].getAttribute("val"), isJs: "1" }, data: { "newTheme": this.options[this.selectedIndex].getAttribute("val"), isJs: "1" },

2
public/init.js
View File

@ -251,7 +251,7 @@ function fetchPhrases(plist) {
runInitHook("pre_init"); runInitHook("pre_init");
}); });
} else { } else {
me = {User:{ID:0,Session:""},Site:{"MaxRequestSize":0}}; me = {User:{ID:0,S:""},Site:{"MaxRequestSize":0}};
runInitHook("pre_init"); runInitHook("pre_init");
} }
})(); })();

6
public/member.js
View File

@ -68,7 +68,7 @@
console.log("hash",hash); console.log("hash",hash);
let formData = new FormData(); let formData = new FormData();
formData.append("session",me.User.Session); formData.append("s",me.User.S);
for(let i = 0; i < this.files.length; i++) formData.append("upload_files",this.files[i]); for(let i = 0; i < this.files.length; i++) formData.append("upload_files",this.files[i]);
bindAttachManager(); bindAttachManager();
@ -183,7 +183,7 @@
$(".attach_item_delete").click(function(){ $(".attach_item_delete").click(function(){
let formData = new URLSearchParams(); let formData = new URLSearchParams();
formData.append("session",me.User.Session); formData.append("s",me.User.S);
let post = this.closest(".post_item"); let post = this.closest(".post_item");
let aidList = ""; let aidList = "";
@ -233,7 +233,7 @@
}); });
let bulkActionSender = function(action, selectedTopics, fragBit) { let bulkActionSender = function(action, selectedTopics, fragBit) {
let url = "/topic/"+action+"/submit/"+fragBit+"?session=" + me.User.Session; let url = "/topic/"+action+"/submit/"+fragBit+"?s=" + me.User.S;
$.ajax({ $.ajax({
url: url, url: url,
type: "POST", type: "POST",

2
public/panel_forums.js
View File

@ -47,7 +47,7 @@ document.getElementById("panel_forums_order_button").addEventListener("click", (
console.trace(); console.trace();
} }
// ? - Is encodeURIComponent the right function for this? // ? - Is encodeURIComponent the right function for this?
req.open("POST","/panel/forums/order/edit/submit/?session=" + encodeURIComponent(me.User.Session)); req.open("POST","/panel/forums/order/edit/submit/?s=" + encodeURIComponent(me.User.S));
req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
let items = ""; let items = "";
for(let i = 0; item = forums[i];i++) items += item+","; for(let i = 0; item = forums[i];i++) items += item+",";

2
public/panel_menu_items.js
View File

@ -44,7 +44,7 @@ document.getElementById("panel_menu_items_order_button").addEventListener("click
} }
// ? - Is encodeURIComponent the right function for this? // ? - Is encodeURIComponent the right function for this?
let spl = document.location.pathname.split("/"); let spl = document.location.pathname.split("/");
req.open("POST","/panel/themes/menus/item/order/edit/submit/"+parseInt(spl[spl.length-1],10)+"?session=" + encodeURIComponent(me.User.Session)); req.open("POST","/panel/themes/menus/item/order/edit/submit/"+parseInt(spl[spl.length-1],10)+"?s=" + encodeURIComponent(me.User.S));
req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
let items = ""; let items = "";
for(let i = 0; item = menuItems[i];i++) items += item+","; for(let i = 0; item = menuItems[i];i++) items += item+",";

4
public/widgets.js
View File

@ -19,7 +19,7 @@ $(document).ready(() => {
event.preventDefault(); event.preventDefault();
eparent.remove(); eparent.remove();
let formData = new URLSearchParams(); let formData = new URLSearchParams();
formData.append("session",me.User.Session); formData.append("s",me.User.S);
let req = new XMLHttpRequest(); let req = new XMLHttpRequest();
let target = this.closest("a").getAttribute("href"); let target = this.closest("a").getAttribute("href");
req.open("POST",target,true); req.open("POST",target,true);
@ -58,7 +58,7 @@ $(document).ready(() => {
let pform = this.closest("form"); let pform = this.closest("form");
let data = new URLSearchParams(); let data = new URLSearchParams();
for (const pair of new FormData(pform)) data.append(pair[0], pair[1]); for (const pair of new FormData(pform)) data.append(pair[0], pair[1]);
data.append("session",me.User.Session); data.append("s",me.User.S);
var req = new XMLHttpRequest(); var req = new XMLHttpRequest();
req.open("POST", pform.getAttribute("action")); req.open("POST", pform.getAttribute("action"));
req.send(data); req.send(data);

2
templates/header.html
View File

@ -7,7 +7,7 @@
{{range .Header.PreScriptsAsync}} {{range .Header.PreScriptsAsync}}
<script async type="text/javascript" src="/s/{{.}}"></script>{{end}} <script async type="text/javascript" src="/s/{{.}}"></script>{{end}}
<meta property="x-loggedin" content="{{.CurrentUser.Loggedin}}" /> <meta property="x-loggedin" content="{{.CurrentUser.Loggedin}}" />
<script type="text/javascript" src="/s/init.js?i=9"></script> <script type="text/javascript" src="/s/init.js?i=10"></script>
{{range .Header.ScriptsAsync}} {{range .Header.ScriptsAsync}}
<script async type="text/javascript" src="/s/{{.}}"></script>{{end}} <script async type="text/javascript" src="/s/{{.}}"></script>{{end}}
<script type="text/javascript" src="/s/jquery-3.1.1.min.js"></script> <script type="text/javascript" src="/s/jquery-3.1.1.min.js"></script>

2
templates/panel_group_edit.html
View File

@ -7,7 +7,7 @@
<div class="rowitem"><h1>{{.Name}}{{lang "panel_group_head_suffix"}}</h1></div> <div class="rowitem"><h1>{{.Name}}{{lang "panel_group_head_suffix"}}</h1></div>
</div> </div>
<div id="panel_group" class="colstack_item the_form"> <div id="panel_group" class="colstack_item the_form">
<form action="/panel/groups/edit/submit/{{.ID}}?session={{.CurrentUser.Session}}" method="post"> <form action="/panel/groups/edit/submit/{{.ID}}?s={{.CurrentUser.Session}}" method="post">
<div class="formrow"> <div class="formrow">
<div class="formitem formlabel"><a>{{lang "panel_group_name"}}</a></div> <div class="formitem formlabel"><a>{{lang "panel_group_name"}}</a></div>
<div class="formitem"><input name="group-name" type="text" value="{{.Name}}" placeholder="{{lang "panel_group_name_placeholder"}}" /></div> <div class="formitem"><input name="group-name" type="text" value="{{.Name}}" placeholder="{{lang "panel_group_name_placeholder"}}" /></div>

2
templates/panel_group_edit_perms.html
View File

@ -6,7 +6,7 @@
<div class="colstack_item colstack_head"> <div class="colstack_item colstack_head">
<div class="rowitem"><h1>{{.Name}}{{lang "panel_group_head_suffix"}}</h1></div> <div class="rowitem"><h1>{{.Name}}{{lang "panel_group_head_suffix"}}</h1></div>
</div> </div>
<form action="/panel/groups/edit/perms/submit/{{.ID}}?session={{.CurrentUser.Session}}" method="post"> <form action="/panel/groups/edit/perms/submit/{{.ID}}?s={{.CurrentUser.Session}}" method="post">
{{if .CurrentUser.Perms.EditGroupLocalPerms}} {{if .CurrentUser.Perms.EditGroupLocalPerms}}
<div class="colstack_item rowlist formlist the_form panel_group_perms"> <div class="colstack_item rowlist formlist the_form panel_group_perms">
{{range .LocalPerms}} {{range .LocalPerms}}

4
templates/panel_pages.html
View File

@ -7,7 +7,7 @@
<a href="/panel/pages/edit/{{.ID}}" class="panel_upshift">{{.Title}}</a>&nbsp;<a href="/pages/{{.Name}}">[{{.Name}}]</a> <a href="/panel/pages/edit/{{.ID}}" class="panel_upshift">{{.Title}}</a>&nbsp;<a href="/pages/{{.Name}}">[{{.Name}}]</a>
<span class="panel_buttons"> <span class="panel_buttons">
<a href="/panel/pages/edit/{{.ID}}" class="panel_tag panel_right_button edit_button" aria-label="{{lang "panel_pages_edit_button_aria"}}"></a> <a href="/panel/pages/edit/{{.ID}}" class="panel_tag panel_right_button edit_button" aria-label="{{lang "panel_pages_edit_button_aria"}}"></a>
<a href="/panel/pages/delete/submit/{{.ID}}?session={{$.CurrentUser.Session}}" class="panel_tag panel_right_button delete_button" aria-label="{{lang "panel_pages_delete_button_aria"}}"></a> <a href="/panel/pages/delete/submit/{{.ID}}?s={{$.CurrentUser.Session}}" class="panel_tag panel_right_button delete_button" aria-label="{{lang "panel_pages_delete_button_aria"}}"></a>
</span> </span>
</div> </div>
{{else}} {{else}}
@ -21,7 +21,7 @@
<div class="rowitem"><h1>{{lang "panel_pages_create_head"}}</h1></div> <div class="rowitem"><h1>{{lang "panel_pages_create_head"}}</h1></div>
</div> </div>
<div class="colstack_item the_form"> <div class="colstack_item the_form">
<form action="/panel/pages/create/submit/?session={{.CurrentUser.Session}}" method="post"> <form action="/panel/pages/create/submit/?s={{.CurrentUser.Session}}" method="post">
<div class="formrow"> <div class="formrow">
<div class="formitem formlabel"><a>{{lang "panel_pages_create_name"}}</a></div> <div class="formitem formlabel"><a>{{lang "panel_pages_create_name"}}</a></div>
<div class="formitem"><input name="name" type="text" placeholder="{{lang "panel_pages_create_name_placeholder"}}" /></div> <div class="formitem"><input name="name" type="text" placeholder="{{lang "panel_pages_create_name_placeholder"}}" /></div>

2
templates/panel_pages_edit.html
View File

@ -1,7 +1,7 @@
<div class="colstack_item colstack_head"> <div class="colstack_item colstack_head">
<div class="rowitem"><h1>{{lang "panel_pages_edit_head"}}</h1></div> <div class="rowitem"><h1>{{lang "panel_pages_edit_head"}}</h1></div>
</div> </div>
<form action="/panel/pages/edit/submit/{{.Page.ID}}?session={{.CurrentUser.Session}}" method="post"> <form action="/panel/pages/edit/submit/{{.Page.ID}}?s={{.CurrentUser.Session}}" method="post">
<div id="panel_page_edit_item" class="colstack_item the_form"> <div id="panel_page_edit_item" class="colstack_item the_form">
<div class="formrow"> <div class="formrow">
<div class="formitem formlabel"><a>{{lang "panel_pages_name"}}</a></div> <div class="formitem formlabel"><a>{{lang "panel_pages_name"}}</a></div>

2
templates/panel_setting.html
View File

@ -2,7 +2,7 @@
<div class="rowitem"><h1>{{.Setting.FriendlyName}}</h1></div> <div class="rowitem"><h1>{{.Setting.FriendlyName}}</h1></div>
</div> </div>
<div id="panel_setting" class="colstack_item the_form"> <div id="panel_setting" class="colstack_item the_form">
<form action="/panel/settings/edit/submit/{{.Setting.Name}}?session={{.CurrentUser.Session}}" method="post"> <form action="/panel/settings/edit/submit/{{.Setting.Name}}?s={{.CurrentUser.Session}}" method="post">
{{if eq .Setting.Type "list"}} {{if eq .Setting.Type "list"}}
<div class="formrow"> <div class="formrow">
<div class="formitem formlabel"><a>{{lang "panel_setting_value"}}</a></div> <div class="formitem formlabel"><a>{{lang "panel_setting_value"}}</a></div>

4
templates/panel_word_filters.html
View File

@ -10,7 +10,7 @@
<span class="panel_buttons"> <span class="panel_buttons">
<a class="panel_tag edit_fields hide_on_edit panel_right_button edit_button" aria-label="{{lang "panel_word_filters_edit_button_aria"}}"></a> <a class="panel_tag edit_fields hide_on_edit panel_right_button edit_button" aria-label="{{lang "panel_word_filters_edit_button_aria"}}"></a>
<a class="panel_right_button show_on_edit" href="/panel/settings/word-filters/edit/submit/{{.ID}}"><button class='panel_tag submit_edit' type='submit'>{{lang "panel_word_filters_update_button"}}</button></a> <a class="panel_right_button show_on_edit" href="/panel/settings/word-filters/edit/submit/{{.ID}}"><button class='panel_tag submit_edit' type='submit'>{{lang "panel_word_filters_update_button"}}</button></a>
<a href="/panel/settings/word-filters/delete/submit/{{.ID}}?session={{$.CurrentUser.Session}}" class="panel_tag panel_right_button hide_on_edit delete_button" aria-label="{{lang "panel_word_filters_delete_button_aria"}}"></a> <a href="/panel/settings/word-filters/delete/submit/{{.ID}}?s={{$.CurrentUser.Session}}" class="panel_tag panel_right_button hide_on_edit delete_button" aria-label="{{lang "panel_word_filters_delete_button_aria"}}"></a>
</span> </span>
</div> </div>
{{else}} {{else}}
@ -24,7 +24,7 @@
<div class="rowitem"><h1>{{lang "panel_word_filters_create_head"}}</h1></div> <div class="rowitem"><h1>{{lang "panel_word_filters_create_head"}}</h1></div>
</div> </div>
<div class="colstack_item the_form"> <div class="colstack_item the_form">
<form action="/panel/settings/word-filters/create/?session={{.CurrentUser.Session}}" method="post"> <form action="/panel/settings/word-filters/create/?s={{.CurrentUser.Session}}" method="post">
<div class="formrow"> <div class="formrow">
<div class="formitem formlabel"><a>{{lang "panel_word_filters_create_find"}}</a></div> <div class="formitem formlabel"><a>{{lang "panel_word_filters_create_find"}}</a></div>
<div class="formitem"><input name="find" type="text" placeholder="{{lang "panel_word_filters_create_find_placeholder"}}" /></div> <div class="formitem"><input name="find" type="text" placeholder="{{lang "panel_word_filters_create_find_placeholder"}}" /></div>