Changeset 2492 for sandbox/workflow/branches/993/inc/class.bo_agent_mail_smtp.inc.php

Timestamp:

04/12/10 16:21:32 (14 years ago)

Author:

pedroerp

Message:

Ticket #993 - Trocando acessos à GLOBALS por acessos à Settings.

File:

• sandbox/workflow/branches/993/inc/class.bo_agent_mail_smtp.inc.php (modified) (4 diffs)

sandbox/workflow/branches/993/inc/class.bo_agent_mail_smtp.inc.php

@@ -300 +300 @@
                 $data['smtpAuth']               = $profileData['smtpAuth'];
                 $data['smtpType']               = $profileData['smtpType'];
-                $useremail = $this->bo_emailadmin->getAccountEmailAddress($GLOBALS['phpgw_info']['user']['userid'], $this->profileID);
+                $useremail = $this->bo_emailadmin->getAccountEmailAddress(Settings::get('expresso', 'user', 'userid'), $this->profileID);
                 $data['emailAddress']           = $useremail[0]['address'];
                 return $data;
@@ -422 +422 @@
         function prepare_mail()
         {
-                $userLang = $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
+                $userLang = Settings::get('expresso', 'preferences', 'lang');
                 $langFile = PHPGW_SERVER_ROOT."/phpgwapi/setup/phpmailer.lang-$userLang.php";
                 if(file_exists($langFile))
@@ -448 +448 @@
                 {
                         $this->mail->SMTPAuth   = true;
-                        $this->mail->Username   = $GLOBALS['phpgw_info']['user']['userid'];
-                        $this->mail->Password   = $GLOBALS['phpgw_info']['user']['passwd'];
+                        $this->mail->Username   = Settings::get('expresso', 'user', 'userid');
+                        $this->mail->Password   = Settings::get('expresso', 'user', 'passwd');
                 }
                 
@@ -668 +668 @@
                                         //the current instance/activity user which is in fact running
                                         //this class actually
-                                        $matches[1][$key] = $GLOBALS['phpgw_info']['user']['email'];
+                                        $matches[1][$key] = Settings::get('expresso', 'user', 'email');
                                         break;
                                 case 'owner' :