Changeset 19

Timestamp:

04/27/07 17:25:27 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk

Files:

• contactcenter/inc/class.ui_data.inc.php (modified) (2 diffs)
• expressoAdmin1_2/inc/class.functions.inc.php (modified) (2 diffs)
• expressoAdmin1_2/setup/phpgw_pt-br.lang (modified) (previous)
• expressoMail1_2/inc/class.phpmailer.php (modified) (2 diffs)

trunk/contactcenter/inc/class.ui_data.inc.php

@@ -2491 +2491 @@
                                         
                                 case 'thunderbird':
-                                        $streamBuffer = "";                                                     
+                                        $streamBuffer = "\n";                                                   
                                         foreach($all_contacts as $index => $object){
-                                                $streamBuffer.= ",,".$object['name'].",,".$object['email'].",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n";
+                                                $streamBuffer.= ",,".$object['name'].",,".$object['email'].",,".$object['phone'].",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n";
                                         }
                                 break;
@@ -2554 +2554 @@
                                                 $name_pos=2;
                                                 $email_pos=4;
-                                                $phone_pos=5;
+                                                $phone_pos=7;
                                                 break;
                                         default:

trunk/expressoAdmin1_2/inc/class.functions.inc.php

@@ -303 +303 @@
                 }
                 
+                //Criado nova função bem mais eficiente!
+                /*
                 function get_organizations($context, $selected='')
                 {
@@ -340 +342 @@
                         return $sector_select;  
                 }
-                
-                function get_organizations2($context, $selected='')
+                */
+                
+                function get_organizations($context, $selected='')
                 {
                         $dn                     = $GLOBALS['phpgw_info']['server']['ldap_root_dn'];

trunk/expressoMail1_2/inc/class.phpmailer.php

@@ -496 +496 @@
         if(count($bad_rcpt) > 0) // Create error message
         {
-                $smtp_code_error = substr($this->smtp->error['smtp_msg'], 0, 5);
+            //Postfix version 2.3.8-2
+            $smtp_code_error = substr($this->smtp->error['smtp_msg'], 0, 5);
+            //Postfix version 2.1.5-9
+            $array_error = explode(":", $this->smtp->error['smtp_msg']);
+            
             for($i = 0; $i < count($bad_rcpt); $i++)
             {
@@ -502 +506 @@
                 $error .= $bad_rcpt[$i];
             }
-            if ($smtp_code_error == '5.7.1')
+            if (($smtp_code_error == '5.7.1') || (trim($array_error[2]) == 'Access denied'))
                 $error = $this->Lang("not_allowed") . $error;
             else