diff options
author | JulienMoumne <julien@piwik.org> | 2012-08-14 00:26:46 +0400 |
---|---|---|
committer | JulienMoumne <julien@piwik.org> | 2012-08-14 00:26:46 +0400 |
commit | 7427003ab87ef41d1b1f23365480cf8c8bb11242 (patch) | |
tree | 203b52fb8bcb69f2b4b999cb828dc3386c29e8ae /core/ReportRenderer.php | |
parent | 4931b9809c69947a16b67954802cecd5140bdfad (diff) |
refs #2708
* fixing a bug in ''Piwik::getPrettyValue()'' where a revenue evolution would be prettified like so: ''$ 100%''
* fixing a bug happening when no data is available for the selected day
* when MultiSites plugin is deactivated, invite user via SMS to activate it back
* SMS API accounts are now managed using an API key instead of a username and a password
* adding ''[too long]'' at the end of the SMS content when it reaches the maximum length allowed by the SMS API
* support for UCS-2 characters
* Mediaburst rebranded to Clockwork
* various UI improvements based on comment:31:ticket:2708
* PDFReport.generateReport now supports $outputType=3 : output report in browser
* removing non-libre select-to-autocomplete jQuery plugin
* tracking count of phone number validation requests and SMS sent
* SMS content now contains CoreHome_ThereIsNoDataForThisReport when applicable
* setting SMS From with General_Reports when configured report is MultiSites_getAll
* adding Clockwork description
TODO
* using POST instead of GET to send SMS to go around a Clockwork limitation
git-svn-id: http://dev.piwik.org/svn/trunk@6727 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/ReportRenderer.php')
-rw-r--r-- | core/ReportRenderer.php | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php index c68f1bb63b..54bae396d9 100644 --- a/core/ReportRenderer.php +++ b/core/ReportRenderer.php @@ -101,6 +101,13 @@ abstract class Piwik_ReportRenderer abstract public function sendToBrowserDownload($filename); /** + * Output rendering to browser + * + * @param string $filename without path & without format extension + */ + abstract public function sendToBrowserInline($filename); + + /** * Generate the first page. * * @param string $websiteName @@ -172,6 +179,13 @@ abstract class Piwik_ReportRenderer header('Content-Type: ' . $contentType); header('Content-Disposition: attachment; filename="'.str_replace('"', '\'', basename($filename)).'";'); header('Content-Length: '.strlen($content)); + + echo $content; + } + + protected static function inlineToBrowser($contentType, $content) + { + header('Content-Type: ' . $contentType); echo $content; } |