{{range .Header.NoticeList}}
{{.}}
{{end}}
diff --git a/templates/widget_simple.html b/templates/widget_simple.html
new file mode 100644
index 00000000..cd18d4a3
--- /dev/null
+++ b/templates/widget_simple.html
@@ -0,0 +1,6 @@
+
+
+{{.Name}}
+
+
diff --git a/themes.go b/themes.go
index 2b39b41c..96f7acb8 100644
--- a/themes.go
+++ b/themes.go
@@ -32,9 +32,11 @@ type Theme struct
ForkOf string
Tag string
URL string
+ Sidebars string // Allowed Values: left, right, both, false
Settings map[string]ThemeSetting
Templates []TemplateMapping
- TemplatesMap map[string]string // TO-DO: Make template mapping work without the template compiler
+ TemplatesMap map[string]string
+ Resources []ThemeResource
// This variable should only be set and unset by the system, not the theme meta file
Active bool
@@ -53,6 +55,12 @@ type TemplateMapping struct
//When string
}
+type ThemeResource struct
+{
+ Name string
+ Location string
+}
+
func LoadThemes() error {
rows, err := get_themes_stmt.Query()
if err != nil {
diff --git a/themes/tempra-simple/public/main.css b/themes/tempra-simple/public/main.css
index 7a0bd8c6..703971a1 100644
--- a/themes/tempra-simple/public/main.css
+++ b/themes/tempra-simple/public/main.css
@@ -141,7 +141,9 @@ li a {
padding: 0px;
padding-top: 0px;
}
-.rowblock:empty { display: none; }
+.rowblock:empty {
+ display: none;
+}
.rowsmall {
font-size:12px;
}
@@ -449,6 +451,18 @@ button.username { position: relative; top: -0.25px; }
top: -2px;
}
+@media(min-width: 881px) {
+ .shrink_main {
+ float: left;
+ width: calc(75% - 12px);
+ }
+ .sidebar {
+ float: left;
+ width: 25%;
+ margin-left: 12px;
+ }
+}
+
@media (max-width: 880px) {
li {
height: 29px;
@@ -477,6 +491,7 @@ button.username { position: relative; top: -0.25px; }
overflow-x: hidden;
}
.container { width: auto; }
+ .sidebar { display: none; }
.selectedAlert .alertList { top: 37px; right: 4px; }
}
diff --git a/themes/tempra-simple/public/sample.css b/themes/tempra-simple/public/sample.css
new file mode 100644
index 00000000..8836f2ef
--- /dev/null
+++ b/themes/tempra-simple/public/sample.css
@@ -0,0 +1 @@
+/* Sample CSS file injected by Tempra Simple. Doesn't do anything. */
diff --git a/themes/tempra-simple/theme.json b/themes/tempra-simple/theme.json
index d15ad0e8..e8c2c4a6 100644
--- a/themes/tempra-simple/theme.json
+++ b/themes/tempra-simple/theme.json
@@ -5,5 +5,12 @@
"Creator": "Azareal",
"FullImage": "tempra-simple.png",
"MobileFriendly": true,
- "URL": "github.com/Azareal/Gosora"
+ "URL": "github.com/Azareal/Gosora",
+ "Sidebars":"false",
+ "Resources": [
+ {
+ "Name": "sample.css",
+ "Location": "none"
+ }
+ ]
}
diff --git a/user.go b/user.go
index 83b6db08..08f3151b 100644
--- a/user.go
+++ b/user.go
@@ -2,9 +2,11 @@ package main
import (
//"fmt"
+ "strings"
"strconv"
"net"
"net/http"
+ "html/template"
"golang.org/x/crypto/bcrypt"
"database/sql"
_ "github.com/go-sql-driver/mysql"
@@ -80,11 +82,12 @@ func SendValidationEmail(username string, email string, token string) bool {
}
func SimpleForumSessionCheck(w http.ResponseWriter, r *http.Request, fid int) (user User, success bool) {
+ user, success = SimpleSessionCheck(w,r)
if !forum_exists(fid) {
PreError("The target forum doesn't exist.",w,r)
return user, false
}
- user, success = SimpleSessionCheck(w,r)
+
fperms := groups[user.Group].Forums[fid]
if fperms.Overrides && !user.Is_Super_Admin {
user.Perms.ViewTopic = fperms.ViewTopic
@@ -108,11 +111,12 @@ func SimpleForumSessionCheck(w http.ResponseWriter, r *http.Request, fid int) (u
}
func ForumSessionCheck(w http.ResponseWriter, r *http.Request, fid int) (user User, headerVars HeaderVars, success bool) {
+ user, headerVars, success = SessionCheck(w,r)
if !forum_exists(fid) {
NotFound(w,r)
return user, headerVars, false
}
- user, success = SimpleSessionCheck(w,r)
+
fperms := groups[user.Group].Forums[fid]
//fmt.Printf("%+v\n", user.Perms)
//fmt.Printf("%+v\n", fperms)
@@ -134,9 +138,6 @@ func ForumSessionCheck(w http.ResponseWriter, r *http.Request, fid int) (user Us
}
}
}
- if user.Is_Banned {
- headerVars.NoticeList = append(headerVars.NoticeList,"Your account has been suspended. Some of your permissions may have been revoked.")
- }
return user, headerVars, success
}
@@ -147,7 +148,25 @@ func _panel_session_check(w http.ResponseWriter, r *http.Request) (user User, he
NoPermissions(w,r,user)
return user, headerVars, false
}
- headerVars.Stylesheets = append(headerVars.Stylesheets,"panel")
+
+ headerVars.Stylesheets = append(headerVars.Stylesheets,"panel.css")
+ if len(themes[defaultTheme].Resources) != 0 {
+ rlist := themes[defaultTheme].Resources
+ for _, resource := range rlist {
+ if resource.Location == "global" || resource.Location == "panel" {
+ halves := strings.Split(resource.Name,".")
+ if len(halves) != 2 {
+ continue
+ }
+ if halves[1] == "css" {
+ headerVars.Stylesheets = append(headerVars.Stylesheets,resource.Name)
+ } else if halves[1] == "js" {
+ headerVars.Scripts = append(headerVars.Scripts,resource.Name)
+ }
+ }
+ }
+ }
+
return user, headerVars, success
}
func _simple_panel_session_check(w http.ResponseWriter, r *http.Request) (user User, success bool) {
@@ -164,6 +183,40 @@ func SessionCheck(w http.ResponseWriter, r *http.Request) (user User, headerVars
if user.Is_Banned {
headerVars.NoticeList = append(headerVars.NoticeList,"Your account has been suspended. Some of your permissions may have been revoked.")
}
+
+ if len(themes[defaultTheme].Resources) != 0 {
+ rlist := themes[defaultTheme].Resources
+ for _, resource := range rlist {
+ if resource.Location == "global" || resource.Location == "frontend" {
+ halves := strings.Split(resource.Name,".")
+ if len(halves) != 2 {
+ continue
+ }
+ if halves[1] == "css" {
+ headerVars.Stylesheets = append(headerVars.Stylesheets,resource.Name)
+ } else if halves[1] == "js" {
+ headerVars.Scripts = append(headerVars.Scripts,resource.Name)
+ }
+ }
+ }
+ }
+
+ // TO-DO: Support for left sidebars and sidebars on both sides
+ //fmt.Println("themes[defaultTheme].Sidebars",themes[defaultTheme].Sidebars)
+ if themes[defaultTheme].Sidebars == "right" {
+ if len(docks.RightSidebar) != 0 {
+ var sbody string
+ for _, widget := range docks.RightSidebar {
+ //fmt.Println("widget",widget)
+ if widget.Enabled && widget.Location == "global" {
+ sbody += widget.Body
+ //fmt.Println("sbody",sbody)
+ }
+ }
+ headerVars.Sidebars.Right = template.HTML(sbody)
+ }
+ }
+
return user, headerVars, success
}
diff --git a/utils.go b/utils.go
index 0a85dd6a..af48b138 100644
--- a/utils.go
+++ b/utils.go
@@ -5,6 +5,7 @@ import (
"time"
"os"
"math"
+ "errors"
"strings"
"unicode"
"strconv"
@@ -171,6 +172,57 @@ func SendEmail(email string, subject string, msg string) (res bool) {
return true
}
+func weak_password(password string) error {
+ if len(password) < 8 {
+ return errors.New("Your password needs to be at-least eight characters long.")
+ }
+ var charMap map[rune]int = make(map[rune]int)
+ var numbers, /*letters, */symbols, upper, lower int
+ for _, char := range password {
+ charItem, ok := charMap[char]
+ if ok {
+ charItem++
+ } else {
+ charItem = 1
+ }
+ charMap[char] = charItem
+
+ if unicode.IsLetter(char) {
+ //letters++
+ if unicode.IsUpper(char) {
+ upper++
+ } else {
+ lower++
+ }
+ } else if unicode.IsNumber(char) {
+ numbers++
+ } else {
+ symbols++
+ }
+ }
+
+ if numbers == 0 {
+ return errors.New("You don't have any numbers in your password.")
+ }
+ /*if letters == 0 {
+ return errors.New("You don't have any letters in your password.")
+ }*/
+ if upper == 0 {
+ return errors.New("You don't have any uppercase characters in your password.")
+ }
+ if lower == 0 {
+ return errors.New("You don't have any lowercase characters in your password.")
+ }
+ if (len(password) / 2) < len(charMap) {
+ return errors.New("You don't have enough unique characters in your password.")
+ }
+
+ if strings.Contains(strings.ToLower(password),"test") || /*strings.Contains(strings.ToLower(password),"123456") || */strings.Contains(strings.ToLower(password),"123") || strings.Contains(strings.ToLower(password),"password") || strings.Contains(strings.ToLower(password),"qwerty") {
+ return errors.New("You may not have 'test', '123', 'password' or 'qwerty' in your password.")
+ }
+ return nil
+}
+
func write_file(name string, content string) (err error) {
f, err := os.Create(name)
if err != nil {
diff --git a/widgets.go b/widgets.go
new file mode 100644
index 00000000..9935b32e
--- /dev/null
+++ b/widgets.go
@@ -0,0 +1,95 @@
+/* Copyright Azareal 2017 - 2018 */
+package main
+
+import "fmt"
+import "bytes"
+import "sync"
+import "encoding/json"
+//import "html/template"
+
+var docks WidgetDocks
+var widget_update_mutex sync.RWMutex
+
+type WidgetDocks struct
+{
+ LeftSidebar []Widget
+ RightSidebar []Widget
+ //PanelLeft []Menus
+}
+
+type Widget struct
+{
+ Enabled bool
+ Location string // Coming Soon: overview, topics, topic / topic_view, forums, forum, global
+ Position int
+ Body string
+}
+
+type NameTextPair struct
+{
+ Name string
+ Text string
+}
+
+func init_widgets() error {
+ rows, err := get_widgets_stmt.Query()
+ if err != nil {
+ return err
+ }
+ defer rows.Close()
+
+ var sbytes []byte
+ var side, wtype, data string
+
+ var leftWidgets []Widget
+ var rightWidgets []Widget
+
+ for rows.Next() {
+ var widget Widget
+ err = rows.Scan(&widget.Position, &side, &wtype, &widget.Enabled, &widget.Location, &data)
+ if err != nil {
+ return err
+ }
+
+ sbytes = []byte(data)
+ switch(wtype) {
+ case "simple":
+ var tmp NameTextPair
+ err = json.Unmarshal(sbytes, &tmp)
+ if err != nil {
+ return err
+ }
+
+ var b bytes.Buffer
+ err = templates.ExecuteTemplate(&b,"widget_simple.html",tmp)
+ if err != nil {
+ return err
+ }
+ widget.Body = string(b.Bytes())
+ default:
+ widget.Body = data
+ }
+
+ if side == "left" {
+ leftWidgets = append(leftWidgets,widget)
+ } else if side == "right" {
+ rightWidgets = append(rightWidgets,widget)
+ }
+ }
+ err = rows.Err()
+ if err != nil {
+ return err
+ }
+
+ widget_update_mutex.Lock()
+ docks.LeftSidebar = leftWidgets
+ docks.RightSidebar = rightWidgets
+ widget_update_mutex.Unlock()
+
+ if super_debug {
+ fmt.Println("docks.LeftSidebar",docks.LeftSidebar)
+ fmt.Println("docks.RightSidebar",docks.RightSidebar)
+ }
+
+ return nil
+}
{{.Text}}
+