diff --git a/server/plugin/plg_editor_onlyoffice/index.go b/server/plugin/plg_editor_onlyoffice/index.go
index 1a267963f..0be2fd422 100644
--- a/server/plugin/plg_editor_onlyoffice/index.go
+++ b/server/plugin/plg_editor_onlyoffice/index.go
@@ -3,12 +3,6 @@ package plg_editor_onlyoffice
import (
"encoding/json"
"fmt"
- "github.com/gorilla/mux"
- . "github.com/mickael-kerjean/filestash/server/common"
- "github.com/mickael-kerjean/filestash/server/ctrl"
- . "github.com/mickael-kerjean/filestash/server/middleware"
- "github.com/mickael-kerjean/filestash/server/model"
- "github.com/patrickmn/go-cache"
"io"
"net"
"net/http"
@@ -17,7 +11,16 @@ import (
"os"
"path/filepath"
"strings"
+ "text/template"
"time"
+
+ . "github.com/mickael-kerjean/filestash/server/common"
+ "github.com/mickael-kerjean/filestash/server/ctrl"
+ "github.com/mickael-kerjean/filestash/server/middleware"
+ "github.com/mickael-kerjean/filestash/server/model"
+
+ "github.com/gorilla/mux"
+ "github.com/patrickmn/go-cache"
)
var (
@@ -26,12 +29,12 @@ var (
onlyoffice_cache *cache.Cache
plugin_enable func() bool
server_url func() string
- can_chat func() bool
- can_copy func() bool
- can_comment func() bool
+ can_chat func() bool
+ can_copy func() bool
+ can_comment func() bool
can_download func() bool
- can_edit func() bool
- can_print func() bool
+ can_edit func() bool
+ can_print func() bool
)
type onlyOfficeCacheData struct {
@@ -88,11 +91,11 @@ func init() {
f.Name = "can_chat"
f.Type = "boolean"
f.Description = "Enable/Disable chat in onlyoffice"
- f.Default = true
+ f.Default = false
return f
}).Bool()
}
-
+
can_copy = func() bool {
return Config.Get("features.office.can_copy").Schema(func(f *FormElement) *FormElement {
if f == nil {
@@ -102,11 +105,11 @@ func init() {
f.Name = "can_copy"
f.Type = "boolean"
f.Description = "Enable/Disable copy text in onlyoffice"
- f.Default = true
+ f.Default = false
return f
}).Bool()
}
-
+
can_comment = func() bool {
return Config.Get("features.office.can_comment").Schema(func(f *FormElement) *FormElement {
if f == nil {
@@ -116,11 +119,11 @@ func init() {
f.Name = "can_comment"
f.Type = "boolean"
f.Description = "Enable/Disable comments in onlyoffice"
- f.Default = true
+ f.Default = false
return f
}).Bool()
}
-
+
can_edit = func() bool {
return Config.Get("features.office.can_edit").Schema(func(f *FormElement) *FormElement {
if f == nil {
@@ -134,7 +137,7 @@ func init() {
return f
}).Bool()
}
-
+
can_download = func() bool {
return Config.Get("features.office.can_download").Schema(func(f *FormElement) *FormElement {
if f == nil {
@@ -157,7 +160,7 @@ func init() {
f.Name = "can_print"
f.Type = "boolean"
f.Description = "Enable/Disable printing in onlyoffice"
- f.Default = true
+ f.Default = false
return f
}).Bool()
}
@@ -181,9 +184,9 @@ func init() {
r.HandleFunc(
COOKIE_PATH+"onlyoffice/iframe",
- NewMiddlewareChain(
+ middleware.NewMiddlewareChain(
IframeContentHandler,
- []Middleware{SessionStart, LoggedInOnly},
+ []Middleware{middleware.SessionStart, middleware.LoggedInOnly},
*app,
),
).Methods("GET")
@@ -252,6 +255,7 @@ func StaticHandler(res http.ResponseWriter, req *http.Request) {
func IframeContentHandler(ctx *App, res http.ResponseWriter, req *http.Request) {
if plugin_enable() == false {
+ Log.Warning("plg_editor_onlyoffice::handler request_disabled")
return
}
if model.CanRead(ctx) == false {
@@ -401,7 +405,8 @@ func IframeContentHandler(ctx *App, res http.ResponseWriter, req *http.Request)
}(path)
filetype = strings.TrimPrefix(filepath.Ext(filename), ".")
onlyoffice_cache.Set(key, &onlyOfficeCacheData{path, ctx.Backend.Save, ctx.Backend.Cat}, cache.DefaultExpiration)
- res.Write([]byte(fmt.Sprintf(`
+
+ tmpl, err := template.New("onlyoffice").Parse(`
@@ -409,7 +414,7 @@ func IframeContentHandler(ctx *App, res http.ResponseWriter, req *http.Request)
-
+
-`,
- contentType,
- oodsDevice,
- filename,
- filestashServerLocation, key,
- filetype,
- key,
- func() string {
- if can_chat() {
- return "true"
- }
- return "false"
- }(),
- func() string {
- if can_copy() {
- return "true"
- }
- return "false"
- }(),
- func() string {
- if can_comment() {
- return "true"
- }
- return "false"
- }(),
- func() string {
- if can_download() {
- return "true"
- }
- return "false"
- }(),
- func() string {
- if can_edit() {
- return "true"
- }
- return "false"
- }(),
- func() string {
- if can_print() {
- return "true"
- }
- return "false"
- }(),
- filestashServerLocation,
- oodsMode,
- userId,
- username,
- )))
+