Changeset 502

Timestamp:

10/01/08 16:45:47 (16 years ago)

Author:

niltonneto

Message:

Na função get_cc_contacts, adiciona os contatos compartilhados, caso exista algum.

File:

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

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

@@ -4 +4 @@
 include_once(PHPGW_API_INC.'/class.db.inc.php');
 include_once('class.dynamic_contacts.inc.php');
-
+        
 class db_functions
 {       
@@ -31 +31 @@
                 $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.' order by A.names_ordered';
-                                
+                $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';
         if (!$this->db->query($query))
                 return null;
@@ -143 +148 @@
         }
 
-        function get_dropdown_contacts() {
+        function get_dropdown_contacts(){
                 
                 $contacts = $this -> get_cc_contacts();
@@ -156 +161 @@
                 elseif ((!$contacts) && ($groups))
                         $stringDropDownContacts = $groups;
-
+                                        
                 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['number_of_contacts'] &&
                         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts']) {
@@ -274 +279 @@
                 {
                 return $this->db->Error;
-        }
+}
                 while($this->db->next_record())
                 {
@@ -292 +297 @@
                 return $contacts;
         }
-        
         function update_contacts($contacts=array())
         {