Changeset 4685 for branches

Timestamp:

07/08/11 16:02:16 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #2068 - Adicionar e-mail externo nas listas do Expresso

Location:

branches/2.2/expressoAdmin1_2

Files:

• inc/class.uimaillists.inc.php (modified) (2 diffs)
• js/jscode/maillists.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (previous)
• templates/default/maillists_form.tpl (modified) (1 diff)

branches/2.2/expressoAdmin1_2/inc/class.uimaillists.inc.php

@@ -271 +271 @@
                                         else
                                         {
-                                                $mail_not_found .= "<option value=" . $mail . ">" . $cn .  " [" . $array_users_uid[$mail] . "]</option>";
+                                                $mail_not_found .= "<option value=" . $mail . ">"  . $array_users_uid[$mail] . "</option>";
                                         }
                                 }
@@ -277 +277 @@
                                 if ($mail_not_found != '')
                                 {
-                                        $opt_tmp_mail_not_found = '<option  value="-1" disabled>--------------------&nbsp;&nbsp;&nbsp;&nbsp;'.lang('emails did not find').'&nbsp;&nbsp;&nbsp;&nbsp;------------------ </option>'."\n";
+                                        $opt_tmp_mail_not_found = '<option  value="-1" disabled>--------------------&nbsp;&nbsp;&nbsp;&nbsp;'.lang('external users').'&nbsp;&nbsp;&nbsp;&nbsp;------------------ </option>'."\n";
                                         $ea_select_usersInMaillist .= $opt_tmp_mail_not_found . $mail_not_found;
                                 }

branches/2.2/expressoAdmin1_2/js/jscode/maillists.js

@@ -460 +460 @@
         return ufn.substring(0,(ufn.length-1));
 }
+function LTrim(value)
+{
+        var w_space = String.fromCharCode(32);
+        var strTemp = "";
+        var iTemp = 0;
+
+        var v_length = value ? value.length : 0;
+        if(v_length < 1)
+                return "";
+
+        while(iTemp < v_length){
+                if(value && value.charAt(iTemp) != w_space){
+                        strTemp = value.substring(iTemp,v_length);
+                        break;
+                }
+                iTemp++;
+        }
+        return strTemp;
+}
+
+function validateEmail()
+{
+
+        externalEmail = document.getElementById('ea_input_externalUser');
+
+        if( externalEmail.value )
+        {
+                //var element = arguments[0];
+                var validate = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+
+                if(this.LTrim(externalEmail.value) != "" && externalEmail.value != "")
+                {
+                        if(!validate.test(externalEmail.value))
+                        {
+                                alert(get_lang('Email address is not valid') + '.');
+                                externalEmail.focus();
+                                return false;
+                        }else {
+                                this.add_externalUser2maillist(externalEmail.value);
+                        }
+                }
+
+        }
+}
+
+function add_externalUser2maillist(mailAddress)
+{
+        input_externalUsers = mailAddress.toLowerCase(); //document.getElementById('ea_input_externalUser').value;
+        select_usersInMaillist = document.getElementById('ea_select_usersInMaillist');
+
+        var count_externalUsers = input_externalUsers.length;
+        var count_usersInMaillist = select_usersInMaillist.options.length;
+        var new_options = '';
+
+        var teste = ''; //Variavel que ira receber mensagem de alerta ao usuario;
+        var alerta = new Boolean(0); //Variavel que sera usada para verificar se o alerta ao usuario sera exibido ou nao;
+
+        //Laco abaixo compara se o valor escolhido em select_available_users ja existe em select_usersInMaillist
+        //se existir, adiciona o valor em teste e muda a variavel alerta para true; teste sera exibido em tela
+        //apenas de alerta  true; ver if no fim da funcao;
+        for(j = 0; j < count_usersInMaillist; j++)
+        {
+                var tmp = select_usersInMaillist.options[j].text
+
+                if(tmp.match(input_externalUsers))
+                {
+                        teste = get_lang("User already belongs to the list") + "\n" + input_externalUsers + "\n";
+                        alerta = new Boolean(1);
+                }
+        }
+
+        if(alerta != true)
+        {
+                if(document.all)
+                {
+                        if ( (select_usersInMaillist.innerHTML.indexOf('value='+input_externalUsers)) == '-1' )
+                        {
+                                new_options +=  "<option value="
+                                                        + input_externalUsers
+                                                        + ">"
+                                                        + input_extenalUsers
+                                                        + "</options>";
+                        }
+                }
+                else
+                {
+                        if ( (select_usersInMaillist.innerHTML.indexOf('value="'+input_externalUsers+'"')) == '-1' )
+                        {
+                                new_options +=  "<option value="
+                                                        + input_externalUsers
+                                                        + ">"
+                                                        + input_externalUsers
+                                                        + "</options>";
+                        }
+                }
+        }
+
+        if(alerta == true)
+        {
+                alert(teste);
+        }
+
+
+        if (new_options != '')
+        {
+                select_usersInMaillist.innerHTML = new_options + select_usersInMaillist.innerHTML;
+                select_usersInMaillist.outerHTML = select_usersInMaillist.outerHTML;
+        }
+
+        document.getElementById('ea_input_externalUser').value = '';
+}

branches/2.2/expressoAdmin1_2/templates/default/maillists_form.tpl

@@ -75 +75 @@
                                                         <b>{lang_users}:</b><br>
                                                         <select id="ea_select_available_users" style="width:400px; height:200px" multiple size="13"></select>
+                                                        <br/><br/> 
+                                                        <b>{lang_external_user}:</b> 
+                                                        <br/> 
+                                                        <input id="ea_input_externalUser" size="35" type="text"> 
+                                                        <input id="input_user" value="Adicionar" onclick="javascript:validateEmail();" type="button"> 
+                                                        <br/> 
                                                 </td>
                                         </tr>