Fixed an import bug, added SetSecretKey to allow the setting of the cookie secretKey if needed

notzippy · notzippy · commit 21d2763c7ba2 · 2017-03-19T10:25:34.000-07:00
diff --git a/revel.go b/revel.go
@@ -100,6 +100,7 @@ var (
 	requestLog           = log.New(ioutil.Discard, "", 0)
 	requestLogTimeFormat = "2006/01/02 15:04:05.000"
 
+    // True when revel engine has been initialized (Init has returned)
 	Initialized bool
 
 	// Private
@@ -223,6 +224,11 @@ func Init(mode, importPath, srcPath string) {
 	INFO.Printf("Initialized Revel v%s (%s) for %s", Version, BuildDate, MinimumGoVersion)
 }
 
+func SetSecretKey(newKey []byte ) error{
+    secretKey = newKey
+    return nil
+}
+
 // Create a logger using log.* directives in app.conf plus the current settings
 // on the default logger.
 func getLogger(name string) *log.Logger {
diff --git a/template_adapter_go.go b/template_adapter_go.go
@@ -9,7 +9,6 @@ import (
 	"reflect"
 	"strings"
 	"time"
-    "github.com/revel.old/revel"
 )
 
 const GO_TEMPLATE = "go"
@@ -214,7 +213,7 @@ func (engine *GoEngine) Event(action string, i interface{}) {
 		engine.templatesBylowerName = map[string]*GoTemplate{}
 		engine.templateSet = template.New("__root__").Funcs(TemplateFuncs)
         // Check to see what should be used for case sensitivity
-        engine.CaseInsensitiveMode = revel.Config.StringDefault("go.template.path","lower")!="case"
+        engine.CaseInsensitiveMode = Config.StringDefault("go.template.path","lower")!="case"
 	}
 }
 func init() {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ import (`
`9`	`9`	`"reflect"`
`10`	`10`	`"strings"`
`11`	`11`	`"time"`
`12`		`- "github.com/revel.old/revel"`
`13`	`12`	`)`
`14`	`13`
`15`	`14`	`const GO_TEMPLATE = "go"`
`@@ -214,7 +213,7 @@ func (engine *GoEngine) Event(action string, i interface{}) {`
`214`	`213`	`engine.templatesBylowerName = map[string]*GoTemplate{}`
`215`	`214`	`engine.templateSet = template.New("__root__").Funcs(TemplateFuncs)`
`216`	`215`	`// Check to see what should be used for case sensitivity`
`217`		`- engine.CaseInsensitiveMode = revel.Config.StringDefault("go.template.path","lower")!="case"`
	`216`	`+ engine.CaseInsensitiveMode = Config.StringDefault("go.template.path","lower")!="case"`
`218`	`217`	`}`
`219`	`218`	`}`
`220`	`219`	`func init() {`