diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-07-23 11:52:15 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-07-23 11:52:15 +0400 |
commit | 5104d94f3b2250f766b9c520e2da8da9b4cab2e9 (patch) | |
tree | 5f30daf7bc14373fb1bbd0504ce11a771dafc02f /core/ReportRenderer.php | |
parent | ae4b1f4e38077b174e4df5b7d4513d63fe026a24 (diff) |
Refs #4059 Work in progress: Conversion to use Namespaces of dozen more classes
Removed many Piwik_ functions, in Piwik 2 it is best practise to use the methods calls instead
Todo: finish converting core/ classes + convert plugins/ classes to use \Piwik\Plugin namespace + fix build + Merge master
Diffstat (limited to 'core/ReportRenderer.php')
-rw-r--r-- | core/ReportRenderer.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php index 7d43bf4856..7f8e959c74 100644 --- a/core/ReportRenderer.php +++ b/core/ReportRenderer.php @@ -8,20 +8,25 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\DataTable\Simple; use Piwik\DataTable\Row; use Piwik\Piwik; use Piwik\DataTable; use Piwik\Loader; +use Piwik\API\Request; +use Piwik_ImageGraph_API; /** * A Report Renderer produces user friendly renderings of any given Piwik report. * All new Renderers must be copied in ReportRenderer and added to the $availableReportRenderers. * * @package Piwik - * @subpackage Piwik_ReportRenderer + * @subpackage ReportRenderer */ -abstract class Piwik_ReportRenderer +abstract class ReportRenderer { const DEFAULT_REPORT_FONT = 'dejavusans'; const REPORT_TEXT_COLOR = "68,68,68"; @@ -44,7 +49,7 @@ abstract class Piwik_ReportRenderer * * @throws exception If the renderer is unknown * @param string $rendererType - * @return Piwik_ReportRenderer + * @return \Piwik\ReportRenderer */ static public function factory($rendererType) { @@ -108,8 +113,8 @@ abstract class Piwik_ReportRenderer * @param string $reportTitle * @param string $prettyDate formatted date * @param string $description - * @param array $reportMetadata metadata for all reports - * @param array $segment segment applied to all reports + * @param array $reportMetadata metadata for all reports + * @param array $segment segment applied to all reports */ abstract public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata, $segment); @@ -168,7 +173,7 @@ abstract class Piwik_ReportRenderer protected static function sendToBrowser($filename, $extension, $contentType, $content) { - $filename = Piwik_ReportRenderer::appendExtension($filename, $extension); + $filename = ReportRenderer::appendExtension($filename, $extension); Piwik::overrideCacheControlHeaders(); header('Content-Description: File Transfer'); @@ -237,7 +242,7 @@ abstract class Piwik_ReportRenderer '&height=' . $height . ($segment != null ? '&segment=' . urlencode($segment['definition']) : ''); - $request = new Piwik_API_Request($requestGraph); + $request = new Request($requestGraph); try { $imageGraph = $request->process(); @@ -250,7 +255,6 @@ abstract class Piwik_ReportRenderer imagedestroy($imageGraph); return $imageGraphData; - } catch (Exception $e) { throw new Exception("ImageGraph API returned an error: " . $e->getMessage() . "\n"); } |