Private GIT

Skip to content
Snippets Groups Projects
Commit 802f4389 authored by Nick's avatar Nick Committed by miigotu
Browse files

Quote showname when it is being used in url parameter (#3419) 

* Quote showname when it is being used in url parameter

* Revert "Quote showname when it is being used in url parameter"

* Use Mako expression filtering to ensure that showname is quoted properly

Also use 'loading_show_name' as alt value in img tags instead of
'loading_show_id', as it is more concise in the case where
'loading_show_id' is set the show's path.
parent b4197418
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
gui/slick/views/inc_home_showList.mako
+ 9
− 9
View file @ 802f4389
...@@ -40,9 +40,9 @@ ...@@ -40,9 +40,9 @@
%> %>
<div class="show-container" data-name="${loading_show_sort_name}" data-date="1" data-network="0" data-progress="0"> <div class="show-container" data-name="${loading_show_sort_name}" data-date="1" data-network="0" data-progress="0">
<div class="show-image"> <div class="show-image">
<img alt="" title="${loading_show_name}" class="show-image" style="border-bottom: 1px solid #111;" src="" data-src="${srRoot}/showPoster/?show=${loading_show_id}&amp;which=poster_thumb" /> <img alt="" title="${loading_show_name}" class="show-image" style="border-bottom: 1px solid #111;" src="" data-src="${srRoot}/showPoster/?show=${loading_show_id | u}&amp;which=poster_thumb" />
</div> </div>
<div class="progressbar hidden-print" style="position:relative;" data-show-id="${loading_show_id}" data-progress-percentage="0"></div> <div class="progressbar hidden-print" style="position:relative;" data-show-id="${loading_show_id | u}" data-progress-percentage="0"></div>
<div class="show-title">${_('Loading')} (${loading_show_name})</div> <div class="show-title">${_('Loading')} (${loading_show_name})</div>
<div class="show-date">&nbsp;</div> <div class="show-date">&nbsp;</div>
<div class="show-details"> <div class="show-details">
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<span class="show-dlstats" title="${'Loading'}">${'Loading'}</span> <span class="show-dlstats" title="${'Loading'}">${'Loading'}</span>
</td> </td>
<td class="show-table"> <td class="show-table">
<span title="${loading_show_network}"><img class="show-network-image" src="" data-src="${srRoot}/showPoster/?show=${loading_show_id}&amp;which=network" alt="${loading_show_network}" title="${loading_show_network}" /></span> <span title="${loading_show_network}"><img class="show-network-image" src="" data-src="${srRoot}/showPoster/?show=${loading_show_id | u}&amp;which=network" alt="${loading_show_network}" title="${loading_show_network}" /></span>
</td> </td>
<td class="show-table"> <td class="show-table">
${renderQualityPill(loading_show_quality, showTitle=True, overrideClass="show-quality")} ${renderQualityPill(loading_show_quality, showTitle=True, overrideClass="show-quality")}
...@@ -233,14 +233,14 @@ ...@@ -233,14 +233,14 @@
<td class="tvShow"> <td class="tvShow">
<div class="imgsmallposter ${sickbeard.HOME_LAYOUT}"> <div class="imgsmallposter ${sickbeard.HOME_LAYOUT}">
% if curLoadingShow.show: % if curLoadingShow.show:
<a href="${srRoot}/home/displayShow?show=${loading_show_id}" title="${loading_show_name}"> <a href="${srRoot}/home/displayShow?show=${loading_show_id | u}" title="${loading_show_name}">
% else: % else:
<span title="${loading_show_name}"> <span title="${loading_show_name}">
% endif % endif
<img src="" data-src="${srRoot}/showPoster/?show=${loading_show_id}&amp;which=poster_thumb" class="${sickbeard.HOME_LAYOUT}" alt="${loading_show_id}"/> <img src="" data-src="${srRoot}/showPoster/?show=${loading_show_id | u}&amp;which=poster_thumb" class="${sickbeard.HOME_LAYOUT}" alt="${loading_show_name}"/>
% if curLoadingShow.show: % if curLoadingShow.show:
</a> </a>
<a href="${srRoot}/home/displayShow?show=${loading_show_id}" style="vertical-align: middle;">${loading_show_name}</a> <a href="${srRoot}/home/displayShow?show=${loading_show_id | u}" style="vertical-align: middle;">${loading_show_name}</a>
% else: % else:
</span> </span>
<span style="vertical-align: middle;">${_('Loading...')} (${loading_show_name})</span> <span style="vertical-align: middle;">${_('Loading...')} (${loading_show_name})</span>
...@@ -252,9 +252,9 @@ ...@@ -252,9 +252,9 @@
<span style="display: none;">${_('Loading...')} (${loading_show_name})</span> <span style="display: none;">${_('Loading...')} (${loading_show_name})</span>
<div class="imgbanner ${sickbeard.HOME_LAYOUT}"> <div class="imgbanner ${sickbeard.HOME_LAYOUT}">
% if curLoadingShow.show: % if curLoadingShow.show:
<a href="${srRoot}/home/displayShow?show=${loading_show_id}"> <a href="${srRoot}/home/displayShow?show=${loading_show_id | u}">
% endif % endif
<img src="" data-src="${srRoot}/showPoster/?show=${loading_show_id}&amp;which=banner" class="${sickbeard.HOME_LAYOUT}" alt="${loading_show_id}" title="${loading_show_name}"/> <img src="" data-src="${srRoot}/showPoster/?show=${loading_show_id | u}&amp;which=banner" class="${sickbeard.HOME_LAYOUT}" alt="${loading_show_name}" title="${loading_show_name}"/>
% if curLoadingShow.show: % if curLoadingShow.show:
</a> </a>
% endif % endif
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
% elif sickbeard.HOME_LAYOUT == 'simple': % elif sickbeard.HOME_LAYOUT == 'simple':
<td class="tvShow"> <td class="tvShow">
% if curLoadingShow.show: % if curLoadingShow.show:
<a href="${srRoot}/home/displayShow?show=${loading_show_id}">${loading_show_name}</a> <a href="${srRoot}/home/displayShow?show=${loading_show_id | u}">${loading_show_name}</a>
% else: % else:
<span title="">${_('Loading...')} (${loading_show_name})</span> <span title="">${_('Loading...')} (${loading_show_name})</span>
% endif % endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Another place to be (or not)