Changeset 5229 for trunk

Timestamp:

12/01/11 13:22:22 (12 years ago)

Author:

douglasz

Message:

Ticket #2362 - Retirar inclusao do proprio rementente na acao de responder a todos

Location:

trunk/expressoMail1_2

Files:

• index.php (modified) (1 diff)
• js/main.js (modified) (6 diffs)
• templates/default/index.tpl (modified) (1 diff)

trunk/expressoMail1_2/index.php

@@ -165 +165 @@
         $template->set_var("msg_number",$_GET['msgball']['msgnum'] ? $_GET['msgball']['msgnum'] : $_GET['to']);
         $template->set_var("user_email",$_SESSION['phpgw_info']['expressomail']['user']['email']);
+        include_once $_SESSION['rootPath'] . '/header.inc.php';
+        require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php';
+        $alternativeMailService = ServiceLocator::getService('ldap');
+        $AlternateEmailExpresso = Array();
+        $AlternateEmailExpresso = $alternativeMailService->getMailAlternateByUidNumber($_SESSION['phpgw_info']['expressomail']['user']['account_id']);
+        $template->set_var("user_email_alternative", implode(",", $AlternateEmailExpresso));    
         $acc = CreateObject('phpgwapi.accounts');
         $template->set_var("user_organization", $acc->get_organization($GLOBALS['phpgw_info']['user']['account_dn']));

trunk/expressoMail1_2/js/main.js

@@ -1265 +1265 @@
             RichTextEditor.editorReady = false; 
 
-
+                
                 if (Element('show_img_link_'+border_ID))
                 {
@@ -1342 +1342 @@
                 if (document.getElementById("to_values_" + border_ID)){
                         data.to_all = document.getElementById("to_values_" + border_ID).value;
+                        data.to_all_alternative = document.getElementById("user_email_alternative").value;
                         data.to_all = data.to_all.replace(/\n/gi," ");
                         data.to_all = data.to_all.replace(/&lt;/gi,"<");
                         data.to_all = data.to_all.replace(/&gt;/gi,">");
                         var _array_to_all = data.to_all.split(",");
+                        var _array_to_alternative = data.to_all_alternative.split(",");
                 }
         }
@@ -1443 +1445 @@
                                 }
                         }
+                        for(i = 0; i < _array_to_alternative.length; i++) {
+                                for(k = 0; k < data.to_all.length; k++){
+                                        if(data.to_all[k].replace(/^\s+|\s+$/g,"") == _array_to_alternative[i])
+                                                data.to_all.splice( k , 1);
+                                }
+                        }
                         data.to_all = data.to_all.join(",");
 
@@ -1450 +1458 @@
                         Element("to_" + new_border_ID).value += ', ' + data.to_all;
                         if (data.cc){
+                                data.cc = new Array();
+                                var j = 0;
+                                for(i = 0; i < _array_cc.length; i++) {
+                                        if(_array_cc[i].lastIndexOf(Element("user_email").value) == "-1"){
+                                                data.cc[j++] = _array_cc[i];
+                                        }
+                                }
+                                for(i = 0; i < _array_to_alternative.length; i++) {
+                                for(k = 0; k < data.cc.length; k++){
+                                        if(data.cc[k].replace(/^\s+|\s+$/g,"") == _array_to_alternative[i])
+                                                data.cc.splice( k , 1);
+                                        }
+                                }
                                 Element("cc_" + new_border_ID).value = data.cc;
                                 Element("a_cc_link_" + new_border_ID).style.display='none';
@@ -1483 +1504 @@
                                 }
                         }
-                        if (data.to_all != get_lang("undisclosed-recipient"))
-                                data.to_all = data.to_all.join(",");
-                        else
+                        for(i = 0; i < _array_to_alternative.length; i++) {
+                                for(k = 0; k < data.to_all.length; k++){
+                                        if(data.to_all[k].replace(/^\s+|\s+$/g,"") == _array_to_alternative[i])
+                                                data.to_all.splice( k , 1);
+                                }
+                        } 
+                        if (data.to_all != get_lang("undisclosed-recipient"))
+                                data.to_all = data.to_all.join(",");
+                        else
                                 data.to_all = "";
                         title = "Re: " + data.subject;
                         Element("to_" + new_border_ID).value = data.to;
+                        
                         Element("to_" + new_border_ID).value += ', ' + data.to_all;
                         
@@ -1495 +1523 @@
                         var j = 0;
                                 for(i = 0; i < _array_cc.length; i++) {
-                                if(_array_cc[i].lastIndexOf(Element("user_email").value) == "-1"){
-                                        data.cc[j++] = _array_cc[i];
-                                }
-                        }
-                        if (data.cc != get_lang("undisclosed-recipient"))
-                                data.cc = data.cc.join(",");
-                        else
-                                                                data.cc = "";                   
+                                        if(_array_cc[i].lastIndexOf(Element("user_email").value) == "-1"){
+                                                data.cc[j++] = _array_cc[i];
+                                        }
+                                }
+                                for(i = 0; i < _array_to_alternative.length; i++) {
+                                        for(k = 0; k < data.cc.length; k++){
+                                                if(data.cc[k].replace(/^\s+|\s+$/g,"") == _array_to_alternative[i])
+                                                        data.cc.splice( k , 1);
+                                        }
+                                }
+                                if (data.cc != get_lang("undisclosed-recipient"))
+                                                data.cc = data.cc.join(",");
+                                else
+                                                data.cc = "";                   
                                 document.getElementById("cc_" + new_border_ID).value = data.cc;
                                 document.getElementById("a_cc_link_" + new_border_ID).style.display='none';

trunk/expressoMail1_2/templates/default/index.tpl

@@ -6 +6 @@
 <input type="hidden" value="{msg_folder}" id="msg_folder">
 <input type="hidden" value="{msg_number}" id="msg_number">
+<input type="hidden" value="{user_email_alternative}" id="user_email_alternative">
 <input type="hidden" value="{user_email}" id="user_email">
 <input type="hidden" value="{user_organization}" id="user_organization">