- {{range $index, $element := .ItemList}}
-
-
{{$element.ContentHtml}}
+ {{range .ItemList}}
+
{{end}}
{{if not .CurrentUser.Is_Banned}}
diff --git a/user.go b/user.go
index ec3d6566..99fe0a11 100644
--- a/user.go
+++ b/user.go
@@ -1,5 +1,5 @@
package main
-import "log"
+//import "log"
import "strings"
import "strconv"
import "net/http"
@@ -46,35 +46,81 @@ func SetPassword(uid int, password string) (error) {
return nil
}
-func SessionCheck(w http.ResponseWriter, r *http.Request) (User) {
- user := User{0,"",0,false,false,false,false,false,false,"",false,"","","","",""}
- var err error
- var cookie *http.Cookie
-
+func SessionCheck(w http.ResponseWriter, r *http.Request) (user User, noticeList map[int]string, success bool) {
// Are there any session cookies..?
// Assign it to user.name to avoid having to create a temporary variable for the type conversion
- cookie, err = r.Cookie("uid")
+ cookie, err := r.Cookie("uid")
if err != nil {
- return user
+ return user, noticeList, true
}
user.Name = cookie.Value
user.ID, err = strconv.Atoi(user.Name)
if err != nil {
- return user
+ return user, noticeList, true
}
cookie, err = r.Cookie("session")
if err != nil {
- return user
+ return user, noticeList, true
}
user.Session = cookie.Value
// Is this session valid..?
err = get_session_stmt.QueryRow(user.ID,user.Session).Scan(&user.ID, &user.Name, &user.Group, &user.Is_Super_Admin, &user.Session, &user.Avatar, &user.Message, &user.URLPrefix, &user.URLName)
if err == sql.ErrNoRows {
- return user
+ return user, noticeList, true
} else if err != nil {
- log.Print(err)
- return user
+ InternalError(err,w,r,user)
+ return user, noticeList, false
+ }
+
+ user.Is_Admin = user.Is_Super_Admin || groups[user.Group].Is_Admin
+ user.Is_Super_Mod = groups[user.Group].Is_Mod || user.Is_Admin
+ user.Is_Mod = user.Is_Super_Mod
+ user.Is_Banned = groups[user.Group].Is_Banned
+ user.Loggedin = !user.Is_Banned || user.Is_Super_Mod
+ if user.Is_Banned && user.Is_Super_Mod {
+ user.Is_Banned = false
+ }
+
+ if user.Is_Banned {
+ noticeList[0] = "You have been banned. Your ability to post has been revoked."
+ }
+
+ if user.Avatar != "" {
+ if user.Avatar[0] == '.' {
+ user.Avatar = "/uploads/avatar_" + strconv.Itoa(user.ID) + user.Avatar
+ }
+ } else {
+ user.Avatar = strings.Replace(noavatar,"{id}",strconv.Itoa(user.ID),1)
+ }
+ return user, noticeList, true
+}
+
+func SimpleSessionCheck(w http.ResponseWriter, r *http.Request) (user User, success bool) {
+ // Are there any session cookies..?
+ // Assign it to user.name to avoid having to create a temporary variable for the type conversion
+ cookie, err := r.Cookie("uid")
+ if err != nil {
+ return user, true
+ }
+ user.Name = cookie.Value
+ user.ID, err = strconv.Atoi(user.Name)
+ if err != nil {
+ return user, true
+ }
+ cookie, err = r.Cookie("session")
+ if err != nil {
+ return user, true
+ }
+ user.Session = cookie.Value
+
+ // Is this session valid..?
+ err = get_session_stmt.QueryRow(user.ID,user.Session).Scan(&user.ID, &user.Name, &user.Group, &user.Is_Super_Admin, &user.Session, &user.Avatar, &user.Message, &user.URLPrefix, &user.URLName)
+ if err == sql.ErrNoRows {
+ return user, true
+ } else if err != nil {
+ InternalError(err,w,r,user)
+ return user, false
}
user.Is_Admin = user.Is_Super_Admin || groups[user.Group].Is_Admin
@@ -93,5 +139,5 @@ func SessionCheck(w http.ResponseWriter, r *http.Request) (User) {
} else {
user.Avatar = strings.Replace(noavatar,"{id}",strconv.Itoa(user.ID),1)
}
- return user
+ return user, true
}
\ No newline at end of file
+