OrgGo
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Working at least 

Former-commit-id: ec78da37b86f172b600dd5568196e0d3515d806d [formerly 3728442230a2e87402eca56380ef3858d14d87f2] [formerly d714694ae051f1f10b0e815d68a9e49eadfc89b7 [formerly 46fdd869a5]]
Former-commit-id: 05a4f1eba2f0c8d7c6f4591805222195eb849144 [formerly c813a9d09fbe2c30bda1e1ad135bdd3b35cc61f6]
Former-commit-id: 12f1a7003f0a0c6c514bd72f1eee20c0e0f4453f
This commit is contained in:
Henrique Dias 2017-07-29 11:02:18 +01:00
parent 00be85db13
commit 5968111f3e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
filemanager.go
View File

@ -6,6 +6,7 @@ import (
"net/http" "net/http"
"os" "os"
"os/exec" "os/exec"
"reflect"
"regexp" "regexp"
"strings" "strings"
@ -286,6 +287,10 @@ func (m *FileManager) SetBaseURL(url string) {
// ActivatePlugin activates a plugin to a File Manager instance and // ActivatePlugin activates a plugin to a File Manager instance and
// loads its options from the database. // loads its options from the database.
func (m *FileManager) ActivatePlugin(name string, options interface{}) error { func (m *FileManager) ActivatePlugin(name string, options interface{}) error {
if reflect.TypeOf(options).Kind() != reflect.Ptr {
return errors.New("options should be a pointer to interface, not interface")
}
var plugin Plugin var plugin Plugin
if p, ok := plugins[name]; !ok { if p, ok := plugins[name]; !ok {
@ -379,6 +384,7 @@ func (m *FileManager) ServeHTTP(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(code) w.WriteHeader(code)
if err != nil { if err != nil {
log.Print(err)
w.Write([]byte(err.Error())) w.Write([]byte(err.Error()))
} else { } else {
w.Write([]byte(http.StatusText(code))) w.Write([]byte(http.StatusText(code)))

2
plugins/hugo.go
View File

@ -117,7 +117,7 @@ func (h Hugo) undraft(file string) error {
type hugo struct{} type hugo struct{}
func (h hugo) Before(c *filemanager.RequestContext, w http.ResponseWriter, r *http.Request) (int, error) { func (h hugo) Before(c *filemanager.RequestContext, w http.ResponseWriter, r *http.Request) (int, error) {
o := c.FM.Plugins["hugo"].(Hugo) o := c.FM.Plugins["hugo"].(*Hugo)
// If we are using the 'magic url' for the settings, we should redirect the // If we are using the 'magic url' for the settings, we should redirect the
// request for the acutual path. // request for the acutual path.