Changeset 325

Timestamp:

06/24/08 16:45:40 (16 years ago)

Author:

rafaelraymundo

Message:

Alterações realizadas para unificação do ExpressoMail?

---

r39 | 50673548368 | 2008-06-24 18:17:33 -0300 (Ter, 24 Jun 2008) | 9 lines
Caminhos mudados:

M /trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
M /trunk/expressoMail1_2/js/QuickCatalogSearch.js

Os arquivos abaixo sofreram modificacoes para tratar a exibicao do departamento na opcao "Pesquisar" do email.

• alteracao na funcao catalogsearch() em expressoMail1_2/inc/class.ldap_functions.inc.php

• alteracao na funcao searchCatalogList em expressoMail1_2/js/QuickCatalogSearch.js

---

r38 | 98954890059 | 2008-06-24 18:07:11 -0300 (Ter, 24 Jun 2008) | 1 line
Caminhos mudados:

M /trunk/expressoMail1_2/js/rich_text_editor.js

Correcao de traducoes e remocao da variavel defaultDraftsFodler

---

r35 | 98954890059 | 2008-06-19 21:11:11 -0300 (Qui, 19 Jun 2008) | 3 lines
Caminhos mudados:

M /trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
M /trunk/expressoMail1_2/js/QuickCatalogSearch.js

Melhoria inseridas pelo Emerson:

Pesquisa por catalogos externos na Lupa(f9).

---

r34 | 00105772038 | 2008-06-19 19:51:58 -0300 (Qui, 19 Jun 2008) | 3 lines
Caminhos mudados:

M /trunk/expressoMail1_2/templates/default/preferences.tpl

Em preferências do Email foi removida a opção duplicada:

• Salvar rascunhos automaticamente

---

r33 | 98954890059 | 2008-06-19 19:23:04 -0300 (Qui, 19 Jun 2008) | 2 lines
Caminhos mudados:

M /trunk/expressoMail1_2/js/draw_api.js

correcao de bug que nao mostrava a cota do usuario ao abrir o expressoMail.

---

r32 | 98954890059 | 2008-06-19 18:17:39 -0300 (Qui, 19 Jun 2008) | 3 lines
Caminhos mudados:

M /trunk/expressoMail1_2/inc/class.ScriptS.inc.php
M /trunk/expressoMail1_2/inc/class.imap_functions.inc.php
M /trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
M /trunk/expressoMail1_2/index.php
M /trunk/expressoMail1_2/js/DropDownContacts.js
M /trunk/expressoMail1_2/js/InfoContact.js
M /trunk/expressoMail1_2/js/TreeS.js
M /trunk/expressoMail1_2/js/TreeShow.js
M /trunk/expressoMail1_2/js/abas.js
M /trunk/expressoMail1_2/js/common_functions.js
M /trunk/expressoMail1_2/js/doiMenuData.js
M /trunk/expressoMail1_2/js/drag_area.js
M /trunk/expressoMail1_2/js/draw_api.js
M /trunk/expressoMail1_2/js/globals.js
M /trunk/expressoMail1_2/js/main.js
M /trunk/expressoMail1_2/js/rich_text_editor.js
M /trunk/expressoMail1_2/js/search.js
M /trunk/expressoMail1_2/js/shortcut.js
M /trunk/expressoMail1_2/preferences.php
M /trunk/expressoMail1_2/setup/phpgw_pt-br.lang
M /trunk/expressoMail1_2/setup/setup.inc.php
M /trunk/expressoMail1_2/templates/default/index.tpl
M /trunk/expressoMail1_2/templates/default/preferences.tpl

Corcacoes da celepar do bug das imagens e tabelas

---

r30 | 00105772038 | 2008-06-05 18:12:17 -0300 (Qui, 05 Jun 2008) | 5 lines
Caminhos mudados:

M /trunk/expressoMail1_2/js/common_functions.js
M /trunk/expressoMail1_2/js/globals.js

• Foram inseridas funcionalidades para:

globals.js: Extenções de imagens permitidas "allowFileExtensions"

common_functions.js: Alterada a função validateFileExtension para rejeitar arquivos que não sejam imagens no corpo do email

---

r28 | 98954890059 | 2008-05-28 17:37:52 -0300 (Qua, 28 Mai 2008) | 2 lines
Caminhos mudados:

M /trunk/expressoMail1_2/inc/class.imap_functions.inc.php
M /trunk/expressoMail1_2/js/main.js

Alterada a funcao empty_trash() para mudar de Lixeira para imapDefaultTrashFolder.

---

r27 | 00105772038 | 2008-05-28 17:11:41 -0300 (Qua, 28 Mai 2008) | 1 line
Caminhos mudados:

M /trunk/expressoMail1_2/setup/phpgw_pt-br.lang

Incluida tradução para mensagem de 'alert' ao tentar excluir emails de uma pasta compartilhada

---

r26 | 98954890059 | 2008-05-28 13:08:26 -0300 (Qua, 28 Mai 2008) | 1 line
Caminhos mudados:

M /trunk/expressoMail1_2/js/main.js

Inserido get_lang na ACL das pastas compartilhadas. Função move_msgs()

---

r24 | 98954890059 | 2008-05-27 17:53:30 -0300 (Ter, 27 Mai 2008) | 2 lines
Caminhos mudados:

M /trunk/expressoMail1_2/js/preferences.js

Aumentado o tamanho da janela javascript das preferencias do expressoMail.

---

r23 | 03436989789 | 2008-05-27 17:43:54 -0300 (Ter, 27 Mai 2008) | 3 lines
Caminhos mudados:

M /trunk/expressoMail1_2/inc/class.imap_functions.inc.php
M /trunk/expressoMail1_2/js/QuickCatalogSearch.js

Substituição de links no email.

---

r22 | 98954890059 | 2008-05-27 17:07:32 -0300 (Ter, 27 Mai 2008) | 2 lines
Caminhos mudados:

M /trunk/expressoMail1_2/js/draw_api.js

Corrigido um bug na visualizacao das pastas compartilhadas.

---

r19 | 03436989789 | 2008-05-27 15:37:01 -0300 (Ter, 27 Mai 2008) | 3 lines
Caminhos mudados:

M /trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

Pesquisa em catalogos externos

---

r17 | 03436989789 | 2008-05-27 13:18:56 -0300 (Ter, 27 Mai 2008) | 3 lines
Caminhos mudados:

M /trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
M /trunk/expressoMail1_2/js/QuickCatalogSearch.js

Busca de catálogos externos no email.

---

r15 | 98954890059 | 2008-05-27 12:19:50 -0300 (Ter, 27 Mai 2008) | 3 lines
Caminhos mudados:

M /trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
M /trunk/expressoMail1_2/js/QuickCatalogSearch.js

Procura em catálogos externos

---

r6 | 98954890059 | 2008-05-21 16:14:33 -0300 (Qua, 21 Mai 2008) | 2 lines
Caminhos mudados:

M /trunk/expressoMail1_2/js/draw_api.js

Correção para atualizar a visualização das cotas
de pastas compartilhadas ao mudar de pasta.

---

r5 | 98954890059 | 2008-05-21 16:02:37 -0300 (Qua, 21 Mai 2008) | 3 lines
Caminhos mudados:

M /trunk/expressoMail1_2/inc/class.imap_functions.inc.php
M /trunk/expressoMail1_2/js/draw_api.js

Alterações iniciais do serpro:

-Mostrar quotas das pastas compartilhadas

---

r4 | 03436989789 | 2008-05-21 13:25:29 -0300 (Qua, 21 Mai 2008) | 10 lines
Caminhos mudados:

M /trunk/expressoMail1_2/inc/class.imap_functions.inc.php
M /trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
M /trunk/expressoMail1_2/index.php
M /trunk/expressoMail1_2/js/common_functions.js
M /trunk/expressoMail1_2/js/filter.js
M /trunk/expressoMail1_2/js/main.js
M /trunk/expressoMail1_2/js/preferences.js
M /trunk/expressoMail1_2/js/rich_text_editor.js
M /trunk/expressoMail1_2/preferences.php
M /trunk/expressoMail1_2/setup/phpgw_pt-br.lang
M /trunk/expressoMail1_2/templates/default/preferences.tpl

Alterações iniciais do sepro:

• Assinatura automática no corpo das mensagens
• Fixar assinatura no corpo das mensagens
• Questão dos Catálogos Externos (Ao clicar em um email o módulo abre nova mensagem)
• Inserção de imagens em Firefox3
• Quota nas pastas compartilhadas
• Traduções nas pastas

---

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (12 diffs)
• inc/class.ldap_functions.inc.php (modified) (15 diffs)
• index.php (modified) (3 diffs)
• js/QuickCatalogSearch.js (modified) (11 diffs)
• js/common_functions.js (modified) (25 diffs)
• js/draw_api.js (modified) (6 diffs)
• js/filter.js (modified) (1 diff)
• js/main.js (modified) (9 diffs)
• js/preferences.js (modified) (5 diffs)
• preferences.php (modified) (4 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)
• templates/default/preferences.tpl (modified) (8 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -696 +696 @@
                 //Search for emails, then open a new message tab.
                 //$body = @ereg_replace('[a-zA-Z0-9!#$%&\'*+/=?^_`{|}~]+@([.]?[a-zA-Z0-9_/-])*', '<a title=\''.$this->functions->getLang("New Message").' -> \\0\'" onclick="Element(\'msg_number\').value=\'\\0\';new_message(\'new\',\'null\')" href="#">\\0</a>',$body);             
-                $matches = array();
+                //$matches = array();
                 // Verify exception.
-                @preg_match("/<a href=\"notes:\/\/\//",$body,$matches);
+                //@preg_match("/<a href=\"notes:\/\/\//",$body,$matches);
                 // It no has exception,then open the link in new window.
-                if(!count($matches)){
+                /*if(!count($matches)){
                         $body = @eregi_replace("<a (.*) href=", "<a \\1 target='_blank' href=", $body);
                         $body = @str_replace("<a href=", "<a target='_blank' href=", $body);
                         $body = @eregi_replace("target=\"\"", "target='_blank'", $body);
                         $body = @eregi_replace("target=''", "target='_blank'", $body);
-                }
+                }*/
+                $body = preg_replace('/(?<=[\s|(<br>)|\n|\r|;])((http(s?):\/\/((?:[\w]\.?)+(?::[\d]+)?[\/.\-~&=?%;@#,+\w]*))|((?:www?\.)(?:\w\.?)*(?::\d+)?[\/\w.\-~&=?%;@+]*))/i', '<a href="http$3://$4$5" target="_blank">http$3://$4$5</a>', $body);
                 return $body;
         }
@@ -946 +947 @@
                 if (is_array($folders_list)) {
                         reset($folders_list);
+                $ldap = new ldap_functions();
                         
                         $i = 0;
@@ -960 +962 @@
                                 $result[$i]['folder_name'] = array_pop($tmp_folder_parent);
                                 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name'];
-                                
+                                if (is_numeric($result[$i]['folder_name']))     {
+                                        if ($cn = $ldap->uid2cn($result[$i]['folder_name'])){
+                                                $result[$i]['folder_name'] = $cn;
+                                        }
+                                }
+                                                                
                                 $tmp_folder_parent = implode($this->imap_delimiter, $tmp_folder_parent);
                                 $result[$i]['folder_parent'] = $tmp_folder_parent == 'INBOX' ? '' : $tmp_folder_parent;
@@ -985 +992 @@
                 }
                 
-                return array_merge($result2, $this->get_quota());
+                if($mbox_stream)
+                        imap_close($mbox_stream);
+                return array_merge($result2);
         }
         
@@ -1408 +1417 @@
                                                 'folder' => $folder,
                                                 'new_folder_name' => $new_folder_name,
-                                                'border_ID' => $params['border_ID']);
-                
-                // Caso estejamos no box principal, não é necessário pegar a informação da mensagem anterior.           
+                                                'border_ID' => $params['border_ID'],
+                                                'status' => true); //Status foi adicionado para validar as permissoes ACL
+                
+                //Este bloco tem a finalidade de averiguar as permissoes para pastas compartilhadas
+        if (substr($folder,0,4) == 'user'){
+                $acl = $this->getacltouser($folder);
+                /*
+                 *   l - lookup (mailbox is visible to LIST/LSUB commands)
+                 *   r - read (SELECT the mailbox, perform CHECK, FETCH, PARTIAL, SEARCH, COPY from mailbox)
+                 *   s - keep seen/unseen information across sessions (STORE SEEN flag)
+                 *   w - write (STORE flags other than SEEN and DELETED)
+                 *   i - insert (perform APPEND, COPY into mailbox)
+                 *   p - post (send mail to submission address for mailbox, not enforced by IMAP4 itself)
+                 *   c - create (CREATE new sub-mailboxes in any implementation-defined hierarchy)
+                 *   d - delete (STORE DELETED flag, perform EXPUNGE)
+                 *   a - administer (perform SETACL)
+                        */
+                        if (strpos($acl, "d") === false){
+                                $return['status'] = false;
+                                return $return;
+                        }
+        }
+                                
+                // Caso estejamos no box principal, nￜo ￜ necessￜrio pegar a informaￜￜo da mensagem anterior.                 
                 if (($params['get_previous_msg']) && ($params['border_ID'] != 'null') && ($params['border_ID'] != ''))
                         $return['previous_msg'] = $this->get_info_previous_msg($params);
@@ -1894 +1924 @@
         }
         
-        function get_quota(){
-                
+        function get_quota($params){
+                $folder_id = $params['folder_id'];
                 if(!$this->mbox)
                         $this->mbox = $this->open_mbox();
                 
-                $quota = imap_get_quotaroot($this->mbox, "INBOX");
+                $quota = imap_get_quotaroot($this->mbox, $folder_id);
                 if($this->mbox)
                         imap_close($this->mbox);
@@ -1935 +1965 @@
                 $toaddress = $params['notificationto'];
                 
-                $subject = 'Confirmação de leitura: ' . $params['subject'];
+                $subject = 'Confirmaￜￜo de leitura: ' . $params['subject'];
                 $body = 'Sua mensagem: ' . $params['subject'] . '<br>';
                 $body .= 'foi lida por: ' . $_SESSION['phpgw_info']['expressomail']['user']['fullname'] . ' &lt;' . $_SESSION['phpgw_info']['expressomail']['user']['email'] . '&gt; em ' . date("d/m/Y H:i");
@@ -1959 +1989 @@
         function empty_trash()
         {
-                $folder = 'INBOX' . $this->imap_delimiter . 'Lixeira';
+                $folder = 'INBOX' . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']; 
                 $mbox_stream = $this->open_mbox($folder);
                 $return = imap_delete($mbox_stream,'1:*');
@@ -2068 +2098 @@
                 $before_date = date("m/d/Y", strtotime("-".$params['before_date']." day"));
                 $criteria =  'BEFORE "'.$before_date.'"';
-                $mbox_stream = $this->open_mbox('INBOX'.$this->imap_delimiter."Lixeira");
+                $mbox_stream = $this->open_mbox('INBOX'.$this->imap_delimiter.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']);
                 $messages = imap_search($mbox_stream, $criteria, SE_UID);
                 if (is_array($messages)){
@@ -2082 +2112 @@
         function remove_accents($string) {
                 return strtr($string, 
-                "?Ó??ó?Ý?úÁÀÃÂÄÇÉÈÊËÍÌ?ÎÏÑÕÔÓÒÖÚÙ?ÛÜ?áàãâäçéèêëíì?îïñóòõôöúù?ûüýÿ", 
+                "?ￜ??ￜ?ￜ?ￜￜￜￜￜￜￜￜￜￜￜￜￜ?ￜￜￜￜￜￜￜￜￜￜ?ￜￜ?ￜￜￜￜￜￜￜￜￜￜￜￜ?ￜￜￜￜￜￜￜￜￜￜ?ￜￜￜￜ", 
                 "SOZsozYYuAAAAACEEEEIIIIINOOOOOUUUUUsaaaaaceeeeiiiiinooooouuuuuyy");
         }
@@ -2287 +2317 @@
                 $return = array();
                 $mbox_stream = $this->open_mbox();
-                $mbox_acl = imap_getacl($mbox_stream, 'user'.$this->imap_delimiter.$user);
+                //Alterado, antes era 'imap_getacl($mbox_stream, 'user'.$this->imap_delimiter.$user);
+                //Afim de tratar as pastas compartilhadas, verificandos as permissoes de operacao sobre as mesmas
+                //No caso de se tratar da caixa do proprio usuario logado, utiliza a sintaxe abaixo
+                if(substr($user,0,4) != 'user')
+                  $mbox_acl = imap_getacl($mbox_stream, 'user'.$this->imap_delimiter.$user);
+                else
+                  $mbox_acl = imap_getacl($mbox_stream, $user);
                 return $mbox_acl[$this->username];
         }
@@ -2354 +2390 @@
                         $msg = $header . $body;
                         $email = $_SESSION['phpgw_info']['expressomail']['user']['email'];
-                        $username = $this->username;
+                        //$tmp_file = $tmp_dir . "msg." . $email . '.'. $msg_number . time();
+                        // maybe we can get it faster with regex, don't know how :'(
+                        $signature = trim(substr($header, strpos($header, 'X-DSPAM-Signature:') + 18));
                         strtok($email, '@');
                         $domain = strtok('@');
 
-                        //Encontrar a assinatura do dspam no cabecalho
-                        $v = explode("\r\n", $header);
-                        foreach ($v as $linha){
-                                if (eregi("^X-DSPAM-Signature", $linha)) {
-                                        
-                                        $args = explode(" ",$linha);
-                                        $signature = $args[1];
-                                }
-                        }
-
                         // feed dspam
-                        switch($is_spam){
-                                case 'true':  $cmd = $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_spam']; break;
-                                case 'false': $cmd = $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_ham']; break;
-                        }
-                        $tags = array('##EMAIL##', '##USERNAME##', '##DOMAIN##', '##SIGNATURE##');
-                        $cmd = str_replace($tags,array($email,$username,$domain,$signature),$cmd);
+                        if ($is_spam)
+                                $cmd = str_replace(
+                                                        array('##EMAIL##', '##USERNAME##', '##DOMAIN##', '##SIGNATURE##'), 
+                                                        array($email, $this->username, $domain, $signature), $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_spam']
+                                                );
+                        else
+                                $cmd = str_replace(
+                                                        array('##EMAIL##', '##USERNAME##', '##DOMAIN##', '##SIGNATURE##'),
+                                                array($email, $this->username, $domain, $signature), $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_ham']
+                                        );
+                        
                         system($cmd);
+                        
                 }
                 imap_close($mbox_stream);

trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -15 +15 @@
         
         // usa o host e context do contact center.
-        function ldapConnect($refer = false){
-                $this->ldap_host        = $_SESSION['phpgw_info']['expressomail']['ldap_server']['host'];
-                $this->ldap_context = $_SESSION['phpgw_info']['expressomail']['ldap_server']['dn'];
-                $this->ds                       = ldap_connect($this->ldap_host);
+        function ldapConnect($refer = false,$catalogo = 0){
+        include("../contactcenter/setup/external_catalogs.inc.php");
+                if ($catalogo == 0){
+                        $this->ldap_host        = $_SESSION['phpgw_info']['expressomail']['ldap_server']['host'];
+                        $this->ldap_context = $_SESSION['phpgw_info']['expressomail']['ldap_server']['dn'];
+                        $this->bind_dn = $_SESSION['phpgw_info']['expressomail']['ldap_server']['acc'];
+                        $this->bind_dn_pw = $_SESSION['phpgw_info']['expressomail']['ldap_server']['pw'];
+                        $this->branch = 'ou';                   
+                }else {
+                        
+                        $this->ldap_host        =   $external_srcs[$catalogo]['host'];
+                        $this->ldap_context =   $external_srcs[$catalogo]['dn'];
+                        $this->bind_dn = $external_srcs[$catalogo]['acc'];
+                        $this->bind_dn_pw = $external_srcs[$catalogo]['pw'];
+                        $this->object_class = $external_srcs[$catalogo]['obj'];
+                        $this->base_dn = $external_srcs[$catalogo]['dn'];
+                        $this->branch = $external_srcs[$catalogo]['branch'];
+
+                }
+                $this->ds = ldap_connect($this->ldap_host);
                 ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3);
                 ldap_set_option($this->ds, LDAP_OPT_REFERRALS, $refer);
-                if ($refer)
-                {
+                if ($refer){
                         ldap_set_rebind_proc($this->ds, ldapRebind);
                 }
-                @ldap_bind($this->ds, $_SESSION['phpgw_info']['expressomail']['ldap_server']['acc'],$_SESSION['phpgw_info']['expressomail']['ldap_server']['pw']);                              
+                @ldap_bind($this->ds,$this->bind_dn,$this->bind_dn_pw );                                
+                
         }
 
@@ -58 +74 @@
         function quicksearch($params)
         {       
+                include_once("../contactcenter/setup/external_catalogs.inc.php");
                 include_once("class.functions.inc.php");
                 $functions = new functions;                                             
 
-                $search_for     = $params['search_for'];
+                $search_for     = utf8_encode($params['search_for']);
                 $field          = $params['field'];
                 $ID                     = $params['ID'];
                 
+                $search_for     = explode(" ",$search_for);
+                $aux="";
+                foreach ($search_for as $search)
+                        {
+                        if(!$aux)
+                                {
+                                $aux=$search;
+                                }
+                                else
+                                {
+                                $aux=$aux."*".$search;
+                                }
+                        }
+                $search_for=$aux;
                 $contacts_result = array();
                 $contacts_result['field'] = $field;
@@ -73 +104 @@
                 
                 if ($this->ds)
-                {
+                        {
                         if (($field != 'null') && ($ID != 'null'))
-                        {
-                                $filter="(& (|(phpgwAccountType=u)(phpgwAccountType=l)) (|(cn=*$search_for*)(mail=$search_for*)) (!(phpgwaccountvisible=-1)) )";
-                                $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid");
-                        }
+                                {
+                                $filter="(& (|(phpgwAccountType=u)(phpgwAccountType=l)) (|(cn=*$search_for*)(mail=*$search_for*)) (!(phpgwaccountvisible=-1)) )";
+                                $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid", "employeeNumber", "ou");
+                                }
                         else
-                        {
+                                {
                                 $filter="(& (phpgwAccountType=u)(cn=*$search_for*) (!(phpgwaccountvisible=-1)) )";
-                                $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "jpegPhoto", "uid");
-                        }
-                        
-                        $sr=ldap_search($this->ds, $this->ldap_context, $filter, $justthese);
+                                $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "jpegPhoto", "uid", "employeeNumber", "ou");
+                                }
+                        $sr=ldap_search($this->ds, $this->ldap_context, $filter, $justthese, 0, 201);
                         $count_entries = ldap_count_entries($this->ds,$sr);
-
+                        
                         // Get user org dn.                     
                         $user_dn = $_SESSION['phpgw_info']['expressomail']['user']['account_dn'];
@@ -104 +134 @@
                                 $this->ldapRootConnect(true);
                                 
-                                $sr=ldap_search($this->ds, $user_sector_dn, $filter, $justthese);
+                                $sr=ldap_search($this->ds, $user_sector_dn, $filter, $justthese, 0, 201);
                                 $count_entries = ldap_count_entries($this->ds,$sr);
                                 
@@ -123 +153 @@
                         $tmp = array();
                         $tmp_users_from_user_org = array();
+                        
+                        if (!$quickSearch_only_in_userSector)
+                                {
+                                $catalogsNum=count($external_srcs);
+                                for ($i=0; $i<=count($external_srcs); $i++)
+                                        {
+                                        if ($external_srcs[$i]["quicksearch"])
+                                                {
+                                                $this->ldapConnect(true,$i);
+                                                $filter="(|(cn=*$search_for*)(mail=*$search_for*))";
+                                                $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid", "employeeNumber", "ou");
+                                                $sr=ldap_search($this->ds, $this->ldap_context, $filter, $justthese, 0, 201);
+                                                $count_entries = ldap_count_entries($this->ds,$sr);
+                                                $search = ldap_get_entries($this->ds, $sr);
+                                                for ($i=0; $i<$search["count"]; $i++)
+                                                        {
+                                                        $info[] = $search[$i];
+                                                        }
+                                                $info["count"] = count($info)-1;
+                                                }
+                                        }
+                                }
+                        
                         for ($i=0; $i<$info["count"]; $i++)
-                        {
-                                // Usuario sempre serao da minha org.
+                                {
                                 if ($quickSearch_only_in_userSector)
-                                {
-                                        $tmp[$info[$i]["mail"][0] . '%' . $info[$i]["telephonenumber"][0] . '%'. $info[$i]["mobile"][0] . '%' . $info[$i]["uid"][0] . '%' . $info[$i]["jpegphoto"]['count']] = $info[$i]["cn"][0];
-                                }
+                                        {
+                                        $tmp[$info[$i]["mail"][0] . '%' . $info[$i]["telephonenumber"][0] . '%'. $info[$i]["mobile"][0] . '%' . $info[$i]["uid"][0] . '%' . $info[$i]["jpegphoto"]['count'] . '%' . $info[$i]["employeenumber"][0] . '%' . $info[$i]["ou"][0]] = utf8_decode($info[$i]["cn"][0]);
+                                        }
                                 else
-                                {
+                                        {
                                         if (preg_match("/$user_sector_dn/i", $info[$i]['dn']))
-                                        {
-                                                $tmp_users_from_user_org[$info[$i]["mail"][0] . '%' . $info[$i]["telephonenumber"][0] . '%'. $info[$i]["mobile"][0] . '%' . $info[$i]["uid"][0] . '%' . $info[$i]["jpegphoto"]['count']] = $info[$i]["cn"][0];
+                                                {
+                                                $tmp_users_from_user_org[$info[$i]["mail"][0] . '%' . $info[$i]["telephonenumber"][0] . '%'. $info[$i]["mobile"][0] . '%' . $info[$i]["uid"][0] . '%' . $info[$i]["jpegphoto"]['count'] . '%' . $info[$i]["employeenumber"][0] . '%' . $info[$i]["ou"][0]] = utf8_decode($info[$i]["cn"][0]);
+                                                }
+                                        else
+                                                {
+                                                $tmp[$info[$i]["mail"][0] . '%' . $info[$i]["telephonenumber"][0] . '%'. $info[$i]["mobile"][0] . '%' . $info[$i]["uid"][0] . '%' . $info[$i]["jpegphoto"]['count'] . '%' . $info[$i]["employeenumber"][0] . '%' . $info[$i]["ou"][0]] = utf8_decode($info[$i]["cn"][0]);
+                                                }
                                         }
-                                        else
-                                        {
-                                                $tmp[$info[$i]["mail"][0] . '%' . $info[$i]["telephonenumber"][0] . '%'. $info[$i]["mobile"][0] . '%' . $info[$i]["uid"][0] . '%' . $info[$i]["jpegphoto"]['count']] = $info[$i]["cn"][0];
-                                        }
-                                }
-                        }
+                                }
                         natcasesort($tmp_users_from_user_org);
                         natcasesort($tmp);
@@ -156 +208 @@
                                         $contacts_result[$i] = array();
                                         $contacts_result[$i]["cn"] = $cn;
-                                        list ($contacts_result[$i]["mail"], $contacts_result[$i]["phone"], $contacts_result[$i]["mobile"]) = split ('%', $info);
+                                        list ($contacts_result[$i]["mail"], $contacts_result[$i]["phone"], $contacts_result[$i]["mobile"], $contacts_result[$i]["uid"], $contacts_result[$i]["jpegphoto"], $contacts_result[$i]["employeenumber"], $contacts_result[$i]["ou"]) = split ('%', $info);
                                         $i++;
                                 }
@@ -272 +324 @@
         }
 
+        function get_catalogs(){
+                include("../contactcenter/setup/external_catalogs.inc.php");
+                $catalogs = array();
+                $catalogs[0] = "Catalogo geral"; 
+                foreach ($external_srcs as $key => $valor ){
+                        $catalogs[$key] = $valor['name'];
+                }
+                return $catalogs;
+        }
         function get_organizations($params){
+
                 $organizations = array();
-                $referral = $params['referral'];
-                $this->ldapConnect($referral);
-                if ($this->ds) {
-                        $filter="ou=*";         
-                        $justthese = array("ou");
-                        $sr = ldap_list($this->ds, $this->ldap_context, $filter, $justthese);
-                        $info = ldap_get_entries($this->ds, $sr);
-                        
-                        for ($i=0; $i<$info["count"]; $i++)
-                                $organizations[$i] = $info[$i]["ou"][0];
-
-                        ldap_close($this->ds);
-                        sort($organizations);                                   
-                }
-                return $organizations;
-        }
-
+                $params['referral']?$referral = $params['referral']:$referral = false;
+                $cat = $params['catalog'];
+
+                $this->ldapConnect($referral,$cat);
+
+                        if($this->branch != '') {
+                                $filter=$this->branch."=*";
+                                $justthese = array("$this->branch");
+                                $sr = ldap_list($this->ds, $this->ldap_context, $filter, $justthese);
+                                $info = ldap_get_entries($this->ds, $sr);
+
+                                for ($i=0; $i<$info["count"]; $i++)
+                                        $organizations[$i] = $info[$i]["ou"][0];
+
+                                ldap_close($this->ds);
+                                sort($organizations);
+                                return $organizations;
+                        }else{
+                        return null;
+                }
+        }
         function get_organizations2($params){
                 $organizations = array();
@@ -315 +381 @@
         function catalogsearch($params)
         {       
-                $this->ldapConnect(true);
-                $cn     = $params['search_for'] ? "*".$params['search_for']."*" : "*";
-                $user_context = "ou=".$params['organization'].",".$this->ldap_context;          
-                $max_result       = $params['max_result'] ? $params['max_result'] : '200';              
+                //$this->ldapConnect(true);
+                include("../contactcenter/inc/external_catalogs.inc.php");
+                $cn     = $params['search_for'] ? "*".utf8_encode($params['search_for'])."*" : "*";
+                $max_result       = $params['max_result'] ? $params['max_result'] : '200';
+                $catalog = $params['catalog'];
                 $error = False;
+                        
+                $this->ldapConnect(false,$catalog);
+                
+                $params['organization'] == 'todos'?$user_context = $this->ldap_context :$user_context = $this->branch."=".$params['organization'].",".$this->ldap_context;              
                 
                 if ($this->ds) {                                                                                        
-                        $justthese = array("cn", "mail", "phpgwaccounttype", "phpgwAccountVisible");
-                        $filter="(&(|(phpgwAccountType=u)(phpgwAccountType=l))(cn=".$cn."))";
-                        $sr=ldap_search($this->ds, $user_context, $filter, $justthese);
-                        
+                        if ($catalog == 0){
+                                //os atributos "employeeNumber" e "ou" foram adicionado ao vetor de busca;
+                                $justthese = array("cn", "mail", "phpgwaccounttype", "phpgwAccountVisible", "employeeNumber", "ou");
+                                $filter="(&(|(phpgwAccountType=u)(phpgwAccountType=l))(cn=".$cn."))";
+                                //$user_context = "ou=".$params['organization'].",".$this->ldap_context;
+                        }else {
+                                //os atributos "employeeNumber" e "ou" foram adicionado ao vetor de busca;
+                                $justthese = array("cn", "mail", "employeeNumber", "ou");
+                                $filter="(&(objectClass=".$this->object_class.")(cn=".$cn."))";
+                                //$user_context = $this->branch."=".$params['organization'].",".$external_srcs[$catalog]['dn'];
+                        }
+                        
+                        $sr=ldap_search($this->ds, $user_context, $filter, $justthese,0,200);
                         $count_entries = ldap_count_entries($this->ds,$sr);
                         if ($count_entries > $max_result){
@@ -340 +420 @@
                         
                         for ($i=0; $i<$info["count"]; $i++){
-                                if ($info[$i]["phpgwaccountvisible"][0] == '-1')
-                                        continue;
-                                if((strtoupper($info[$i]["phpgwaccounttype"][0]) == 'U') && ($info[$i]["phpgwaccountvisible"][0] != '-1'))
-                                        $u_tmp[$info[$i]["mail"][0]] = $info[$i]["cn"][0];
+                                if((!$catalog==0)||(strtoupper($info[$i]["phpgwaccounttype"][0]) == 'U') && ($info[$i]["phpgwaccountvisible"][0] != '-1'))
+                                        //aqui eh feita a concatenacao do departamento ao cn;
+                                        $u_tmp[$info[$i]["mail"][0]] = utf8_decode($info[$i]["cn"][0]). '%' . $info[$i]["ou"][0];
                                 else
-                                        $g_tmp[$info[$i]["mail"][0]] = $info[$i]["cn"][0];
+                                        $g_tmp[$info[$i]["mail"][0]] = utf8_decode($info[$i]["cn"][0]);
                         }                                                                               
                         
                         natcasesort($u_tmp);
                         natcasesort($g_tmp);
-                        
+
                         $i = 0;
-                        $users = array();                       
-                        
-                        foreach ($u_tmp as $mail => $cn){                               
-                                $users[$i++] = array("name" => $cn, "email" => $mail);
-                        }
+                        $users = array();
+
+
+                        foreach ($u_tmp as $mail => $cn){
+
+                                $tmp = explode("%", $cn); //explode o cn pelo caracter "%" e joga em $tmp;
+                                $name = $tmp[0]; //pega o primeiro item (cn) do vetor resultante do explode acima;
+                                $department = $tmp[1]; //pega o segundo item (ou) do vetor resultanto do explode acima;
+                                $users[$i++] = array("name" => $name, "email" => $mail, "department" => $department);
+
+                        }
+
                         unset($u_tmp);
                         
@@ -368 +454 @@
                         
                         return  array('users' => $users, 'groups' => $groups, 'error' => $error);
-                }                               
+                }else                           
                 return null;
         }
@@ -393 +479 @@
         }
         
-        //Busca usuários de um contexto e já retorna as options do select;
+        //Busca usuￜrios de um contexto e jￜ retorna as options do select;
         function get_available_users($params)
     {
         $this->ldapRootConnect();
-        //Monta lista de Grupos e Usuários
+        //Monta lista de Grupos e Usuï¿œrios
         $users = Array();
         $groups = Array();
@@ -449 +535 @@
     }
 
-        //Busca usuários de um contexto e já retorna as options do select;
+        //Busca usuￜrios de um contexto e jￜ retorna as options do select;
         function get_available_users2($params)
         {
@@ -499 +585 @@
                         
                         $info = ldap_get_entries($this->ds, $sr);
-                        return $info[0]["cn"][0];
+                        return utf8_decode($info[0]["cn"][0]);
                 }
                 return false;
@@ -524 +610 @@
                         $info   =       ldap_get_entries($this->ds, $sr);
                         $info['myname'] = $_SESSION['phpgw_info']['expressomail']['user']['fullname'];                                          
+                        for ($i = 0;$i < $info["count"]; $i++)
+                                $info[$i]['cn'][0] = utf8_decode($info[$i]['cn'][0]);
                         return $info;
                 }
@@ -546 +634 @@
                         
                         if($entry) {                                            
-                                $obj =  array("cn" => ldap_get_values($ds, $entry, "cn"),
+                                $obj =  array("cn" => utf8_decode(ldap_get_values($ds, $entry, "cn")),
                                                   "email" => $params['email'],
                                                   "uid" => ldap_get_values($ds, $entry, "uid"),

trunk/expressoMail1_2/index.php

@@ -40 +40 @@
         
         //Enable/Disable VoIP Service
-        $voip_enabled = false;
+        $voip_enabled = true;
 
         // Get Data from ldap_manager and emailadmin.
@@ -62 +62 @@
                 'mainscreen_showmail'                           => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['mainscreen_showmail'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['mainscreen_showmail'] : "0",
                 'signature'                                             => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['signature'],
-                'hide_folders'                                          => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] : "0",                 
+                'use_signature'                                         => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'],
+                        'hide_folders'                                          => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] : "0",                 
                 'save_in_folder'                                        => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] : "-1",
                 'line_height'                                           => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['line_height'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['line_height'] : "30",
@@ -114 +115 @@
        // Set Imap Folder names options
 
-    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']   = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']     ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']             : lang("Trash");
-    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']  = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'] ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']       : lang("Drafts");
-    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']              : lang("Spam");
-    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']              : lang("Sent");
+    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']   = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']     ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']             : "Trash";
+    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']  = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'] ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']       : "Drafts";
+    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']              : "Spam";
+    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']              : "Sent";
 
     echo '<script> var special_folders = new Array(4);

trunk/expressoMail1_2/js/QuickCatalogSearch.js

@@ -35 +35 @@
                         var cmb = document.createElement("SELECT");
                         cmb.id = "select_QuickCatalogSearch";
-                        cmb.style.width = "585px";
+                        cmb.style.width = "685px"; // na comunidade valor eh 585px
                         cmb.size = "12";
                         cmb.onkeypress = function (e)
@@ -134 +134 @@
                         Op.text = data[i].cn + ' (' + data[i].mail + ')';
                         if (data[i].phone != '')
-                                Op.text += ' (tel: ' + data[i].phone + ')';
+                                Op.text += ' - ' + data[i].phone;
+                        if (data[i].ou != '')
+                                Op.text += ' - ' + data[i].ou; // adicionado "data[i].ou" para exibir setor (F9)
                         Op.value = '"' + data[i].cn + '" ' + '<' + data[i].mail + '>';
                         cmb.options.add(Op);
+
                 }
                 cmb.options[0].selected = true;
@@ -150 +153 @@
                                                         
                 if(! this.arrayWin[div.id]) {
-                        div.style.width = "600px";
+                        div.style.width = "700px"; //na comunidade valor eh 600px
                         div.style.height = "230px";
                         var title = get_lang('The results were found in the Global Catalog')+':';
@@ -223 +226 @@
                 el.style.visibility = "hidden";
                 el.style.position = "absolute";
-                el.style.width = "495px";
+                el.style.width = "700px"; // na comunidade valor eh 495px
                 el.style.height = is_ie ? "360px" : "375px";            
                 el.style.left = "0px";
@@ -234 +237 @@
                                            '<table border="0" cellpading="0" cellspacing="0">'+
                                            '<tr><td>'+get_lang("Select an organization and click on button <b>Search</b>")+'&nbsp;:</td></tr>'+
-                                           '<tr><td><select id="select_organization" name="select_organization"></select>&nbsp;'+
-                                           '<input type="text" id="search_for" name="search_for" value="" size="17" maxlength="20"/>&nbsp;<input type="button" onclick="QuickCatalogSearch.searchCatalogList(true)" class="button" value="'+get_lang('Search')+'">&nbsp;<input type="button" onclick="QuickCatalogSearch.searchCatalogList(false)" class="button" value="'+get_lang('List All')+'"></td></tr>'+
+                                        '<tr><td><select style="width:150px" id="select_catalog" name="select_catalog" onchange="javascript:QuickCatalogSearch.update_organizations();"></select>&nbsp'+
+                                        '<select id="select_organization" style="width:100px" name="select_organization"></select>&nbsp;'+   
+                                        '<input type="text" id="search_for" name="search_for" value="" size="10" maxlength="15"/>&nbsp;<input type="button" onclick="QuickCatalogSearch.searchCatalogList(true)" class="button" value="'+get_lang('Search')+'">&nbsp;<input style="display:none" type="button" onclick="QuickCatalogSearch.searchCatalogList(false)" class="button" value="'+get_lang('List All')+'"></td></tr>'+
                                            '<tr><td><input onclick="javascript:QuickCatalogSearch.changeOptions(this.value)" id="type" type="radio" name="type" value="l"/>'+get_lang('Public Lists')+'&nbsp;&nbsp;<input type="radio" name="type" value="u" onclick="javascript:QuickCatalogSearch.changeOptions(this.value)" checked/>'+get_lang('Users')+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+
                                            '<span style="visibility:hidden;background:#cc4444" id=msg_search>&nbsp;&nbsp;<font face="Verdana" size="1" color="WHITE">'+get_lang('Search in Catalog')+'...</font>&nbsp;</span></td></tr>'+
                                            '<tr><td>'+
-                                           '<span id="list_span"><select multiple style="display:none;width:400px" size="14" id="list_values"></select></span>'+
-                                           '<span id="user_span"><select multiple style="width:400px" size="14" id="user_values"></select></span>'+
+                                           '<span id="list_span"><select multiple style="display:none;width:450px" size="14" id="list_values"></select></span>'+
+                                           '<span id="user_span"><select multiple style="width:580px" size="14" id="user_values"></select></span>'+
                                            '</td></tr>'+
                                            '<tr><td nowrap><center>'+get_lang('Click here to add into the fields')+':&nbsp;<input type="button" class="button" value="'+get_lang('TO')+'" onClick="javascript:QuickCatalogSearch.addContacts(\'to\')">&nbsp;'+
@@ -291 +295 @@
                 win.open();
 
-                var handler_organizations = function(data){
-                        var user_organization = Element('user_organization').value;
+                var handler_catalogs = function(data){
+                        var user_catalog = "Catalogo Geral";
 
                         for(i = 0; i < data.length; i++) {
-                                Element('select_organization').options[i] = new Option(data[i],data[i]);
-                                if(user_organization.toUpperCase() == data[i].toUpperCase())
-                                        Element('select_organization').options[i].selected = true;
-                        }
-                }
-                cExecute ("$this.ldap_functions.get_organizations&referral=true", handler_organizations);
-                
+                        
+                                Element('select_catalog').options[i] = new Option(data[i],i);
+                                if(user_catalog.toUpperCase() == data[i].toUpperCase())
+                                        Element('select_catalog').options[i].selected = true;
+                        }
+                }
+                cExecute ("$this.ldap_functions.get_catalogs", handler_catalogs);               
+
+                this.update_organizations();
+        
                 var handler_cc_contacts= function(data){
                         if(data && data.length > 0){
@@ -367 +374 @@
         }
 
+        emQuickCatalogSearch.prototype.update_organizations = function(){
+
+                        
+                while(Element('select_organization').options.length > 0) {
+                        Element('select_organization').remove(0);
+                }
+                
+                
+                var handler_org = function(data){
+                        Element('select_organization').options[0] = new Option('todos','todos');
+                        if (data != null){
+                        
+                        for(x = 0; x < data.length; x++) {
+                                Element('select_organization').options[x+1] = new Option(data[x],data[x]);
+                                }
+                        }
+                        
+                }
+                
+                cExecute ("$this.ldap_functions.get_organizations&referral=false&catalog="+Element('select_catalog').value, handler_org);
+                
+        }
+
         emQuickCatalogSearch.prototype.changeOptions = function(type){  
 
@@ -428 +458 @@
         emQuickCatalogSearch.prototype.searchCatalogList = function (itemSearch){
 
-                if(itemSearch && Element('search_for').value.length == 0){
-                        alert(get_lang('No data to search'));
+                if(itemSearch && Element('search_for').value.length < 4){
+                        alert(get_lang('your search argument must be longer than 4 characters.'));
                         Element('search_for').focus();
                         return false;
@@ -435 +465 @@
                 var organization = Element('select_organization').value;                
                 var search               = itemSearch ? Element('search_for').value : '';
-                var max_result   = 2000;
+                var catalog              = Element('select_catalog').value;
+                var max_result   = 300;
 
                 var handler_searchResults = function(data){
@@ -477 +508 @@
                         
                         for(i = 0; data.users && i < data.users.length; i++) {                  
-                                if(is_ie)
+                                if(is_ie){
                                         arr[i] = '<option value="'+'&quot;'+data.users[i].name+'&quot; &lt;'+data.users[i].email+'&gt;">'+data.users[i].name+' ('+data.users[i].email+')'+'</option>';
-                                else
-                                        user.options[i] = new Option(data.users[i].name+' ('+data.users[i].email+')','"'+data.users[i].name+'" <'+data.users[i].email+'>');
+                                }
+                                else{
+
+                                /*******************************************************************************************/
+                                /* O resultado pratico do bloco de codigo a seguir eh a exibicao dos valores em tela,
+                                ja que vai verificar se o departamento e o email estao vazios ou nulos e a partir dai o
+                                resultado apresentado em tela sera exibido de maneira mais apresentavel;
+                                */
+                                        //verifica se departamento eh null ou nao;
+                                        var departamento_nulo = 'false';
+                                        if((data.users[i].department == null) || (data.users[i].department == '')) {
+                                                data.users[i].department = '';
+                                                departamento_nulo = 'true';
+                                        }
+                                        else {
+                                                data.users[i].department = ' - ' + data.users[i].department;
+                                        }
+
+                                        //verifica se email eh null ou nao;
+                                        if((data.users[i].email == null) || (data.users[i].email == '')) {
+                                                if(departamento_nulo = 'true') {
+                                                        data.users[i].email = '';
+                                                }
+                                                else {
+                                                        data.users[i].email = ' - ';
+                                                }
+                                        }
+                                        else {
+                                                data.users[i].email = ' (' + data.users[i].email + ') ';
+                                        }
+
+                                        user.options[i] = new Option(data.users[i].name+data.users[i].email+data.users[i].department,'"'+data.users[i].name+'" <'+data.users[i].email+'>'); // incluido data.users[i].department para exibir setor na opcao "Pesquisar" do email;
+                                }
                         }
         
@@ -488 +550 @@
 
                 Element('msg_search').style.visibility = 'visible';
-                cExecute ("$this.ldap_functions.catalogsearch&max_result="+max_result+"&organization="+organization+"&search_for="+search, handler_searchResults);
+                cExecute ("$this.ldap_functions.catalogsearch&max_result="+max_result+"&organization="+organization+"&search_for="+search+"&catalog="+catalog, handler_searchResults);
         }
 

trunk/expressoMail1_2/js/common_functions.js

@@ -35 +35 @@
         var bar = Element("toolbar");
         var offset = 0;
-        if(bar.style.visibility != 'hidden') 
-                offset = (bar.offsetHeight ? bar.offsetHeight :  bar.clientHeight);     
+        if(bar.style.visibility != 'hidden')
+                offset = (bar.offsetHeight ? bar.offsetHeight :  bar.clientHeight);
 
         var screenHeight = document.body.clientHeight ? document.body.clientHeight : document.body.offsetHeight;
@@ -57 +57 @@
 // END: FUNCTION RESIZE WINDOW
 
-// onUnload edit message
-
 var _beforeunload_ = window.onbeforeunload;
 
@@ -79 +77 @@
 function get_lang(_key,_arg1,_arg2,_arg3,_arg4) {
 
-        if(!array_lang[0]){             
+        if(!array_lang[0]){
                 return _key+"*";
         }
-        _value = "";    
+        _value = "";
         for(i = 0; i < array_lang[0].length;i++){
                 if(array_lang[0][i] == _key.toLowerCase()) {
-                        _value = array_lang[1][i];                                      
+                        _value = array_lang[1][i];
                         break;
                 }
-        }       
-        
+        }
+
         if(!_value)
                 return _key+"*";
-                        
+
         if(_arg1 || _arg2 ||_arg3 || _arg4) {
                 for(j = 1; j <= 4; j++){
                         if(eval("_arg"+j)) {
-                                var regExp = new RegExp("%"+j+"");              
+                                var regExp = new RegExp("%"+j+"");
                                 _value = _value.replace(regExp,eval("_arg"+j));
                         }
                 }
         }
-        
+
         return _value;
 }
@@ -112 +110 @@
 
 // Change the class of message.
-// In refresh, the flags UnRead and UnSeen don't exist anymore. 
+// In refresh, the flags UnRead and UnSeen don't exist anymore.
 function set_msg_as_read(msg_number, selected){
         tr_message = Element(msg_number);
@@ -170 +168 @@
         //Get element tBody.
         main = document.getElementById("tbody_box");
-                
+
         // Get all TR (messages) in tBody.
         main_list = main.childNodes;
-        
+
         return main_list.length;
 }
@@ -180 +178 @@
         div_attachment = document.getElementById("id_div_attachment");
         var params = '';
-        
+
         if (div_attachment == null){
                 var div_attachment = document.createElement("DIV");
@@ -195 +193 @@
 
 function download_all_attachments(msg_folder, msg_number){
-        var handler_source = function(data){            
+        var handler_source = function(data){
                 download_attachments(null, null, data, null,null,'anexos.zip');
         }
@@ -205 +203 @@
         if (! divFiles)
                 return false;
-        
+
         if (divFiles.lastChild)
                 var countDivFiles = parseInt(divFiles.lastChild.id.split('_')[2]) + 1;
@@ -211 +209 @@
         if (! countDivFiles)
                 var countDivFiles = 1;
-        
+
         divFile = document.createElement('DIV');
-        
+
         var inputFile = document.createElement("INPUT");
-        
+
         var tmp_id_border = document.createAttribute('id_border');
         tmp_id_border.value = id_border;
-        
+
         inputFile.setAttributeNode(tmp_id_border);
         inputFile.id = "inputFile_"+id_border+"_"+countDivFiles;
@@ -226 +224 @@
         inputFile.maxLength = 255;
         inputFile.name='file_'+countDivFiles;
-        
+
         divFile.appendChild(inputFile);
-        
+
         var linkFile = document.createElement("A");
         linkFile.id = "linkFile_"+id_border+"_"+countDivFiles;
         linkFile.href='javascript:void(0)';
         linkFile.onclick=function () {removeFile(this.id.replace("link","div")); return false;};
-        linkFile.innerHTML=get_lang("Remove");  
+        linkFile.innerHTML=get_lang("Remove");
         //divFile.innerHTML += "&nbsp;&nbsp;";
         divFile.appendChild(linkFile);
-        divFile.id = "divFile_"+id_border+"_"+countDivFiles;    
+        divFile.id = "divFile_"+id_border+"_"+countDivFiles;
         divFiles.appendChild(divFile);
 }
@@ -289 +287 @@
 // Funcao usada para escrever mensagem
 // notimeout = True : mensagem nao apaga
-function write_msg(msg, notimeout){     
-        
+function write_msg(msg, notimeout){
+
         if (setTimeout_write_msg)
                 clearTimeout(setTimeout_write_msg);
-        
+
         var msg_div = Element('em_div_write_msg');
         var old_divStatusBar = Element("divStatusBar");
@@ -304 +302 @@
                 msg_div.style.display = 'none';
                 old_divStatusBar.parentNode.insertBefore(msg_div,old_divStatusBar);
-        }       
+        }
         msg_div.innerHTML = '<table bgcolor="#f7f8fa" width=100% cellspacing="0" cellpadding="0" border="0"><tbody><tr><th width="40%"></th><th noWrap class="action_info_th">'+msg+'</th><th width="40%"></th></tr></tbody></table>';
         old_divStatusBar.style.display = 'none';
-        msg_div.style.display = '';     
+        msg_div.style.display = '';
         // Nao ponha var na frente!! jakjr
         handle_write_msg = function(){
@@ -314 +312 @@
                                 clean_msg();
                         else
-                                write_msg(old_msg, true);                       
+                                write_msg(old_msg, true);
                 }
                 catch(e){}
@@ -330 +328 @@
         if(msg_div)
                 msg_div.style.display = 'none';
-        old_divStatusBar.style.display = '';    
+        old_divStatusBar.style.display = '';
 }
 
@@ -373 +371 @@
         var quickSearchKeyBegin;
         var quickSearchKeyEnd;
-        
+
         var handler_emQuickSearch = function(data)
         {
@@ -380 +378 @@
                         window_DropDownContacts.style.visibility = 'hidden';
                 }
-                
+
                 if ((!data.status) && (data.error == "many results")){
                         alert(get_lang('More than %1 results. Please, try to refine your search.',200));
                         return false;
                 }
-                        
+
                 if (data.length > 0){
                         if ((field != 'null') && (ID != 'null'))
@@ -402 +400 @@
                 return true;
         }
-        
+
         if ((field != 'null') && (ID != 'null'))
         {
-                Element(field +'_'+ ID).focus(); //necessário para o IE.
+                Element(field +'_'+ ID).focus(); //necessï¿œrio para o IE.
                 var i = getPosition(Element(field +'_'+ ID)); //inputBox.selectionStart;
                 var j = --i;
@@ -422 +420 @@
         else
                 var search_for = emailList;
-        
+
         if (search_for.length < 4){
                 alert(get_lang('Your search argument must be longer than 4 characters.'));
                 return false;
         }
-        
+
         cExecute ("$this.ldap_functions.quicksearch&search_for="+search_for+"&field="+field+"&ID="+ID, handler_emQuickSearch);
 }
@@ -475 +473 @@
 
 function url_encode(str){
-    var hex_chars = "0123456789ABCDEF"; 
-    var noEncode = /^([a-zA-Z0-9\_\-\.])$/; 
-    var n, strCode, hex1, hex2, strEncode = ""; 
-
-    for(n = 0; n < str.length; n++) { 
-        if (noEncode.test(str.charAt(n))) { 
-            strEncode += str.charAt(n); 
-        } else { 
-            strCode = str.charCodeAt(n); 
-            hex1 = hex_chars.charAt(Math.floor(strCode / 16)); 
-            hex2 = hex_chars.charAt(strCode % 16); 
-            strEncode += "%" + (hex1 + hex2); 
-        } 
-    } 
-    return strEncode; 
-}  
-
-function url_decode(str) { 
-
-        var n, strCode, strDecode = ""; 
-        for (n = 0; n < str.length; n++) { 
-            if (str.charAt(n) == "%") { 
-                strCode = str.charAt(n + 1) + str.charAt(n + 2); 
-                strDecode += String.fromCharCode(parseInt(strCode, 16)); 
-                n += 2; 
-            } else { 
-                strDecode += str.charAt(n); 
-            } 
-        } 
-        return strDecode; 
-}  
+    var hex_chars = "0123456789ABCDEF";
+    var noEncode = /^([a-zA-Z0-9\_\-\.])$/;
+    var n, strCode, hex1, hex2, strEncode = "";
+
+    for(n = 0; n < str.length; n++) {
+        if (noEncode.test(str.charAt(n))) {
+            strEncode += str.charAt(n);
+        } else {
+            strCode = str.charCodeAt(n);
+            hex1 = hex_chars.charAt(Math.floor(strCode / 16));
+            hex2 = hex_chars.charAt(strCode % 16);
+            strEncode += "%" + (hex1 + hex2);
+        }
+    }
+    return strEncode;
+}
+
+function url_decode(str) {
+
+        var n, strCode, strDecode = "";
+        for (n = 0; n < str.length; n++) {
+            if (str.charAt(n) == "%") {
+                strCode = str.charAt(n + 1) + str.charAt(n + 2);
+                strDecode += String.fromCharCode(parseInt(strCode, 16));
+                n += 2;
+            } else {
+                strDecode += str.charAt(n);
+            }
+        }
+        return strDecode;
+}
 
 
@@ -530 +528 @@
                         var Lp=obj.createTextRange();
                 }
-                
+
                 Lp.setEndPoint("EndToStart",M);
                 var rb=Lp.text.length;
-                
+
                 if(rb > obj.value.length)
                 {
@@ -543 +541 @@
 
 function trim(inputString) {
-   if (typeof inputString != "string") 
+   if (typeof inputString != "string")
         return inputString;
-      
+
    var retValue = inputString;
    var ch = retValue.substring(0, 1);
-   while (ch == " ") { 
+   while (ch == " ") {
           retValue = retValue.substring(1, retValue.length);
           ch = retValue.substring(0, 1);
    }
    ch = retValue.substring(retValue.length-1, retValue.length);
-   while (ch == " ") { 
+   while (ch == " ") {
           retValue = retValue.substring(0, retValue.length-1);
           ch = retValue.substring(retValue.length-1, retValue.length);
    }
-   while (retValue.indexOf("  ") != -1) { 
-          retValue = retValue.substring(0, retValue.indexOf("  ")) + retValue.substring(retValue.indexOf("  ")+1, retValue.length); 
+   while (retValue.indexOf("  ") != -1) {
+          retValue = retValue.substring(0, retValue.indexOf("  ")) + retValue.substring(retValue.indexOf("  ")+1, retValue.length);
    }
-   return retValue; 
+   return retValue;
 }
 
 function increment_folder_unseen(){
         var folder_id = get_current_folder();
-        
+
         var folder_unseen = Element('dftree_'+folder_id+'_unseen');
         if (folder_unseen)
@@ -581 +579 @@
 function decrement_folder_unseen(){
         var folder_id = get_current_folder();
-        
+
         var folder_unseen = Element('dftree_'+folder_id+'_unseen');
         if(!folder_unseen)
@@ -605 +603 @@
         var strTemp = "";
         var iTemp = 0;
-        
+
         if(v_length < 1)
                 return "";
 
         var v_length = value ? value.length : 0;
-        
+
         while(iTemp < v_length){
                 if(value && value.charAt(iTemp) != w_space){
@@ -617 +615 @@
                 }
                 iTemp++;
-        }       
+        }
         return strTemp;
 }
@@ -673 +671 @@
         var main_list = main.childNodes;
         var len_main_list = main_list.length;
-        
+
         if (select)
         {

trunk/expressoMail1_2/js/draw_api.js

@@ -34 +34 @@
 //                                      }
                                         Element('new_m').innerHTML = data[i].folder_unseen ? '<font color="RED">'+data[i].folder_unseen+'</font>' : 0;
-                                        draw_paging(Element('tot_m').innerHTML);
+                                        draw_paging(Element('tot_m').innerHTML);                
                                 }
                         }
@@ -114 +114 @@
                 draw_tree_folders(data);
                 if(data) {
-                        build_quota(data);                      
+                        update_quota('INBOX');                  
                         var f_unseen = Element('dftree_'+get_current_folder()+'_unseen');
                         if(f_unseen && f_unseen.innerHTML)
@@ -148 +148 @@
                         Element("tot_m").innerHTML = data.num_msgs;
                         update_menu();
+                        update_quota(folder);
                         return true;
                 }
@@ -156 +157 @@
 
 function open_folder(folder, folder_name){
-        if (get_current_folder()!= folder)
-        {
+        if (get_current_folder() != folder) {
                 current_folder = folder;
-                var handler_draw_box = function(data)
-                {
-                        if(!verify_session(data))
-                                return false;
-                        numBox++;
-                        create_border(folder_name,numBox.toString());
-                        draw_box(data, current_folder, false);
-                        alternate_border(numBox);
-                        return true;
-                }
-                cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+sort_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box);
+                var handler_draw_box = function(data){
+                        if (!verify_session(data)) 
+                                return;
+                        Element("border_id_0").innerHTML = "&nbsp;" + lang_folder(folder_name) + '&nbsp;<font face="Verdana" size="1" color="#505050">[<span id="new_m">&nbsp;</span> / <span id="tot_m"></span>]</font>';
+                        draw_box(data, current_folder);
+                        draw_paging(data.num_msgs);
+                        Element("tot_m").innerHTML = data.num_msgs;
+                        update_menu();
+                        update_quota(folder);
+                        alternate_border(0);
+                }
+                cExecute("$this.imap_functions.get_range_msgs2&folder=" + current_folder + "&msg_range_begin=1&msg_range_end=" + preferences.max_email_per_page + "&sort_box_type=" + sort_box_type + "&search_box_type=" + search_box_type + "&sort_box_reverse=" + sort_box_reverse + "", handler_draw_box);
         }
         else
-                alternate_border(numBox);
-        return true;
+                alternate_border(0);
 }
 
@@ -1845 +1845 @@
         }
         else{
+        div.innerHTML = null;
         value = data['quota_percent'];
         q_used = data['quota_used'];
@@ -1913 +1914 @@
 }
 
-function update_quota(){        
-        cExecute ("$this.imap_functions.get_quota",build_quota);
+function update_quota(folder_id){       
+        cExecute ("$this.imap_functions.get_quota&folder_id="+folder_id,build_quota);
 }
 

trunk/expressoMail1_2/js/filter.js

@@ -220 +220 @@
         }
 
+        /*
+         * Corrige bug 65, solução: desabilitar radio3 e field6 e desmarcar radio3 (ação de rejeição)
+         * quando a caixa de seleção para manter o e-mail na caixa de entrada do usuário for selecionada
+         */
+        cfilter.prototype.disable_radio3 =  function(){
+
+                radio3 = Element('radio3');
+                field6 = Element('field6');
+                cb2 = Element('checkBox2');
+
+                if (cb2.checked){
+                        radio3.disabled = true;
+                        field6.disabled = true;
+
+                        if (radio3.checked){
+                                radio3.checked = false;
+                        }
+                }
+                else{
+                        radio3.disabled = false;
+                        field6.disabled = false;
+                }
+
+        }
+
         cfilter.prototype.forms_ = function(){
                         var form   = "";
                         form       = "<div id='div_rule' style='display:none'><table id='table_rule' border='0' cellpading='0' cellspacing='0' width='100%'>"+
                                                  "<tr><td colspan='2'><input type='checkBox' id='checkBox1' name='checkb'>"+get_lang('Also check message against next rule') + "</td></tr>"+
-                                                 "<tr><td colspan='2'><input type='checkBox' id='checkBox2' name='checkb'>"+get_lang('Keep a copy of the message at your Inbox')+ "</td><tr>"+
+                                                 "<tr><td colspan='2'><input type='checkBox' id='checkBox2' onclick='filter.disable_radio3();' name='checkb'>"+get_lang('Keep a copy of the message at your Inbox')+ "</td><tr>"+
                                                  "<tr><td colspan='2'><hr size='1' width='100%'></td></tr><tr>"+
                                                  "<td rowspan='4' width='20%'>"+get_lang('Coincident')+"<br><select id='select_rules' name='select_rules'>"+

trunk/expressoMail1_2/js/main.js

@@ -316 +316 @@
                                 return false;
                         }
+                //Este bloco verifica as permissoes ACL sobre pastas compartilhadas
+                if(data.status == false){
+                        alert(get_lang("You don't have permission for this operation in this shared folder!"));
+                        return false;
+                }
 
 
@@ -506 +511 @@
                         var body = Element("body_" + new_border_ID);
                         body.contentWindow.document.open();
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'></body></html>");
+                        // Insert the signature automaticaly at message body if use_signature preference is set
+                        if (preferences.use_signature){ 
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>");
+                        }
+                        else{ 
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'></body></html>");
+                        }
                         body.contentWindow.document.close();
                         body.contentWindow.document.designMode = "on";
@@ -529 +540 @@
                         var body = Element("body_" + new_border_ID);
                         body.contentWindow.document.open();
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>"+block_quoted_body+"</body></html>");
+                        // Insert the signature automaticaly at message body if use_signature preference is set
+                        if (preferences.use_signature) {
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>" + block_quoted_body + "</body></html>");
+                        }
+                        else {
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + block_quoted_body + "</body></html>");
+                        }
                         body.contentWindow.document.close();
                         body.contentWindow.document.designMode = "on";
@@ -568 +585 @@
                         var body = Element("body_" + new_border_ID);
                         body.contentWindow.document.open();
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'></body></html>");
+                        // Insert the signature automaticaly at message body if use_signature preference is set
+                        if (preferences.use_signature) {
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>");
+                        }
+                        else {
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'></body></html>");
+                        }
                         body.contentWindow.document.close();
                         body.contentWindow.document.designMode = "on";
@@ -607 +630 @@
                         var body = document.getElementById("body_" + new_border_ID);
                         body.contentWindow.document.open();
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>"+block_quoted_body+"</body></html>");
+                        // Insert the signature automaticaly at message body if use_signature preference is set
+                        if (preferences.use_signature) {
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>" + block_quoted_body + "</body></html>");
+                        }
+                        else {
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + block_quoted_body + "</body></html>");
+                        }
                         body.contentWindow.document.close();
                         body.contentWindow.document.designMode = "on";
@@ -649 +678 @@
                         var body = Element("body_" + new_border_ID);
                         body.contentWindow.document.open();
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>"+make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)+"</body></html>");
+                        // Insert the signature automaticaly at message body if use_signature preference is set
+                        if (preferences.use_signature) {
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>" + make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc) + "</body></html>");
+                        }
+                        else {
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc) + "</body></html>");
+                        }
                         body.contentWindow.document.close();
                         body.contentWindow.document.designMode = "on";
@@ -676 +711 @@
                         var body = document.getElementById("body_" + new_border_ID);
                         body.contentWindow.document.open();
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'></body></html>");
+                        // Insert the signature automaticaly at message body if use_signature preference is set
+                        if (preferences.use_signature) {
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>");
+                        }
+                        else {
+                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'></body></html>");
+                        }
                         body.contentWindow.document.close();
                         body.contentWindow.document.designMode = "on";
@@ -993 +1034 @@
                 watch_changes_in_msg(border_id);
                 
-                write_msg(get_lang('Your message was save as draft in folder %1.', folder_name));
+                write_msg(get_lang('Your message was save as draft in folder %1.', lang_folder(folder_name)));
         }               
 }
@@ -1264 +1305 @@
                 tree_folders.getNodeById('INBOX'+cyrus_delimiter+trashfolder).alter({caption: get_lang("Trash")});
                 tree_folders.getNodeById('INBOX'+cyrus_delimiter+trashfolder)._refresh();
-                update_quota();
+                update_quota(get_current_folder());
                 if (data)
                         write_msg(get_lang('Your Trash folder was empty.'));

trunk/expressoMail1_2/js/preferences.js

@@ -77 +77 @@
                                 "<tr><td> - " + get_lang("Use shortcuts?") + "</td>"+
                                 "<td><input type='checkBox' id='use_shortcuts' name='use_shortcuts'></td></tr>"+
+                                "<tr><td nowrap> - " + get_lang('Insert signature automatically in new messages?') + "</td>"+
+                                "<td><input type='checkBox' id='use_signature' name='use_signature'></td>"+
+                                "</tr>"+
                                 "<tr><td colspan='2'> - " + get_lang('Signature') + "<br>"+
                                 "<textarea id='txt_signature' name='txt_signature' rows='3' cols='59'></textarea></td>"+
@@ -129 +132 @@
                         for(var i=0; i < sel_size_font.options.length; i++){
                                 if(sel_size_font.options[i].value == preferences.font_size){sel_size_font.options[i].selected = true;}
+                        }
+                var use_signature = Element("use_signature");
+                        if( preferences.use_signature == 1){
+                                use_signature.checked = true;
                         }
                 var txt_signature = Element("txt_signature");
@@ -169 +176 @@
             preferences.line_height = Element("sel_height_line").value;
                 preferences.font_size = Element("sel_size_font").value;
+                preferences.use_signature = Element("use_signature").checked ? 1 : 0;
                 preferences.signature = Element("txt_signature").value;
                 preferences.use_shortcuts = Element("use_shortcuts").checked ? 1 : 0;
@@ -217 +225 @@
                 document.getElementById('check_menu').checked = false;
                 document.getElementById("sel_name_box").options[0].selected = true;
+                document.getElementById("check_use_signature").checked = false;         
                 document.getElementById('txt_signature').value = "";
         }
@@ -225 +234 @@
                 if(! this.prefeW[div.id]) {
                         div.style.height = is_ie ? "385px" : "370px";
-                        div.style.width = "510px";
+                        div.style.width = "515px";
                         div.style.visibility = "hidden";
                         div.style.position = "absolute";
                         div.style.paddingLeft = "10px";                 
                         var title = get_lang("ExpressoMail 1.2 Configuration");
-                        var wHeight = div.offsetHeight + "px";
-                        var wWidth =  div.offsetWidth   + "px";
+                        var wHeight = "420px";
+                        var wWidth =  "530px";
 
                         win = new dJSWin({                      

trunk/expressoMail1_2/preferences.php

@@ -58 +58 @@
                         $GLOBALS['phpgw']->template->set_var('checked_auto_save_draft','');
 
+                // Insert new expressoMail preference use_signature: defines if the signature will be automatically inserted
+                // at the e-mail body
+                if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'])
+                        $GLOBALS['phpgw']->template->set_var('checked_use_signature','checked');
+                else
+                        $GLOBALS['phpgw']->template->set_var('checked_use_signature','');
+
                 if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['signature'])
                         $GLOBALS['phpgw']->template->set_var('text_signature',$GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['signature']);
@@ -119 +126 @@
                 else
                         $GLOBALS['phpgw']->preferences->add('expressoMail','auto_save_draft',$_POST['auto_save_draft']);        
+
+                // Insert new expressoMail preference use_signature: defines if the signature will be automatically inserted
+                // at the e-mail body
+                if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'])
+                        $GLOBALS['phpgw']->preferences->change('expressoMail','use_signature',$_POST['use_signature']);
+                else
+                        $GLOBALS['phpgw']->preferences->add('expressoMail','use_signature',$_POST['use_signature']);
 
                 if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['signature'])
@@ -183 +197 @@
         $GLOBALS['phpgw']->template->set_var('normal',lang('Normal'));
         $GLOBALS['phpgw']->template->set_var('big',lang('Big'));
+        $GLOBALS['phpgw']->template->set_var('lang_use_signature',lang('Insert signature automatically in new messages?'));
+        $GLOBALS['phpgw']->template->set_var('lang_signature',lang('Signature'));
 
         $boemailadmin   = CreateObject('emailadmin.bo');
@@ -195 +211 @@
                 $GLOBALS['phpgw']->template->set_var('checked_delete_and_show_previous_message','checked');
                 $GLOBALS['phpgw']->template->set_var('checked_alert_new_msg','checked');
+                $GLOBALS['phpgw']->template->set_var('checked_use_signature','checked');
                 $GLOBALS['phpgw']->template->set_var('checked_mainscreen_showmail','checked');
-                $save_in_folder_selected = "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter']."Enviados";
+                $save_in_folder_selected = "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter']."Sent";
         }
         $o_folders = "<option value='-1' ".(!$save_in_folder_selected ? 'selected' : '' ).">".lang("Select on send")."</option>";
-        foreach($imap -> get_folders_list() as $id => $folder)
+        foreach($imap -> get_folders_list() as $id => $folder){
+                $folder['folder_name'] = $folder['folder_name'] == ('Inbox') ? lang($folder['folder_name']) : $folder['folder_name'];
+                $folder['folder_name'] = $folder['folder_name'] == ('Trash') ? lang($folder['folder_name']) : $folder['folder_name'];
+                $folder['folder_name'] = $folder['folder_name'] == ('Drafts') ? lang($folder['folder_name']) : $folder['folder_name'];
+                $folder['folder_name'] = $folder['folder_name'] == ('Sent') ? lang($folder['folder_name']) : $folder['folder_name'];
+                $folder['folder_name'] = $folder['folder_name'] == ('Spam') ? lang($folder['folder_name']) : $folder['folder_name'];
                 $o_folders.= "<option value='".$folder['folder_id']."' ".($save_in_folder_selected == $folder['folder_id'] ? 'selected' : '' ).">".$folder['folder_name']."</option>";          
         $GLOBALS['phpgw']->template->set_var('value_save_in_folder',$o_folders);        
+        }
 
         $GLOBALS['phpgw']->template->set_var('lang_save',lang('Save'));

trunk/expressoMail1_2/templates/default/preferences.tpl

@@ -60 +60 @@
     <tr bgcolor="{tr_color1}">
         <td>{lang_save_in_folder}</td>
-        <td align="center">             
+        <td align="center">
                 <select name="save_in_folder">{value_save_in_folder}</select>
         </td>
@@ -66 +66 @@
     <tr bgcolor="{tr_color2}">
         <td>{lang_hide_menu}</td>
-        <td align="center">             
+        <td align="center">
                         <input type="checkbox" name="check_menu" value=1 {checked_menu}>
         </td>
@@ -73 +73 @@
         <td>{lang_line_height}</td>
         <td align="center">
-                        <select name="line_height">                             
+                        <select name="line_height">
                                 <option {line_height_option_20_selected} value="20">{normal}</option>
                                 <option {line_height_option_30_selected} value="30">{medium}</option>
-                                <option {line_height_option_40_selected} value="40">{big}</option>                                                              
+                                <option {line_height_option_40_selected} value="40">{big}</option>
                         </select>
         </td>
@@ -86 +86 @@
                                 <option {font_size_option_10_selected} value="10">{small}</option>
                                 <option {font_size_option_11_selected} value="11">{normal}</option>
-                                <option {font_size_option_15_selected} value="15">{big}</option>                                                                
+                                <option {font_size_option_15_selected} value="15">{big}</option>
                         </select>
         </td>
@@ -96 +96 @@
                 <td align="center">
                         <input type="checkbox" name="use_shortcuts" value=1 {checked_shortcuts}>
-                </td>
-    </tr>
-    
-    <tr bgcolor="{tr_color1}">
-        <td>
-                        {lang_auto_save_draft}
-                </td>
-                <td align="center">
-                        <input type="checkbox" name="auto_save_draft" value=1 {checked_auto_save_draft}>
                 </td>
     </tr>
@@ -117 +108 @@
     </tr>
 
+     <tr bgcolor="{tr_color1}">
+        <td>
+                        {lang_use_signature}
+                </td>
+                <td align="center">
+                        <input type="checkbox" name="use_signature" value=1 {checked_use_signature}>
+                </td>
+    </tr>
+
     <tr bgcolor="{tr_color2}">
         <td colspan='2'>
@@ -123 +123 @@
         </td>
     </tr>
-    
+
     <tr bgcolor="{th_bg}">
         <td colspan="2" >
@@ -133 +133 @@
                                 <td align="right">
                                         <input type="submit" name="submit" value="{lang_save}" onClick="try_saved.value='true';">
-                                </td>                           
+                                </td>
                         </tr>
-        </td>        
+        </td>
     </tr>