Changeset 977

Timestamp:

06/10/09 18:26:16 (15 years ago)

Author:

alexandrecorreia

Message:

Ticket #541 - O arquivo confLDAPInternal.php não é criado, gera um erro no applet java.

File:

• trunk/jabberit_messenger/inc/class.contacts_im.inc.php (modified) (6 diffs)

trunk/jabberit_messenger/inc/class.contacts_im.inc.php

@@ -20 +20 @@
         private $db;
         private $ou_User;
-        private $hostsJabber;
         private $serverJabber;
                 
-        public final function __construct()
+        function __construct()
         {
                 $this->ldap = new ldap_im();
@@ -32 +31 @@
                 $this->ou_User = substr($this->ou_User,strpos($this->ou_User, "ou="));
                 $this->ou_User = strtoupper(substr($this->ou_User, 0, strpos($this->ou_User, ",dc=")));
-                
-                // Hosts Jabber
-                $this->hostsJabber = unserialize($_SESSION['phpgw_info']['jabberit_messenger']['map_org_realm_jabberit']);
                 
                 // Server Name Jabber
@@ -71 +67 @@
                         return "<error>Many Results</error>";
 
-                foreach($this->hostsJabber as $conf )
-                        if(array_search("*", $conf))
+                // Hosts Jabber
+                $hostsJabber = unserialize($_SESSION['phpgw_info']['jabberit_messenger']['map_org_realm_jabberit']);
+
+                foreach($hostsJabber as $conf )
+                        if( array_search("*", $conf) )
                                 $hostDefault = $conf['jabberName'];
                         
@@ -79 +78 @@
                         for($i = 0; $i < count($users); $i++)                           
                         {
-                                if( is_array($this->hostsJabber) )
-                                {
-                                        foreach($this->hostsJabber as $itens)
+                                if( is_array($hostsJabber) )
+                                {
+                                        foreach($hostsJabber as $itens)
                                         {
-                                                if( $itens['org'] === $users[$i]['ou']  )
-                                                {
-                                                        if( strpos($users[$i]['jid'], "@") === false )
-                                                                $users[$i]['jid'] = $users[$i]['jid']."@".$itens['jabberName'];
-                                                }
+                                                if( trim($users[$i]['ou']) === trim($itens['org']) )
+                                                        $users[$i]['jid'] = $users[$i]['jid']."@".$itens['jabberName'];
                                                 else
                                                 {
                                                         if( $users[$i]['ou'] === $ou_User )
-                                                        {
-                                                                if( strpos($users[$i]['jid'], "@") === false )
+                                                                if(strpos($users[$i]['jid'],"@") === false)
                                                                         $users[$i]['jid'] = $users[$i]['jid']."@".$this->serverJabber;
-                                                        }
                                                         else
-                                                        {
-                                                                if( strpos($users[$i]['jid'], "@") === false )
+                                                                if(strpos($users[$i]['jid'],"@") === false)
                                                                         $users[$i]['jid'] = $users[$i]['jid']."@".$hostDefault;
-                                                        }
                                                 }
                                         }
@@ -109 +101 @@
                                 if ( !array_key_exists($tmp['ou'], $order) )
                                         $order[$tmp['ou']] = array();
-
-                                if( strpos($tmp['jid'], "@") === false)
-                                        $tmp['jid'] = $tmp['jid']."@".$this->serverJabber;
 
                                 $order[$tmp['ou']][] = '<data><ou>'.$tmp['ou'].'</ou><cn>'.$tmp['cn'].'</cn><mail>'.$tmp['mail'].'</mail><uid>'.$tmp['uid'].'</uid><jid>'.$tmp['jid'].'</jid><photo>'.$tmp['photo'].'</photo></data>';
@@ -184 +173 @@
                         return $uids_org;
         }            
+
                 return $members;        
         }