mirror of
https://gitea.phreedom.club/localhost_frssoft/bloat.git
synced 2024-11-13 08:19:20 +02:00
Fix search query escaping
This commit is contained in:
parent
9c5cb289f9
commit
7d989d56e5
|
@ -2,7 +2,6 @@ package renderer
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
htemplate "html/template"
|
||||
"io"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
@ -146,7 +145,6 @@ func NewRenderer(templateGlobPattern string) (r *renderer, err error) {
|
|||
"FormatTimeRFC3339": formatTimeRFC3339,
|
||||
"FormatTimeRFC822": formatTimeRFC822,
|
||||
"WithContext": withContext,
|
||||
"HTMLEscape": htemplate.HTMLEscapeString,
|
||||
}).ParseGlob(templateGlobPattern)
|
||||
if err != nil {
|
||||
return
|
||||
|
|
|
@ -5,6 +5,7 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
"mime/multipart"
|
||||
"html/template"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
|
@ -589,18 +590,19 @@ func (svc *service) ServeUserSearchPage(c *model.Client,
|
|||
|
||||
if len(results.Statuses) == 20 {
|
||||
offset += 20
|
||||
nextLink = fmt.Sprintf("/usersearch/%s?q=%s&offset=%d", id, q, offset)
|
||||
nextLink = fmt.Sprintf("/usersearch/%s?q=%s&offset=%d", id, url.QueryEscape(q), offset)
|
||||
}
|
||||
|
||||
qq := template.HTMLEscapeString(q)
|
||||
if len(q) > 0 {
|
||||
title += " \"" + q + "\""
|
||||
title += " \"" + qq + "\""
|
||||
}
|
||||
|
||||
commonData := svc.getCommonData(c, title)
|
||||
data := &renderer.UserSearchData{
|
||||
CommonData: commonData,
|
||||
User: user,
|
||||
Q: q,
|
||||
Q: qq,
|
||||
Statuses: results.Statuses,
|
||||
NextLink: nextLink,
|
||||
}
|
||||
|
@ -649,17 +651,18 @@ func (svc *service) ServeSearchPage(c *model.Client,
|
|||
if (qType == "accounts" && len(results.Accounts) == 20) ||
|
||||
(qType == "statuses" && len(results.Statuses) == 20) {
|
||||
offset += 20
|
||||
nextLink = fmt.Sprintf("/search?q=%s&type=%s&offset=%d", q, qType, offset)
|
||||
nextLink = fmt.Sprintf("/search?q=%s&type=%s&offset=%d", url.QueryEscape(q), qType, offset)
|
||||
}
|
||||
|
||||
qq := template.HTMLEscapeString(q)
|
||||
if len(q) > 0 {
|
||||
title += " \"" + q + "\""
|
||||
title += " \"" + qq + "\""
|
||||
}
|
||||
|
||||
commonData := svc.getCommonData(c, title)
|
||||
data := &renderer.SearchData{
|
||||
CommonData: commonData,
|
||||
Q: q,
|
||||
Q: qq,
|
||||
Type: qType,
|
||||
Users: results.Accounts,
|
||||
Statuses: results.Statuses,
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<form class="search-form" action="/search" method="GET">
|
||||
<span class="post-form-field">
|
||||
<label for="query"> Query </label>
|
||||
<input id="query" name="q" value="{{.Q | HTMLEscape}}">
|
||||
<input id="query" name="q" value="{{.Q}}">
|
||||
</span>
|
||||
<span class="post-form-field">
|
||||
<label for="type"> Type </label>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<form class="search-form" action="/usersearch/{{.User.ID}}" method="GET">
|
||||
<span class="post-form-field>
|
||||
<label for="query"> Query </label>
|
||||
<input id="query" name="q" value="{{.Q | HTMLEscape}}">
|
||||
<input id="query" name="q" value="{{.Q}}">
|
||||
</span>
|
||||
<button type="submit"> Search </button>
|
||||
</form>
|
||||
|
|
Loading…
Reference in New Issue