Changeset 1747

Timestamp:

12/04/09 11:47:00 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #605 - Implementação de preferência sobre uid ou cn nas pastas compratilhadas.

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (4 diffs)
• inc/hook_settings.inc.php (modified) (1 diff)
• js/draw_api.js (modified) (2 diffs)
• js/local_messages.js (modified) (2 diffs)
• js/search.js (modified) (1 diff)
• setup/phpgw_en.lang (modified) (1 diff)

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

@@ -1499 +1499 @@
                                 $result[$i]['folder_name'] = array_pop($tmp_folder_parent);
                                 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name'];
-                                if (substr($folder_id,0,4) == 'user' && is_numeric($result[$i]['folder_name'])) {
+                                if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn'] && substr($folder_id,0,4) == 'user')       {
                                         //$this->ldap = new ldap_functions();
                                         if ($cn = $this->ldap->uid2cn($result[$i]['folder_name'])){
@@ -2232 +2232 @@
         }
         //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name
-        if (substr($new_folder_name,0,4) == 'user'){
-                $this->ldap = new ldap_functions();
-                $tmp_folder_name = explode($this->imap_delimiter, $new_folder_name);
-                        $return['new_folder_name'] = array_pop($tmp_folder_name);
-                        if (is_numeric($return['new_folder_name']))
-                                if( $cn = $this->ldap->uid2cn($return['new_folder_name']))
-                                        $return['new_folder_name'] = $cn;
+        if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn']){
+            if (substr($new_folder_name,0,4) == 'user'){
+                $this->ldap = new ldap_functions();
+                $tmp_folder_name = explode($this->imap_delimiter, $new_folder_name);
+                $return['new_folder_name'] = array_pop($tmp_folder_name);
+                if( $cn = $this->ldap->uid2cn($return['new_folder_name']))
+                {
+                    $return['new_folder_name'] = $cn;
+                }
+            }
         }
 
@@ -3085 +3088 @@
                     $filter = $this->remove_accents($filter);
                     //Este bloco tem a finalidade de transformar o login (quando numerico) das pastas compartilhadas em common name
-                    $folder_name = explode($this->imap_delimiter,$name_box);
-                    if (is_numeric($folder_name[1]))
+                    if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn'] && substr($name_box,0,4) == 'user')
                     {
+                        $folder_name = explode($this->imap_delimiter,$name_box);
                         $this->ldap = new ldap_functions();
                         if ($cn = $this->ldap->uid2cn($folder_name[1]))
@@ -3093 +3096 @@
                             $folder_name[1] = $cn;
                         }
+                        $folder_name = implode($this->imap_delimiter,$folder_name);
                     }
-                    $folder_name = implode($this->imap_delimiter,$folder_name);
+                    else
+                    {
+                        $folder_name = mb_convert_encoding(utf8_decode($name_box), "UTF7-IMAP", "ISO_8859-1" );
+                    }
 
                     if(!is_resource($mbox_stream))

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -61 +61 @@
 }');
 //}
+$default = false;
+create_check_box('Do you want to show common name instead of UID?','uid2cn',$default,
+        'Do you want to show common name instead of UID?');
 
 $default = array(

trunk/expressoMail1_2/js/draw_api.js

@@ -19 +19 @@
 var currentTab,numBox = 0; // Open Tab and num of mailboxes opened at context
 
+// Objeto Map, talvez o ideal fosse adicionar este objeto à Api do egroupware, e carregá-lo
+// aqui no expressoMail.
+function Map()
+{
+    this.keys = new Array();
+    this.values = new Array();
+}
+
+Map.prototype.add = function(key, value)
+{
+    this.keys.push(key);
+    this.values.push(value);
+}
+
+Map.prototype.get = function(key)
+{
+    result = new Array();
+    for (i = 0; i < this.keys.length; i++)
+    {
+        if (this.keys[i] == key)
+        {
+            result.push(this.values[i]);
+        }
+    }
+
+    if (result.length == 0)
+    {
+        return null;
+    }
+
+    return result;
+}
+
+var translatedFolders = new Map();
+
 function draw_tree_folders(folders){
         // Check if the tree folders alredy exist.
+        translatedFolders = new Map();
         if (Element('dftree_tree_folders')){
                 if (!expresso_offline) {
@@ -162 +198 @@
                                         
                                         if (!tree_folders.getNodeById('user')){
+                                                tmpFolderId = folders[i].folder_id.split(cyrus_delimiter).pop();
+                                                if (tmpFolderId != folders[i].folder_name)
+                                                {
+                                                    translatedFolders.add(tmpFolderId, folders[i].folder_name);
+                                                }
                                                 var n_root_shared_folders = new dNode({id:'user', caption:get_lang("Shared folders"), plusSign:true}); 
                                                 tree_folders.add(n_root_shared_folders,'root');

trunk/expressoMail1_2/js/local_messages.js

@@ -779 +779 @@
                 }
                 sql += ") and (";
-                for (var z=0;z<friendly_filters.length-1;z++) {
+                for (var z=0;z<friendly_filters.length;z++) {
                     if (z != 0) {
                         if (sFilter.indexOf('ALL') != -1)
@@ -808 +808 @@
                 while(rs.isValidRow()) {
                     var header = connector.unserialize(rs.field(0));
-                    retorno+="##"+"local_"+rs.field(1)+"--"+"local_"+rs.field(1)+"--"+header["from"]["name"]+"--"+header["subject"]+"--"+header["udate"]+"--"+this.aux_convert_size(rs.field(3))+"--"+header["Unseen"]+header["Recent"]+header["Flagged"]+header["Draft"]+"--"+rs.field(2)+"##";
+                    retorno+="##"+"local_"+rs.field(1)+"--"+header["from"]["name"]+"--"+header["subject"]+"--"+header["udate"]+"--"+this.aux_convert_size(rs.field(3))+"--"+header["Unseen"]+header["Recent"]+header["Flagged"]+header["Draft"]+"--"+rs.field(2)+"##";
                     rs.next();
                 }

trunk/expressoMail1_2/js/search.js

@@ -482 +482 @@
                                         
                                         var td1  = get_lang(td1).substr(get_lang(td1).length-1) == "*"?td1:get_lang(td1);
+                                        if ((tmp = translatedFolders.get(td1)))
+                                        {
+                                            td1 = tmp;
+                                        }
 
                                         if(proxy_mensagens.is_local_folder(td1)) {

trunk/expressoMail1_2/setup/phpgw_en.lang

@@ -82 +82 @@
 Do you want to block this e-mail?       expressoMail1_2 en      Do you want to block this e-mail?
 Do you want to log the sent messages?   admin   en      Do you want to log the sent messages?
+Do you want to show common name instead of UID? expressoMail1_2 en      Do you want to show common name instead of UID?
 Do you want to use the spam filter?     admin   en      Do you want to use the spam filter?
 Do you wish to exclude the folder       expressoMail1_2 en      Do you wish to exclude the folder