phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-02 15:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

strip trailing baseurl slash. Added a new template function "sanitizeurl" which ensures no double slashes. Fixed #221

Browse source
This commit is contained in:
spf13 2014-04-07 22:02:08 -04:00
parent a6170154cf
commit ad34be9d77
3 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
helpers/url.go
View file

@ -16,8 +16,18 @@ package helpers
import ( import (
"net/url" "net/url"
"path" "path"
"github.com/PuerkitoBio/purell"
) )
func SanitizeUrl(in string) string {
url, err := purell.NormalizeURLString(in, purell.FlagsUsuallySafeGreedy|purell.FlagRemoveDuplicateSlashes|purell.FlagRemoveUnnecessaryHostDots|purell.FlagRemoveEmptyPortSeparator)
if err != nil {
return in
}
return url
}
// Similar to MakePath, but with Unicode handling // Similar to MakePath, but with Unicode handling
// Example: // Example:
// uri: Vim (text editor) // uri: Vim (text editor)
@ -55,6 +65,7 @@ func MakePermalink(host, plink string) *url.URL {
} }
func UrlPrep(ugly bool, in string) string { func UrlPrep(ugly bool, in string) string {
in = SanitizeUrl(in)
if ugly { if ugly {
return Uglify(in) return Uglify(in)
} else { } else {

2
hugolib/site.go
View file

@ -227,7 +227,7 @@ func (s *Site) initializeSiteInfo() {
} }
s.Info = SiteInfo{ s.Info = SiteInfo{
BaseUrl: template.URL(viper.GetString("BaseUrl")), BaseUrl: template.URL(helpers.SanitizeUrl(viper.GetString("BaseUrl"))),
Title: viper.GetString("Title"), Title: viper.GetString("Title"),
Recent: &s.Pages, Recent: &s.Pages,
Params: params, Params: params,

38
template/bundle/template.go
View file

@ -2,8 +2,6 @@ package bundle
import ( import (
"errors" "errors"
"github.com/eknkc/amber"
"github.com/spf13/hugo/helpers"
"html" "html"
"html/template" "html/template"
"io" "io"
@ -13,6 +11,9 @@ import (
"reflect" "reflect"
"strconv" "strconv"
"strings" "strings"
"github.com/eknkc/amber"
"github.com/spf13/hugo/helpers"
) )
func Gt(a interface{}, b interface{}) bool { func Gt(a interface{}, b interface{}) bool {
@ -159,22 +160,23 @@ func NewTemplate() Template {
} }
funcMap := template.FuncMap{ funcMap := template.FuncMap{
"urlize": helpers.Urlize, "urlize": helpers.Urlize,
"gt": Gt, "sanitizeurl": helpers.SanitizeUrl,
"isset": IsSet, "gt": Gt,
"echoParam": ReturnWhenSet, "isset": IsSet,
"safeHtml": SafeHtml, "echoParam": ReturnWhenSet,
"first": First, "safeHtml": SafeHtml,
"highlight": Highlight, "first": First,
"add": func(a, b int) int { return a + b }, "highlight": Highlight,
"sub": func(a, b int) int { return a - b }, "add": func(a, b int) int { return a + b },
"div": func(a, b int) int { return a / b }, "sub": func(a, b int) int { return a - b },
"mod": func(a, b int) int { return a % b }, "div": func(a, b int) int { return a / b },
"mul": func(a, b int) int { return a * b }, "mod": func(a, b int) int { return a % b },
"modBool": func(a, b int) bool { return a%b == 0 }, "mul": func(a, b int) int { return a * b },
"lower": func(a string) string { return strings.ToLower(a) }, "modBool": func(a, b int) bool { return a%b == 0 },
"upper": func(a string) string { return strings.ToUpper(a) }, "lower": func(a string) string { return strings.ToLower(a) },
"title": func(a string) string { return strings.Title(a) }, "upper": func(a string) string { return strings.ToUpper(a) },
"title": func(a string) string { return strings.Title(a) },
} }
templates.Funcs(funcMap) templates.Funcs(funcMap)