Changeset 2519

Timestamp:

04/14/10 11:53:45 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Permitindo que o ExpressoMail? não realize reload de página.

Location:

trunk

Files:

• expressoMail1_2/index.php (modified) (3 diffs)
• expressoMail1_2/js/jscode/InfoContact.js (modified) (2 diffs)
• expressoMail1_2/js/jscode/InfoQuota.js (modified) (1 diff)
• expressoMail1_2/js/jscode/QuickCatalogSearch.js (modified) (5 diffs)
• expressoMail1_2/js/jscode/TreeShow.js (modified) (5 diffs)
• expressoMail1_2/js/jscode/common_functions.js (modified) (4 diffs)
• expressoMail1_2/js/jscode/draw_api.js (modified) (29 diffs)
• expressoMail1_2/js/jscode/filter.js (modified) (3 diffs)
• expressoMail1_2/js/jscode/globals.js (modified) (1 diff)
• expressoMail1_2/js/jscode/local_messages.js (modified) (5 diffs)
• expressoMail1_2/js/jscode/mail_sync.js (modified) (3 diffs)
• expressoMail1_2/js/jscode/main.js (modified) (1 diff)
• expressoMail1_2/js/jscode/messages_controller.js (modified) (3 diffs)
• expressoMail1_2/js/jscode/preferences.js (modified) (2 diffs)
• expressoMail1_2/js/jscode/search.js (modified) (2 diffs)
• expressoMail1_2/js/jscode/sharemailbox.js (modified) (5 diffs)
• expressoMail1_2/templates/default/index.tpl (modified) (4 diffs)
• phpgwapi/js/tools/xlink.js (modified) (1 diff)
• phpgwapi/templates/default/navbar.inc.php (modified) (1 diff)

trunk/expressoMail1_2/index.php

@@ -21 +21 @@
         require_once('../header.inc.php');
 
-        include("inc/load_lang.php");
+        include_once("inc/load_lang.php");
 
         $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user'];
@@ -107 +107 @@
         
         $template->set_file(Array('expressoMail' => 'index.tpl'));
+        $template->set_var( 'url', $GLOBALS[ 'phpgw' ] -> link( '/expressoMail1_2' ) );
         $template->set_block('expressoMail','list');
         $template->pfp('out','list');
@@ -140 +141 @@
         $var_tokens = 'ePass2000Lx;/usr/lib/libepsng_p11.so,ePass2000Win;c:/windows/system32/ngp11v211.dll';
     }
+
+
+        if ( ! @is_object($GLOBALS['phpgw']->js ) )
+                $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
 
         $GLOBALS['phpgw']->js->validate_file( 'dJSWin', 'dJSWin' );

trunk/expressoMail1_2/js/jscode/InfoContact.js

@@ -63 +63 @@
                 }
         }
-        cExecute ("$this.functions.callVoipConnect&to="+phoneUser+"&typePhone="+typePhone, handler_connectVoip);
+        cExecute ("expressoMail1_2.functions.callVoipConnect&to="+phoneUser+"&typePhone="+typePhone, handler_connectVoip);
 }
 
@@ -126 +126 @@
         
         if (trustedDomain)
-                cExecute ("$this.ldap_functions.getUserByEmail&email="+email, handler_search);
+                cExecute ("expressoMail1_2.ldap_functions.getUserByEmail&email="+email, handler_search);
         else
                 _this.label(email);

trunk/expressoMail1_2/js/jscode/InfoQuota.js

@@ -40 +40 @@
                 }
                 
-                cExecute ("$this.imap_functions.get_quota_folders", handler_buildQuota);                
+                cExecute ("expressoMail1_2.imap_functions.get_quota_folders", handler_buildQuota);              
         }
 

trunk/expressoMail1_2/js/jscode/QuickCatalogSearch.js

@@ -304 +304 @@
                         }
                 }
-                cExecute ("$this.ldap_functions.get_catalogs", handler_catalogs);               
+                cExecute ("expressoMail1_2.ldap_functions.get_catalogs", handler_catalogs);             
                 
                 this.update_organizations();
@@ -315 +315 @@
                         }
                 }
-                cExecute("$this.db_functions.get_cc_contacts",handler_cc_contacts);
+                cExecute("expressoMail1_2.db_functions.get_cc_contacts",handler_cc_contacts);
 
                 var handler_cc_groups = function(data){
@@ -325 +325 @@
                         }
                 }
-                cExecute("$this.db_functions.get_cc_groups",handler_cc_groups);
+                cExecute("expressoMail1_2.db_functions.get_cc_groups",handler_cc_groups);
         
         }
@@ -387 +387 @@
                         }
                 }               
-                cExecute ("$this.ldap_functions.get_organizations&referral=false&catalog="+Element('select_catalog').value, handler_org);               
+                cExecute ("expressoMail1_2.ldap_functions.get_organizations&referral=false&catalog="+Element('select_catalog').value, handler_org);             
         }
 
@@ -531 +531 @@
 
                 Element('msg_search').style.visibility = 'visible';
-                cExecute ("$this.ldap_functions.catalogsearch&max_result="+max_result+"&organization="+organization+"&search_for="+search+"&catalog="+catalog, handler_searchResults);
+                cExecute ("expressoMail1_2.ldap_functions.catalogsearch&max_result="+max_result+"&organization="+organization+"&search_for="+search+"&catalog="+catalog, handler_searchResults);
         }
 

trunk/expressoMail1_2/js/jscode/TreeShow.js

@@ -36 +36 @@
                 {
                         expresso.connector.cacheNextRequest(1);
-                        cExecute ("$this.imap_functions.get_folders_list&folder="+current_folder, handler_update_folders);              
+                        cExecute ("expressoMail1_2.imap_functions.get_folders_list&folder="+current_folder, handler_update_folders);            
                 }
                 else
@@ -183 +183 @@
                                 }
                         }
-                        var args = "$this.imap_functions.create_mailbox";
+                        var args = "expressoMail1_2.imap_functions.create_mailbox";
                         var params = "newp="+newp;
                         cExecute(args,handler_return,params);
@@ -237 +237 @@
                                 }
                         }
-                        var args = "$this.imap_functions.ren_mailbox";
+                        var args = "expressoMail1_2.imap_functions.ren_mailbox";
                         var params = "rename="+rename_new+"&current="+old_box;
                         cExecute(args,handler_return,params);
@@ -257 +257 @@
                           download_attachments(null, null, data, null,null, name_f +'.zip');
                 }
-                cExecute("$this.exporteml.export_all",hand_export,"folder="+ttree.FOLDER);      
+                cExecute("expressoMail1_2.exporteml.export_all",hand_export,"folder="+ttree.FOLDER);    
                 write_msg(get_lang('You must wait while the messages will be exported...'));                    
         }
@@ -305 +305 @@
                                 }
                         }
-                        var args = "$this.imap_functions.delete_mailbox";
+                        var args = "expressoMail1_2.imap_functions.delete_mailbox";
                         var params = "del_past="+param;
                         cExecute(args,handler_return,params);

trunk/expressoMail1_2/js/jscode/common_functions.js

@@ -226 +226 @@
                 download_attachments(null, null, data, null,null,'anexos.zip');
         }
-        cExecute("$this.exporteml.download_all_attachments",handler_source,"folder="+msg_folder+"&num_msg="+msg_number);
+        cExecute("expressoMail1_2.exporteml.download_all_attachments",handler_source,"folder="+msg_folder+"&num_msg="+msg_number);
 }
 //ADD forwarded files
@@ -552 +552 @@
         }
         
-        cExecute ("$this.ldap_functions.quicksearch&search_for="+search_for+"&field="+field+"&ID="+ID, handler_emQuickSearch);
+        cExecute ("expressoMail1_2.ldap_functions.quicksearch&search_for="+search_for+"&field="+field+"&ID="+ID, handler_emQuickSearch);
 }
 
@@ -577 +577 @@
                 sharemailbox.makeWindow(options);
         }
-        cExecute ("$this.imap_functions.getacl", handler_imap_getacl);
+        cExecute ("expressoMail1_2.imap_functions.getacl", handler_imap_getacl);
 }
 
@@ -594 +594 @@
                 download_attachments(null, null, data, null,null,'fonte_da_mensagem.eml');
         }
-        cExecute("$this.exporteml.export_msg",handler_source,"folder="+url_decode(folder)+"&msgs_to_export="+num_msg);
+        cExecute("expressoMail1_2.exporteml.export_msg",handler_source,"folder="+url_decode(folder)+"&msgs_to_export="+num_msg);
 }
 

trunk/expressoMail1_2/js/jscode/draw_api.js

@@ -241 +241 @@
 
                 if (trash_span)
-                        trash_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_trash.png)";
+                        trash_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_trash.png)";
 
                 if (draft_span)
-                        draft_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_draft.png)"
+                        draft_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_draft.png)"
 
                 if (sent_span)
-                        sent_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_sent.png)";
+                        sent_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_sent.png)";
 
                 if (spam_span)
-                        spam_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_spam.png)";
+                        spam_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_spam.png)";
 
 
@@ -417 +417 @@
                                 }
                         }
-                        expresso.connector.newRequest('error.html', 'templates/'+template+'/error.html', 'GET',
+                        expresso.connector.newRequest('error.html', URL_SERVER + '/expressoMail1_2/templates/'+template+'/error.html', 'GET',
                                 function(data)
                                 {
@@ -879 +879 @@
                 td_element2.setAttribute("width", "2%");
                 if (headers_msgs.attachment && headers_msgs.attachment.number_attachments > 0)
-                        td_element2.innerHTML = "<img src ='templates/"+template+"/images/clip.gif' title='" + url_decode(headers_msgs.attachment.names) + "'>";                        
+                        td_element2.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/clip.gif" title="' + url_decode(headers_msgs.attachment.names) + '">';                     
                         
                 td_element21 = document.createElement("TD");
@@ -891 +891 @@
                         {
                                 if (url_decode(attach_name[item]) != 'smime.p7s' && url_decode(attach_name[item]) != 'smime.p7m'){
-                                        td_element21.innerHTML = "<img src ='templates/"+template+"/images/clip.gif' title='" + url_decode(attach_name[item]) + "'>";
+                                        td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/clip.gif" title="' + url_decode(attach_name[item]) + '">';
                                         break;
                                 }
@@ -898 +898 @@
 
                 if ((headers_msgs.Forwarded == 'F')  || (headers_msgs.Draft == 'X' && headers_msgs.Answered == 'A')){
-                        td_element21.innerHTML = "<img src ='templates/"+template+"/images/forwarded.gif' title='"+get_lang('Forwarded')+"'>";
+                        td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/forwarded.gif" title="'+get_lang('Forwarded')+'">';
                         headers_msgs.Draft = '' 
                         headers_msgs.Answered = '';
@@ -904 +904 @@
                 }
                 else if (headers_msgs.Draft == 'X')
-                        td_element21.innerHTML = "<img src ='templates/"+template+"/images/draft.gif' title='"+get_lang('Draft')+"'>";
+                        td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/draft.gif" title="'+get_lang('Draft')+'">';
                 else if (headers_msgs.Answered == 'A')
-                        td_element21.innerHTML = "<img src ='templates/"+template+"/images/answered.gif' title='"+get_lang('Answered')+"'>";
+                        td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/answered.gif" title="'+get_lang('Answered')+'">';
                 else
                         td_element21.innerHTML = "&nbsp;&nbsp;&nbsp;";
@@ -922 +922 @@
             case "signature":
                         {
-                                td_element22.innerHTML = "<img src ='templates/"+template+"/images/signed_msg.gif' title='" + get_lang('Signed message') + "'>";
+                                td_element22.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/signed_msg.gif" title="' + get_lang('Signed message') + '">';
                                 break;
                         }
             case "cipher":
                         {
-                                td_element22.innerHTML = "<img src ='templates/"+template+"/images/lock.gif' title='" + get_lang('Crypted message') + "'>";
+                                td_element22.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/lock.gif" title="' + get_lang('Crypted message') + '">';
                                 break;
                         }
@@ -943 +943 @@
                 if (headers_msgs.Flagged == 'F' || (headers_msgs.Importance.toLowerCase().indexOf("high") != -1 && parseInt(preferences.use_important_flag)))
                 {
-                        td_element23.innerHTML = "<img src ='templates/"+template+"/images/important.gif' title='"+get_lang('Important')+"'>";
+                        td_element23.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/important.gif" title="'+get_lang('Important')+'">';
                 }
                 else
@@ -955 +955 @@
                 // preload image
                 var _img_sent = new Image();
-                _img_sent.src    = "templates/"+template+"/images/sent.gif";
+                _img_sent.src    = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/sent.gif';
 
                 td_element3 = document.createElement("TD");
@@ -974 +974 @@
                         else{                           
                                 if(headers_msgs.to.email != null && headers_msgs.to.email.toLowerCase() != Element("user_email").value)
-                                        td_element24.innerHTML = "<img valign='center' src ='templates/"+template+"/images/sent.gif' title='"+get_lang('Sent')+"'>";
+                                        td_element24.innerHTML = '<img valign="center" src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/sent.gif" title="'+get_lang('Sent')+'">';
                         
                                 if ((headers_msgs.to)&&(headers_msgs.to.name != null))
@@ -1108 +1108 @@
         document.getElementById("message_header_SORTARRIVAL_"+numBox).innerHTML = get_lang("Date");
         document.getElementById("message_header_SORTSIZE_"+numBox).innerHTML    = get_lang("Size");     
-        document.getElementById("message_header_"+(sort_box_type.lastIndexOf("SORT") != "-1" ? sort_box_type : "SORTARRIVAL")+"_"+numBox ).innerHTML = "<B>"+type_name+"</B><img src ='templates/"+template+"/images/arrow_"+(sort_box_reverse == 1 ? 'desc' : 'asc')+"endant.gif'>";
+        document.getElementById("message_header_"+(sort_box_type.lastIndexOf("SORT") != "-1" ? sort_box_type : "SORTARRIVAL")+"_"+numBox ).innerHTML = "<B>"+type_name+'</B><img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/arrow_'+(sort_box_reverse == 1 ? 'desc' : 'asc')+'endant.gif">';
 }
 function draw_message(info_msg, ID){
@@ -1126 +1126 @@
         var img_next_msg = document.createElement("IMG");
         img_next_msg.id = 'msg_opt_next_' + ID;
-        img_next_msg.src = './templates/'+template+'/images/down.button.png';
+        img_next_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/down.button.png';
         img_next_msg.title = get_lang('Next');
         img_next_msg.style.cursor = 'pointer';
@@ -1156 +1156 @@
         else
         {
-            img_next_msg.src = "./templates/"+template+"/images/down.gray.button.png";
+            img_next_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/down.gray.button.png';
             img_next_msg.style.cursor = 'default';
 
@@ -1163 +1163 @@
     else
     {
-        img_next_msg.src = "./templates/"+template+"/images/down.gray.button.png";
+        img_next_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/down.gray.button.png';
                 img_next_msg.style.cursor = 'default';
                 if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX/decifradas")) // testa se a mensagem e local
@@ -1182 +1182 @@
         var img_previous_msg = document.createElement("IMG");
         img_previous_msg.id = 'msg_opt_previous_' + ID;
-        img_previous_msg.src = './templates/'+template+'/images/up.button.png';
+        img_previous_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/up.button.png';
         img_previous_msg.title = get_lang('Previous');
         img_previous_msg.style.cursor = 'pointer';
@@ -1211 +1211 @@
         else
         {
-            img_previous_msg.src = "./templates/"+template+"/images/up.gray.button.png";
+            img_previous_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/up.gray.button.png';
             img_previous_msg.style.cursor = 'default';
         }
@@ -1217 +1217 @@
         else
         {
-                img_previous_msg.src = "./templates/"+template+"/images/up.gray.button.png";
+                img_previous_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/up.gray.button.png';
                 img_previous_msg.style.cursor = 'default';
                 if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX/decifradas")) // testa se a mensagem e local
@@ -1266 +1266 @@
         td.innerHTML = _name.bold() + ', ' + info_msg.smalldate;
         if (info_msg.attachments.length > 0)
-                td.innerHTML += "&nbsp<img style='cursor:pointer' onclick='javascript:Element(\"option_hide_more_"+ID+"\").onclick()' src ='templates/"+template+"/images/clip.gif' title='"+info_msg.attachments.names+"'>";
+                td.innerHTML += "&nbsp<img style='cursor:pointer' onclick='javascript:Element(\"option_hide_more_"+ID+"\").onclick()' src ='" + URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/clip.gif' title='"+info_msg.attachments.names+"'>";
         
         if (typeof(info_msg.signature) == 'string')
         {       
                 if (info_msg.signature != "void")
-                        td.innerHTML += '&nbsp;<img style="cursor:pointer" onclick="alert(\''+ get_lang("This message is signed, and you can trust.") + info_msg.signature +'\');" src="templates/'+template+'/images/signed.gif">';
+                        td.innerHTML += '&nbsp;<img style="cursor:pointer" onclick="alert(\''+ get_lang("This message is signed, and you can trust.") + info_msg.signature +'\');" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/signed.gif">';
                 else
-                        td.innerHTML += "&nbsp;<img style='cursor:pointer' onclick='alert(\""+get_lang("This message is signed, but it is invalid. You should not trust on it.")+"\");' title='"+get_lang("Voided message")+"' src='templates/"+template+"/images/invalid.gif'>";
+                        td.innerHTML += "&nbsp;<img style='cursor:pointer' onclick='alert(\""+get_lang("This message is signed, but it is invalid. You should not trust on it.")+"\");' title='"+get_lang("Voided message")+"' src='" + URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/invalid.gif'>";
         }
         
         if (info_msg.DispositionNotificationTo)
         {
-                td.innerHTML += '&nbsp;<img style="cursor:pointer" alt="'+ get_lang('Message with read notification') + '" title="'+ get_lang('Message with read notification') + '" src="templates/'+template+'/images/notification.gif">';
+                td.innerHTML += '&nbsp;<img style="cursor:pointer" alt="'+ get_lang('Message with read notification') + '" title="'+ get_lang('Message with read notification') + '" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/notification.gif">';
         }
         
@@ -1430 +1430 @@
                 if(signature_status_pos < 0 )
                 {
-                td.innerHTML += '&nbsp;<img style="cursor:pointer" src="templates/'+template+'/images/signed_error.gif" title="'+get_lang("Details")+'">';
+                td.innerHTML += '&nbsp;<img style="cursor:pointer" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/signed_error.gif" title="'+get_lang("Details")+'">';
                 tr_signature.style.display = '';
                 }
                 else
                 {
-                td.innerHTML += '&nbsp;<img style="cursor:pointer" src="templates/'+template+'/images/signed_table.gif" title="'+get_lang("Details")+'">';
+                td.innerHTML += '&nbsp;<img style="cursor:pointer" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/signed_table.gif" title="'+get_lang("Details")+'">';
                 }
                 td.onclick = function(){
@@ -1879 +1879 @@
                                 if (forbidden)
                                 {
-                                        newBody = newBody.replace(imgTag[j],"<img src='templates/"+template+"/images/forbidden.jpg'>");
+                                        newBody = newBody.replace(imgTag[j],"<img src='" + URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/forbidden.jpg'>");
                                         blocked=true;
                                 }
@@ -1957 +1957 @@
                 }
                 
-                td.innerHTML += "<BR><img src='templates/"+template+"/images/menu/ktip.png'>"+get_lang("<b>Tip:</b> For faster save, click over the image with <u>right button</u>.");
+                td.innerHTML += "<BR><img src='" + URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/menu/ktip.png'>"+get_lang("<b>Tip:</b> For faster save, click over the image with <u>right button</u>.");
                 td.innerHTML += "<BR>";
 
@@ -2194 +2194 @@
         if (!expresso_offline) {
                 var img_search = document.createElement("IMG");
-                img_search.src = "./templates/"+template+"/images/search.gif";
+                img_search.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/search.gif';
                 img_search.title = get_lang('Search') + " | " + get_lang('Use F9 Key as shortcut.');
                 img_search.onclick = function () {emQuickSearch(document.getElementById('to_'+ID).value, 'to', ID);};
@@ -2282 +2282 @@
         td_cc.appendChild(input_cc);
         var img_search = document.createElement("IMG");
-        img_search.src = "./templates/"+template+"/images/search.gif";
+        img_search.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/search.gif';
         img_search.onclick = function () {emQuickSearch(document.getElementById('cc_'+ID).value, 'cc', ID)}
         img_search.title = get_lang('Search') + " | " + get_lang('Use F9 Key as shortcut.');
@@ -2365 +2365 @@
         td_cco.appendChild(input_cco);
         var img_search = document.createElement("IMG");
-        img_search.src = "./templates/"+template+"/images/search.gif";
+        img_search.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/search.gif';
         img_search.title = get_lang('Search') + " | " + get_lang('Use F9 Key as shortcut.');    
         img_search.onclick = function () {emQuickSearch(document.getElementById('cco_'+ID).value, 'cco', ID);};
@@ -2751 +2751 @@
         td21.height="15";
         td22 = document.createElement("TD");    
-        td21.setAttribute("background","../phpgwapi/templates/"+template+"/images/dsunused.gif");
+        td21.setAttribute("background", URL_SERVER + '/phpgwapi/templates/' + template + '/images/dsunused.gif');
         table221 = document.createElement("TABLE");
         tbody221 = document.createElement("TBODY");
@@ -2771 +2771 @@
         }
         else if(value > 80)
-                td221.setAttribute("background","templates/"+template+"/images/dswarn.gif");
+                td221.setAttribute("background", URL_SERVER + '/expressoMail1_2/templates/' + template + '/images/dswarn.gif');
         else
                 td221.className = 'dsused';
@@ -2864 +2864 @@
         td_element5.align = "center";
         td_element5.innerHTML = "<B>"+get_lang("Date")+"</B>";  
-        td_element5.innerHTML += "<img src ='templates/"+template+"/images/arrow_descendant.gif'>";
+        td_element5.innerHTML += '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/arrow_descendant.gif">';
         td_element6 = document.createElement("TD");
         td_element6.setAttribute("width", "10%");
@@ -2990 +2990 @@
         
         var sm_envelope_img1 = '<img style="cursor:'+ (is_ie ? 'hand' : 'pointer') +'" title="' + get_lang("Add Contact") +
-        '" onclick="ccQuickAddOne.showList(\''+cc_data+'\')" src="./templates/'+template+'/images/user_card.png">';
+        '" onclick="ccQuickAddOne.showList(\''+cc_data+'\')" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/user_card.png">';
         var to_addybook_add = "<SPAN id='insert_plugin_"+idx_cc+"_"+ID+"'>";
         to_addybook_add += addrs;
@@ -3006 +3006 @@
                 dn_em.setAttribute("title",get_lang("Block Sender"));
                 dn_em.style.cursor = "pointer";         
-                dn_em.innerHTML = "<img align='top' onclick=filter.new_rule('"+email+"') src='./templates/"+template+"/images/deny.gif'>";
+                dn_em.innerHTML = "<img align='top' onclick=filter.new_rule('"+email+"') src='" + URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/deny.gif'>";
         return dn_em;
         

trunk/expressoMail1_2/js/jscode/filter.js

@@ -67 +67 @@
                         if(Element('form_status') != null)
                                 Element('form_status').innerHTML = "<span style='background:#cc4444;'>&nbsp;&nbsp;<font color='WHITE'>Aguarde...</font>&nbsp;</span>";
-                        cExecute("$this.ScriptS.init_a",handler_sieve);
+                        cExecute("expressoMail1_2.ScriptS.init_a",handler_sieve);
                         _this.get_email();
             }
@@ -114 +114 @@
                         _this.email_ld = data ? data : "";
                 }
-                cExecute("$this.user.get_email",handler_get_email);
+                cExecute("expressoMail1_2.user.get_email",handler_get_email);
         }
         
@@ -743 +743 @@
                         if(data != "Ok"){alert("Erro : \n" + data);}
                 }
-                var args   = "$this.ScriptS.rec_rules";
+                var args   = "expressoMail1_2.ScriptS.rec_rules";
                 var params = "arfilter="+aux_rul;
                 cExecute(args,h_filter,params);

trunk/expressoMail1_2/js/jscode/globals.js

@@ -23 +23 @@
         '<tr><td align=left height=16px width="1%" nowrap class="table_top">&nbsp;'+
         '<a href=# onclick="javascript:new_message(\'new\',\'null\')" align=left>'+
-        '<img src="templates/'+template+'/images/menu/createmail.gif">'+
+        '<img src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/menu/createmail.gif">'+
         '&nbsp;Novo</a>&nbsp;&nbsp;'+
         '<a href="#" onclick="javascript:wfolders.makeWindow(\'\', \'change_folder\')" align=left>'+
-        '<img src="templates/'+template+'/images/menu/editfolders.png">'+
+        '<img src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/menu/editfolders.png">'+
         '&nbsp;Trocar Pasta</a>&nbsp;&nbsp'+    
         '<a href="#" onclick="javascript:refresh();" align=left>'+
-        '<img src="templates/'+template+'/images/menu/checkmail.gif">'+
+        '<img src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/menu/checkmail.gif">'+
         '&nbsp;Atualizar</a>&nbsp;&nbsp;'+
         '<a id="link_tools" href="#" align=left>'+
-        '<img height="16px" src="templates/'+template+'/images/menu/tools.gif">'+
+        '<img height="16px" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/menu/tools.gif">'+
         '&nbsp;Ferramentas...</a>&nbsp;&nbsp;</td><td style="padding-left:17px" width="1%" id="content_quota" align=left nowrap></td><td width=* id="div_menu_c3" align="right"></td></tr></table>';
 

trunk/expressoMail1_2/js/jscode/local_messages.js

@@ -1037 +1037 @@
         }
             params="&folder="+new_folder+"&source="+source+"&timestamp="+timestamp;
-            cExecute ("$this.imap_functions.unarchive_mail&", handler_unarchive, params);
+            cExecute ("expressoMail1_2.imap_functions.unarchive_mail&", handler_unarchive, params);
     }
 
@@ -1083 +1083 @@
             download_attachments(null, null, data, null,null,'anexos.zip');
         }
-        cExecute("$this.imap_functions.download_all_local_attachments",handler_source,"source="+source);
+        cExecute("expressoMail1_2.imap_functions.download_all_local_attachments",handler_source,"source="+source);
     }
 
@@ -1122 +1122 @@
             subjects = escape(subjects);
             params = "subjects="+subjects+"&mesgs="+mesgs+"&l_msg="+l_msg+"&msgs_to_export="+msgs_to_export_id;
-            cExecute ("$this.exporteml.makeAll&", handler_local_mesgs_to_export, params);
+            cExecute ("expressoMail1_2.exporteml.makeAll&", handler_local_mesgs_to_export, params);
         }
         return true;
@@ -1164 +1164 @@
            subjects = escape(subjects);
            params = "folder="+folder_name+"&subjects="+subjects+"&mesgs="+source+"&l_msg="+l_msg+"&msgs_to_export="+msgs_to_export;
-           cExecute ("$this.exporteml.makeAll&", handler_local_mesgs_to_export, params);
+           cExecute ("expressoMail1_2.exporteml.makeAll&", handler_local_mesgs_to_export, params);
           
 
@@ -1322 +1322 @@
                 }
                 managedStore.checkForUpdate();
-                this.capt_url('controller.php?action=$this.db_functions.get_dropdown_contacts_to_cache');
+                this.capt_url('controller.php?action=expressoMail1_2.db_functions.get_dropdown_contacts_to_cache');
                 
                 this.finalize();

trunk/expressoMail1_2/js/jscode/mail_sync.js

@@ -166 +166 @@
                 if (folder_to_sync[3]) {
                         document.getElementById('main_title').innerHTML = get_lang("Starting to archive messages");
-                        cExecute("$this.imap_functions.get_info_msgs&folder=" + folder_to_sync[0] + "&msgs_number=" + folder_to_sync[2], start_sync_mails);
+                        cExecute("expressoMail1_2.imap_functions.get_info_msgs&folder=" + folder_to_sync[0] + "&msgs_number=" + folder_to_sync[2], start_sync_mails);
                         this.is_auto = false;
                 }
@@ -172 +172 @@
                         document.getElementById('main_title').innerHTML = get_lang("Starting to sync folder")+" "+lang_folder(folder_to_sync[1]);
                         var params = "folder="+folder_to_sync[0]+"&mails="+folder_to_sync[2];
-                        cExecute("$this.imap_functions.msgs_to_archive", start_sync_mails,params);
+                        cExecute("expressoMail1_2.imap_functions.msgs_to_archive", start_sync_mails,params);
                         this.is_auto = true;
                 }
@@ -388 +388 @@
                         }
                         
-                        cExecute ("$this.imap_functions.delete_msgs&folder="+folder_to_remove_msgs+"&msgs_number="+msgs, handler_delete_msgs);
+                        cExecute ("expressoMail1_2.imap_functions.delete_msgs&folder="+folder_to_remove_msgs+"&msgs_number="+msgs, handler_delete_msgs);
                         this.dbGears.execute("delete from msgs_to_remove where folder=? and uid_usuario=?",[folder_to_remove_msgs,account_id]);
                         this.dbGears.close();

trunk/expressoMail1_2/js/jscode/main.js

@@ -8 +8 @@
         current_folder = "INBOX";
         if (!is_ie)
-                Element('tableDivAppbox').width = '100%';
+                if ( Element('tableDivAppbox') )
+                        ifElement('tableDivAppbox').width = '100%';
         
         var save_contacts = function(data){

trunk/expressoMail1_2/js/jscode/messages_controller.js

@@ -16 +16 @@
                         draw_tree_local_folders();
                 }else {
-                        cExecute ("$this.imap_functions.get_range_msgs2&folder="+folder+"&msg_range_begin="+msg_range_begin+"&msg_range_end="+emails_per_page+"&sort_box_type="+sort_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", call_back);
+                        cExecute ("expressoMail1_2.imap_functions.get_range_msgs2&folder="+folder+"&msg_range_begin="+msg_range_begin+"&msg_range_end="+emails_per_page+"&sort_box_type="+sort_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", call_back);
                 }
         }
@@ -29 +29 @@
                 }else {
                         expresso.connector.cacheNextRequest();
-                        cExecute("$this.imap_functions.get_info_msg&msg_number="+ msg_number + "&msg_folder=" + url_encode(msg_folder), call_back);
+                        cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+ msg_number + "&msg_folder=" + url_encode(msg_folder), call_back);
                 }
         }
@@ -289 +289 @@
      {
         expresso.connector.cacheNextRequest();
-        cExecute('$this.imap_functions.get_info_msg&msg_number='+msgs_number+'&msg_folder='+url_encode(folder_name),call_back);
+        cExecute('expressoMail1_2.imap_functions.get_info_msg&msg_number='+msgs_number+'&msg_folder='+url_encode(folder_name),call_back);
      }
     }

trunk/expressoMail1_2/js/jscode/preferences.js

@@ -16 +16 @@
                 }
                 preferences[key] = value;
-                var args   = "$this.db_functions.update_preferences";
+                var args   = "expressoMail1_2.db_functions.update_preferences";
                 var params = "prefe_string="+url_encode(connector.serialize(preferences));
                 cExecute(args,handler_preferences,params);
@@ -23 +23 @@
         Preferences.prototype.delete_dynamic_contacts = function(){
                 var handler = function(data){}
-                var args   = "$this.dynamic_contacts.delete_dynamic_contacts";
+                var args   = "expressoMail1_2.dynamic_contacts.delete_dynamic_contacts";
                 var params = "";
                 cExecute(args,handler,params);

trunk/expressoMail1_2/js/jscode/search.js

@@ -720 +720 @@
                 }
                 proxy_mensagens.get_msg(uid_msg,mailbox,false,handler_get_msg);
-                /*var args   = "$this.imap_functions.get_info_msg";
+                /*var args   = "expressoMail1_2.imap_functions.get_info_msg";
                 var params = "msg_number=" + uid_msg + "&msg_folder=" + mailbox;
                 cExecute(args,handler_get_msg,params);*/
@@ -956 +956 @@
 
                 }
-                var args   = "$this.imap_functions.search_msg";
+                var args   = "expressoMail1_2.imap_functions.search_msg";
                 var params = "condition=" + nm_box;
                 if(expresso_offline)

trunk/expressoMail1_2/js/jscode/sharemailbox.js

@@ -30 +30 @@
                         }
                 }
-                cExecute ("$this.ldap_functions.get_available_users2&context="+context, handler_get_available_users);
+                cExecute ("expressoMail1_2.ldap_functions.get_available_users2&context="+context, handler_get_available_users);
         }
 
@@ -75 +75 @@
                         } else Element('em_input_saveAcl').disabled = true;
                 }
-                cExecute ("$this.imap_functions.getaclfromuser&user="+user, handler_getaclfromuser);
+                cExecute ("expressoMail1_2.imap_functions.getaclfromuser&user="+user, handler_getaclfromuser);
         }
         
@@ -122 +122 @@
                         return true;
                 }
-                cExecute ("$this.imap_functions.setaclfromuser&user="+user+"&acl="+acl, handler_setaclfromuser);
+                cExecute ("expressoMail1_2.imap_functions.setaclfromuser&user="+user+"&acl="+acl, handler_setaclfromuser);
         }
         
@@ -208 +208 @@
                         }
                 }
-                cExecute ("$this.ldap_functions.get_organizations2&referral=false", handler_organizations);
+                cExecute ("expressoMail1_2.ldap_functions.get_organizations2&referral=false", handler_organizations);
 
                 var butt = Element('dJSWin_wfolders_bok')
@@ -238 +238 @@
                         }
 
-                        cExecute ("$this.imap_functions.setacl", handler_save, 'users='+attributes);
+                        cExecute ("expressoMail1_2.imap_functions.setacl", handler_save, 'users='+attributes);
 
                 }

trunk/expressoMail1_2/templates/default/index.tpl

@@ -22 +22 @@
                                                                 <div id="search_div" align="center" style="white-space:nowrap"></div>
                                                                 <input type="text" id="em_message_search" size="16" maxlength="22" onfocus="javascript:onFocusQuickSearchEmail(this); return false;"/>
-                                                                <a style="padding:1 8px; width:16px; height:16px; background: url(templates/default/images/search.gif) no-repeat center; margin: 0 3px;" class="" onMouseOut="window.status='';return true;" title='{lang_Open_Search_Window}' onMouseOver="window.status='{lang_Open_Search_Window}';return true;" href="javascript:void(0);"  onClick="javascript:search_emails(Element('em_message_search').value)" />
-                                                                <a style="padding:1 8px; width:16px; height:16px; background: url(templates/default/images/users.gif) no-repeat center;" class="" onMouseOut="window.status='';return true;" title='{lang_search_user}' onMouseOver="window.status='{lang_search_user}' ;return true;" href="javascript:void(0);"  onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null')" />
+                                                                <a style="padding:1 8px; width:16px; height:16px; background: url({url}/templates/default/images/search.gif) no-repeat center; margin: 0 3px;" class="" onMouseOut="window.status='';return true;" title='{lang_Open_Search_Window}' onMouseOver="window.status='{lang_Open_Search_Window}';return true;" href="javascript:void(0);"  onClick="javascript:search_emails(Element('em_message_search').value)" />
+                                                                <a style="padding:1 8px; width:16px; height:16px; background: url({url}/templates/default/images/users.gif) no-repeat center;" class="" onMouseOut="window.status='';return true;" title='{lang_search_user}' onMouseOver="window.status='{lang_search_user}' ;return true;" href="javascript:void(0);"  onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null')" />
                                                         </td>
                                                 </tr>
@@ -29 +29 @@
                                                         <td class='content-menu-td' onclick='javascript:new_message("new","null");' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'>
                                                                 <div class='em_div_sidebox_menu'>
-                                                                        <img src='./templates/default/images/menu/createmail.gif' />
+                                                                        <img src='{url}/templates/default/images/menu/createmail.gif' />
                                                                         <span class="em_sidebox_menu">{new_message}</span>
                                                                 </div>
@@ -37 +37 @@
                                                         <td class='content-menu-td' id='em_refresh_button' onclick='javascript:refresh();' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'>
                                                                 <div class='em_div_sidebox_menu'>
-                                                                        <img src='./templates/default/images/menu/checkmail.gif' />
+                                                                        <img src='{url}/templates/default/images/menu/checkmail.gif' />
                                                                                 <span class="em_sidebox_menu">{refresh}</span>
                                                                 </div>
@@ -45 +45 @@
                                                         <td id="link_tools" class='content-menu-td' onmouseover='javascript:set_menu_bg(Element("link_tools"));' onmouseout='javascript:unset_menu_bg(this);'>
                                                                 <div class='em_div_sidebox_menu'>
-                                                                        <img height='16px' src='./templates/default/images/menu/tools.gif' />
+                                                                        <img height='16px' src='{url}/templates/default/images/menu/tools.gif' />
                                                                                 <span class="em_sidebox_menu">{tools} ...</span>
                                                                 </div>

trunk/phpgwapi/js/tools/xlink.js

@@ -13 +13 @@
                 a = ( a || ( action.indexOf( window.location + '#' ) === 0 ) );
                 a = ( a || ! ( action.indexOf( 'workflow' ) < 0 ) );
-                a = ( a || ! ( action.indexOf( 'expressoMail1_2' ) < 0 ) );
+                //a = ( a || ! ( action.indexOf( 'expressoMail1_2' ) < 0 ) );
 
                 if ( ! a )

trunk/phpgwapi/templates/default/navbar.inc.php

@@ -70 +70 @@
                                 if($app != 'preferences' && $app != 'about' && $app != 'logout')
                                 {
-                                        $icon = '<a href="'.$app_data['url'].'" cacheit="'.( ( $app == 'admin' || $app == 'expressoAdmin1_2' ) ? 'true' : 'false').'">';
+                                        $icon = '<a href="'.$app_data['url'].'" cacheit="'.( ( $app == 'admin' || $app == 'expressoAdmin1_2' || $app == 'expressoMail1_2' ) ? 'true' : 'false').'">';
                                         $title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
                                         if($app == 'home') $title = lang('Home');