Changeset 6528 for trunk/expressoMail1_2/inc

Timestamp:

06/15/12 17:00:17 (12 years ago)

Author:

gustavo

Message:

Ticket #2766 - Merge do branch das novas funcionalidaes para o trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• expressoMail1_2/inc/class.db_functions.inc.php (modified) (8 diffs)
• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)
• expressoMail1_2/inc/class.ldap_functions.inc.php (modified) (2 diffs)

trunk/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
@@ -249 +248 @@
 
         //Gera lista de contatos para ser gravado e acessado pelo expresso offline.
-        function get_dropdown_contacts_to_cache() {
+        /*function get_dropdown_contacts_to_cache() {
                 return $this->get_dropdown_contacts();
         }
@@ -275 +274 @@
                 }
                 return $stringDropDownContacts; 
-        }
+        }*/
         function getUserByEmail($params){       
                 // Follow the referral
@@ -308 +307 @@
                 return $result;
         }
-        
+        /*
         function get_dynamic_contacts()
         {                               
@@ -333 +332 @@
                 return $contacts;
         }
+        */
+        /*
         function update_contacts($contacts=array())
         {                       
@@ -364 +365 @@
                 }
                 return $contacts;
-        }       
+        }       */
+        
         function update_preferences($params){
                 $string_serial = urldecode($params['prefe_string']);                            
@@ -377 +379 @@
         }
         
+        /*
         function insert_contact($contact)       
         {
@@ -396 +399 @@
                 $this->db->delete('phpgw_expressomail_contacts',$where,$line,$file);    
         }
-        
+        */ 
         function import_vcard($params){
             include_once('class.imap_functions.inc.php');

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -3087 +3087 @@
                     error_log("$now - $userip - $sent [$subject] - $userid => $addrs\r\n", 3, "/home/expressolivre/mail_senders.log");
                 }
-                if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts']) {
-                    $contacts = new dynamic_contacts();
-                    $new_contacts = $contacts->add_dynamic_contacts($toaddress . "," . $ccaddress . "," . $ccoaddress);
-                    return array("success" => true, "new_contacts" => $new_contacts);
-                }
-                
-                   if($params['uids_save'] )
-                        $this->delete_msgs(array('folder'=> $params['save_folder'] , 'msgs_number' => $params['uids_save']));
+                if($params['uids_save'] )
+                                        $this->delete_msgs(array('folder'=> $params['save_folder'] , 'msgs_number' => $params['uids_save']));
                        
-                
                 //return array("success" => true, "folder" => $folder_list);
                                 return array("success" => true, "load" => $has_new_folder);

trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -564 +564 @@
                         '<tr class="quicksearchcontacts_unselected">' .
                                 '<td class="cc" width="1%">' .
-                                        '<a title="'.$this->functions->getLang("Write message").'" onClick="javascript:QuickSearchUser.create_new_message(\''.$contacts_result["cn"].'\', \''.$contacts_result["mail"].'\')">' .
+                                        '<a title="'.$this->functions->getLang("Write message").'" onClick="javascript:QuickSearchUser.create_new_message(\''.$contacts_result["cn"].'\', \''.$contacts_result["mail"].'\', \''.$contacts_result["uid"].'\')">' .
                                                 $photo_link .
                                         '</a>' .
@@ -570 +570 @@
                                 '<td class="cc">' .
                                         '<span name="cn">' . ($empNumber != "" ? $empNumber : $uid) . $contacts_result['cn'] . '</span>' . '<br>' .
-                                        '<a title="'.$functions->getLang("Write message").'" onClick="javascript:QuickSearchUser.create_new_message(\''.$contacts_result["cn"].'\', \''.$contacts_result["mail"].'\')">' .
+                                        '<a title="'.$functions->getLang("Write message").'" onClick="javascript:QuickSearchUser.create_new_message(\''.$contacts_result["cn"].'\', \''.$contacts_result["mail"].'\', \''.$contacts_result["uid"].'\')">' .
                                                 '<font color=blue>' .
                                                 '<span name="mail">' . $contacts_result['mail'] . '</span></a></font>'.