Changeset 3589 for branches/2.2/mobile/inc

Timestamp:

12/14/10 10:38:59 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1407 - Adição de busca, remover msgs e marcar como lida

Location:

branches/2.2/mobile/inc

Files:

• class.ui_home.inc.php (modified) (1 diff)
• class.ui_mobilemail.inc.php (modified) (10 diffs)

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

@@ -186 +186 @@
                         //E-mails
                         $no_mail_search=false;
-                        if($params['default_folders']==="1") {
-                                if($params['personal_folders']!=="1")
-                                        $mail_params['folderType'] = 'default';                 
-                        }
-                        else {
-                                if($params['personal_folders']==="1")
-                                        $mail_params['folderType'] = 'personal';
-                                else
-                                        $no_mail_search = true;
-                        }                       
+                        if(!isset($params['folder_to_search'])) {
+                                if($params['default_folders']==="1") {
+                                        if($params['personal_folders']!=="1")
+                                                $mail_params['folderType'] = 'default';                 
+                                }
+                                else {
+                                        if($params['personal_folders']==="1")
+                                                $mail_params['folderType'] = 'personal';
+                                        else
+                                                $no_mail_search = true;
+                                }
+                        }
+                        else {
+                                $mail_params['folder'] = $params['folder_to_search'];
+                        }
 
                         if(!$no_mail_search) {

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

@@ -35 +35 @@
                         'save_draft' => true,
                         'mark_message_with_flag' => true,
-                        'change_search_box_type' => true
+                        'change_search_box_type' => true,
+                        'index' => true
                 );
 
@@ -163 +164 @@
                                 
                         $GLOBALS['phpgw_info']['mobiletemplate']->set_error_msg($params["error_message"]);
+                        $GLOBALS['phpgw_info']['mobiletemplate']->set_success_msg($params["success_message"]);
                         $this->mail_list();
                         $this->save_session();
@@ -169 +171 @@
                 function mark_message_with_flag($params=array())
                 {
+                        
+                        if(isset($params['msgs'])) 
+                                $params["msgs_to_set"] = implode(",",$params["msgs"]);
+                        
                         $return = $this->imap_functions->set_messages_flag($params);
                         
                         if($return)
-                                header('Location: index.php?menuaction=menuaction=mobile.ui_mobilemail.change_folder&folder='.$this->current_folder);
+                                header('Location: index.php?menuaction=menuaction=mobile.ui_mobilemail.index&success_message='.lang("The messages were marked as seen"));
                         else
                                 header('Location: index.php?menuaction=menuaction=mobile.ui_mobilemail.show_msg&msg_number='.$params["msgs_to_set"].'&msg_folder='.$return["msg_folder"].'&error_message='.$return["msg"]);
@@ -259 +265 @@
                  */
                  // TODO: Talvez seja melhor voltar sempre para o Inbox e primeira página
-                function index()
-                {
-                        $this->print_folder_selection();
+                function index($params)
+                {
+                        $GLOBALS['phpgw_info']['mobiletemplate']->set_error_msg($params["error_message"]);
+                        $GLOBALS['phpgw_info']['mobiletemplate']->set_success_msg($params["success_message"]);
                         $this->mail_list();
                         $this->save_session();
@@ -400 +407 @@
                         );
                         $p->set_var("page",$this->current_page+1);
+                        $p->set_var("lang_new_message",lang("new message"));
+                        $p->set_var("lang_new",strtoupper(lang("new")));
+                        $p->set_var("folder_id",$this->folders[$this->current_folder]['folder_id']);
                         $p->set_var("folder",$this->folders[$this->current_folder]['folder_name']);
                         $p->set_var("selected_".$this->current_search_box_type,"selected");
@@ -422 +432 @@
                         
                         $messages = $this->imap_functions->get_range_msgs2($params);
-//                      print_r($messages);
+                        if($params['msg_range_end']<$messages[num_msgs])
+                                $p->set_var("show_more","block");
+                        else
+                                $p->set_var("show_more","none");
                         $this->number_of_messages = $messages[num_msgs];
                         
@@ -457 +470 @@
                         if(count($messages)>1) { //O array de emails tem pelo menos uma posição com o total de mensagens.
                                 $bg = "par";
-        
                                 foreach($messages as $id => $message) {
                                         
@@ -469 +481 @@
                                         $p->set_var('bg',$bg=="par"?$bg="reset-dt":$bg="par");
                                         
-                                        $pre = " ";
-                                        $pos = " ";
+                                        $flag=" ";
+                                                                                
+                                        if($message["Unseen"]!=="U") 
+                                                $flag="seen ";
                                         
-                                        if($message["Unseen"]==="U") {
-                                                $pre.="<b>";
-                                                $pos.="</b>";
-                                        }
+                                        if($message["Flagged"]==="F")
+                                                $flag.="important";
                                         
-                                        if($message["Flagged"]==="F") {
-                                                $pre.= "<font color='#FF0000'>";
-                                                $pos = "</font>".$pos;
-                                        }
-                                        
+                                        $p->set_var("flag",$flag);
                                         if($print_checkbox)
                                                 $p->set_var('show_check','inline');
@@ -490 +498 @@
                                         $p->set_var('pos_type',$pos);
                                         $p->set_var('from',$from_name);
+                                        $p->set_var('msg_number',$message["msg_number"]);
                                         $p->set_var('mail_time',$message['smalldate']);
                                         $p->set_var('mail_from',$functions->strach_string($message['from']['email'],23));
@@ -954 +963 @@
                 function delete_msg($params)
                 {
-                        if (isset($_GET['msg_number']))
-                        {
-                                $params = array(
-                                        'msgs_number' => $_GET['msg_number'],
-                                        'folder' => $_GET['msg_folder'],
+
+                        if (isset($params['msgs']))
+                        {
+                                $params_messages = array(
+                                        'msgs_number' => implode(",",$params['msgs']),
+                                        'folder' => $this->folders[$this->current_folder]['folder_name'],
                                         'new_folder_name' => 'Trash',
                                         'new_folder' => 'INBOX/Trash'
                                 );
                         }       
-
-                        $this->imap_functions->move_messages($params);
-                        //Cria um objeto template
-                        //Define o template para mensagens de retorno da funcao
-                        $this->template->set_file(array('move_msg_t' => 'sent_msg.tpl'));
-                        $this->template->set_block('move_msg_t','retorno');
-                        //@header('Refresh: 1; url=./ui_mobilemail.index?folder='.$this->current_folder);                       
-                        $this->template->set_var('msg', lang("The message was moved to trash"));                                
-
-                        $this->template->pfp('out','retorno');                             
+                        $this->imap_functions->move_messages($params_messages);
+
+                        header("Location: index.php?menuaction=mobile.ui_mobilemail.index&success_message=".lang("The messages were moved to trash"));
                     
                 }