diff options
Diffstat (limited to 'plugins/ImageGraph')
| -rw-r--r-- | plugins/ImageGraph/API.php | 15 | ||||
| -rw-r--r-- | plugins/ImageGraph/ImageGraph.php | 4 | ||||
| -rw-r--r-- | plugins/ImageGraph/StaticGraph.php | 6 |
3 files changed, 15 insertions, 10 deletions
diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php index dd6967b56b..b2811772f0 100644 --- a/plugins/ImageGraph/API.php +++ b/plugins/ImageGraph/API.php @@ -11,6 +11,7 @@ use Piwik\Period; use Piwik\Piwik; use Piwik\Common; +use Piwik\Translate; /** * The ImageGraph.get API call lets you generate beautiful static PNG Graphs for any existing Piwik report. @@ -145,7 +146,7 @@ class Piwik_ImageGraph_API $useUnicodeFont = array( 'am', 'ar', 'el', 'fa', 'fi', 'he', 'ja', 'ka', 'ko', 'te', 'th', 'zh-cn', 'zh-tw', ); - $languageLoaded = Piwik_Translate::getInstance()->getLanguageLoaded(); + $languageLoaded = Translate::getInstance()->getLanguageLoaded(); $font = self::getFontPath(self::DEFAULT_FONT); if (in_array($languageLoaded, $useUnicodeFont)) { $unicodeFontPath = self::getFontPath(self::UNICODE_FONT); @@ -378,10 +379,10 @@ class Piwik_ImageGraph_API $reportMetadata = $processedReport['reportMetadata']->getRows(); $i = 0; - // $reportData instanceof Piwik_DataTable - foreach ($reportData->getRows() as $row) // Piwik_DataTable_Row[] + // $reportData instanceof DataTable + foreach ($reportData->getRows() as $row) // Row[] { - // $row instanceof Piwik_DataTable_Row + // $row instanceof Row $rowData = $row->getColumns(); // Associative Array $abscissaSeries[] = Common::unsanitizeInputValue($rowData['label']); @@ -408,13 +409,13 @@ class Piwik_ImageGraph_API } } else // if the report has no dimension we have multiple reports each with only one row within the reportData { - // $periodsData instanceof Piwik_DataTable_Simple[] + // $periodsData instanceof Simple[] $periodsData = array_values($reportData->getArray()); $periodsCount = count($periodsData); for ($i = 0; $i < $periodsCount; $i++) { - // $periodsData[$i] instanceof Piwik_DataTable_Simple - // $rows instanceof Piwik_DataTable_Row[] + // $periodsData[$i] instanceof Simple + // $rows instanceof Row[] if (empty($periodsData[$i])) { continue; } diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php index 73743ccbba..3a2f56bb58 100644 --- a/plugins/ImageGraph/ImageGraph.php +++ b/plugins/ImageGraph/ImageGraph.php @@ -1,7 +1,9 @@ <?php use Piwik\Common; use Piwik\Period; +use Piwik\Plugin; use Piwik\Site; +use Piwik\Config; /** * Piwik - Open source web analytics @@ -13,7 +15,7 @@ use Piwik\Site; * @package Piwik_ImageGraph */ -class Piwik_ImageGraph extends Piwik_Plugin +class Piwik_ImageGraph extends Plugin { static private $CONSTANT_ROW_COUNT_REPORT_EXCEPTIONS = array( 'Referers_getRefererType', diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php index 4fe0523e2a..85778163e0 100644 --- a/plugins/ImageGraph/StaticGraph.php +++ b/plugins/ImageGraph/StaticGraph.php @@ -9,6 +9,8 @@ * @package Piwik_ImageGraph */ +use Piwik\Loader; + require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pDraw.class.php"; require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pImage.class.php"; require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pData.class.php"; @@ -77,7 +79,7 @@ abstract class Piwik_ImageGraph_StaticGraph if (isset(self::$availableStaticGraphTypes[$graphType])) { $className = self::$availableStaticGraphTypes[$graphType]; - Piwik_Loader::loadClass($className); + Loader::loadClass($className); return new $className; } else { throw new Exception( @@ -108,7 +110,7 @@ abstract class Piwik_ImageGraph_StaticGraph } /** - * @return rendered static graph + * @return Image rendered static graph */ public function getRenderedImage() { |