IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Final updates

Browse Source
This commit is contained in:
JoramWilander
2016-01-14 08:23:48 -05:00
parent 22c522178c
commit c26edcf678
7 changed files with 86 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/license.go
View File

@@ -69,14 +69,15 @@ func addLicense(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
go func() {
if err := writeFileLocally(data, utils.LICENSE_FILE_LOC); err != nil {
l4g.Error("Could not save license file")
}
}()
if err := writeFileLocally(data, utils.LicenseLocation()); err != nil {
c.LogAudit("failed - could not save license file")
c.Err = model.NewAppError("addLicense", "License did not save properly.", "path="+utils.LicenseLocation())
utils.RemoveLicense()
return
}
} else {
c.LogAudit("failed - invalid license")
c.Err = model.NewAppError("addLicense", "Invalid license file", "")
c.Err = model.NewAppError("addLicense", "Invalid license file.", "")
return
}
@@ -87,7 +88,11 @@ func addLicense(c *Context, w http.ResponseWriter, r *http.Request) {
func removeLicense(c *Context, w http.ResponseWriter, r *http.Request) {
c.LogAudit("")
utils.RemoveLicense()
if ok := utils.RemoveLicense(); !ok {
c.LogAudit("failed - could not remove license file")
c.Err = model.NewAppError("removeLicense", "License did not remove properly.", "")
return
}
rdata := map[string]string{}
rdata["status"] = "ok"