Changeset 3245

Timestamp:

09/14/10 17:10:33 (14 years ago)

Author:

brunocosta

Message:

Ticket #1267 - Implementado conforme descrito no Ticket.

Location:

branches/2.2/expressoMail1_2

Files:

• inc/hook_settings.inc.php (modified) (1 diff)
• index.php (modified) (1 diff)
• js/draw_api.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (1 diff)

branches/2.2/expressoMail1_2/inc/hook_settings.inc.php

@@ -157 +157 @@
 }
 create_select_box('Save sent messages in folder','save_in_folder',$default,'Save automatically sent messages in selected folder');
+create_check_box('Show TO: in place of FROM: only in Automatic SEND folder','from_to_sent','Show TO: in place of FROM: only in Automatic SEND folder');
+
+
 create_check_box('Hide menu folders?','hide_folders','You can use it if your screen does not have good resolution');
 

branches/2.2/expressoMail1_2/index.php

@@ -86 +86 @@
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['imap_max_folders'] = $current_config['expressoMail_imap_max_folders']; 
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] : "50";
+        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['from_to_sent'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['from_to_sent'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['from_to_sent'] : "0";
+
+
         $template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
         $template->set_var("txt_loading",lang("Loading"));

branches/2.2/expressoMail1_2/js/draw_api.js

@@ -967 +967 @@
                 td_element3.innerHTML = ' ';
 
-                if (typeof(headers_msgs.from) == 'undefined')
-                        return false;
-                if( headers_msgs.from.email && headers_msgs.from.email.toLowerCase() == Element("user_email").value )
+                test = true;
+                if(msg_folder.indexOf(sentfolder) !=-1 ||msg_folder.indexOf(preferences.save_in_folder) !=-1 || msg_folder.replace("local_","INBOX/").indexOf(preferences.save_in_folder) !=-1)
+                    test = false;
+
+                if(headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase() && !(preferences.from_to_sent == "1" && test))
                 {
                         td_element3.onmouseover = function () {this.title=headers_msgs.to.email;};

branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -590 +590 @@
 Your Trash folder was empty.    expressoMail1_2 pt-br   Sua pasta Lixeira foi limpa.
 zip mails to import     expressoMail1_2 pt-br   Arquivo .zip ou .eml:
+Show TO: in place of FROM: only in Automatic SEND folder        expressoMail1_2 pt-br   Trocar remetente pelo destinatário na coluna QUEM somente na pasta Enviado