ston1th/gowiki
0
0
Fork 0
Code Issues 2 Releases Activity

upgraded bootstrap, fixed style, added share blacklisting

Browse source
This commit is contained in:
ston1th 2018-09-14 20:49:50 +02:00
commit 3fb1cfc17d
37 changed files with 811 additions and 892 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/db/db.go
View file

@ -1,4 +1,4 @@
// Copyright (C) 2017 Marius Schellenberger
// Copyright (C) 2018 Marius Schellenberger
package db

2
pkg/db/dump.go
View file

@ -1,4 +1,4 @@
// Copyright (C) 2017 Marius Schellenberger
// Copyright (C) 2018 Marius Schellenberger
package db

1
pkg/db/helper.go
View file

@ -7,6 +7,7 @@ import (
var reservedUsers = []string{
"all",
"blacklist",
"login",
"logout",
"new",

7
pkg/db/page.go
View file

@ -4,7 +4,6 @@ import (
"git.giftfish.de/ston1th/gowiki/pkg/core"
"git.giftfish.de/ston1th/gowiki/pkg/render"
"git.giftfish.de/ston1th/gowiki/pkg/store"
"git.giftfish.de/ston1th/gowiki/pkg/util"
"sort"
)
@ -65,7 +64,7 @@ func (db *DB) CreatePage(title, section, markdown, username string, p core.Permi
err = errPrivateWikiPage
return
}
st := util.StoreTitle(section, title)
st := render.StoreTitle(section, title)
if _, err = db.getPage(st, username); err != nil && err != store.ErrKeyNotFound {
return
}
@ -104,7 +103,7 @@ func (db *DB) UpdatePage(title, section, markdown, username string, p core.Permi
err = errPrivateWikiPage
return
}
st := util.StoreTitle(section, title)
st := render.StoreTitle(section, title)
page, err := db.getPage(st, username)
if err != nil {
return
@ -140,7 +139,7 @@ func (db *DB) DeletePage(title, section, username string) (err error) {
err = errDeleteIndexPage
return
}
st := util.StoreTitle(section, title)
st := render.StoreTitle(section, title)
if page, err = db.getPage(st, username); err != nil {
return
}

33
pkg/db/user.go
View file

@ -13,7 +13,7 @@ var (
errUserReserved = dbErr("username is reserved")
)
func (db *DB) GetUsers() (users core.Users, err error) {
func (db *DB) DumpUsers() (users core.Users, err error) {
db.users.ForEach(func(username string, _ []byte) error {
u, err := db.GetUser(username)
if err == nil {
@ -21,6 +21,14 @@ func (db *DB) GetUsers() (users core.Users, err error) {
}
return nil
})
return
}
func (db *DB) GetUsers() (users core.Users, err error) {
users, err = db.DumpUsers()
for i := range users {
users[i].Password = ""
}
sort.Sort(users)
return
}
@ -41,28 +49,7 @@ func (db *DB) UserExists(username string) error {
}
// TODO
/*func (bs *BoltStore) DumpUsers() (users []User, err error) {
var buf [][]byte
err = bs.db.View(func(tx *bolt.Tx) error {
return tx.Bucket([]byte(userTable)).ForEach(func(k, v []byte) error {
buf = append(buf, copyBuf(v))
return nil
})
})
if err != nil {
return
}
for _, b := range buf {
u := new(User)
if err = bs.Unmarshal(b, u); err != nil {
return
}
users = append(users, *u)
}
return
}
func (bs *BoltStore) RestoreUsers(users []User) error {
/*func (bs *BoltStore) RestoreUsers(users []User) error {
return bs.db.Update(func(tx *bolt.Tx) error {
b := tx.Bucket([]byte(userTable))
err := b.ForEach(func(k, v []byte) error {