Refs #4059 Work in progress: Conversion to use Namespaces: Period*, Metrics, Segment, SegmentExpression, PluginsManager.

Removed some deprecated code.

2 files changed, 17 insertions, 12 deletions

diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php
index c3eea2e13d..4826fe8c80 100644
--- a/plugins/PDFReports/API.php
+++ b/plugins/PDFReports/API.php
@@ -10,7 +10,9 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Date;
 use Piwik\Site;
+use Piwik\Translate;
 
 /**
  * The PDFReports API lets you manage Scheduled Email reports, as well as generate, download or email any existing report.
@@ -119,7 +121,7 @@ class Piwik_PDFReports_API
                  'format'      => $reportFormat,
                  'parameters'  => $parameters,
                  'reports'     => $reports,
-                 'ts_created'  => Piwik_Date::now()->getDatetime(),
+                 'ts_created'  => Date::now()->getDatetime(),
                  'deleted'     => 0,
             ));
 
@@ -294,10 +296,10 @@ class Piwik_PDFReports_API
 
         // load specified language
         if (empty($language)) {
-            $language = Piwik_Translate::getInstance()->getLanguageDefault();
+            $language = Translate::getInstance()->getLanguageDefault();
         }
 
-        Piwik_Translate::getInstance()->reloadLanguage($language);
+        Translate::getInstance()->reloadLanguage($language);
 
         $reports = $this->getReports($idSite = false, $_period = false, $idReport);
         $report = reset($reports);
@@ -496,7 +498,7 @@ class Piwik_PDFReports_API
         }
 
         if (empty($date)) {
-            $date = Piwik_Date::now()->subPeriod(1, $report['period'])->toString();
+            $date = Date::now()->subPeriod(1, $report['period'])->toString();
         }
 
         $language = Piwik_LanguagesManager_API::getInstance()->getLanguageForUser($report['login']);
@@ -538,7 +540,7 @@ class Piwik_PDFReports_API
 
         // Update flag in DB
         Zend_Registry::get('db')->update(Common::prefixTable('report'),
-            array('ts_last_sent' => Piwik_Date::now()->getDatetime()),
+            array('ts_last_sent' => Date::now()->getDatetime()),
             "idreport = " . $report['idreport']
         );
 
@@ -798,6 +800,6 @@ class Piwik_PDFReports_API
      */
     public static function isSegmentEditorActivated()
     {
-        return PluginsManager::getInstance()->isPluginActivated('SegmentEditor');
+        return \Piwik\PluginsManager::getInstance()->isPluginActivated('SegmentEditor');
     }
 }
diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php
index 5d93ed38cb..69ddb3d498 100644
--- a/plugins/PDFReports/PDFReports.php
+++ b/plugins/PDFReports/PDFReports.php
@@ -10,13 +10,16 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Config;
+use Piwik\Date;
+use Piwik\Plugin;
 use Piwik\Site;
 
 /**
  *
  * @package Piwik_PDFReports
  */
-class Piwik_PDFReports extends Piwik_Plugin
+class Piwik_PDFReports extends Plugin
 {
     const MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY = 'MobileMessaging_TopMenu';
     const PDF_REPORTS_TOP_MENU_TRANSLATION_KEY = 'PDFReports_EmailReports';
@@ -204,7 +207,7 @@ class Piwik_PDFReports extends Piwik_Plugin
                         :
                         $displayFormat != self::DISPLAY_FORMAT_TABLES_ONLY)
                         && Piwik::isGdExtensionEnabled()
-                        && PluginsManager::getInstance()->isPluginActivated('ImageGraph')
+                        && \Piwik\PluginsManager::getInstance()->isPluginActivated('ImageGraph')
                         && !empty($metadata['imageGraphUrl']);
 
                 $processedReport['evolutionGraph'] = $evolutionGraph;
@@ -409,13 +412,13 @@ class Piwik_PDFReports extends Piwik_Plugin
 
     public function getScheduledTasks(&$tasks)
     {
-        $arbitraryDateInUTC = Piwik_Date::factory('2011-01-01');
+        $arbitraryDateInUTC = Date::factory('2011-01-01');
         foreach (Piwik_PDFReports_API::getInstance()->getReports() as $report) {
             if (!$report['deleted'] && $report['period'] != Piwik_ScheduledTime::PERIOD_NEVER) {
                 $midnightInSiteTimezone =
                     date(
                         'H',
-                        Piwik_Date::factory(
+                        Date::factory(
                             $arbitraryDateInUTC,
                             Site::getTimezoneFor($report['idsite'])
                         )->getTimestamp()
@@ -461,7 +464,7 @@ class Piwik_PDFReports extends Piwik_Plugin
             13,
             $isHTML = false,
             $tooltip = Piwik_Translate(
-                PluginsManager::getInstance()->isPluginActivated('MobileMessaging')
+                \Piwik\PluginsManager::getInstance()->isPluginActivated('MobileMessaging')
                     ? 'MobileMessaging_TopLinkTooltip' : 'PDFReports_TopLinkTooltip'
             )
         );
@@ -470,7 +473,7 @@ class Piwik_PDFReports extends Piwik_Plugin
     function getTopMenuTranslationKey()
     {
         // if MobileMessaging is not activated, display 'Email reports'
-        if (!PluginsManager::getInstance()->isPluginActivated('MobileMessaging'))
+        if (!\Piwik\PluginsManager::getInstance()->isPluginActivated('MobileMessaging'))
             return self::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY;
 
         if (Piwik::isUserIsAnonymous()) {