diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-06-25 09:07:58 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-06-25 09:07:58 +0400 |
| commit | 7bbf3052d1e34cc280a391d21b1086e328774b40 (patch) | |
| tree | 8d93b4b8749f86db1bf770b3df06c7221aeb7bbe | |
| parent | 1c83deaa3ef5e981456692a5c611f2fe587437de (diff) | |
Reverting my commit where I removed all |raw per @halfdan feedback
Instead we should manually add the missing |raw...
Refs #4019
81 files changed, 239 insertions, 241 deletions
diff --git a/core/Twig.php b/core/Twig.php index f54eb51c2a..a08a8a484a 100644 --- a/core/Twig.php +++ b/core/Twig.php @@ -40,7 +40,6 @@ class Piwik_Twig // Create new Twig Environment and set cache dir $this->twig = new Twig_Environment($chainLoader, array( - 'autoescape' => false //'cache' => PIWIK_DOCUMENT_ROOT . '/tmp/templates_c', ) ); diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig index 95cfdae483..0b1b76000f 100644 --- a/plugins/API/templates/listAllAPI.twig +++ b/plugins/API/templates/listAllAPI.twig @@ -18,17 +18,17 @@ {% endif %} <p> - <b>{{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api/reference'>","</a>") }}</b> + <b>{{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api/reference'>","</a>")|raw }}</b> </p> <h2>{{ 'API_UserAuthentication'|translate }}</h2> <p> - {{ 'API_UsingTokenAuth'|translate('<b>','</b>',"") }}<br/> + {{ 'API_UsingTokenAuth'|translate('<b>','</b>',"")|raw }}<br/> <span id='token_auth'>&token_auth=<b>{{ token_auth }}</b></span><br/> {{ 'API_KeepTokenSecret'|translate('<b>','</b>') }} <!-- {'API_LoadedAPIs'|translate:$countLoadedAPI} --> - {{ list_api_methods_with_links }} + {{ list_api_methods_with_links|raw }} <br/> </div> {% endblock %}
\ No newline at end of file diff --git a/plugins/Actions/templates/indexSiteSearch.twig b/plugins/Actions/templates/indexSiteSearch.twig index d541b9ed62..2b9ea3afbc 100644 --- a/plugins/Actions/templates/indexSiteSearch.twig +++ b/plugins/Actions/templates/indexSiteSearch.twig @@ -1,17 +1,17 @@ <div id='leftcolumn'> <h2>{{ 'Actions_WidgetSearchKeywords'|translate }}</h2> - {{ keywords }} + {{ keywords|raw }} <h2>{{ 'Actions_WidgetSearchNoResultKeywords'|translate }}</h2> - {{ noResultKeywords }} + {{ noResultKeywords|raw }} {% if categories is defined %} <h2>{{ 'Actions_WidgetSearchCategories'|translate }}</h2> - {{ categories }} + {{ categories|raw }} {% endif %} </div> <div id='rightcolumn'> <h2>{{ 'Actions_WidgetPageUrlsFollowingSearch'|translate }}</h2> - {{ pagesUrlsFollowingSiteSearch }} + {{ pagesUrlsFollowingSiteSearch|raw }} </div> diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index 5a9a7187d7..cbc8d1743a 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -24,14 +24,14 @@ <label> <input type="radio" value="0" name="enableBrowserTriggerArchiving"{% if enableBrowserTriggerArchiving==0 %} checked="checked"{% endif %} /> {{ 'General_No'|translate }} <br/> - <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>") }}</span> + <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}</span> </label> </fieldset> <td> {% set browserArchivingHelp %} {{ 'General_ArchivingInlineHelp'|translate }} <br/> - {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>") }} + {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }} {% endset %} {{ piwik.inlineHelp(browserArchivingHelp) }} </td> @@ -43,7 +43,7 @@ </label> </td> <td> - {{ 'General_NSeconds'|translate("<input size='3' value='" ~ todayArchiveTimeToLive ~ "' id='todayArchiveTimeToLive' />") }} + {{ 'General_NSeconds'|translate("<input size='3' value='" ~ todayArchiveTimeToLive ~ "' id='todayArchiveTimeToLive' />")|raw }} </td> <td width='450px'> {% set archiveTodayTTLHelp %} @@ -77,9 +77,9 @@ </fieldset> <td> {% set checkReleaseHelp %} - {{ 'CoreAdminHome_DevelopmentProcess'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>","</a>") }} + {{ 'CoreAdminHome_DevelopmentProcess'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>","</a>")|raw }} <br/> - {{ 'CoreAdminHome_StableReleases'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/user-feedback/' target='_blank'>","</a>") }} + {{ 'CoreAdminHome_StableReleases'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/user-feedback/' target='_blank'>","</a>")|raw }} {% endset %} {{ piwik.inlineHelp(checkReleaseHelp) }} </td> @@ -215,7 +215,7 @@ <div id='logoSettings'> {% set giveUsFeedbackText %}"{{ 'General_GiveUsYourFeedback'|translate }}"{% endset %} {% set customLogoHelp %} - {{ 'CoreAdminHome_CustomLogoFeedbackInfo'|translate(giveUsFeedbackText,"<a href='?module=CorePluginsAdmin&action=index' target='_blank'>","</a>") }} + {{ 'CoreAdminHome_CustomLogoFeedbackInfo'|translate(giveUsFeedbackText,"<a href='?module=CorePluginsAdmin&action=index' target='_blank'>","</a>")|raw }} {% endset %} {{ piwik.inlineHelp(customLogoHelp) }} <form id="logoUploadForm" method="post" enctype="multipart/form-data" action="index.php?module=CoreAdminHome&format=json&action=uploadCustomLogo"> @@ -233,7 +233,7 @@ </td> {% else %} <td> - <span class="ajaxSuccess">{{ 'CoreAdminHome_LogoNotWriteable'|translate("<ul style='list-style: disc inside;'><li>/misc/user/</li><li>/misc/user/logo.png</li><li>/misc/user/logo-header.png</li></ul>") }}</span> + <span class="ajaxSuccess">{{ 'CoreAdminHome_LogoNotWriteable'|translate("<ul style='list-style: disc inside;'><li>/misc/user/</li><li>/misc/user/logo.png</li><li>/misc/user/logo-header.png</li></ul>")|raw }}</span> </td> {% endif %} </tr> @@ -262,7 +262,7 @@ {% endset %} <code>{{ iframeOptOut }}</code> <br/> - {{ 'CoreAdminHome_OptOutExplanationBis'|translate("<a href='" ~ optOutUrl ~ "' target='_blank'>","</a>") }} + {{ 'CoreAdminHome_OptOutExplanationBis'|translate("<a href='" ~ optOutUrl ~ "' target='_blank'>","</a>")|raw }} </p> {% endblock %} diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig index 58afcc3efb..f5a8ee7799 100644 --- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig +++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig @@ -7,7 +7,7 @@ {% endblock %} {% block content %} -<div id="js-tracking-generator-data" data-currencies="{{ currencySymbols|json_encode|e('html') }}"></div> +<div id="js-tracking-generator-data" data-currencies="{{ currencySymbols|json_encode }}"></div> <h2>{{ 'CoreAdminHome_JavaScriptTracking'|translate }}</h2> @@ -16,11 +16,11 @@ <p> {{ 'CoreAdminHome_JSTrackingIntro1'|translate }} <br/><br/> - {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3'|translate('<a href="http://piwik.org/integrate/" target="_blank">','</a>') }} + {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3'|translate('<a href="http://piwik.org/integrate/" target="_blank">','</a>')|raw }} <br/><br/> - {{ 'CoreAdminHome_JSTrackingIntro4'|translate('<a href="#image-tracking-link">','</a>') }} + {{ 'CoreAdminHome_JSTrackingIntro4'|translate('<a href="#image-tracking-link">','</a>')|raw }} <br/><br/> - {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a target="_blank" href="http://piwik.org/docs/javascript-tracking/">','</a>') }} + {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a target="_blank" href="http://piwik.org/docs/javascript-tracking/">','</a>')|raw }} </p> <div> @@ -49,7 +49,7 @@ </label> <div class="small-form-description"> - {{ 'CoreAdminHome_JSTracking_MergeSubdomainsDesc'|translate("x.<span class='current-site-host'>"~defaultReportSiteDomain~"</span>","y.<span class='current-site-host'>"~defaultReportSiteDomain~"</span>") }} + {{ 'CoreAdminHome_JSTracking_MergeSubdomainsDesc'|translate("x.<span class='current-site-host'>"~defaultReportSiteDomain~"</span>","y.<span class='current-site-host'>"~defaultReportSiteDomain~"</span>")|raw }} </div> </div> @@ -59,7 +59,7 @@ <label for="javascript-tracking-group-by-domain">{{ 'CoreAdminHome_JSTracking_GroupPageTitlesByDomain'|translate }}</label> <div class="small-form-description"> - {{ 'CoreAdminHome_JSTracking_GroupPageTitlesByDomainDesc1'|translate("<span class='current-site-host'>" ~ defaultReportSiteDomain ~ "</span>") }} + {{ 'CoreAdminHome_JSTracking_GroupPageTitlesByDomainDesc1'|translate("<span class='current-site-host'>" ~ defaultReportSiteDomain ~ "</span>")|raw }} </div> </div> @@ -71,7 +71,7 @@ </label> <div class="small-form-description"> - {{ 'CoreAdminHome_JSTracking_MergeAliasesDesc'|translate("<span class='current-site-alias'>"~defaultReportSiteAlias~"</span>") }} + {{ 'CoreAdminHome_JSTracking_MergeAliasesDesc'|translate("<span class='current-site-alias'>"~defaultReportSiteAlias~"</span>")|raw }} </div> </div> @@ -148,7 +148,7 @@ <label for="custom-campaign-query-params-check">{{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParam'|translate }}</label> <div class="small-form-description"> - {{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc'|translate('<a href="http://piwik.org/faq/general/#faq_119" target="_blank">','</a>') }} + {{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc'|translate('<a href="http://piwik.org/faq/general/#faq_119" target="_blank">','</a>')|raw }} </div> <table style="display:none" id="js-campaign-query-param-extra"> @@ -172,7 +172,7 @@ <div id="javascript-output-section"> <h3>{{ 'Installation_JsTag'|translate }}</h3> - <p class="form-description">{{ 'CoreAdminHome_JSTracking_CodeNote'|translate("</body>") }}</p> + <p class="form-description">{{ 'CoreAdminHome_JSTracking_CodeNote'|translate("</body>")|raw }}</p> <div id="javascript-text"> <textarea> </textarea> @@ -185,9 +185,9 @@ <div id="image-tracking-code-options" class="adminTable"> <p> - {{ 'CoreAdminHome_ImageTrackingIntro1'|translate }} {{ 'CoreAdminHome_ImageTrackingIntro2'|translate("<em><noscript></noscript></em>") }} + {{ 'CoreAdminHome_ImageTrackingIntro1'|translate }} {{ 'CoreAdminHome_ImageTrackingIntro2'|translate("<em><noscript></noscript></em>")|raw }} <br/><br/> - {{ 'CoreAdminHome_ImageTrackingIntro3'|translate('<a href="http://piwik.org/docs/tracking-api/reference/" target="_blank">','</a>') }} + {{ 'CoreAdminHome_ImageTrackingIntro3'|translate('<a href="http://piwik.org/docs/tracking-api/reference/" target="_blank">','</a>')|raw }} </p> <div> @@ -253,7 +253,7 @@ <h2>{{ 'CoreAdminHome_ImportingServerLogs'|translate }}</h2> <p> - {{ 'CoreAdminHome_ImportingServerLogsDesc'|translate('<a href="http://piwik.org/log-analytics/" target="_blank">','</a>') }} + {{ 'CoreAdminHome_ImportingServerLogsDesc'|translate('<a href="http://piwik.org/log-analytics/" target="_blank">','</a>')|raw }} </p> {% endblock %} diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig index 1c23f82285..b9555dc5ef 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig @@ -55,7 +55,7 @@ {% if rowMetadata.url is defined %} <a style="color: rgb({{ reportTextColor }});" href='{% if rowMetadata.url|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ rowMetadata.url }}'> {% endif %} - {{ rowMetrics[columnId] }}{# labels are escaped by SafeDecodeLabel filter in core/API/Response.php #} + {{ rowMetrics[columnId] | raw }}{# labels are escaped by SafeDecodeLabel filter in core/API/Response.php #} {% if rowMetadata.url is defined %} </a> {% endif %} diff --git a/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig b/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig index 07130f8089..acea8389b3 100644 --- a/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig +++ b/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig @@ -7,7 +7,7 @@ <ul class='listCircle'> {% for idx, dimension in dimensions %} <li class="reportDimension {% if idx == 0 and loop.parent.index0 == 0 %}activeDimension{% endif %}" - data-url="{{ dimension.url|e('html') }}"> + data-url="{{ dimension.url }}"> <span class='dimension'>{{ dimension.title|translate }}</span> </li> {% endfor %} @@ -21,7 +21,7 @@ <img src="plugins/Zeitgeist/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }} </div> - <div class="dimensionReport">{{ firstReport }}</div> + <div class="dimensionReport">{{ firstReport|raw }}</div> </div> <div class="clear"></div> diff --git a/plugins/CoreHome/templates/_dataTable.twig b/plugins/CoreHome/templates/_dataTable.twig index 97035e544c..0411e7dd85 100644 --- a/plugins/CoreHome/templates/_dataTable.twig +++ b/plugins/CoreHome/templates/_dataTable.twig @@ -1,4 +1,4 @@ -<div class="dataTable" data-table-type="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode|e('html') }}"> +<div class="dataTable" data-table-type="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}"> <div class="reportDocumentation"> {% if reportDocumentation is not empty %}<p>{{ reportDocumentation }}</p>{% endif %} {% if properties.metadata.archived_date is defined %}<span class='helpDate'>{{ properties.metadata.archived_date }}</span>{% endif %} diff --git a/plugins/CoreHome/templates/_dataTableActions.twig b/plugins/CoreHome/templates/_dataTableActions.twig index 1b10eca109..cc5988e06a 100644 --- a/plugins/CoreHome/templates/_dataTableActions.twig +++ b/plugins/CoreHome/templates/_dataTableActions.twig @@ -1,6 +1,6 @@ -<div class="dataTable" data-table-type="actionDataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode|e('html') }}"> +<div class="dataTable" data-table-type="actionDataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}"> <div class="reportDocumentation"> - {% if reportDocumentation is not empty %}<p>{{ reportDocumentation }}</p>{% endif %} + {% if reportDocumentation is not empty %}<p>{{ reportDocumentation|raw }}</p>{% endif %} {% if properties.metadata.archived_date is defined %}<span class='helpDate'>{{ properties.metadata.archived_date }}</span>{% endif %} </div> <div class="dataTableActionsWrapper"> diff --git a/plugins/CoreHome/templates/_dataTableActions_recursive.twig b/plugins/CoreHome/templates/_dataTableActions_recursive.twig index d4f5f96c07..6667fe2350 100644 --- a/plugins/CoreHome/templates/_dataTableActions_recursive.twig +++ b/plugins/CoreHome/templates/_dataTableActions_recursive.twig @@ -1,4 +1,4 @@ -<div class="dataTable" data-table-type="actionDataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode|e('html') }}"> +<div class="dataTable" data-table-type="actionDataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}"> <div class="dataTableActionsWrapper"> {% if arrayDataTable.result is define and arrayDataTable.result == 'error' %} {{ arrayDataTable.message }} diff --git a/plugins/CoreHome/templates/_dataTableCell.twig b/plugins/CoreHome/templates/_dataTableCell.twig index ed0cbd7966..c9ef7d67d8 100644 --- a/plugins/CoreHome/templates/_dataTableCell.twig +++ b/plugins/CoreHome/templates/_dataTableCell.twig @@ -1,5 +1,5 @@ {% set tooltipIndex = column ~ '_tooltip' %} -{% if row.metadata[tooltipIndex] is defined %}<span class="cell-tooltip" data-tooltip="{{ row.metadata[tooltipIndex]|e('html') }}">{% endif %} +{% if row.metadata[tooltipIndex] is defined %}<span class="cell-tooltip" data-tooltip="{{ row.metadata[tooltipIndex] }}">{% endif %} {% if not row.idsubdatatable and column=='label' and row.metadata.url is not empty %} <a target="_blank" href='{% if row.metadata.url|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.metadata.url }}'> {% if row.metadata.logo is empty %} @@ -15,7 +15,7 @@ {# make sure there are no whitespaces inside the span #} {% if row.metadata.html_label_suffix is not empty %}<span class='label-suffix'>{{ row.metadata.html_label_suffix | raw }}</span>{% endif %} {% endif %} -{% if row.columns[column] is defined %}{{ row.columns[column] }}{% else %}{{ defaultWhenColumnValueNotDefined }}{% endif %} +{% if row.columns[column] is defined %}{{ row.columns[column]|raw }}{% else %}{{ defaultWhenColumnValueNotDefined }}{% endif %} {% if column=='label' %}</span>{% endif %} {% if not row.idsubdatatable and column=='label' and row.metadata.url is not empty %} </a> diff --git a/plugins/CoreHome/templates/_dataTableCloud.twig b/plugins/CoreHome/templates/_dataTableCloud.twig index ac343e8e98..1007628587 100644 --- a/plugins/CoreHome/templates/_dataTableCloud.twig +++ b/plugins/CoreHome/templates/_dataTableCloud.twig @@ -1,4 +1,4 @@ -<div class="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode|e('html') }}"> +<div class="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}"> {% if reportDocumentation is not empty and javascriptVariablesToSet.viewDataTable != 'tableGoals' %} <div class="reportDocumentation"><p>{{ reportDocumentation }}</p></div> {% endif %} diff --git a/plugins/CoreHome/templates/_dataTableGraph.twig b/plugins/CoreHome/templates/_dataTableGraph.twig index 1656118def..63496255bb 100644 --- a/plugins/CoreHome/templates/_dataTableGraph.twig +++ b/plugins/CoreHome/templates/_dataTableGraph.twig @@ -1,4 +1,4 @@ -<div class="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode|e('html') }}"> +<div class="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}"> <div class="reportDocumentation"> {% if reportDocumentation is not empty %}<p>{{ reportDocumentation }}</p>{% endif %} diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig index 394638caef..ad5ad8dee7 100755 --- a/plugins/CoreHome/templates/_donate.twig +++ b/plugins/CoreHome/templates/_donate.twig @@ -5,7 +5,7 @@ {% else %} <p>{{ 'CoreHome_DonateCall1'|translate }}</p> <p><strong><em>{{ 'CoreHome_DonateCall2'|translate }}</em></strong></p> - <p>{{ 'CoreHome_DonateCall3'|translate('<em><strong>','</strong></em>') }}</p> + <p>{{ 'CoreHome_DonateCall3'|translate('<em><strong>','</strong></em>')|raw }}</p> {% endif %} </div> diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index 9a157225cc..c929db3c03 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -17,17 +17,17 @@ {% if piwikUrl == 'http://demo.piwik.org/' %} {{ 'General_YouAreViewingDemoShortMessage'|translate }} <br/> - {{ 'General_DownloadFullVersion'|translate("<a href='http://piwik.org/'>","</a>","<a href='http://piwik.org'>piwik.org</a>") }} + {{ 'General_DownloadFullVersion'|translate("<a href='http://piwik.org/'>","</a>","<a href='http://piwik.org'>piwik.org</a>")|raw }} {% elseif latest_version_available %} {% if isSuperUser %} - {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>","</a>") }} + {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>","</a>")|raw }} <br/> {{ 'General_YouAreCurrentlyUsing'|translate(piwik_version) }} {% else %} - {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>{{ latest_version_available }}</a>") }} + {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>{{ latest_version_available }}</a>")|raw }} {% endif %} {% else %} - {{ 'General_PiwikIsACollaborativeProjectYouCanContributeAndDonate'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org' target='_blank'>",piwik_version+"</a>","<br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/contribute/'>","</a>",'<br/>',"<a href='http://piwik.org/donate/' target='_blank'><strong><em>","</em></strong></a>") }} + {{ 'General_PiwikIsACollaborativeProjectYouCanContributeAndDonate'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org' target='_blank'>",piwik_version+"</a>","<br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/contribute/'>","</a>",'<br/>',"<a href='http://piwik.org/donate/' target='_blank'><strong><em>","</em></strong></a>")|raw }} {% endif %} {% if hasSomeAdminAccess %} <br/> diff --git a/plugins/CoreHome/templates/_javaScriptDisabled.twig b/plugins/CoreHome/templates/_javaScriptDisabled.twig index 37a699be43..fb50e92d56 100644 --- a/plugins/CoreHome/templates/_javaScriptDisabled.twig +++ b/plugins/CoreHome/templates/_javaScriptDisabled.twig @@ -1,3 +1,3 @@ <noscript> - <div id="javascriptDisabled">{{ 'CoreHome_JavascriptDisabled'|translate('<a href="">','</a>') }}</div> + <div id="javascriptDisabled">{{ 'CoreHome_JavascriptDisabled'|translate('<a href="">','</a>')|raw }}</div> </noscript> diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig index 1675dabb97..2d8cefed98 100644 --- a/plugins/CoreHome/templates/_menu.twig +++ b/plugins/CoreHome/templates/_menu.twig @@ -2,13 +2,13 @@ {% for level1,level2 in menu %} <li> <a name='{{ level2._url|urlRewriteWithParameters }}' href='#{{ level2._url|urlRewriteWithParameters|slice(1) }}' - onclick='return piwikMenu.onItemClick(this);'>{{ level1|translate|e('html') }}</a> + onclick='return piwikMenu.onItemClick(this);'>{{ level1|translate }}</a> <ul> {% for name,urlParameters in level2 %} {% if name|slice(0,1) != '_' %} <li> <a href='#{{ urlParameters._url|urlRewriteWithParameters|slice(1) }}' - onclick='return piwikMenu.onItemClick(this);'>{{ name|translate|e('html') }}</a> + onclick='return piwikMenu.onItemClick(this);'>{{ name|translate }}</a> </li> {% endif %} {% endfor %} diff --git a/plugins/CoreHome/templates/_periodSelect.twig b/plugins/CoreHome/templates/_periodSelect.twig index 5e2bea5f83..b0b3b81123 100644 --- a/plugins/CoreHome/templates/_periodSelect.twig +++ b/plugins/CoreHome/templates/_periodSelect.twig @@ -1,4 +1,4 @@ -{{ loadJavascriptTranslations(['CoreHome']) }} +{{ loadJavascriptTranslations(['CoreHome'])|raw }} <div id="periodString"> <div id="date">{{ 'General_DateRange'|translate }} <b>{{ prettyDate }}</b></div> diff --git a/plugins/CoreHome/templates/_singleReport.twig b/plugins/CoreHome/templates/_singleReport.twig index bd64e5cd4f..f6ad622f21 100644 --- a/plugins/CoreHome/templates/_singleReport.twig +++ b/plugins/CoreHome/templates/_singleReport.twig @@ -1,2 +1,2 @@ <h2>{{ title }}</h2> -{{ report }}
\ No newline at end of file +{{ report|raw }}
\ No newline at end of file diff --git a/plugins/CoreHome/templates/_topBarHelloMenu.twig b/plugins/CoreHome/templates/_topBarHelloMenu.twig index afb62308a3..5d3fb16a12 100644 --- a/plugins/CoreHome/templates/_topBarHelloMenu.twig +++ b/plugins/CoreHome/templates/_topBarHelloMenu.twig @@ -6,7 +6,7 @@ <strong>{{ userLogin }}</strong> {% endif %} {% endset %} - <span class="topBarElem">{{ 'General_HelloUser'|translate(helloAlias) }}</span> + <span class="topBarElem">{{ 'General_HelloUser'|translate(helloAlias)|raw }}</span> {% if userLogin != 'anonymous' %} | <span class="topBarElem"><a href='index.php?module=CoreAdminHome'>{{ 'General_Settings'|translate }}</a></span> {% endif %} diff --git a/plugins/CoreHome/templates/_topBarTopMenu.twig b/plugins/CoreHome/templates/_topBarTopMenu.twig index aea76952e1..29330720a0 100644 --- a/plugins/CoreHome/templates/_topBarTopMenu.twig +++ b/plugins/CoreHome/templates/_topBarTopMenu.twig @@ -1,7 +1,7 @@ <div id="topLeftBar"> {% for label,menu in topMenu %} {% if menu._html is defined %} - {{ menu._html }} + {{ menu._html|raw }} {% elseif (menu._url.module == currentModule and (menu._url.action is empty or menu._url.action == currentAction)) %} <span class="topBarElem"><b>{{ label|translate }}</b></span> | {% else %} diff --git a/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig index 4da43f714a..8cf72bbd4e 100644 --- a/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig +++ b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig @@ -1,7 +1,7 @@ <div class="rowevolution multirowevolution"> <div class="popover-title">{{ 'RowEvolution_MultiRowEvolutionTitle'|translate }}</div> <div class="graph"> - {{ graph }} + {{ graph | raw }} </div> <div class="metrics-container"> <h2>{{ availableRecordsText|translate }}</h2> @@ -9,7 +9,7 @@ {% for metric in metrics %} <tr> <td class="sparkline"> - {{ metric.sparkline }} + {{ metric.sparkline|raw }} </td> <td class="text"> {% import 'macros.twig' as piwik %} diff --git a/plugins/CoreHome/templates/getRowEvolutionPopover.twig b/plugins/CoreHome/templates/getRowEvolutionPopover.twig index e1f2c39178..575107d2b4 100644 --- a/plugins/CoreHome/templates/getRowEvolutionPopover.twig +++ b/plugins/CoreHome/templates/getRowEvolutionPopover.twig @@ -1,7 +1,7 @@ <div class="rowevolution"> - <div class="popover-title">{{ popoverTitle }}</div> + <div class="popover-title">{{ popoverTitle | raw }}</div> <div class="graph"> - {{ graph }} + {{ graph|raw }} </div> <div class="metrics-container"> <h2>{{ availableMetricsText }}</h2> @@ -13,7 +13,7 @@ {% for metric in metrics %} <tr> <td class="sparkline"> - {{ metric.sparkline }} + {{ metric.sparkline | raw }} </td> <td class="text"> <span style="color:{{ metric.color }}">{{ metric.label }}</span> diff --git a/plugins/CorePluginsAdmin/templates/index.twig b/plugins/CorePluginsAdmin/templates/index.twig index f827861e4a..214a764dc9 100644 --- a/plugins/CorePluginsAdmin/templates/index.twig +++ b/plugins/CorePluginsAdmin/templates/index.twig @@ -31,7 +31,7 @@ </td> <td class="vers">{{ plugin.info.version }}</td> <td class="desc"> - {{ plugin.info.description|nl2br }} + {{ plugin.info.description|raw|nl2br }} {% if plugin.info.license is defined %} ({% if plugin.info.license_homepage is defined %}<a title="{{ 'CorePluginsAdmin_LicenseHomepage'|translate }}" target="_blank" href="{{ plugin.info.license_homepage }}">{% endif %}{{ plugin.info.license }}{% if plugin.info.license_homepage is defined %}</a>){% endif %} {% endif %} diff --git a/plugins/CoreUpdater/templates/layout.twig b/plugins/CoreUpdater/templates/layout.twig index c302ef001a..e20c4a027d 100644 --- a/plugins/CoreUpdater/templates/layout.twig +++ b/plugins/CoreUpdater/templates/layout.twig @@ -34,7 +34,7 @@ {% if 'General_LayoutDirection'|translate =='rtl' %} <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/rtl.css"/> {% endif %} - {{ loadJavascriptTranslations(['CoreHome']) }} + {{ loadJavascriptTranslations(['CoreHome'])|raw }} </head> <body id="simple"> <div id="contentsimple"> diff --git a/plugins/CoreUpdater/templates/newVersionAvailable.twig b/plugins/CoreUpdater/templates/newVersionAvailable.twig index aba3c92d7b..00f2d14b3b 100644 --- a/plugins/CoreUpdater/templates/newVersionAvailable.twig +++ b/plugins/CoreUpdater/templates/newVersionAvailable.twig @@ -9,7 +9,7 @@ {% else %} <p>{{ 'Installation_SystemCheckAutoUpdateHelp'|translate }}</p> <p>{{ 'CoreUpdater_YouMustDownloadPackageOrFixPermissions'|translate(piwik_new_version) }} - {{ makeWritableCommands }} + {{ makeWritableCommands|raw }} </p> {% endif %} diff --git a/plugins/CoreUpdater/templates/oneClickResults.twig b/plugins/CoreUpdater/templates/oneClickResults.twig index 6cdeb263a3..3795153608 100644 --- a/plugins/CoreUpdater/templates/oneClickResults.twig +++ b/plugins/CoreUpdater/templates/oneClickResults.twig @@ -14,7 +14,7 @@ <br/> <div class="warning"> <img src="plugins/Zeitgeist/images/warning_medium.png"/> - {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/update/'>","</a>") }} + {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/update/'>","</a>")|raw }} </div> <br/> <br/> diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig index 5eb2748d1a..917ddaaeba 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig @@ -1,6 +1,6 @@ {% extends '@CoreUpdater/layout.twig' %} {% set helpMessage %} - {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/">','</a>','</li><li>') }} + {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/">','</a>','</li><li>')|raw }} {% endset %} {% block content %} diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig index f4575d4bba..39f1f00920 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig @@ -1,9 +1,9 @@ {% extends '@CoreUpdater/layout.twig' %} {% block content %} -<span style="float:right">{{ postEvent('template_topBar') }}</span> +<span style="float:right">{{ postEvent('template_topBar')|raw }}</span> {% set helpMessage %} - {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/">','</a>','</li><li>') }} + {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/">','</a>','</li><li>')|raw }} {% endset %} {% if coreError %} @@ -12,13 +12,13 @@ <div class="error"> <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }} {% for message in errorMessages %} - <pre>{{ message }}</pre> + <pre>{{ message|raw }}</pre> {% endfor %} </div> <br/> <p>{{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }} <ul> - <li>{{ helpMessage }}</li> + <li>{{ helpMessage|raw }}</li> </ul> </p> {% else %} @@ -41,7 +41,7 @@ </p> {% endif %} <ul> - <li>{{ 'CoreUpdater_TheUpgradeProcessMayFailExecuteCommand'|translate(commandUpgradePiwik) }}</li> + <li>{{ 'CoreUpdater_TheUpgradeProcessMayFailExecuteCommand'|translate(commandUpgradePiwik)|raw }}</li> <li>It is also recommended for high traffic Piwik servers to <a target='_blank' href='?module=Proxy&action=redirect&url={{ "http://piwik.org/faq/how-to/#faq_111"|url_encode }}'>momentarily disable visitor Tracking and put the Piwik User Interface in maintenance mode</a>. diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig index 84ef60c57b..4a4bcdfb8f 100755 --- a/plugins/DBStats/templates/index.twig +++ b/plugins/DBStats/templates/index.twig @@ -26,14 +26,14 @@ <h2>{{ 'DBStats_DatabaseUsage'|translate }}</h2> <p> {{ 'DBStats_MainDescription'|translate(totalSpaceUsed) }}<br/> - {{ 'DBStats_LearnMore'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>Piwik Auto Archiving</a>") }} + {{ 'DBStats_LearnMore'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>Piwik Auto Archiving</a>")|raw }} <br/> <br/> </p> <table class="adminTable dbstatsTable"> <tbody> <tr> - <td>{{ databaseUsageSummary }}</td> + <td>{{ databaseUsageSummary|raw }}</td> <td> <h3 style="margin-top:0">{{ 'General_GeneralInformation'|translate }}</h3><br/> @@ -65,7 +65,7 @@ <tr> <td> <h2>{{ 'DBStats_TrackerTables'|translate }}</h2> - {{ trackerDataSummary }} + {{ trackerDataSummary|raw }} </td> <td> </td> </tr> @@ -78,7 +78,7 @@ <tr> <td> <h2>{{ 'DBStats_ReportTables'|translate }}</h2> - {{ reportDataSummary }} + {{ reportDataSummary|raw }} </td> <td> <h2>{{ 'General_Reports'|translate }}</h2> @@ -97,7 +97,7 @@ <tr> <td> <h2>{{ 'DBStats_MetricTables'|translate }}</h2> - {{ metricDataSummary }} + {{ metricDataSummary|raw }} </td> <td> <h2>{{ 'General_Metrics'|translate }}</h2> @@ -116,7 +116,7 @@ <tr> <td> <h2>{{ 'DBStats_OtherTables'|translate }}</h2> - {{ adminDataSummary }} + {{ adminDataSummary|raw }} </td> <td> </td> </tr> diff --git a/plugins/Dashboard/templates/_header.twig b/plugins/Dashboard/templates/_header.twig index a30a993e4f..f9dfba3f4b 100644 --- a/plugins/Dashboard/templates/_header.twig +++ b/plugins/Dashboard/templates/_header.twig @@ -5,7 +5,7 @@ <head> <title>{{ 'General_Dashboard'|translate }} - {{ 'CoreHome_WebAnalyticsReports'|translate }}</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - {{ loadJavascriptTranslations(['CoreHome',' Dashboard']) }} + {{ loadJavascriptTranslations(['CoreHome',' Dashboard'])|raw }} <!--[if lt IE 9]> <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script> <![endif]--> diff --git a/plugins/Dashboard/templates/embeddedIndex.twig b/plugins/Dashboard/templates/embeddedIndex.twig index 60e45a9faa..c5b037b0b8 100644 --- a/plugins/Dashboard/templates/embeddedIndex.twig +++ b/plugins/Dashboard/templates/embeddedIndex.twig @@ -1,9 +1,9 @@ -{{ loadJavascriptTranslations(['CoreHome','Dashboard']) }} +{{ loadJavascriptTranslations(['CoreHome','Dashboard'])|raw }} <script type="text/javascript"> - widgetsHelper.availableWidgets = {{ availableWidgets }}; + widgetsHelper.availableWidgets = {{ availableWidgets|raw }}; $(document).ready(function () { - initDashboard({{ dashboardId }}, {{ dashboardLayout }}); + initDashboard({{ dashboardId }}, {{ dashboardLayout|raw }}); }); </script> <div id="dashboard"> diff --git a/plugins/ExamplePlugin/templates/piwikDownloads.twig b/plugins/ExamplePlugin/templates/piwikDownloads.twig index 5e269158ab..3a87d426aa 100644 --- a/plugins/ExamplePlugin/templates/piwikDownloads.twig +++ b/plugins/ExamplePlugin/templates/piwikDownloads.twig @@ -1,5 +1,5 @@ <div style="padding:1.5em;text-align:center"> - {{ "ExamplePlugin_PiwikForumReceivedVisits"|translate(prettyDate,'<b class="piwikDownloadCount_cnt" >...</b>') }} + {{ "ExamplePlugin_PiwikForumReceivedVisits"|translate(prettyDate,'<b class="piwikDownloadCount_cnt" >...</b>')|raw }} </div> {# # loading piwik download stats from demo.piwik.org diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig index 183adeb839..9ad96bea94 100644 --- a/plugins/Feedback/templates/index.twig +++ b/plugins/Feedback/templates/index.twig @@ -26,16 +26,16 @@ <div id="feedback-faq"> <p><strong>{{ 'Feedback_DoYouHaveBugReportOrFeatureRequest'|translate }}</strong></p> - <p> • {{ 'Feedback_ViewAnswersToFAQ'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/faq/'>","</a>") }}.</p> + <p> • {{ 'Feedback_ViewAnswersToFAQ'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/faq/'>","</a>")|raw }}.</p> <ul> <li>» {{ 'Feedback_WhyAreMyVisitsNoTracked'|translate }}</li> <li>» {{ 'Feedback_HowToExclude'|translate }}</li> <li>» {{ 'Feedback_WhyWrongCountry'|translate }}</li> <li>» {{ 'Feedback_HowToAnonymizeIP'|translate }}</li> </ul> - <p> • {{ 'Feedback_VisitTheForums'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://forum.piwik.org/'>","</a>") }}.</p> + <p> • {{ 'Feedback_VisitTheForums'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://forum.piwik.org/'>","</a>")|raw }}.</p> - <p> • {{ 'Feedback_LearnWaysToParticipate'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/contribute/'>","</a>") }} + <p> • {{ 'Feedback_LearnWaysToParticipate'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/contribute/'>","</a>")|raw }} .</p> <br/> diff --git a/plugins/Goals/templates/_addEditGoal.twig b/plugins/Goals/templates/_addEditGoal.twig index 3834d68553..9d0b17dd0c 100644 --- a/plugins/Goals/templates/_addEditGoal.twig +++ b/plugins/Goals/templates/_addEditGoal.twig @@ -4,7 +4,7 @@ <p>{{ 'Goals_NewGoalDescription'|translate }} {{ 'Goals_NewWhatDoYouWantUsersToDo'|translate }} {{ 'Goals_NewGoalYouWillBeAbleTo'|translate }}</p> - <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>") }} + <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} </p> {% else %} <div class="clear"></div> @@ -13,7 +13,7 @@ <ul class='listCircle'> <li><a onclick='' name='linkAddNewGoal'>{{ 'Goals_CreateNewGOal'|translate }}</a></li> <li><a onclick='' name='linkEditGoals'>{{ 'Goals_ViewAndEditGoals'|translate }}</a></li> - <li>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>") }}</li> + <li>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}</li> <li> {% if not ecommerceEnabled %} @@ -23,9 +23,9 @@ {% set ecommerceReportText %} <a href="http://piwik.org/docs/ecommerce-analytics/" target="_blank">{{ 'Goals_EcommerceReports'|translate }}</a> {% endset %} - {{ 'Goals_Optional'|translate }} {{ 'Goals_Ecommerce'|translate }}: {{ 'Goals_YouCanEnableEcommerceReports'|translate(ecommerceReportText,websiteManageText) }} + {{ 'Goals_Optional'|translate }} {{ 'Goals_Ecommerce'|translate }}: {{ 'Goals_YouCanEnableEcommerceReports'|translate(ecommerceReportText,websiteManageText)|raw }} {% else %} - {{ 'SitesManager_PiwikOffersEcommerceAnalytics'|translate('<a href="http://piwik.org/docs/ecommerce-analytics/" target="_blank">',"</a>") }} + {{ 'SitesManager_PiwikOffersEcommerceAnalytics'|translate('<a href="http://piwik.org/docs/ecommerce-analytics/" target="_blank">',"</a>")|raw }} {% endif %} </li> </ul> @@ -73,7 +73,7 @@ bindGoalForm(); {% if onlyShowAddNewGoal is not defined %} - piwik.goals = {{ goalsJSON }}; + piwik.goals = {{ goalsJSON|raw }}; bindListGoalEdit(); {% else %} initAndShowAddGoalForm(); diff --git a/plugins/Goals/templates/_formAddGoal.twig b/plugins/Goals/templates/_formAddGoal.twig index 14068ac15d..a8ac48b6aa 100644 --- a/plugins/Goals/templates/_formAddGoal.twig +++ b/plugins/Goals/templates/_formAddGoal.twig @@ -58,7 +58,7 @@ <tbody id="manual_trigger_section" style="display:none"> <tr> <td colspan="2" class="first"> - {{ 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/javascript-tracking/%23toc-manually-trigger-a-conversion-for-a-goal'>","</a>") }} + {{ 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/javascript-tracking/%23toc-manually-trigger-a-conversion-for-a-goal'>","</a>")|raw }} </td> </tr> </tbody> @@ -83,7 +83,7 @@ <tbody> <tr> <td class="first">{{ 'Goals_Optional'|translate }} {{ 'Goals_DefaultRevenue'|translate }}</td> - <td>{{ ' <input type="text" name="revenue" size="2" value="0" class="inp" /> '|money(idSite) }} + <td>{{ ' <input type="text" name="revenue" size="2" value="0" class="inp" /> '|money(idSite)|raw }} <div class="entityInlineHelp"> {{ 'Goals_DefaultRevenueHelp'|translate }} </div> </td> </tr> diff --git a/plugins/Goals/templates/_listTopDimension.twig b/plugins/Goals/templates/_listTopDimension.twig index 599f7bf169..040cc28ba0 100644 --- a/plugins/Goals/templates/_listTopDimension.twig +++ b/plugins/Goals/templates/_listTopDimension.twig @@ -1,7 +1,7 @@ {% for element in topDimension %} {% set goal_nb_conversion=element.nb_conversions %} {% set goal_conversion_rate=element.conversion_rate %} - <span class='goalTopElement' title='{{ 'Goals_Conversions'|translate("<b>"~goal_nb_conversion~"</b>") }}, + <span class='goalTopElement' title='{{ 'Goals_Conversions'|translate("<b>"~goal_nb_conversion~"</b>")|raw }}, {{ 'Goals_ConversionRate'|translate("<b>"~goal_conversion_rate~"</b>") }}'> {{ element.name }} </span> diff --git a/plugins/Goals/templates/_titleAndEvolutionGraph.twig b/plugins/Goals/templates/_titleAndEvolutionGraph.twig index 40ce469424..2fed15afb9 100644 --- a/plugins/Goals/templates/_titleAndEvolutionGraph.twig +++ b/plugins/Goals/templates/_titleAndEvolutionGraph.twig @@ -3,7 +3,7 @@ {% if displayFullReport %} <h2>{% if goalName is defined %}{{ 'Goals_GoalX'|translate(goalName) }}{% else %}{{ 'Goals_GoalsOverview'|translate }}{% endif %}</h2> {% endif %} -{{ graphEvolution }} +{{ graphEvolution|raw }} <div id='leftcolumn' {% if not isWidget %}style='width:33%'{% endif %}> <div class="sparkline">{{ sparkline(urlSparklineConversions) }} @@ -12,10 +12,10 @@ {{ 'General_EcommerceOrders'|translate }} <img src='plugins/Zeitgeist/images/ecommerceOrder.gif'> {% else %} - {{ 'Goals_Conversions'|translate("<strong>"~nb_conversions~"</strong>") }} + {{ 'Goals_Conversions'|translate("<strong>"~nb_conversions~"</strong>")|raw }} {% endif %} {% if goalAllowMultipleConversionsPerVisit is defined and goalAllowMultipleConversionsPerVisit %} - ({{ 'VisitsSummary_NbVisits'|translate("<strong>"~nb_visits_converted~"</strong>") }}) + ({{ 'VisitsSummary_NbVisits'|translate("<strong>"~nb_visits_converted~"</strong>")|raw }}) {% endif %} </div> {% if revenue != 0 or ecommerce is defined %} @@ -25,7 +25,7 @@ {% if ecommerce is defined %} <strong>{{ revenue }}</strong> {{ 'General_TotalRevenue'|translate }} {% else %} - {{ 'Goals_OverallRevenue'|translate("<strong>"~revenue~"</strong>") }} + {{ 'Goals_OverallRevenue'|translate("<strong>"~revenue~"</strong>")|raw }} {% endif %} </div> {% endif %} @@ -41,9 +41,9 @@ <div class="sparkline">{{ sparkline(urlSparklineConversionRate) }} {% if ecommerce is defined %} {% set ecommerceOrdersText %}{{ 'General_EcommerceOrders'|translate }}{% endset %} - {{ 'Goals_ConversionRate'|translate("<strong>"~conversion_rate~"</strong> "~ecommerceOrdersText) }} + {{ 'Goals_ConversionRate'|translate("<strong>"~conversion_rate~"</strong> "~ecommerceOrdersText)|raw }} {% else %} - {{ 'Goals_OverallConversionRate'|translate("<strong>"~conversion_rate~"</strong>") }} + {{ 'Goals_OverallConversionRate'|translate("<strong>"~conversion_rate~"</strong>")|raw }} {% endif %} </div> {% if ecommerce is defined %} diff --git a/plugins/Goals/templates/addNewGoal.twig b/plugins/Goals/templates/addNewGoal.twig index 95b8075741..cb4021c645 100644 --- a/plugins/Goals/templates/addNewGoal.twig +++ b/plugins/Goals/templates/addNewGoal.twig @@ -6,6 +6,6 @@ {{ 'Goals_NoGoalsNeedAccess'|translate }} </p> <p> - {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>") }} + {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} </p> {% endif %} diff --git a/plugins/Goals/templates/getGoalReportView.twig b/plugins/Goals/templates/getGoalReportView.twig index f1bf8ea00f..61c85ad772 100644 --- a/plugins/Goals/templates/getGoalReportView.twig +++ b/plugins/Goals/templates/getGoalReportView.twig @@ -1,8 +1,7 @@ <link rel="stylesheet" type="text/css" href="plugins/Goals/stylesheets/goals.css"/> -{% include "@Goals/_titleAndEvolutionGraph.twig" %} +{% include "@Goals/_titleAndEvolutionGraph.twig" | raw %} <div class="clear"></div> - {% if nb_conversions > 0 %} <h2>{{ 'Goals_ConversionsOverview'|translate }}</h2> <ul class="ulGoalTopElements"> @@ -17,7 +16,7 @@ <li>{{ 'Goals_BestReferers'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.website} %}</li> {% endif %} <li> - {{ 'Goals_ReturningVisitorsConversionRateIs'|translate("<strong>"~conversion_rate_returning~"</strong>") }} + {{ 'Goals_ReturningVisitorsConversionRateIs'|translate("<strong>"~conversion_rate_returning~"</strong>")|raw }} , {{ 'Goals_NewVisitorsConversionRateIs'|translate("<strong>"~conversion_rate_new~"</strong>") }} </li> {% else %} diff --git a/plugins/Goals/templates/getOverviewView.twig b/plugins/Goals/templates/getOverviewView.twig index 6b40243fd6..0ae0996dbb 100644 --- a/plugins/Goals/templates/getOverviewView.twig +++ b/plugins/Goals/templates/getOverviewView.twig @@ -17,7 +17,7 @@ <div id='leftcolumn'> <div class="sparkline">{{ sparkline(goal.urlSparklineConversions) }} - {{ 'Goals_Conversions'|translate("<strong>"~nb_conversions~"</strong>") }} + {{ 'Goals_Conversions'|translate("<strong>"~nb_conversions~"</strong>")|raw }} {% if goal.goalAllowMultipleConversionsPerVisit %} ({{ 'VisitsSummary_NbVisits'|translate("<strong>"~nb_visits_converted~"</strong>") }}) {% endif %} @@ -25,7 +25,7 @@ </div> <div id='rightcolumn'> <div class="sparkline">{{ sparkline(goal.urlSparklineConversionRate) }} - {{ 'Goals_ConversionRate'|translate("<strong>"~conversion_rate~"</strong>") }} + {{ 'Goals_ConversionRate'|translate("<strong>"~conversion_rate~"</strong>")|raw }} </div> </div> <br class="clear"/> @@ -41,7 +41,7 @@ {{ 'Goals_ConversionsOverviewBy'|translate }} {% endif %} </h2> - {{ goalReportsByDimension }} + {{ goalReportsByDimension|raw }} {% endif %} {% if userCanEditGoals %} diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig index db828a7f19..7ff8da3666 100755 --- a/plugins/Installation/templates/_systemCheckSection.twig +++ b/plugins/Installation/templates/_systemCheckSection.twig @@ -12,7 +12,7 @@ {% if infos.phpVersion_ok %} {{ ok }} {% else %} - {{ error }} <span class="err">{{ 'General_Error'|translate }}: {{ 'General_Required'|translate(MinPHP) }}</span> + {{ error }} <span class="err">{{ 'General_Error'|translate }}: {{ 'General_Required'|translate(MinPHP)|raw }}</span> {% endif %} </td> </tr> @@ -39,9 +39,9 @@ {{ 'Installation_SystemCheckDatabaseHelp'|translate }} <p> {% if infos.isWindows %} - {{ 'Installation_SystemCheckWinPdoAndMysqliHelp'|translate("<br /><br /><code>extension=php_mysqli.dll</code><br /><code>extension=php_pdo.dll</code><br /><code>extension=php_pdo_mysql.dll</code><br />")|nl2br }} + {{ 'Installation_SystemCheckWinPdoAndMysqliHelp'|translate("<br /><br /><code>extension=php_mysqli.dll</code><br /><code>extension=php_pdo.dll</code><br /><code>extension=php_pdo_mysql.dll</code><br />")|raw|nl2br }} {% else %} - {{ 'Installation_SystemCheckPdoAndMysqliHelp'|translate("<br /><br /><code>--with-mysqli</code><br /><code>--with-pdo-mysql</code><br /><br />","<br /><br /><code>extension=mysqli.so</code><br /><code>extension=pdo.so</code><br /><code>extension=pdo_mysql.so</code><br />") }} + {{ 'Installation_SystemCheckPdoAndMysqliHelp'|translate("<br /><br /><code>--with-mysqli</code><br /><code>--with-pdo-mysql</code><br /><br />","<br /><br /><code>extension=mysqli.so</code><br /><code>extension=pdo.so</code><br /><code>extension=pdo_mysql.so</code><br />")|raw }} {% endif %} {{ 'Installation_RestartWebServer'|translate }} <br/> diff --git a/plugins/Installation/templates/displayJavascriptCode.twig b/plugins/Installation/templates/displayJavascriptCode.twig index 868dceae39..dede2e5a3e 100644 --- a/plugins/Installation/templates/displayJavascriptCode.twig +++ b/plugins/Installation/templates/displayJavascriptCode.twig @@ -11,8 +11,8 @@ {{ trackingHelp }} <br/><br/> <h2>{{ 'Installation_LargePiwikInstances'|translate }}</h2> -{{ 'Installation_JsTagArchivingHelp1'|translate('<a target="_blank" href="http://piwik.org/docs/setup-auto-archiving/">','</a>') }} -{{ 'General_ReadThisToLearnMore'|translate('<a target="_blank" href="http://piwik.org/docs/optimize/">','</a>') }} +{{ 'Installation_JsTagArchivingHelp1'|translate('<a target="_blank" href="http://piwik.org/docs/setup-auto-archiving/">','</a>')|raw }} +{{ 'General_ReadThisToLearnMore'|translate('<a target="_blank" href="http://piwik.org/docs/optimize/">','</a>')|raw }} <style type="text/css"> code { diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig index 90b182448b..cf5cdc7494 100644 --- a/plugins/Installation/templates/finished.twig +++ b/plugins/Installation/templates/finished.twig @@ -1,9 +1,9 @@ {% extends '@Installation/layout.twig' %} {% block content %} -<h2>{{ 'Installation_Congratulations'|translate }}</h2> +<h2>{{ 'Installation_Congratulations'|translate|raw }}</h2> -{{ 'Installation_CongratulationsHelp'|translate }} +{{ 'Installation_CongratulationsHelp'|translate|raw }} <p class="nextStep"> diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig index 07a7b6f631..2a61063f1e 100644 --- a/plugins/Installation/templates/layout.twig +++ b/plugins/Installation/templates/layout.twig @@ -36,7 +36,7 @@ </div> <div style="float:right" id="topRightBar"> <br/> - {{ postEvent('template_topBar') }} + {{ postEvent('template_topBar')|raw }} </div> <div class="both"></div> diff --git a/plugins/Installation/templates/systemCheckPage.twig b/plugins/Installation/templates/systemCheckPage.twig index 511cd0229e..7739f7c72e 100755 --- a/plugins/Installation/templates/systemCheckPage.twig +++ b/plugins/Installation/templates/systemCheckPage.twig @@ -6,7 +6,7 @@ <p style="margin-left:1em"> {% if infos.has_errors %} <img src='plugins/Zeitgeist/images/error.png'/> - {{ 'Installation_SystemCheckSummaryThereWereErrors'|translate('<strong>','</strong>','<strong><em>','</em></strong>') }} {{ 'Installation_SeeBelowForMoreInfo'|translate }} + {{ 'Installation_SystemCheckSummaryThereWereErrors'|translate('<strong>','</strong>','<strong><em>','</em></strong>')|raw }} {{ 'Installation_SeeBelowForMoreInfo'|translate }} {% elseif infos.has_warnings %} <img src='plugins/Zeitgeist/images/warning.png'/> {{ 'Installation_SystemCheckSummaryThereWereWarnings'|translate }} {{ 'Installation_SeeBelowForMoreInfo'|translate }} diff --git a/plugins/Installation/templates/tablesCreation.twig b/plugins/Installation/templates/tablesCreation.twig index 33d63e5bc3..f51db570b3 100644 --- a/plugins/Installation/templates/tablesCreation.twig +++ b/plugins/Installation/templates/tablesCreation.twig @@ -4,7 +4,7 @@ <h2>{{ 'Installation_Tables'|translate }}</h2> {% if someTablesInstalled is defined %} - <div class="warning">{{ 'Installation_TablesWithSameNamesFound'|translate("<span id='linkToggle'>","</span>") }} + <div class="warning">{{ 'Installation_TablesWithSameNamesFound'|translate("<span id='linkToggle'>","</span>")|raw }} <img src="plugins/Zeitgeist/images/warning_medium.png"/> </div> <div id="toggle" style="display:none;color:#4F2410"> diff --git a/plugins/Installation/templates/welcome.twig b/plugins/Installation/templates/welcome.twig index 90a92ed068..5ded3aa8e6 100644 --- a/plugins/Installation/templates/welcome.twig +++ b/plugins/Installation/templates/welcome.twig @@ -4,7 +4,7 @@ <h2>{{ 'Installation_Welcome'|translate }}</h2> {% if newInstall %} - {{ 'Installation_WelcomeHelp'|translate(totalNumberOfSteps) }} + {{ 'Installation_WelcomeHelp'|translate(totalNumberOfSteps)|raw }} {% else %} <p>{{ 'Installation_ConfigurationHelp'|translate }}</p> <br/> diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig index d32935719a..8134b7150a 100644 --- a/plugins/Live/templates/getLastVisitsStart.twig +++ b/plugins/Live/templates/getLastVisitsStart.twig @@ -6,8 +6,8 @@ <li id="{{ visitor.idVisit }}" class="visit"> <div style="display:none" class="idvisit">{{ visitor.idVisit }}</div> <div title="{{ visitor.actionDetails|length }} {{ 'Live_Actions'|translate }}" class="datetime"> - <span style='display:none' class='serverTimestamp'>{{ visitor.serverTimestamp }}</span> - {{ visitor.serverDatePretty }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<i>({{ visitor.visitDurationPretty }})</i>{% endif %} + <span style='display:none' class='serverTimestamp'>{{ visitor.serverTimestamp|raw }}</span> + {{ visitor.serverDatePretty }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<i>({{ visitor.visitDurationPretty|raw }})</i>{% endif %} <img src="{{ visitor.countryFlag }}" title="{{ visitor.location }}, {{ 'Provider_ColumnProvider'|translate }} {{ visitor.providerName }}"/> <img src="{{ visitor.browserIcon }}" title="{{ visitor.browserName }}, {{ 'UserSettings_Plugins'|translate }}: {{ visitor.plugins }}"/> <img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}, {{ visitor.resolution }}"/> diff --git a/plugins/Live/templates/getSimpleLastVisitCount.twig b/plugins/Live/templates/getSimpleLastVisitCount.twig index 615a1f5699..2b2d95adbb 100644 --- a/plugins/Live/templates/getSimpleLastVisitCount.twig +++ b/plugins/Live/templates/getSimpleLastVisitCount.twig @@ -103,7 +103,7 @@ } </style> -<div class='simple-realtime-visitor-widget' data-last-minutes="{{ lastMinutes }}" data-translations="{{ translations|json_encode|e('html') }}"> +<div class='simple-realtime-visitor-widget' data-last-minutes="{{ lastMinutes }}" data-translations="{{ translations|json_encode }}"> <div class='simple-realtime-visitor-counter' title="{% if visitors == 1 %}{{ 'Live_NbVisitor'|translate }}{% else %}{{ 'Live_NbVisitors'|translate(visitors) }}{% endif %}"> <div>{{ visitors }}</div> </div> @@ -120,6 +120,6 @@ <span class="simple-realtime-metric" data-metric="minutes">{% if lastMinutes == 1 %}{{ 'General_OneMinute'|translate }}{% else %}{{ 'General_NMinutes'|translate(lastMinutes) }}{% endif %}</span> {% endset %} - {{ 'Live_SimpleRealTimeWidget_Message'|translate(visitsMessage,actionsMessage,minutesMessage) }} + {{ 'Live_SimpleRealTimeWidget_Message'|translate(visitsMessage,actionsMessage,minutesMessage) | raw }} </div> </div> diff --git a/plugins/Live/templates/getVisitorLog.twig b/plugins/Live/templates/getVisitorLog.twig index e80b3121ea..28c5631bf5 100644 --- a/plugins/Live/templates/getVisitorLog.twig +++ b/plugins/Live/templates/getVisitorLog.twig @@ -1,4 +1,4 @@ -<div class="visitorLog dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode|e('html') }}"> +<div class="visitorLog dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}"> {% if not isWidget %} <h2>{% if javascriptVariablesToSet.filterEcommerce %}{{ 'Goals_EcommerceLog'|translate }}{% else %}{{ 'Live_VisitorLog'|translate }}{% endif %}</h2> diff --git a/plugins/Live/templates/index.twig b/plugins/Live/templates/index.twig index 9bee3767b3..ea6028db27 100644 --- a/plugins/Live/templates/index.twig +++ b/plugins/Live/templates/index.twig @@ -27,7 +27,7 @@ {% include "@Live/_totalVisitors.twig" %} -{{ visitors }} +{{ visitors|raw }} <div class="visitsLiveFooter"> <a title="Pause Live!" href="javascript:void(0);" onclick="onClickPause();"> diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index c9ef7638e2..d699e17a6c 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -89,7 +89,7 @@ <p class="message">{{ infoMessage}}</p> {% endif %} </div> - <form {{ form_data.attributes }}> + <form {{ form_data.attributes|raw }}> <h1>{{'Login_LogIn'|translate }}</h1> <fieldset class="inputs"> <input type="text" name="form_login" id="login_form_login" class="input" value="" size="20" tabindex="10" diff --git a/plugins/MobileMessaging/templates/index.twig b/plugins/MobileMessaging/templates/index.twig index 9f93513a96..ffb36ab959 100644 --- a/plugins/MobileMessaging/templates/index.twig +++ b/plugins/MobileMessaging/templates/index.twig @@ -1,7 +1,7 @@ {% extends 'admin.twig' %} {% block content %} -{{ loadJavascriptTranslations(['MobileMessaging']) }} +{{ loadJavascriptTranslations(['MobileMessaging'])|raw }} <style>#accountForm ul { list-style: circle; @@ -24,7 +24,7 @@ {{ 'MobileMessaging_Settings_CredentialProvided'|translate(provider) }} {{ creditLeft }} <br/> - {{ 'MobileMessaging_Settings_UpdateOrDeleteAccount'|translate("<a id='displayAccountForm'>","</a>","<a id='deleteAccount'>","</a>") }} + {{ 'MobileMessaging_Settings_UpdateOrDeleteAccount'|translate("<a id='displayAccountForm'>","</a>","<a id='deleteAccount'>","</a>")|raw }} {% else %} {{ 'MobileMessaging_Settings_PleaseSignUp'|translate }} {% endif %} @@ -46,7 +46,7 @@ {% for smsProvider, description in smsProviders %} <div class='providerDescription' id='{{ smsProvider }}'> - {{ description }} + {{ description|raw }} </div> {% endfor %} diff --git a/plugins/MultiSites/templates/getSitesInfo.twig b/plugins/MultiSites/templates/getSitesInfo.twig index 1d151e9bb6..f94118a270 100644 --- a/plugins/MultiSites/templates/getSitesInfo.twig +++ b/plugins/MultiSites/templates/getSitesInfo.twig @@ -12,12 +12,12 @@ allSites[{{ i }}] = new setRowData({{ site.idsite }}, {{ site.visits }}, {{ site.pageviews }}, - {% if site.revenue is empty %}0{% else %}{{ site.revenue }}{% endif %}, + {% if site.revenue is empty %}0{% else %}{{ site.revenue|raw }}{% endif %}, '{{ site.name|e("js") }}', '{{ site.main_url|e("js") }}', '{% if site.visits_evolution is defined %}{{ site.visits_evolution|replace({",":"."}) }}{% endif %}', '{% if site.pageviews_evolution is defined %}{{ site.pageviews_evolution|replace({",":"."}) }}{% endif %}', - '{% if site.revenue_evolution is defined %}{{ site.revenue_evolution|replace({",":"."}) }}{% endif %}' + '{% if site.revenue_evolution is defined %}{{ site.revenue_evolution|replace({",":"."})|raw }}{% endif %}' ); {% endfor %} params['period'] = '{{ period }}'; @@ -50,7 +50,7 @@ {% set nVisitsLast %}{{ 'General_NVisits'|translate(pastTotalVisits) }}{% endset %} <span class='smallTitle' {% if totalVisitsEvolution %}title="{{ 'General_EvolutionSummaryGeneric'|translate(nVisits,prettyDate,nVisitsLast,pastPeriodPretty,totalVisitsEvolution) }}"{% endif %}> - {{ 'General_TotalVisitsPageviewsRevenue'|translate("<strong>"~totalVisits~"</strong>","<strong>"~totalPageviews~"</strong>","<strong>"~totalRevenue~"</strong>") }} + {{ 'General_TotalVisitsPageviewsRevenue'|translate("<strong>"~totalVisits~"</strong>","<strong>"~totalPageviews~"</strong>","<strong>"~totalRevenue~"</strong>")|raw }} </span> </h2> diff --git a/plugins/Overlay/templates/renderSidebar.twig b/plugins/Overlay/templates/renderSidebar.twig index fe22d00927..3ff6ee50a8 100644 --- a/plugins/Overlay/templates/renderSidebar.twig +++ b/plugins/Overlay/templates/renderSidebar.twig @@ -3,7 +3,7 @@ <!-- This div is removed by JS and the content is put in the location div --> <div class="Overlay_Location"> <b>{{ 'Overlay_Location'|translate }}:</b> - <span data-normalized-url="{{ normalizedUrl|e('html') }}" data-label="{{ label|e('html') }}"> + <span data-normalized-url="{{ normalizedUrl }}" data-label="{{ label }}"> {{ location }} </span> </div> diff --git a/plugins/PDFReports/templates/_addReport.twig b/plugins/PDFReports/templates/_addReport.twig index 451dcf385a..f394a519d0 100644 --- a/plugins/PDFReports/templates/_addReport.twig +++ b/plugins/PDFReports/templates/_addReport.twig @@ -1,6 +1,6 @@ <div class='entityAddContainer' style='display:none'> <div class='entityCancel'> - {{ 'PDFReports_CancelAndReturnToReports'|translate("<a class='entityCancelLink'>","</a>") }} + {{ 'PDFReports_CancelAndReturnToReports'|translate("<a class='entityCancelLink'>","</a>")|raw }} </div> <div class='clear'></div> <form id='addEditReport'> @@ -41,7 +41,7 @@ <div class="entityInlineHelp"> {% set SegmentEditor_DefaultAllVisits %}{{ 'SegmentEditor_DefaultAllVisits'|translate }}{% endset %} {% set SegmentEditor_AddNewSegment %}{{ 'SegmentEditor_AddNewSegment'|translate }}{% endset %} - {{ 'PDFReports_Segment_Help'|translate('<a href="./" target="_blank">','</a>',SegmentEditor_DefaultAllVisits,SegmentEditor_AddNewSegment) }} + {{ 'PDFReports_Segment_Help'|translate('<a href="./" target="_blank">','</a>',SegmentEditor_DefaultAllVisits,SegmentEditor_AddNewSegment)|raw }} </div> </td> </tr> @@ -155,6 +155,6 @@ </form> <div class='entityCancel'> - {{ 'General_OrCancel'|translate("<a class='entityCancelLink'>","</a>") }} + {{ 'General_OrCancel'|translate("<a class='entityCancelLink'>","</a>")|raw }} </div> </div> diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index 8f7eb2a075..dce6d50416 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -4,7 +4,7 @@ {% import 'macros.twig' as piwik %} {% if isSuperUser %} <h2>{{ 'PrivacyManager_TeaserHeadline'|translate }}</h2> - <p>{{ 'PrivacyManager_Teaser'|translate('<a href="#anonymizeIPAnchor">',"</a>",'<a href="#deleteLogsAnchor">',"</a>",'<a href="#optOutAnchor">',"</a>") }} + <p>{{ 'PrivacyManager_Teaser'|translate('<a href="#anonymizeIPAnchor">',"</a>",'<a href="#deleteLogsAnchor">',"</a>",'<a href="#optOutAnchor">',"</a>")|raw }} See also our official guide <b><a href='http://piwik.org/privacy/' target='_blank'>Web Analytics Privacy</a></b></p> <a name="anonymizeIPAnchor"></a> <h2>{{ 'PrivacyManager_UseAnonymizeIp'|translate }}</h2> @@ -88,7 +88,7 @@ checked {% endif %}/> {{ 'General_No'|translate }} </label> <span class="ajaxSuccess"> - {{ 'PrivacyManager_DeleteLogDescription2'|translate }} + {{ 'PrivacyManager_DeleteLogDescription2'|translate|raw }} <a href="http://piwik.org/faq/general/#faq_125" target="_blank"> {{ 'General_ClickHere'|translate }} </a> @@ -96,14 +96,14 @@ </td> <td width="200"> {% set deleteLogInfo %} - {{ 'PrivacyManager_DeleteLogInfo'|translate(deleteData.deleteTables) }} + {{ 'PrivacyManager_DeleteLogInfo'|translate(deleteData.deleteTables)|raw }} {% if not canDeleteLogActions %} <br/> <br/> {{ 'PrivacyManager_CannotLockSoDeleteLogActions'|translate(dbUser) }} {% endif %} {% endset %} - {{ piwik.inlineHelp(deleteLogInfo) }} + {{ piwik.inlineHelp(deleteLogInfo)|raw }} </td> </tr> <tr id="deleteLogSettings"> @@ -134,7 +134,7 @@ <span class="ajaxSuccess"> {% set deleteOldLogs %}{{ 'PrivacyManager_UseDeleteLog'|translate }}{% endset %} - {{ 'PrivacyManager_DeleteReportsInfo'|translate('<em>','</em>') }} + {{ 'PrivacyManager_DeleteReportsInfo'|translate('<em>','</em>')|raw }} <span id='deleteOldReportsMoreInfo'><br/><br/> {{ 'PrivacyManager_DeleteReportsInfo2'|translate(deleteOldLogs) }}<br/><br/> {{ 'PrivacyManager_DeleteReportsInfo3'|translate(deleteOldLogs) }}</span> @@ -266,7 +266,7 @@ {% set iframeOptOut %}<iframe frameborder="no" width="600px" height="200px" src="{{ optOutUrl }}"></iframe>{% endset %} <code>{{ iframeOptOut|e('html') }}</code> <br/> - {{ 'CoreAdminHome_OptOutExplanationBis'|translate("<a href='" ~ optOutUrl ~ "' target='_blank'>","</a>") }} + {{ 'CoreAdminHome_OptOutExplanationBis'|translate("<a href='" ~ optOutUrl ~ "' target='_blank'>","</a>")|raw }} </p> <div style='height:100px'></div> diff --git a/plugins/Referers/templates/getSearchEnginesAndKeywords.twig b/plugins/Referers/templates/getSearchEnginesAndKeywords.twig index 403aa0f575..d930921631 100644 --- a/plugins/Referers/templates/getSearchEnginesAndKeywords.twig +++ b/plugins/Referers/templates/getSearchEnginesAndKeywords.twig @@ -1,9 +1,9 @@ <div id='leftcolumn'> <h2>{{ 'Referers_Keywords'|translate }}</h2> - {{ keywords }} + {{ keywords|raw }} </div> <div id='rightcolumn'> <h2>{{ 'Referers_SearchEngines'|translate }}</h2> - {{ searchEngines }} + {{ searchEngines|raw }} </div> diff --git a/plugins/Referers/templates/index.twig b/plugins/Referers/templates/index.twig index c72d70db9a..fbba86c575 100644 --- a/plugins/Referers/templates/index.twig +++ b/plugins/Referers/templates/index.twig @@ -1,6 +1,6 @@ <a name="evolutionGraph" graphId="{{ nameGraphEvolutionReferers }}"></a> <h2>{{ 'Referers_Evolution'|translate }}</h2> -{{ graphEvolutionReferers }} +{{ graphEvolutionReferers|raw }} <br/> <div id='leftcolumn' style="position:relative"> @@ -8,16 +8,16 @@ <div id='leftcolumn'> <div class="sparkline">{{ sparkline(urlSparklineDirectEntry) }} - {{ 'Referers_TypeDirectEntries'|translate("<strong>"~visitorsFromDirectEntry~"</strong>") }} + {{ 'Referers_TypeDirectEntries'|translate("<strong>"~visitorsFromDirectEntry~"</strong>")|raw }} {% if visitorsFromDirectEntryPercent is not empty %}, <strong>{{ visitorsFromDirectEntryPercent }}%</strong> of visits {% endif %} {% if visitorsFromDirectEntryEvolution is not empty %} - {{ visitorsFromDirectEntryEvolution }} + {{ visitorsFromDirectEntryEvolution|raw }} {% endif %} </div> <div class="sparkline">{{ sparkline(urlSparklineSearchEngines) }} - {{ 'Referers_TypeSearchEngines'|translate("<strong>"~visitorsFromSearchEngines~"</strong>") }} + {{ 'Referers_TypeSearchEngines'|translate("<strong>"~visitorsFromSearchEngines~"</strong>")|raw }} {% if visitorsFromSearchEnginesPercent is not empty %}, <strong>{{ visitorsFromSearchEnginesPercent }}%</strong> of visits {% endif %} @@ -28,7 +28,7 @@ </div> <div id='rightcolumn'> <div class="sparkline">{{ sparkline(urlSparklineWebsites) }} - {{ 'Referers_TypeWebsites'|translate("<strong>"~visitorsFromWebsites~"</strong>") }} + {{ 'Referers_TypeWebsites'|translate("<strong>"~visitorsFromWebsites~"</strong>")|raw }} {% if visitorsFromWebsitesPercent is not empty %}, <strong>{{ visitorsFromWebsitesPercent }}%</strong> of visits {% endif %} @@ -37,7 +37,7 @@ {% endif %} </div> <div class="sparkline">{{ sparkline(urlSparklineCampaigns) }} - {{ 'Referers_TypeCampaigns'|translate("<strong>"~visitorsFromCampaigns~"</strong>") }} + {{ 'Referers_TypeCampaigns'|translate("<strong>"~visitorsFromCampaigns~"</strong>")|raw }} {% if visitorsFromCampaignsPercent is not empty %}, <strong>{{ visitorsFromCampaignsPercent }}%</strong> of visits {% endif %} @@ -105,14 +105,14 @@ <div id='rightcolumn'> <h2>{{ 'Referers_DetailsByRefererType'|translate }}</h2> - {{ dataTableRefererType }} + {{ dataTableRefererType|raw }} </div> <div style="clear:both;"></div> {% if totalVisits > 0 %} <h2>{{ 'Referers_ReferrersOverview'|translate }}</h2> - {{ referrersReportsByDimension }} + {{ referrersReportsByDimension|raw }} {% endif %} {% include "_sparklineFooter.twig" %} diff --git a/plugins/Referers/templates/indexWebsites.twig b/plugins/Referers/templates/indexWebsites.twig index 3a2457cbae..44596c307c 100755 --- a/plugins/Referers/templates/indexWebsites.twig +++ b/plugins/Referers/templates/indexWebsites.twig @@ -1,9 +1,9 @@ <div id='leftcolumn'> <h2>{{ 'Referers_Websites'|translate }}</h2> - {{ websites }} + {{ websites|raw }} </div> <div id='rightcolumn'> <h2>{{ 'Referers_Socials'|translate }}</h2> - {{ socials }} + {{ socials|raw }} </div> diff --git a/plugins/SecurityInfo/templates/index.twig b/plugins/SecurityInfo/templates/index.twig index f26d4c7806..6ee158fc68 100644 --- a/plugins/SecurityInfo/templates/index.twig +++ b/plugins/SecurityInfo/templates/index.twig @@ -1,7 +1,7 @@ {% extends 'admin.twig' %} {% block content %} -{{ loadJavascriptTranslations(['SecurityInfo']) }} +{{ loadJavascriptTranslations(['SecurityInfo'])|raw }} <h2>{{ 'SecurityInfo_SecurityInformation'|translate }}</h2> <p>{{ 'SecurityInfo_PluginDescription'|translate }}</p> <p>Learn more: read our guide <a target='_blank' href='http://piwik.org/security/how-to-secure-piwik/'>Hardening Piwik: How to make Piwik and your web server diff --git a/plugins/SegmentEditor/templates/getSelector.twig b/plugins/SegmentEditor/templates/getSelector.twig index 70529272de..6a3d4f4ff7 100644 --- a/plugins/SegmentEditor/templates/getSelector.twig +++ b/plugins/SegmentEditor/templates/getSelector.twig @@ -68,13 +68,13 @@ <div class="segment-or">{{ 'SegmentEditor_OperatorOR'|translate }}</div> <div class="segment-add-or"><div> {% set orCondition %}<span>{{ 'SegmentEditor_OperatorOR'|translate }}</span>{% endset %} - <a href="#"> + {{ 'SegmentEditor_AddANDorORCondition'|translate(orCondition) }} </a> + <a href="#"> + {{ 'SegmentEditor_AddANDorORCondition'|translate(orCondition)|raw }} </a> </div> </div> <div class="segment-and">{{ 'SegmentEditor_OperatorAND'|translate }}</div> <div class="segment-add-row"><div> {% set andCondition %}<span>{{ 'SegmentEditor_OperatorAND'|translate }}</span>{% endset %} - <a href="#">+ {{ 'SegmentEditor_AddANDorORCondition'|translate(andCondition) }}</a> + <a href="#">+ {{ 'SegmentEditor_AddANDorORCondition'|translate(andCondition)|raw }}</a> </div> </div> <div style="position: absolute; z-index:999; width:1040px;" class="segment-element"> @@ -148,6 +148,6 @@ </div> <script type="text/javascript"> -var availableSegments = {{ savedSegmentsJson }}; -var segmentTranslations = {{ segmentTranslations }}; +var availableSegments = {{ savedSegmentsJson|raw }}; +var segmentTranslations = {{ segmentTranslations|raw }}; </script> diff --git a/plugins/SitesManager/templates/_displayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig index 6728f7ba66..950ce47705 100644 --- a/plugins/SitesManager/templates/_displayJavascriptCode.twig +++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig @@ -22,18 +22,18 @@ <div class='trackingHelp'> {{ 'Installation_JSTracking_Intro'|translate }} <br/><br/> - {{ 'CoreAdminHome_JSTrackingIntro3'|translate('<a href="http://piwik.org/integrate/" target="_blank">','</a>') }} + {{ 'CoreAdminHome_JSTrackingIntro3'|translate('<a href="http://piwik.org/integrate/" target="_blank">','</a>')|raw }} <h3>{{ 'SitesManager_JsTrackingTag'|translate }}</h3> - <p>{{ 'CoreAdminHome_JSTracking_CodeNote'|translate("</body>") }}</p> + <p>{{ 'CoreAdminHome_JSTracking_CodeNote'|translate("</body>")|raw }}</p> - <pre class="code-pre"><code>{{ jsTag }}</code></pre> + <pre class="code-pre"><code>{{ jsTag|raw }}</code></pre> <br/> - {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a target="_blank" href="http://piwik.org/docs/javascript-tracking/">','</a>') }} + {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a target="_blank" href="http://piwik.org/docs/javascript-tracking/">','</a>')|raw }} <br/><br/> - {{ 'Installation_JSTracking_EndNote'|translate('<em>','</em>') }} + {{ 'Installation_JSTracking_EndNote'|translate('<em>','</em>')|raw }} </div> <script type="text/javascript"> $(document).ready(function () { diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig index d4060b65f1..16704bc7dd 100644 --- a/plugins/SitesManager/templates/index.twig +++ b/plugins/SitesManager/templates/index.twig @@ -8,7 +8,7 @@ {% set excludedIpHelpPlain %} {{ 'SitesManager_HelpExcludedIps'|translate("1.2.3.*","1.2.*.*") }} <br/><br/> - {{ 'SitesManager_YourCurrentIpAddressIs'|translate("<i>" ~ currentIpAddress ~ "</i>") }} + {{ 'SitesManager_YourCurrentIpAddressIs'|translate("<i>" ~ currentIpAddress ~ "</i>")|raw }} {% endset %} {% set excludedIpHelp=piwik.inlineHelp(excludedIpHelpPlain) %} @@ -35,7 +35,7 @@ {% set ecommerceHelpPlain %} {{ 'SitesManager_EcommerceHelp'|translate }} <br/> - {{ 'SitesManager_PiwikOffersEcommerceAnalytics'|translate("<a href='http://piwik.org/docs/ecommerce-analytics/' target='_blank'>","</a>") }} + {{ 'SitesManager_PiwikOffersEcommerceAnalytics'|translate("<a href='http://piwik.org/docs/ecommerce-analytics/' target='_blank'>","</a>")|raw }} {% endset %} {% set excludedQueryParametersHelp %} @@ -87,7 +87,7 @@ var searchCategoryHelp = '{{ searchCategoryHelp|e('js') }}'; var sitesearchDesc = '{{ 'SitesManager_TrackingSiteSearch'|translate|e('js') }}'; var keepURLFragmentSelectHTML = '{{ keepURLFragmentSelectHTML|e('js') }}'; -var sitesManager = new SitesManager({{ timezones }}, {{ currencies }}, '{{ defaultTimezone }}', '{{ defaultCurrency }}'); +var sitesManager = new SitesManager({{ timezones|raw }}, {{ currencies|raw }}, '{{ defaultTimezone|raw }}', '{{ defaultCurrency|raw }}'); {% set searchKeywordLabel='SitesManager_SearchKeywordLabel'|translate %} {% set searchCategoryLabel='SitesManager_SearchCategoryLabel'|translate %} var searchKeywordLabel = '{{ searchKeywordLabel|e('js') }}'; @@ -154,10 +154,10 @@ $(document).ready(function () { <h2>{{ 'SitesManager_WebsitesManagement'|translate }}</h2> <p>{{ 'SitesManager_MainDescription'|translate }} -{{ 'SitesManager_YouCurrentlyHaveAccessToNWebsites'|translate("<strong>" ~ adminSitesCount ~ "</strong>") }} +{{ 'SitesManager_YouCurrentlyHaveAccessToNWebsites'|translate("<strong>" ~ adminSitesCount ~ "</strong>")|raw }} {% if isSuperUser %} <br/> - {{ 'SitesManager_SuperUserCan'|translate("<a href='#globalSettings'>","</a>") }} + {{ 'SitesManager_SuperUserCan'|translate("<a href='#globalSettings'>","</a>")|raw }} {% endif %} </p> {{ ajax.errorDiv() }} @@ -188,7 +188,7 @@ $(document).ready(function () { <th>{{ 'General_Name'|translate }}</th> <th>{{ 'SitesManager_Urls'|translate }}</th> <th>{{ 'SitesManager_ExcludedIps'|translate }}</th> - <th>{{ 'SitesManager_ExcludedParameters'|translate|replace({" ":"<br />"}) }}</th> + <th>{{ 'SitesManager_ExcludedParameters'|translate|replace({" ":"<br />"})|raw }}</th> <th id='exclude-user-agent-header' {% if not allowSiteSpecificUserAgentExclude %}style="display:none"{% endif %}>{{ 'SitesManager_ExcludedUserAgents'|translate }}</th> <th>{{ 'Actions_SubmenuSitesearch'|translate }}</th> @@ -353,7 +353,7 @@ $(document).ready(function () { <td colspan="2"> <strong>{{ 'SitesManager_KeepURLFragments'|translate }}</strong> - <p>{{ 'SitesManager_KeepURLFragmentsHelp'|translate("<em>#</em>","<em>example.org/index.html#first_section</em>","<em>example.org/index.html</em>") }} + <p>{{ 'SitesManager_KeepURLFragmentsHelp'|translate("<em>#</em>","<em>example.org/index.html#first_section</em>","<em>example.org/index.html</em>")|raw }} </p> <input type="checkbox" id="globalKeepURLFragments" name="globalKeepURLFragments" {% if globalKeepURLFragments %}checked="checked"{% endif %}/> diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig index fbfe0a519b..8673348604 100755 --- a/plugins/UserCountry/templates/adminIndex.twig +++ b/plugins/UserCountry/templates/adminIndex.twig @@ -2,7 +2,7 @@ {% block content %} {% import 'macros.twig' as piwik %} -{{ loadJavascriptTranslations(['UserCountry']) }} +{{ loadJavascriptTranslations(['UserCountry'])|raw }} <h2 id="location-providers">{{ 'UserCountry_Geolocation'|translate }}</h2> @@ -14,9 +14,9 @@ <h3 style="margin-top:0">{{ 'UserCountry_HowToSetupGeoIP'|translate }}</h3> <p>{{ 'UserCountry_HowToSetupGeoIPIntro'|translate }}</p> <ul style="list-style:disc;margin-left:2em"> - <li>{{ 'UserCountry_HowToSetupGeoIP_Step1'|translate('<a href="http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz">','</a>','<a target="_blank" href="http://www.maxmind.com/?rId=piwik">','</a>') }}</li> - <li>{{ 'UserCountry_HowToSetupGeoIP_Step2'|translate("'GeoLiteCity.dat'",'<strong>','</strong>') }}</li> - <li>{{ 'UserCountry_HowToSetupGeoIP_Step3'|translate('<strong>','</strong>','<span style="color:green"><strong>','</strong></span>') }}</li> + <li>{{ 'UserCountry_HowToSetupGeoIP_Step1'|translate('<a href="http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz">','</a>','<a target="_blank" href="http://www.maxmind.com/?rId=piwik">','</a>')|raw }}</li> + <li>{{ 'UserCountry_HowToSetupGeoIP_Step2'|translate("'GeoLiteCity.dat'",'<strong>','</strong>')|raw }}</li> + <li>{{ 'UserCountry_HowToSetupGeoIP_Step3'|translate('<strong>','</strong>','<span style="color:green"><strong>','</strong></span>')|raw }}</li> <li>{{ 'UserCountry_HowToSetupGeoIP_Step4'|translate }}</li> </ul> <p> </p> @@ -52,9 +52,9 @@ </p> </td> <td> - <p>{{ provider.description|translate }}</p> + <p>{{ provider.description|translate|raw }}</p> {% if provider.status != 1 and provider.install_docs is defined %} - <p>{{ provider.install_docs }}</p> + <p>{{ provider.install_docs|raw }}</p> {% endif %} </td> <td width="164"> @@ -85,7 +85,7 @@ {% endif %} {% if provider.extra_message is defined and provider.extra_message %} {% set extraMessage %} - {{ provider.extra_message }} + {{ provider.extra_message|raw }} {% endset %} <br/> {{ piwik.inlineHelp(extraMessage) }} @@ -110,11 +110,11 @@ <p>{{ 'UserCountry_PiwikNotManagingGeoIPDBs'|translate }}</p> <div class="geoipdb-column-1"> - <p>{{ 'UserCountry_IWantToDownloadFreeGeoIP'|translate }}</p> + <p>{{ 'UserCountry_IWantToDownloadFreeGeoIP'|translate|raw }}</p> <input type="button" class="submit" value="{{ 'General_GetStarted'|translate }}..." id="start-download-free-geoip"/> </div> <div class="geoipdb-column-2"> - <p>{{ 'UserCountry_IPurchasedGeoIPDBs'|translate('<a href="http://www.maxmind.com/en/geolocation_landing?rId=piwik">','</a>') }}</p> + <p>{{ 'UserCountry_IPurchasedGeoIPDBs'|translate('<a href="http://www.maxmind.com/en/geolocation_landing?rId=piwik">','</a>')|raw }}</p> <input type="button" class="submit" value="{{ 'General_GetStarted'|translate }}..." id="start-automatic-update-geoip"/> </div> </div> diff --git a/plugins/UserCountry/templates/index.twig b/plugins/UserCountry/templates/index.twig index c62b4d0d50..c6cca67e60 100644 --- a/plugins/UserCountry/templates/index.twig +++ b/plugins/UserCountry/templates/index.twig @@ -2,11 +2,11 @@ {{ postEvent("template_leftColumnUserCountry") }} <h2>{{ 'UserCountry_Continent'|translate }}</h2> - {{ dataTableContinent }} + {{ dataTableContinent|raw }} <div class="sparkline"> {{ sparkline(urlSparklineCountries) }} - {{ 'UserCountry_DistinctCountries'|translate("<strong>"~numberDistinctCountries~"</strong>") }} + {{ 'UserCountry_DistinctCountries'|translate("<strong>"~numberDistinctCountries~"</strong>")|raw }} </div> {{ postEvent("template_footerUserCountry") }} @@ -15,12 +15,12 @@ <div id="rightcolumn"> <h2>{{ 'UserCountry_Country'|translate }}</h2> - {{ dataTableCountry }} + {{ dataTableCountry|raw }} <h2>{{ 'UserCountry_Region'|translate }}</h2> - {{ dataTableRegion }} + {{ dataTableRegion|raw }} <h2>{{ 'UserCountry_City'|translate }}</h2> - {{ dataTableCity }} + {{ dataTableCity|raw }} </div> diff --git a/plugins/UserSettings/templates/index.twig b/plugins/UserSettings/templates/index.twig index eca67e397b..68b6333ddc 100644 --- a/plugins/UserSettings/templates/index.twig +++ b/plugins/UserSettings/templates/index.twig @@ -1,27 +1,27 @@ <div id='leftcolumn'> <h2>{{ 'UserSettings_BrowserFamilies'|translate }}</h2> - {{ dataTableBrowserType }} + {{ dataTableBrowserType|raw }} <h2>{{ 'UserSettings_Browsers'|translate }}</h2> - {{ dataTableBrowser }} + {{ dataTableBrowser|raw }} <h2>{{ 'UserSettings_Plugins'|translate }}</h2> - {{ dataTablePlugin }} + {{ dataTablePlugin|raw }} </div> <div id='rightcolumn'> <h2>{{ 'UserSettings_Configurations'|translate }}</h2> - {{ dataTableConfiguration }} + {{ dataTableConfiguration|raw }} <h2>{{ 'UserSettings_OperatingSystems'|translate }}</h2> - {{ dataTableOS }} + {{ dataTableOS|raw }} <h2>{{ 'UserSettings_Resolutions'|translate }}</h2> - {{ dataTableResolution }} + {{ dataTableResolution|raw }} <h2>{{ 'UserSettings_MobileVsDesktop'|translate }}</h2> - {{ dataTableMobileVsDesktop }} + {{ dataTableMobileVsDesktop|raw }} <h2>{{ 'UserSettings_BrowserLanguage'|translate }}</h2> - {{ dataTableBrowserLanguage }} + {{ dataTableBrowserLanguage|raw }} </div> diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig index 478d3bc88a..6efd1bc4d7 100644 --- a/plugins/UsersManager/templates/index.twig +++ b/plugins/UsersManager/templates/index.twig @@ -1,7 +1,7 @@ {% extends 'admin.twig' %} {% block content %} -{{ loadJavascriptTranslations(['UsersManager']) }} +{{ loadJavascriptTranslations(['UsersManager'])|raw }} <style type="text/css"> .dialog { @@ -99,7 +99,7 @@ </div> <div class="ui-confirm" id="confirm"> - <h2>{{ 'UsersManager_ChangeAllConfirm'|translate("<span id='login'></span>") }}</h2> + <h2>{{ 'UsersManager_ChangeAllConfirm'|translate("<span id='login'></span>")|raw }}</h2> <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/> <input role="no" type="button" value="{{ 'General_No'|translate }}"/> </div> @@ -118,7 +118,7 @@ <br/> <h2>{{ 'UsersManager_UsersManagement'|translate }}</h2> <p>{{ 'UsersManager_UsersManagementMainDescription'|translate }} - {{ 'UsersManager_ThereAreCurrentlyNRegisteredUsers'|translate("<b>"~usersCount~"</b>") }}</p> + {{ 'UsersManager_ThereAreCurrentlyNRegisteredUsers'|translate("<b>"~usersCount~"</b>")|raw }}</p> {% import 'ajaxMacros.twig' as ajax %} {{ ajax.errorDiv('ajaxErrorUsersManagement') }} {{ ajax.loadingDiv('ajaxLoadingUsersManagement') }} diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index 621ba5024e..d52c2ea6eb 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -1,7 +1,7 @@ {% extends 'admin.twig' %} {% block content %} -{{ loadJavascriptTranslations(['UsersManager']) }} +{{ loadJavascriptTranslations(['UsersManager'])|raw }} <h2>{{ 'UsersManager_MenuUserSettings'|translate }}</h2> <br/> @@ -86,7 +86,7 @@ {% if isValidHost is not defined or not isValidHost %} <div class="ajaxSuccess"> {{ 'UsersManager_InjectedHostCannotChangePwd'|translate(invalidHost) }} - {% if not isSuperUser %}{{ 'UsersManager_EmailYourAdministrator'|translate(invalidHostMailLinkStart,'</a>') }}{% endif %} + {% if not isSuperUser %}{{ 'UsersManager_EmailYourAdministrator'|translate(invalidHostMailLinkStart,'</a>')|raw }}{% endif %} </div> <br/> {% endif %} @@ -100,9 +100,9 @@ <a name='excludeCookie'></a><h2>{{ 'UsersManager_ExcludeVisitsViaCookie'|translate }}</h2> <p> {% if ignoreCookieSet %} - {{ 'UsersManager_YourVisitsAreIgnoredOnDomain'|translate("<strong>", piwikHost, "</strong>") }} + {{ 'UsersManager_YourVisitsAreIgnoredOnDomain'|translate("<strong>", piwikHost, "</strong>")|raw }} {% else %} - {{ 'UsersManager_YourVisitsAreNotIgnored'|translate("<strong>","</strong>") }} + {{ 'UsersManager_YourVisitsAreNotIgnored'|translate("<strong>","</strong>")|raw }} {% endif %} </p> <span style='margin-left:20px'> diff --git a/plugins/VisitFrequency/templates/_sparklines.twig b/plugins/VisitFrequency/templates/_sparklines.twig index 78444e57b5..5acca4b3dc 100644 --- a/plugins/VisitFrequency/templates/_sparklines.twig +++ b/plugins/VisitFrequency/templates/_sparklines.twig @@ -1,22 +1,22 @@ <div class="sparkline"> {{ sparkline(urlSparklineNbVisitsReturning) }} - {{ 'VisitFrequency_ReturnVisits'|translate("<strong>"~nbVisitsReturning~"</strong>") }} + {{ 'VisitFrequency_ReturnVisits'|translate("<strong>"~nbVisitsReturning~"</strong>")|raw }} </div> <div class="sparkline"> {{ sparkline(urlSparklineNbActionsReturning) }} - {{ 'VisitFrequency_ReturnActions'|translate("<strong>"~nbActionsReturning~"</strong>") }} + {{ 'VisitFrequency_ReturnActions'|translate("<strong>"~nbActionsReturning~"</strong>")|raw }} </div> <div class="sparkline"> {{ sparkline(urlSparklineActionsPerVisitReturning) }} - {{ 'VisitFrequency_ReturnAvgActions'|translate("<strong>"~nbActionsPerVisitReturning~"</strong>") }} + {{ 'VisitFrequency_ReturnAvgActions'|translate("<strong>"~nbActionsPerVisitReturning~"</strong>")|raw }} </div> <div class="sparkline"> {{ sparkline(urlSparklineAvgVisitDurationReturning) }} {% set avgVisitDurationReturning=avgVisitDurationReturning|sumtime %} - {{ 'VisitFrequency_ReturnAverageVisitDuration'|translate("<strong>"~avgVisitDurationReturning~"</strong>") }} + {{ 'VisitFrequency_ReturnAverageVisitDuration'|translate("<strong>"~avgVisitDurationReturning~"</strong>")|raw }} </div> <div class="sparkline"> {{ sparkline(urlSparklineBounceRateReturning) }} - {{ 'VisitFrequency_ReturnBounceRate'|translate("<strong>"~bounceRateReturning~"%</strong>") }} + {{ 'VisitFrequency_ReturnBounceRate'|translate("<strong>"~bounceRateReturning~"%</strong>")|raw }} </div> {% include "_sparklineFooter.twig" %} diff --git a/plugins/VisitFrequency/templates/index.twig b/plugins/VisitFrequency/templates/index.twig index 5a737588af..82053d00f6 100644 --- a/plugins/VisitFrequency/templates/index.twig +++ b/plugins/VisitFrequency/templates/index.twig @@ -2,7 +2,7 @@ <a name="evolutionGraph" graphId="VisitFrequencygetEvolutionGraph"></a> <h2>{{ 'VisitFrequency_ColumnReturningVisits'|translate }}</h2> -{{ graphEvolutionVisitFrequency }} +{{ graphEvolutionVisitFrequency|raw }} <br/> {% include "@VisitFrequency/_sparklines.twig" %} diff --git a/plugins/VisitTime/templates/index.twig b/plugins/VisitTime/templates/index.twig index b463ec6e1f..bb41160beb 100644 --- a/plugins/VisitTime/templates/index.twig +++ b/plugins/VisitTime/templates/index.twig @@ -1,9 +1,9 @@ <div id='leftcolumn'> <h2>{{ 'VisitTime_LocalTime'|translate }}</h2> - {{ dataTableVisitInformationPerLocalTime }} + {{ dataTableVisitInformationPerLocalTime|raw }} </div> <div id='rightcolumn'> <h2>{{ 'VisitTime_ServerTime'|translate }}</h2> - {{ dataTableVisitInformationPerServerTime }} + {{ dataTableVisitInformationPerServerTime|raw }} </div> diff --git a/plugins/VisitorGenerator/templates/index.twig b/plugins/VisitorGenerator/templates/index.twig index d1944e6149..85b3006287 100644 --- a/plugins/VisitorGenerator/templates/index.twig +++ b/plugins/VisitorGenerator/templates/index.twig @@ -20,7 +20,7 @@ </tr> </table> {{ 'VisitorGenerator_Warning'|translate }}<br/> - {{ 'VisitorGenerator_NotReversible'|translate('<b>','</b>') }}<br/><br/> + {{ 'VisitorGenerator_NotReversible'|translate('<b>','</b>')|raw }}<br/><br/> <p><strong>This will generate approximately {{ countActionsPerRun }} fake actions on this site for each day</strong>.<br/> </p> diff --git a/plugins/VisitsSummary/templates/_sparklines.twig b/plugins/VisitsSummary/templates/_sparklines.twig index 3f002529b7..abeb3dbc5a 100644 --- a/plugins/VisitsSummary/templates/_sparklines.twig +++ b/plugins/VisitsSummary/templates/_sparklines.twig @@ -1,62 +1,62 @@ <div id='leftcolumn'> <div class="sparkline"> - {{ sparkline(urlSparklineNbVisits) }} - {{ 'VisitsSummary_NbVisits'|translate("<strong>"~nbVisits~"</strong>") }}{% if displayUniqueVisitors %}, - {{ 'VisitsSummary_NbUniqueVisitors'|translate("<strong>"~nbUniqVisitors~"</strong>") }}{% endif %} + {{ sparkline(urlSparklineNbVisits)|raw }} + {{ 'VisitsSummary_NbVisits'|translate("<strong>"~nbVisits~"</strong>")|raw }}{% if displayUniqueVisitors %}, + {{ 'VisitsSummary_NbUniqueVisitors'|translate("<strong>"~nbUniqVisitors~"</strong>")|raw }}{% endif %} </div> <div class="sparkline"> - {{ sparkline(urlSparklineAvgVisitDuration) }} + {{ sparkline(urlSparklineAvgVisitDuration)|raw }} {% set averageVisitDuration=averageVisitDuration|sumtime %} - {{ 'VisitsSummary_AverageVisitDuration'|translate("<strong>"~averageVisitDuration~"</strong>") }} + {{ 'VisitsSummary_AverageVisitDuration'|translate("<strong>"~averageVisitDuration~"</strong>")|raw }} </div> <div class="sparkline"> - {{ sparkline(urlSparklineBounceRate) }} - {{ 'VisitsSummary_NbVisitsBounced'|translate("<strong>"~bounceRate~"%</strong>") }} + {{ sparkline(urlSparklineBounceRate)|raw }} + {{ 'VisitsSummary_NbVisitsBounced'|translate("<strong>"~bounceRate~"%</strong>")|raw }} </div> <div class="sparkline"> - {{ sparkline(urlSparklineActionsPerVisit) }} - {{ 'VisitsSummary_NbActionsPerVisit'|translate("<strong>"~nbActionsPerVisit~"</strong>") }} + {{ sparkline(urlSparklineActionsPerVisit)|raw }} + {{ 'VisitsSummary_NbActionsPerVisit'|translate("<strong>"~nbActionsPerVisit~"</strong>")|raw }} </div> <div class="sparkline"> - {{ sparkline(urlSparklineAvgGenerationTime) }} + {{ sparkline(urlSparklineAvgGenerationTime)|raw }} {% set averageGenerationTime=averageGenerationTime|sumtime %} - {{ 'VisitsSummary_AverageGenerationTime'|translate("<strong>"~averageGenerationTime~"</strong>") }} + {{ 'VisitsSummary_AverageGenerationTime'|translate("<strong>"~averageGenerationTime~"</strong>")|raw }} </div> </div> <div id='rightcolumn'> {% if showOnlyActions %} <div class="sparkline"> - {{ sparkline(urlSparklineNbActions) }} - {{ 'VisitsSummary_NbActionsDescription'|translate("<strong>"~nbActions~"</strong>") }} + {{ sparkline(urlSparklineNbActions)|raw }} + {{ 'VisitsSummary_NbActionsDescription'|translate("<strong>"~nbActions~"</strong>")|raw }} </div> {% else %} <div class="sparkline"> - {{ sparkline(urlSparklineNbPageviews) }} - {{ 'VisitsSummary_NbPageviewsDescription'|translate("<strong>"~nbPageviews~"</strong>")|trim }}, - {{ 'VisitsSummary_NbUniquePageviewsDescription'|translate("<strong>"~nbUniquePageviews~"</strong>") }} + {{ sparkline(urlSparklineNbPageviews)|raw }} + {{ 'VisitsSummary_NbPageviewsDescription'|translate("<strong>"~nbPageviews~"</strong>")|trim|raw }}, + {{ 'VisitsSummary_NbUniquePageviewsDescription'|translate("<strong>"~nbUniquePageviews~"</strong>")|raw }} </div> {% if displaySiteSearch %} <div class="sparkline"> - {{ sparkline(urlSparklineNbSearches) }} - {{ 'VisitsSummary_NbSearchesDescription'|translate("<strong>"~nbSearches~"</strong>")|trim }}, - {{ 'VisitsSummary_NbKeywordsDescription'|translate("<strong>"~nbKeywords~"</strong>") }} + {{ sparkline(urlSparklineNbSearches)|raw }} + {{ 'VisitsSummary_NbSearchesDescription'|translate("<strong>"~nbSearches~"</strong>")|trim|raw }}, + {{ 'VisitsSummary_NbKeywordsDescription'|translate("<strong>"~nbKeywords~"</strong>")|raw }} </div> {% endif %} <div class="sparkline"> - {{ sparkline(urlSparklineNbDownloads) }} - {{ 'VisitsSummary_NbDownloadsDescription'|translate("<strong>"~nbDownloads~"</strong>")|trim }}, - {{ 'VisitsSummary_NbUniqueDownloadsDescription'|translate("<strong>"~nbUniqueDownloads~"</strong>") }} + {{ sparkline(urlSparklineNbDownloads)|raw }} + {{ 'VisitsSummary_NbDownloadsDescription'|translate("<strong>"~nbDownloads~"</strong>")|trim|raw }}, + {{ 'VisitsSummary_NbUniqueDownloadsDescription'|translate("<strong>"~nbUniqueDownloads~"</strong>")|raw }} </div> <div class="sparkline"> - {{ sparkline(urlSparklineNbOutlinks) }} - {{ 'VisitsSummary_NbOutlinksDescription'|translate("<strong>"~nbOutlinks~"</strong>")|trim }}, - {{ 'VisitsSummary_NbUniqueOutlinksDescription'|translate("<strong>"~nbUniqueOutlinks~"</strong>") }} + {{ sparkline(urlSparklineNbOutlinks)|raw }} + {{ 'VisitsSummary_NbOutlinksDescription'|translate("<strong>"~nbOutlinks~"</strong>")|trim|raw }}, + {{ 'VisitsSummary_NbUniqueOutlinksDescription'|translate("<strong>"~nbUniqueOutlinks~"</strong>")|raw }} </div> {% endif %} <div class="sparkline"> - {{ sparkline(urlSparklineMaxActions) }} - {{ 'VisitsSummary_MaxNbActions'|translate("<strong>"~maxActions~"</strong>") }} + {{ sparkline(urlSparklineMaxActions)|raw }} + {{ 'VisitsSummary_MaxNbActions'|translate("<strong>"~maxActions~"</strong>")|raw }} </div> </div> <div style="clear:both;"></div> diff --git a/plugins/VisitsSummary/templates/index.twig b/plugins/VisitsSummary/templates/index.twig index 933288c7f9..c872e5c1a2 100644 --- a/plugins/VisitsSummary/templates/index.twig +++ b/plugins/VisitsSummary/templates/index.twig @@ -3,7 +3,7 @@ <h2>{{ 'Referers_Evolution'|translate }}</h2> -{{ graphEvolutionVisitsSummary }} +{{ graphEvolutionVisitsSummary|raw }} <h2>{{ 'General_Report'|translate }}</h2> {% include "@VisitsSummary/_sparklines.twig" %} diff --git a/plugins/Widgetize/templates/iframe.twig b/plugins/Widgetize/templates/iframe.twig index 2332cb15a3..ea34ef8936 100644 --- a/plugins/Widgetize/templates/iframe.twig +++ b/plugins/Widgetize/templates/iframe.twig @@ -15,7 +15,7 @@ </head> <body> <div class="widget"> - {{ content }} + {{ content|raw }} </div> </body> </html> diff --git a/plugins/Widgetize/templates/iframe_empty.twig b/plugins/Widgetize/templates/iframe_empty.twig index e02a27c0d8..b40340ba39 100644 --- a/plugins/Widgetize/templates/iframe_empty.twig +++ b/plugins/Widgetize/templates/iframe_empty.twig @@ -1 +1 @@ -{{ content }}
\ No newline at end of file +{{ content|raw }}
\ No newline at end of file diff --git a/plugins/Zeitgeist/templates/admin.twig b/plugins/Zeitgeist/templates/admin.twig index 755dd26262..a5746c5847 100644 --- a/plugins/Zeitgeist/templates/admin.twig +++ b/plugins/Zeitgeist/templates/admin.twig @@ -10,7 +10,7 @@ <meta name="generator" content="Piwik - Open Source Web Analytics"/> <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> - {{ loadJavascriptTranslations(['CoreAdminHome','CoreHome']) }} + {{ loadJavascriptTranslations(['CoreAdminHome','CoreHome'])|raw }} {% include "_jsGlobalVariables.twig" %} {% include "_jsCssIncludes.twig" %} @@ -81,7 +81,7 @@ {% if isSuperUser and usingOldGeoIPPlugin is not empty %} <div class="ajaxSuccess"> <strong>{{ 'General_Warning'|translate }} - : </strong>{{ 'UserCountry_OldGeoIPWarning'|translate('<a href="index.php?module=CorePluginsAdmin&action=index&idSite=1&period=day&date=yesterday">','</a>','<a href="index.php?module=UserCountry&action=adminIndex&idSite=1&period=day&date=yesterday#location-providers">','</a>','<a href="http://piwik.org/faq/how-to/#faq_167">','</a>','<a href="http://piwik.org/faq/how-to/#faq_59">','</a>') }} + : </strong>{{ 'UserCountry_OldGeoIPWarning'|translate('<a href="index.php?module=CorePluginsAdmin&action=index&idSite=1&period=day&date=yesterday">','</a>','<a href="index.php?module=UserCountry&action=adminIndex&idSite=1&period=day&date=yesterday#location-providers">','</a>','<a href="http://piwik.org/faq/how-to/#faq_167">','</a>','<a href="http://piwik.org/faq/how-to/#faq_59">','</a>')|raw }} </div> {% endif %} diff --git a/plugins/Zeitgeist/templates/dashboard.twig b/plugins/Zeitgeist/templates/dashboard.twig index 63b1d4e3a5..fb6c675dbb 100644 --- a/plugins/Zeitgeist/templates/dashboard.twig +++ b/plugins/Zeitgeist/templates/dashboard.twig @@ -10,7 +10,7 @@ <meta name="generator" content="Piwik - Open Source Web Analytics"/> <meta name="description" content="Web Analytics report for '{{ siteName }}' - Piwik"/> <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> - {{ loadJavascriptTranslations(['CoreHome','Annotations']) }} + {{ loadJavascriptTranslations(['CoreHome','Annotations'])|raw }} {% include "_jsGlobalVariables.twig" %} <!--[if lt IE 9]> <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script> diff --git a/plugins/Zeitgeist/templates/genericForm.twig b/plugins/Zeitgeist/templates/genericForm.twig index f2f4dfd420..1c509a9ae5 100644 --- a/plugins/Zeitgeist/templates/genericForm.twig +++ b/plugins/Zeitgeist/templates/genericForm.twig @@ -10,27 +10,27 @@ </div> {% endif %} -<form {{ form_data.attributes }}> +<form {{ form_data.attributes|raw }}> <div class="centrer"> <table class="centrer"> {% for fieldname in element_list %} {% if form_data[fieldname].type == 'checkbox' %} <tr> - <td colspan=2>{{ form_data[fieldname].html }}</td> + <td colspan=2>{{ form_data[fieldname].html|raw }}</td> </tr> {% elseif form_data[fieldname].label %} <tr> - <td>{{ form_data[fieldname].label }}</td> - <td>{{ form_data[fieldname].html }}</td> + <td>{{ form_data[fieldname].label|raw }}</td> + <td>{{ form_data[fieldname].html|raw }}</td> </tr> {% elseif form_data[fieldname].type == 'hidden' %} <tr> - <td colspan=2>{{ form_data[fieldname].html }}</td> + <td colspan=2>{{ form_data[fieldname].html|raw }}</td> </tr> {% endif %} {% endfor %} </table> </div> - {{ form_data.submit.html }} + {{ form_data.submit.html|raw }} </form> |