Changeset 3596 for branches/2.2/mobile/inc/class.ui_home.inc.php

Timestamp:

12/16/10 16:43:10 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1412 - Implementado a busca quando requisitada pela tela enviar email

File:

• branches/2.2/mobile/inc/class.ui_home.inc.php (modified) (5 diffs)

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

@@ -34 +34 @@
                         $this->template->set_var('lang_my_folders', lang("my folders"));
                         $this->template->set_var('lang_my_commitments', lang("my commitments"));
-      $this->template->set_var('lang_my_contacts', lang("my contacts"));
+                $this->template->set_var('lang_my_contacts', lang("my contacts"));
                         $this->template->set_var('lang_new_mail', lang("new mail"));
                         $this->template->set_var('lang_mark_as_read', lang("mark as read"));
@@ -139 +139 @@
                         $p->set_var('lang_events',lang('events'));
                         $p->set_var('default_folders',$params['default_folders']);
-                        $p->set_var('personal_folders',$params['personal_folders']);    
+                        $p->set_var('personal_folders',$params['personal_folders']);
+                        $p->set_var('folder_to_search',$params['folder_to_search']);
                         $p->set_var('contacts_search',$params['contacts_search']);      
+                        $p->set_var('catalog_to_search',$params['catalog_to_search']);
                         $p->set_var('calendar_search',$params['calendar_search']);
                         $p->set_var('lang_more',lang("more"));  
@@ -147 +149 @@
                         $p->set_var('show_more_messages',"none");
                         $p->set_var('show_more_events',"none");
+                        $p->set_var('contacts_request_from',
+                                                        isset($params["request_from"])?
+                                                        $params["request_from"]:"none");
                         
                         //Contatos                      
                         if(($params["contacts_search"]==="1") || 
-                                        (isset($params["catalog_to_search"]))) {
+                                        (isset($params["catalog_to_search"]) && $params["catalog_to_search"]!=="")) {
+
                                 $bo_cc =  CreateObject('mobile.bo_mobilecc');
                                 
-                                if(isset($params["catalog_to_search"]))
+                                if(isset($params["catalog_to_search"]) && $params["catalog_to_search"]!=="")
                                         $catalogs = array(0=>array("catalog"=>$params["catalog_to_search"],
                                                                                         "label" => $params["catalog_to_search"]));
@@ -183 +189 @@
                                                 unset($partial_result["has_more"]);
                                         }
+                                        
                                         $contacts_result = array_merge($contacts_result,$partial_result);
                                         
                                 }
-                                $p->set_var('contacts',ui_mobilecc::print_contacts($contacts_result));
+                                
+                                if(isset($params['request_from'])  && $params['request_from']!="none") //Buscas feitas requisitadas por outros modulos
+                                        $request_from = $params['request_from'];
+                                else
+                                        $request_from = null;
+                                $p->set_var('contacts',ui_mobilecc::print_contacts($contacts_result,false));
                         }
                         else {
@@ -194 +206 @@
                         //E-mails
                         $no_mail_search=false;
-                        if(!isset($params['folder_to_search'])) {
+                        if((!isset($params['folder_to_search'])) || ($params['folder_to_search']==="")) {
                                 if($params['default_folders']==="1") {
                                         if($params['personal_folders']!=="1")