ref #7531 Fix a double encoded site name bug

matomo-org · Apr 7, 2015 · 662621b · 662621b
1 parent 9037275
commit 662621b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector-model.service.js b/plugins/CoreHome/angularjs/siteselector/siteselector-model.service.js
@@ -35,6 +35,13 @@
 
             angular.forEach(sites, function (site) {
                 if (site.group) site.name = '[' + site.group + '] ' + site.name;
+                if (!site.name) {
+                    return;
+                }
+                // Escape site names, see https://github.com/piwik/piwik/issues/7531
+                site.name = site.name.replace(/[\u0000-\u2666]/g, function(c) {
+                    return '&#'+c.charCodeAt(0)+';';
+                });
             });
 
             model.sites = $filter('orderBy')(sites, '+name');

diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js b/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js
@@ -16,7 +16,6 @@
         $scope.autocompleteMinSites = AUTOCOMPLETE_MIN_SITES;
         $scope.selectedSite = {id: '', name: ''};
         $scope.activeSiteId = piwik.idSite;
-        $scope.selectedSiteNameHtml = '';
 
         $scope.switchSite = function (site) {
             $scope.selectedSite = {id: site.idsite, name: site.name};
@@ -40,15 +39,6 @@
             '#' + piwik.helper.getQueryStringWithParametersModified(hash.substring(1), newParameters);
         };
 
-        $scope.$watch('selectedSite', function (site) {
-            if (!site.name) {
-                return;
-            }
-            $scope.selectedSiteNameHtml = site.name.replace(/[\u0000-\u2666]/g, function(c) {
-                return '&#'+c.charCodeAt(0)+';';
-            });
-        });
-
         siteSelectorModel.loadInitialSites();
     }
 })();
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html
@@ -16,7 +16,7 @@
        href="javascript:void(0)"
        class="custom_select_main_link"
        ng-class="{'loading': model.isLoading}">
-        <span ng-bind-html="selectedSiteNameHtml || model.firstSiteName">?</span>
+        <span ng-bind-html="selectedSite.name || model.firstSiteName">?</span>
     </a>
 
     <div ng-show="view.showSitesList" class="custom_select_block">
@@ -29,7 +29,8 @@
                     ng-repeat="site in model.sites"
                     ng-hide="!showSelectedSite && activeSiteId==site.idsite">
                     <a piwik-ignore-click href="{{ getUrlForSiteId(site.idsite) }}"
-                       piwik-autocomplete-matched="view.searchTerm">{{ site.name }}</a>
+                       piwik-autocomplete-matched="view.searchTerm"
+                       ng-bind-html="site.name"></a>
                 </li>
             </ul>
             <ul ng-show="!model.sites.length && view.searchTerm" class="ui-autocomplete ui-front ui-menu ui-widget ui-widget-content ui-corner-all siteSelect">

diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
@@ -449,7 +449,7 @@ public function generateReport($idReport, $date, $language = false, $outputType
         // render report
         $description = str_replace(array("\r", "\n"), ' ', $report['description']);
 
-        list($reportSubject, $reportTitle) = self::getReportSubjectAndReportTitle(Site::getNameFor($idSite), $report['reports']);
+        list($reportSubject, $reportTitle) = self::getReportSubjectAndReportTitle(Common::unsanitizeInputValue(Site::getNameFor($idSite)), $report['reports']);
 
         // if reporting for a segment, use the segment's name in the title
         if(is_array($segment) && strlen($segment['name'])) {

diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
@@ -126,6 +126,8 @@ public function siteWithoutData()
         $piwikUrl = Url::getCurrentUrlWithoutFileName();
 
         return $this->renderTemplate('siteWithoutData', array(
+            'site'         => $this->site,
+            'idSite'       => $this->idSite,
             'siteName'     => $this->site->getName(),
             'trackingHelp' => $this->renderTemplate('_displayJavascriptCode', array(
                 'displaySiteName' => Common::unsanitizeInputValue($this->site->getName()),