Changeset 5037 for trunk/mobile/inc/class.ui_mobilemail.inc.php

Timestamp:

09/05/11 17:12:06 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #2260 - Sincronismo do branch2.2(versão 2.2.8) do modulo mobile para 2.4

File:

• trunk/mobile/inc/class.ui_mobilemail.inc.php (modified) (8 diffs)

trunk/mobile/inc/class.ui_mobilemail.inc.php

@@ -689 +689 @@
                 function new_msg($params)
                 {
+                        $flagImportant = intval($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_important_flag']);
                         $this->template->set_file(array('new_msg_t' => 'new_msg.tpl'));
                         $this->template->set_block('new_msg_t', 'page');
@@ -702 +703 @@
                         $this->template->set_var('lang_cc', lang("cc"));
                         $this->template->set_var('lang_subject', lang("Subject"));
+                        $this->template->set_var('visible_important', ( ($flagImportant == 1 ) ? "block" : "none" ) );
                         $this->template->set_var('lang_mark_as_important', lang("mark as important"));
                         $this->template->set_var('lang_read_confirmation', lang("read confirmation"));
@@ -708 +710 @@
                         $this->template->set_var("show_check_add_history","none");
                         
-                        if(isset($params["error_message"])) {
+                        if(isset($params["error_message"]))
+                        {
                                 $this->template->set_var('input_to', $_POST['input_to']);
                                 $this->template->set_var('input_cc', $_POST['input_cc']);
@@ -723 +726 @@
                                 
                                 $GLOBALS['phpgw_info']['mobiletemplate']->set_error_msg($params["error_message"]);
-                        } else {
-                                if (isset($params['msg_number'])) $msg = $this->imap_functions->get_info_msg(array('msg_number' => $params['msg_number'], 'msg_folder' => $params['msg_folder'] ) );
-                                
+                        }
+                        else
+                        {
+                                if (isset($params['msg_number']) )
+                                {
+                                        $msg = $this->imap_functions->get_info_msg(array('msg_number' => $params['msg_number'], 'msg_folder' => $params['msg_folder'] ) );
+                                }
                                 
                                 if($params['type']=="clk")
@@ -790 +797 @@
                                                 $this->template->set_var("show_forward_attachment","block");
                                                 $this->template->set_block("new_msg_t","forward_attach_block");
-                                                foreach($msg['attachments'] as $forward_attach) {
+                                                foreach($msg['attachments'] as $forward_attach)
+                                                {
                                                         $value = rawurlencode(serialize(array(0=>$msg['msg_folder'],
                                                                                    1=>$msg['msg_number'],
@@ -802 +810 @@
                                         }
                                 }
-                                else if($params['type']=="use_draft"){
+                                else if($params['type']=="use_draft")
+                                {
                                         $this->template->set_var('input_to', $msg['toaddress2']);
                                         $this->template->set_var('input_cc', $msg['cc']);
@@ -918 +927 @@
                         if($isImportant) $mail->isImportant();
                         //add history
-                        if($addHistory && $msgNumber) {
+                        if($addHistory && $msgNumber)
+                        {
                                 $msg = $this->imap_functions->get_info_msg(array('msg_number' => $msgNumber ) );
-                                $mail->Body .= "<br />".$msg['body']."<br />";
+                                
+                                $_name  = ( isset($msg['from']['name']) ) ? $msg['from']['name'] : "";
+                                $_email = ( isset($msg['from']['email']) ) ? " ".$msg['from']['email']." " : "";
+                                
+                                $history_msg  = "<br/><br/><br/>";
+                                $history_msg .= lang('At %1, %2 hours, %3 wrote:', $msg['msg_day'], $msg['msg_hour'],"\"".$_name."\"".$_email );
+                                $history_msg .= "<br/>";
+                                
+                                $mail->Body .= "<br/>". $history_msg . $msg['body']."<br/>";
                         }
                         //read confirmation
@@ -974 +992 @@
                                 header("Location: index.php?menuaction=mobile.ui_mobilemail.index&error_message=".lang("please select one e-mail"));
                         } else {
-                                $params_messages = array(
-                                        'msgs_number' => isset($params['msgs'])?implode(",",$params['msgs']):$params['msg_number'],
-                                        'folder' => $this->folders[$this->current_folder]['folder_name'],
-                                        'new_folder_name' => 'Trash',
-                                        'new_folder' => 'INBOX/Trash'
-                                );
+                                $msg = "";
+
+                                if($params["msg_folder"] == "INBOX/Trash") {
+                                        $params_messages = array(
+                                                'msgs_number' => isset($params['msgs'])?implode(",",$params['msgs']):$params['msg_number'],
+                                                'folder' => 'INBOX/Trash'
+                                        );
                                 
-                                $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").'&ignore_trace_url=true');                         
+                                        $this->imap_functions->delete_msgs($params_messages);
+                                
+                                        $msg = lang("The messages were deleted");
+                                } else {
+                                        $params_messages = array(
+                                                'msgs_number' => isset($params['msgs'])?implode(",",$params['msgs']):$params['msg_number'],
+                                                'folder' => $this->folders[$this->current_folder]['folder_name'],
+                                                'new_folder_name' => 'Trash',
+                                                'new_folder' => 'INBOX/Trash'
+                                        );
+
+                                        $this->imap_functions->move_messages($params_messages);
+                                
+                                        $msg = lang("The messages were moved to trash");
+                                }
+
+                                header("Location: index.php?menuaction=mobile.ui_mobilemail.index&success_message=".$msg.'&ignore_trace_url=true');
                         }
                 }