Changeset 525 for trunk

Timestamp:

10/10/08 17:20:50 (16 years ago)

Author:

niltonneto

Message:

Melhoria no carregamento dos contatos pessoais e compartilhados.

File:

• trunk/expressoMail1_2/inc/class.db_functions.inc.php (modified) (1 diff)

trunk/expressoMail1_2/inc/class.db_functions.inc.php

@@ -29 +29 @@
         {                               
                 $result = array();
-                $stringDropDownContacts = '';
-                // Pesquisa no CC os nomes e email dos contatos.
-                $query = 'select A.names_ordered, C.connection_value from phpgw_cc_contact A,
-                                        phpgw_cc_contact_conns B, phpgw_cc_connections C where
-                                        A.id_contact = B.id_contact and B.id_connection = C.id_connection
-                                        and B.id_typeof_contact_connection = 1 and
-                                        (A.id_owner ='.$this -> user_id.' or 
-                                        A.id_owner in (
-                                        select id_related from phpgw_cc_contact_rels where id_contact='.$this -> user_id.' and id_typeof_contact_relation=1
-                                        )
-                                        ) 
-                                        group by A.names_ordered,C.connection_value
-                                        order by A.names_ordered';
+                $stringDropDownContacts = '';           
+                // Traz primeiro os usuarios que compartilharam com o usuario logado:
+                $query = 'select id_related from phpgw_cc_contact_rels where id_contact='.$this -> user_id.' and id_typeof_contact_relation=1';
+                // Somente do usuario logado
+                $query_related = 'A.id_owner ='.$this -> user_id;
+                if (!$this->db->query($query))
+                return null;                    
+                while($this->db->next_record()){
+                        $row = $this->db->row();
+                        $result[] = $row['id_related'];
+                }
+                $ids_related = implode(",",$result);
+
+                // Se houver contatos compartilhados então altera a query.
+                if($ids_related)                
+                        $query_related = '(A.id_owner ='.$this -> user_id.' or A.id_owner in ('.$ids_related.'))';
+                        
+                // Traz os contatos pessoais e compartilhados
+                $query = 'select A.names_ordered, C.connection_value from phpgw_cc_contact A, '.
+                        'phpgw_cc_contact_conns B, phpgw_cc_connections C where '.
+                        'A.id_contact = B.id_contact and B.id_connection = C.id_connection '.
+                        'and B.id_typeof_contact_connection = 1 and '.$query_related.' group by '. 
+                        'A.names_ordered,C.connection_value     order by A.names_ordered';
+
         if (!$this->db->query($query))
                 return null;
-                                
-                
                 while($this->db->next_record())
                         $result[] = $this->db->row();