alarig
/
bird-lg
mirror of https://github.com/sileht/bird-lg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Encode `+` when it appears in URL. 

This patch takes care of encoding `+` within URL, such as `View the BGP map` link on the output of `show route where net ~ [ <prefix> + ]` response.
This commit is contained in:
tamihiro 2019-06-09 21:39:21 +09:00
parent 85963901f8
commit 1f020cdc40
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/lg.js
View File

@ -14,7 +14,7 @@ function reload(){
loc = "/" + request_type + "/" + hosts + "/" + proto; loc = "/" + request_type + "/" + hosts + "/" + proto;
if (request_type != "summary" ){ if (request_type != "summary" ){
if( request_args != undefined && request_args != ""){ if( request_args != undefined && request_args != ""){
loc = loc + "?q=" + escape(request_args); loc = loc + "?q=" + encodeURIComponent(request_args);
change_url(loc) change_url(loc)
} }
} else { } else {

2
templates/layout.html
View File

@ -84,7 +84,7 @@
<li class="nav-header">Request history</li> <li class="nav-header">Request history</li>
{% for hosts, proto, request_type, request_args in session.history %} {% for hosts, proto, request_type, request_args in session.history %}
<li{% if loop.first %} class="active"{% endif %}> <li{% if loop.first %} class="active"{% endif %}>
<a href="/{{ [request_type, hosts, proto]|join("/") }}{% if request_args %}?q={{request_args}}{% endif %}"> <a href="/{{ [request_type, hosts, proto]|join("/") }}{% if request_args %}?q={{request_args|urlencode}}{% endif %}">
{{hosts}}/{{proto}}: {{ commands_dict[request_type]|replace("...", request_args) }} {{hosts}}/{{proto}}: {{ commands_dict[request_type]|replace("...", request_args) }}
</a> </a>
</li> </li>

2
templates/route.html
View File

@ -3,7 +3,7 @@
{% for host in detail %} {% for host in detail %}
<h3> <h3>
{{host}}: {{command}} {{host}}: {{command}}
<small><a class="pull-right" href="/{{session.request_type|replace("_detail","")}}_bgpmap/{{session.hosts}}/{{session.proto}}?q={{session.request_args}}">View the BGP map</a></small> <small><a class="pull-right" href="/{{session.request_type|replace("_detail","")}}_bgpmap/{{session.hosts}}/{{session.proto}}?q={{session.request_args|urlencode}}">View the BGP map</a></small>
</h3> </h3>
{% if session.request_args != expression|replace("/32","")|replace("/128","") %} {% if session.request_args != expression|replace("/32","")|replace("/128","") %}
<i>DNS: <a href="/whois/{{session.request_args}}" class="whois">{{session.request_args}}</a> => <a href="/whois/{{ expression|replace("/32","")|replace("/128","") }}" class="whois">{{expression|replace("/32","")|replace("/128","")}}</a></i><br /> <i>DNS: <a href="/whois/{{session.request_args}}" class="whois">{{session.request_args}}</a> => <a href="/whois/{{ expression|replace("/32","")|replace("/128","") }}" class="whois">{{expression|replace("/32","")|replace("/128","")}}</a></i><br />