Fixes #3467

matomo-org · Mar 11, 2013 · 51ff12a · 51ff12a
1 parent 2debefd
commit 51ff12a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/core/ReportRenderer/Pdf.php b/core/ReportRenderer/Pdf.php
@@ -145,7 +145,7 @@ public function getRenderedReport()
 
 	public function renderFrontPage($websiteName, $prettyDate, $description, $reportMetadata)
 	{
-		$websiteTitle = $this->formatText(Piwik_Translate('General_Website') . " " . $websiteName);
+		$websiteTitle = $this->formatText($websiteName);
 		$dateRange = $this->formatText(Piwik_Translate('General_DateRange') . " " . $prettyDate);
 
 		//Setup Footer font and data

diff --git a/plugins/CoreHome/templates/html_report_header.tpl b/plugins/CoreHome/templates/html_report_header.tpl
@@ -8,7 +8,7 @@
 	<a target="_blank" href="{$currentPath}"><img title="{'General_GoTo'|translate:"Piwik"}" border="0" alt="Piwik" src='{$logoHeader}' /></a>
 
 	<h1 style="color: rgb({$reportTitleTextColor}); font-size: {$reportTitleTextSize}pt;">
-		{'General_Website'|translate} {$websiteName}
+		{$websiteName}
 	</h1>
 
 	<p>

diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php
@@ -323,17 +323,14 @@ public function generateReport($idReport, $date, $language = false, $outputType
 			true
 		);
 
-		// decode report list
-		$reportUniqueIds = $report['reports'];
-
 		// available reports
 		$availableReportMetadata = Piwik_API_API::getInstance()->getReportMetadata($idSite);
 
 		// we need to lookup which reports metadata are registered in this report
 		$reportMetadata = array();
 		foreach($availableReportMetadata as $metadata)
 		{
-			if(in_array($metadata['uniqueId'], $reportUniqueIds))
+			if(in_array($metadata['uniqueId'], $report['reports']))
 			{
 				$reportMetadata[] = $metadata;
 			}
@@ -426,13 +423,21 @@ public function generateReport($idReport, $date, $language = false, $outputType
 		$reportRenderer->setLocale($language);
 
 		// render report
-		$websiteName = Piwik_Site::getNameFor($idSite);
-		$description = str_replace(array("\r", "\n"), ' ', $report['description']);
+        $description = str_replace(array("\r", "\n"), ' ', $report['description']);
+
+        // if the only report is "All websites", we don't display the site name
+        $websiteName = Piwik_Translate('General_Website') . " " . Piwik_Site::getNameFor($idSite);
+        if(count($report['reports']) == 1
+               && $report['reports'][0] == 'MultiSites_getAll')
+        {
+            $websiteName = Piwik_Translate('General_MultiSitesSummary');
+        }
+        $reportTitle = "$websiteName - $prettyDate - $description";
 
-		$reportRenderer->renderFrontPage($websiteName, $prettyDate, $description, $reportMetadata);
-		array_walk($processedReports, array($reportRenderer, 'renderReport'));
+        $reportRenderer->renderFrontPage($websiteName, $prettyDate, $description, $reportMetadata);
+        array_walk($processedReports, array($reportRenderer, 'renderReport'));
 
-		switch($outputType)
+        switch($outputType)
 		{
 			case self::OUTPUT_SAVE_ON_DISK:
 				$outputFilename = strtoupper($reportFormat) . ' ' . ucfirst($reportType) .' Report - ' . $idReport . '.' . $date . '.' . $idSite . '.' . $language;
@@ -472,7 +477,7 @@ public function generateReport($idReport, $date, $language = false, $outputType
 
 			case self::OUTPUT_INLINE:
 
-				$reportRenderer->sendToBrowserInline("$websiteName - $prettyDate - $description");
+				$reportRenderer->sendToBrowserInline($reportTitle);
 				break;
 
 			case self::OUTPUT_RETURN:
@@ -482,7 +487,7 @@ public function generateReport($idReport, $date, $language = false, $outputType
 
 			default:
 			case self::OUTPUT_DOWNLOAD:
-				$reportRenderer->sendToBrowserDownload("$websiteName - $prettyDate - $description");
+				$reportRenderer->sendToBrowserDownload($reportTitle);
 				break;
 		}
 	}