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

1 files changed, 8 insertions, 4 deletions

diff --git a/core/Mail.php b/core/Mail.php
index d9f917e464..1ffbc5d2e4 100644
--- a/core/Mail.php
+++ b/core/Mail.php
@@ -8,8 +8,12 @@
  * @category Piwik
  * @package Piwik
  */
+namespace Piwik;
+
 use Piwik\Config;
 use Piwik\Piwik;
+use Piwik\Url;
+use Zend_Mail;
 
 /**
  * Class for sending mails, for more information see:
@@ -18,7 +22,7 @@ use Piwik\Piwik;
  * @see Zend_Mail, libs/Zend/Mail.php
  * @link http://framework.zend.com/manual/en/zend.mail.html
  */
-class Piwik_Mail extends Zend_Mail
+class Mail extends Zend_Mail
 {
     /**
      * Default charset utf-8
@@ -41,7 +45,7 @@ class Piwik_Mail extends Zend_Mail
     public function setFrom($email, $name = null)
     {
         $hostname = Config::getInstance()->mail['defaultHostnameIfEmpty'];
-        $piwikHost = Piwik_Url::getCurrentHost($hostname);
+        $piwikHost = Url::getCurrentHost($hostname);
 
         // If known Piwik URL, use it instead of "localhost"
         $piwikUrl = Piwik::getPiwikUrl();
@@ -77,8 +81,8 @@ class Piwik_Mail extends Zend_Mail
         if (!empty($mailConfig['encryption']))
             $smtpConfig['ssl'] = $mailConfig['encryption'];
 
-        $tr = new Zend_Mail_Transport_Smtp($mailConfig['host'], $smtpConfig);
-        Piwik_Mail::setDefaultTransport($tr);
+        $tr = new \Zend_Mail_Transport_Smtp($mailConfig['host'], $smtpConfig);
+        Mail::setDefaultTransport($tr);
         ini_set("smtp_port", $mailConfig['port']);
     }
 }