Changeset 5316 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

01/06/12 08:52:37 (12 years ago)

Author:

cristiano

Message:

Ticket #2423 - Trocar chamada da variável rootPath

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (11 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -274 +274 @@
                 $to = $header->to;
                 $head_array['to'] = array();
-                if(isset($to[1]) && $to[1]->host == ".SYNTAX-ERROR.") { //E-mails que não possuem o campo "para", vêm com o recipiente preenchido, porém com um recipiente a mais alegando erro de sintaxe.
+                if(isset($to[1]) && isset($to[1]->host) && $to[1]->host == ".SYNTAX-ERROR.") { //E-mails que não possuem o campo "para", vêm com o recipiente preenchido, porém com um recipiente a mais alegando erro de sintaxe.
                         $head_array['to']['name'] = $head_array['to']['email'] = NULL;
                 }
@@ -935 +935 @@
     {
         $return = array();
-        require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php';
+        require_once dirname(__FILE__).'/class.attachment.inc.php';
         
         $atObj = new attachment();
@@ -1322 +1322 @@
              * Requires of librarys
              */
-            require_once $_SESSION['rootPath'].'/library/mime/mimePart.php';
-            require_once $_SESSION['rootPath'].'/library/mime/mimeDecode.php';
-            require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php';
+            require_once dirname(__FILE__).'/../../library/mime/mimePart.php';
+            require_once dirname(__FILE__).'/../../library/mime/mimeDecode.php';
+            require_once dirname(__FILE__).'/class.attachment.inc.php';
             //include_once("class.message_components.inc.php");
             //--------------------------------------------------------------------//
@@ -1533 +1533 @@
 
                     case 'REPLY':
-                          include_once($_SESSION['rootPath'].'/header.inc.php');
-                          include_once($_SESSION['rootPath'].'/calendar/inc/class.boicalendar.inc.php');
+                          include_once(dirname(__FILE__).'/../../header.inc.php');
+                          include_once(dirname(__FILE__).'/../../calendar/inc/class.boicalendar.inc.php');
                           $boicalendar = new boicalendar();
 
@@ -2064 +2064 @@
                 if (!count($images)) return '';
                
-                foreach ($images as $key => $value) { 
+                foreach ($images as $key => $value) {                    
                         $images[$key]['width']  = 160; 
                         $images[$key]['height'] = 120; 
-                        $images[$key]['url']    = "inc/get_archive.php?msgFolder=".$msg_folder."&msgNumber=".$msg_number."&indexPart=".$image['pid']."&image=true"; 
+                        $images[$key]['url']    = "inc/get_archive.php?msgFolder=".$msg_folder."&msgNumber=".$msg_number."&indexPart=".$value['pid']."&image=true"; 
                 }
 
@@ -2570 +2570 @@
         function send_mail($params)
         {
-                require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php';
+                require_once dirname(__FILE__) . '/../../API/class.servicelocator.php';
                 $mailService = ServiceLocator::getService('mail');
 
@@ -3299 +3299 @@
         function get_forwarding_attachment($msg_folder, $msg_number, $msg_part, $encoding)
         {
-            include_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php';
+            include_once dirname(__FILE__).'/class.attachment.inc.php';
             $attachment = new attachment();
                         $attachment->decodeConf['rfc_822bodies'] = true; //Forçar a não decodificação de mensagens em anexo.
@@ -3308 +3308 @@
         function get_forwarding_attachment2($msg_folder, $msg_number, $msg_part, $encoding)
         {
-            include_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php';
+            include_once dirname(__FILE__).'/class.attachment.inc.php';
             $attachment = new attachment();
             $attachment->setStructureFromMail($msg_folder, $msg_number);
@@ -3663 +3663 @@
         {
         
-                require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php';
+                require_oncedirname(__FILE__) . '/../../API/class.servicelocator.php';
                 $mailService = ServiceLocator::getService('mail');
 
@@ -4959 +4959 @@
                 fputs($f,base64_encode($source));
             fclose($f);
-            $command = "python ".$_SESSION['rootPath']."/expressoMail1_2/imap.py \"$imap_server\" \"$imap_port\" \"$username\" \"$password\" \"$timestamp\" \"$folder\" \"$file\"";
+            $command = "python ".dirname(__FILE__)."/../imap.py \"$imap_server\" \"$imap_port\" \"$username\" \"$password\" \"$timestamp\" \"$folder\" \"$file\"";
             $return['command']= exec($command);
         }else{
@@ -5129 +5129 @@
                                 "$msg_user</body><br><br><hr>"; 
                              
-                require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php';
+                require_once dirname(__FILE__) . '/../../API/class.servicelocator.php';
                 $mailService = ServiceLocator::getService('mail');      
                 $mailService->addStringAttachment($mail_content, 'report.eml', 'application/text');