Changeset 469

Timestamp:

09/24/08 09:46:11 (16 years ago)

Author:

niltonneto

Message:

Somente identação e otimização correta no código da classe imap.

File:

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

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

@@ -432 +432 @@
                                 $this->has_cid = true;
                         
-                        if (strtolower($msg->structure[$msg_number]->subtype) == "alternative")
-                        {
-                                $show_only_html = false;
-                                foreach($msg->pid[$msg_number] as $values => $msg_part)
-                                {
+                        if (strtolower($msg->structure[$msg_number]->subtype) == "alternative") {
+                                $show_only_html = false;
+                                foreach($msg->pid[$msg_number] as $values => $msg_part) {
                                         $file_type = strtolower($msg->file_type[$msg_number][$values]);
                                         if($file_type == "text/html")
-                                $show_only_html = true;                 
-                                }
-                        }
+                                                $show_only_html = true;                 
+                                }
+                        }
                         else
                                 $show_only_html = false;
@@ -989 +987 @@
                 if (is_array($folders_list)) {
                         reset($folders_list);
-                $this->ldap = new ldap_functions();
                         
                         $i = 0;
@@ -1005 +1002 @@
                                 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name'];
                                 if (is_numeric($result[$i]['folder_name']))     {
+                                        $this->ldap = new ldap_functions();
                                         if ($cn = $this->ldap->uid2cn($result[$i]['folder_name'])){
                                                 $result[$i]['folder_name'] = $cn;
@@ -1310 +1308 @@
                                 error_log("$now - $userip - $sent [$subject] - $userid => $addrs\r\n", 3, "/home/expressolivre/mail_senders.log");
                         }
-                        if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'])
-                        {
-                        $contacts = new dynamic_contacts();
-                        $contacts->add_dynamic_contacts($toaddress.$ccaddress.$ccoaddress);
+                        if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts']) {
+                                $contacts = new dynamic_contacts();
+                                $contacts->add_dynamic_contacts($toaddress.$ccaddress.$ccoaddress);
                         }
                         return true;
@@ -2192 +2189 @@
         }
 
-        function search_msg($params = ''){
-                $this->ldap = new ldap_functions();
+        function search_msg($params = ''){              
                 $retorno = "";
                 $mbox_stream = "";
@@ -2215 +2211 @@
                                 $name_box = mb_convert_encoding(utf8_decode($name_box), "UTF7-IMAP", "ISO_8859-1" ); 
                                 $filter = $this->remove_accents($filter);
+                                //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name
                                 $folder_name = explode($this->imap_delimiter,$name_box);
-                                if (is_numeric($folder_name[1]))
-                                {
-                                        if ($cn = $this->ldap->uid2cn($folder_name[1]))
-                                        {
-                                        $folder_name[1] = $cn;  
+                                if (is_numeric($folder_name[1])) {
+                                        $this->ldap = new ldap_functions();
+                                        if ($cn = $this->ldap->uid2cn($folder_name[1])) {
+                                                $folder_name[1] = $cn;
                                         }
                                 }