Changeset 4510 for sandbox/2.2.0.2/contactcenter/inc/class.so_group.inc.php

Timestamp:

05/25/11 16:25:53 (13 years ago)

Author:

wmerlotto

Message:

Ticket #1935 - Correcao na importacao de contatos de arquivos CSV do contactcenter

File:

• sandbox/2.2.0.2/contactcenter/inc/class.so_group.inc.php (modified) (1 diff)

sandbox/2.2.0.2/contactcenter/inc/class.so_group.inc.php

@@ -423 +423 @@
                 }
 
-                function verifyContact($email)
-                {
-                        $query = 'select A.names_ordered, C.id_connection 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->owner.' and C.connection_value = \''.$email.'\'';
-                                                
-                        if (!$this->db->query($query))
-                        {
-                                exit ('Query failed! File: '.__FILE__.' on line'.__LINE__);
-                        }
+                function verifyContact($email, $name, $phone)
+                {
+                        if ($email) {
+                        
+                                $query = 'select A.names_ordered, C.id_connection 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->owner."' and C.connection_value = '".$email. "'";
+
+                                if (!$this->db->query($query))
+                                {       
+                                        exit ('Query failed! File: '.__FILE__.' on line'.__LINE__);
+                                }
                          
-                        $return = false;
-                        
-                        while($this->db->next_record())
-                        {
-                                $row = $this->db->row();
-                                $return[] =  $row['names_ordered'];
-                                $return[] =  $row['id_connection'];
-                        }
-                        
+                                $return = false;
+                        
+                                while($this->db->next_record())
+                                {
+                                        $row = $this->db->row();
+                                        $return[] =  $row['names_ordered']; 
+                                }
+                        } 
+                        
+                        if (!$return && $phone) { 
+
+                                $query = 'select A.names_ordered, C.id_connection 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 = 2 and '.
+                                "A.id_owner ='" .$this->owner."' and C.connection_value = '".$phone. "'";
+
+                                if (!$this->db->query($query))
+                                {       
+                                        exit ('Query failed! File: '.__FILE__.' on line'.__LINE__);
+                                }
+                         
+                                $return = false;
+                        
+                                while($this->db->next_record())
+                                {
+                                        $row = $this->db->row();
+                                        $return[] =  $row['names_ordered']; 
+                                }
+
+                        }
+                        
+                        if (!$return && $name) { 
+
+                                $query = "select names_ordered, C.id_connection from phpgw_cc_contact where id_owner = '" . $this->owner . "' and RTRIM(names_ordered) = '". $name. "'";
+
+                                if (!$this->db->query($query))
+                                {       
+                                        exit ('Query failed! File: '.__FILE__.' on line'.__LINE__);
+                                }
+                         
+                                $return = false;
+                        
+                                while($this->db->next_record())
+                                {
+                                        $row = $this->db->row();
+                                        $return[] =  $row['names_ordered']; 
+                                }
+
+                        }
+                    $return[] =  $row['id_connection'];
+
                         return $return;
                 }