diff options
author | diosmosis <diosmosis@users.noreply.github.com> | 2018-10-11 23:02:44 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-11 23:02:44 +0300 |
commit | cdbf944146cea42a4725eb9fa814c51c7b32b17b (patch) | |
tree | f52355de561266281f8b9b6db5dd9e04f66f3286 /plugins/Live | |
parent | 221a25f83989df5ea155fd2af6086bb48b280f28 (diff) |
Tweaks to escaping strategy in a couple places (#13500)
* Use correct filter in certain places in twig templates.
* Another filter change.
* Reverse encoding strategy in site selector.
* Tweak to annotation escaping.
* Fix couple more double encoding issues.
* encode report name on unsubscription page
* Escape site name in quickaccess directive.
Diffstat (limited to 'plugins/Live')
-rw-r--r-- | plugins/Live/templates/_dataTableViz_visitorLog.twig | 2 | ||||
-rw-r--r-- | plugins/Live/templates/_visitorDetails.twig | 4 | ||||
-rw-r--r-- | plugins/Live/templates/getVisitorProfilePopup.twig | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index eb09ee8730..02221fa485 100644 --- a/plugins/Live/templates/_dataTableViz_visitorLog.twig +++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig @@ -8,7 +8,7 @@ {% if visitor.getColumn('visitorId') is not empty and not clientSideParameters.hideProfileLink %} <a class="visitor-log-visitor-profile-link visitorLogTooltip" title="{{ 'Live_ViewVisitorProfile'|translate }}" data-visitor-id="{{ visitor.getColumn("visitorId") }}"> <img src="plugins/Live/images/visitorProfileLaunch.png"/> <span>{{ 'Live_ViewVisitorProfile'|translate }} - {%- if visitor.getColumn('userId') is not empty %}: {{ visitor.getColumn('userId')|raw }}{% endif %}</span> + {%- if visitor.getColumn('userId') is not empty %}: {{ visitor.getColumn('userId')|rawSafeDecoded }}{% endif %}</span> </a> {% endif %} diff --git a/plugins/Live/templates/_visitorDetails.twig b/plugins/Live/templates/_visitorDetails.twig index 6bcb5255d0..f0e22943ce 100644 --- a/plugins/Live/templates/_visitorDetails.twig +++ b/plugins/Live/templates/_visitorDetails.twig @@ -2,7 +2,7 @@ {{ visitInfo.getColumn('serverDatePrettyFirstAction') }} {% if isWidget %}<br/>{% else %}-{% endif %} {{ visitInfo.getColumn('serverTimePrettyFirstAction') }}</strong> {% if visitInfo.getColumn('visitIp') is not empty %} -<span class="visitor-log-ip-location visitorLogTooltip" title="{% if visitInfo.getColumn('userId') is not empty %}{{ 'General_UserId'|translate }}: {{ visitInfo.getColumn('userId')|raw }} +<span class="visitor-log-ip-location visitorLogTooltip" title="{% if visitInfo.getColumn('userId') is not empty %}{{ 'General_UserId'|translate }}: {{ visitInfo.getColumn('userId')|rawSafeDecoded }} {% endif %}{% if visitInfo.getColumn('visitorId') is not empty %}{{ 'General_VisitorID'|translate }}: {{ visitInfo.getColumn('visitorId') }} {% endif %}{% if visitInfo.getColumn('idVisit') is not empty %} {{ 'General_Visit'|translate }} ID: {{ visitInfo.getColumn('idVisit') }} @@ -15,7 +15,7 @@ GPS (lat/long): {{ visitInfo.getColumn('latitude') }},{{ visitInfo.getColumn('lo {% if visitInfo.getColumn('location') != 'General_Unknown'|translate %}<span><img width="16" class="flag" src="{{ visitInfo.getColumn('countryFlag') }}"/> {% if visitInfo.getColumn('city') is not empty %}{{ visitInfo.getColumn('city') }}{% else %}{{ visitInfo.getColumn('country') }}{% endif %}</span>{% endif %} - {% if visitInfo.getColumn('userId') is not empty %}<br/><br/>{{ visitInfo.getColumn('userId')|raw }}{% endif %} + {% if visitInfo.getColumn('userId') is not empty %}<br/><br/>{{ visitInfo.getColumn('userId')|rawSafeDecoded }}{% endif %} </span>{% endif %} {% if isWidget %} <br /> diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig index 96c95fc2f8..7949f12301 100644 --- a/plugins/Live/templates/getVisitorProfilePopup.twig +++ b/plugins/Live/templates/getVisitorProfilePopup.twig @@ -32,7 +32,7 @@ {%- if visitorData.userId is empty %} {{ 'Live_VisitorProfile'|translate }} {%- else %} - <span title="{{ 'General_UserId'|translate }}: {{ visitorData.userId|raw }}">{{ visitorData.userId|raw }}</span> + <span title="{{ 'General_UserId'|translate }}: {{ visitorData.userId|rawSafeDecoded }}">{{ visitorData.userId|rawSafeDecoded }}</span> {% endif -%} </h1> {% if visitorData.nextVisitorId is not empty %}<a class="visitor-profile-next-visitor" |