Changeset 3629

Timestamp:

12/23/10 16:31:17 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1412 - Melhoria na lógica de connections do contato.

Location:

branches/2.2/mobile/inc

Files:

• class.bo_mobilecc.inc.php (modified) (1 diff)
• class.ui_mobilecc.inc.php (modified) (1 diff)

branches/2.2/mobile/inc/class.bo_mobilecc.inc.php

@@ -96 +96 @@
                         
                         
-                        $ids = $this->bo->find($what,$rules,false,false,true);
+                        $ids = $this->bo->find($what,$rules,array('order'=>$search),false,true);
 
                         if(is_array($ids)) {

branches/2.2/mobile/inc/class.ui_mobilecc.inc.php

@@ -252 +252 @@
                                         
                                         $p->set_var('show_check',$show_checkbox?"inline":"none");
-                                        $p->set_var('bg',$bg=="par"?$bg="reset-dt":$bg="par");
-                                                                                
-                                        if($contact["catalog"]!=="bo_group_manager") {  //Contatos              
-                                                $id=strpos($contact["catalog"],"ldap")===false?$contact["id_contact"]:$contact['uidnumber'][0];
+                    $p->set_var('bg',$bg=="par"?$bg="reset-dt":$bg="par");
+                                       
+                    if($contact["catalog"]!=="bo_group_manager") {    //Contatos       
+                        $id=strpos($contact["catalog"],"ldap")===false?$contact["id_contact"]:$id;
+
+                        $mail = ' '; $tel = ' ';
+                        foreach($contact['connections'] as $key => $conn) {
+
+                            $test = false;
+                            if ($conn['connection_is_default']) {
+                                $test = true;
+                            }
+                           
+                            if (is_array($conn)){
+                                $test = true;
+                            }
+                           
+                            if ( $test) {
+                                if ( ($conn['id_type'] == 1) )
+                                    $mail = $conn['connection_value'];
+                                else if ( ($conn['id_type'] == 2) )
+                                    $tel = $conn['connection_value'];
+                            }
+                                                }
+
                                                 
-                                                $mail = $contact["connections"]["connection1"]["connection_value"];//Preciso o mail depois
-                                                $cn = is_array($contact["names_ordered"])?
-                                                                                $contact["names_ordered"][0]:$contact["names_ordered"];
-                                                if(($contact["connections"]["connection1"]["connection_value"]==null || 
-                                                                                (string)$contact["connections"]["connection1"]["id_type"]!=="1")
-                                                                                && isset($request_from)) //Se vier de outro módulo e não possuir e-mail, não mostre.
+                        $cn = is_array($contact["names_ordered"])?$contact["names_ordered"][0]:$contact["names_ordered"];
+                        $vtel = ($tel==null || $tel==' ')?"none":"inline";
+                                                
+                                                if(($mail==' ' || $mail==null) && isset($request_from))//Se vier de outro módulo e não possuir e-mail, não mostre.
                                                         continue;
 
-                                                $p->set_var('contact_id',$id);          
-                                                $p->set_var('lang_tel',lang("tel"));
-                                                $p->set_var('show_tel',$contact["connections"]["connection2"]["connection_value"]!=null?"inline":"none");
-                                                $p->set_var('contact_name',$functions->strach_string($cn,17));
-                                                $p->set_var('email',
-                                                                        $functions->strach_string(
-                                                                                ($contact["connections"]["connection1"]["connection_value"]!=null && 
-                                                                                (string)$contact["connections"]["connection1"]["id_type"]==="1")?
-                                                                                        $contact["connections"]["connection1"]["connection_value"]:" ",20));
-                                                $p->set_var('tel',$functions->strach_string($contact["connections"]["connection1"]["id_type"]==="2"?
-                                                                                        $contact["connections"]["connection1"]["connection_value"]:
-                                                                                        $contact["connections"]["connection2"]["connection_value"],19));
-                                                        
-                                                $block = "row_contacts";
-                                        }
-                                        else { //Grupos
-                                                $id=$contact["id_group"];
-                                                $mail = $cn = $contact["title"];
-                                                $p->set_var('group_id',$contact["id_group"]);
-                                                $p->set_var('group_name',$contact["title"]);
-                                                $block = "row_groups";
-                                        }
-                                        
-                                        if($request_from==null) {
-                                                $p->set_var('lang_see_details',strtoupper(lang("see details")));
-                                                $p->set_var('href_details',"ui_mobilecc.contact_view&id=$id&catalog=".$contact["catalog"]);
-                                        }
-                                        else {
-                                                $p->set_var('lang_see_details',strtoupper(lang("select")));
-                                                $p->set_var("href_details","ui_mobilemail.add_recipient&mail=$mail&cn=$cn");
-                                        }
-                                        
-                                        $p->fp('rows',$block,True);
+                        $p->set_var('show_tel',$vtel);
+                        $p->set_var('email',$mail);
+                        $p->set_var('tel',$tel);
+                        $p->set_var('contact_id',$id);
+                        $p->set_var('lang_tel',lang("tel"));
+                        $p->set_var('contact_name',$functions->strach_string($cn,14));
+
+                        $block = "row_contacts";
+                    }
+                    else { //Grupos
+                        $id=$contact["id_group"];
+                        $mail = $cn = $contact["title"];
+                        $p->set_var('group_id',$contact["id_group"]);
+                        $p->set_var('group_name',$contact["title"]);
+                        $block = "row_groups";
+                    }
+                   
+                    if($request_from==null) {
+                        $p->set_var('lang_see_details',strtoupper(lang("see details")));
+                        $cat_encode = urlencode($contact["catalog"]);
+                        $p->set_var('href_details',"ui_mobilecc.contact_view&id=$id&catalog=".urlencode($contact["catalog"]));
+                    }
+                    else {
+                        $p->set_var('lang_see_details',strtoupper(lang("select")));
+                        $p->set_var("href_details","ui_mobilemail.add_recipient&mail=$mail&cn=$cn");
+                    }
+                   
+                    $p->fp('rows',$block,True);
                                 }