Changeset 6754 for branches/2.4/expressoMail1_2/inc/class.db_functions.inc.php

Timestamp:

07/11/12 11:45:10 (12 years ago)

Author:

niltonneto

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.1.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• expressoMail1_2/inc/class.db_functions.inc.php (modified) (4 diffs)

branches/2.4/expressoMail1_2/inc/class.db_functions.inc.php

@@ -24 +24 @@
         include_once(PHPGW_API_INC.'/class.db.inc.php'); 
 } 
-include_once('class.dynamic_contacts.inc.php');
         
 class db_functions
@@ -248 +247 @@
         }
 
-        //Gera lista de contatos para ser gravado e acessado pelo expresso offline.
-        function get_dropdown_contacts_to_cache() {
-                return $this->get_dropdown_contacts();
-        }
-        
-        function get_dropdown_contacts(){
-                $contacts = $this->get_cc_contacts();
-                $groups = $this->get_cc_groups();
-                
-                if(($contacts) && ($groups))
-                        $stringDropDownContacts = $contacts . ',' . $groups;
-                elseif ((!$contacts) && (!$groups))
-                        $stringDropDownContacts = '';
-                elseif (($contacts) && (!$groups))
-                        $stringDropDownContacts = $contacts;
-                elseif ((!$contacts) && ($groups))
-                        $stringDropDownContacts = $groups;
-                                        
-                if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts']) {
-                        // Free others requests 
-                        session_write_close(); 
-                        $dynamic_contact = new dynamic_contacts();
-                        $dynamic = $dynamic_contact->dynamic_contact_toString();
-                        if ($dynamic)
-                                $stringDropDownContacts .= ($stringDropDownContacts ? ',' : '') . $dynamic;
-                }
-                return $stringDropDownContacts; 
-        }
         function getUserByEmail($params){       
                 // Follow the referral
@@ -309 +280 @@
         }
         
-        function get_dynamic_contacts()
-        {                               
-                // Pesquisa os emails e ultima inserção nos contatos dinamicos.
-                if(!$this->db->select('phpgw_expressomail_contacts','data','id_owner ='.$this->user_id,__LINE__,__FILE__))
-                {
-                return $this->db->Error;
-}
-                while($this->db->next_record())
-                {
-                        $result[] = $this->db->row();
-                }
-                if($result) foreach($result as $item) 
-                {
-                        $contacts = unserialize($item['data']);
-                }
-                if (count($contacts) == 0)
-                {                       
-                        return null;
-                }       
-                //Sort by email
-                function cmp($a, $b) { return strcmp($a["email"], $b["email"]);} 
-                usort($contacts,"cmp");
-                return $contacts;
-        }
-        function update_contacts($contacts=array())
-        {                       
-                
-        
-                if(!$this->db->select('phpgw_expressomail_contacts','data','id_owner ='.$this->user_id,__LINE__,__FILE__))
-        {
-            $result['dberr1'] = $this->db->Error;
-        }
-                $regs = array();
-                while($this->db->next_record())
-        {
-            $regs[] = $this->db->row();
-        }
-                $old_contatacts = array();
-                foreach($regs as $old){
-                        $old_contatacts = unserialize($old['data']);
-                }
-                 
-                foreach($old_contatacts as $i => $v)
-                        foreach($contacts as $ii => $vv)
-                                if(trim($v['email']) == trim($vv['email']))
-                                        unset($old_contatacts[$i]);
-                
-                 
-                 $old_contatacts = array_merge( $old_contatacts , $contacts);           
-                // Atualiza um email nos contatos dinamicos.
-                if(!$this->db->update('phpgw_expressomail_contacts ','data=\''.serialize($old_contatacts).'\'','id_owner ='.$this->user_id,__LINE__,__FILE__))
-                {
-                        return $this->db->Error;
-                }
-                return $contacts;
-        }       
         function update_preferences($params){
                 $string_serial = urldecode($params['prefe_string']);                            
@@ -375 +290 @@
                 else
                         return array("success" => true);
-        }
-        
-        function insert_contact($contact)       
-        {
-                $contacts[] = array( 'timestamp'        => time(),
-                                                                'email'         => $contact );
-
-                // Insere um email nos contatos dinamicos.      
-                $query = 'INSERT INTO phpgw_expressomail_contacts (data, id_owner)  ' .
-                                        'values ( \''.serialize($contacts).'\', '.$this->user_id.')';
-                
-                if(!$this->db->query($query,__LINE__,__FILE__))
-                return $this->db->Error;
-        return $contacts;
-        }
-        
-        function remove_dynamic_contact($user_id,$line,$file)
-        {
-                $where = $user_id.' = id_owner';
-                $this->db->delete('phpgw_expressomail_contacts',$where,$line,$file);    
         }