Merge branch 'master' into mm-1420

2 files changed, 31 insertions, 10 deletions

diff --git a/utils/config.go b/utils/config.go
index efa4b263a..e8fa9a477 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -18,16 +18,18 @@ const (
 )
 
 type ServiceSettings struct {
-	SiteName       string
-	Mode           string
-	AllowTesting   bool
-	UseSSL         bool
-	Port           string
-	Version        string
-	InviteSalt     string
-	PublicLinkSalt string
-	ResetSalt      string
-	AnalyticsUrl   string
+	SiteName         string
+	Mode             string
+	AllowTesting     bool
+	UseSSL           bool
+	Port             string
+	Version          string
+	InviteSalt       string
+	PublicLinkSalt   string
+	ResetSalt        string
+	AnalyticsUrl     string
+	UseLocalStorage  bool
+	StorageDirectory string
 }
 
 type SqlSettings struct {
diff --git a/utils/urlencode.go b/utils/urlencode.go
new file mode 100644
index 000000000..63a8f7880
--- /dev/null
+++ b/utils/urlencode.go
@@ -0,0 +1,19 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package utils
+
+import (
+	"net/url"
+	"strings"
+)
+
+func UrlEncode(str string) string {
+	strs := strings.Split(str, " ")
+
+	for i, s := range strs {
+		strs[i] = url.QueryEscape(s)
+	}
+
+	return strings.Join(strs, "%20")
+}