Changeset 2630

Timestamp:

04/27/10 09:54:22 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Mitigando problema com escopo do dominio.

Location:

trunk

Files:

• calendar/js/edit_exmail.js (modified) (1 diff)
• contactcenter/js/cc.js (modified) (22 diffs)
• contactcenter/js/ccIEContacts.js (modified) (2 diffs)
• contactcenter/js/ccMain.js (modified) (1 diff)
• contactcenter/js/ccQuickAddContact.js (modified) (1 diff)
• expressoAdmin1_2/js/jscode/globals.js (modified) (1 diff)
• expressoMail1_2/js/jscode/InfoContact.js (modified) (2 diffs)
• expressoMail1_2/js/jscode/abas.js (modified) (1 diff)
• expressoMail1_2/js/jscode/doiMenuData.js (modified) (1 diff)
• expressoMail1_2/js/jscode/drag_area.js (modified) (1 diff)
• expressoMail1_2/js/jscode/draw_api_folders.js (modified) (14 diffs)
• expressoMail1_2/js/jscode/draw_api_messages.js (modified) (18 diffs)
• expressoMail1_2/js/jscode/filters.js (modified) (1 diff)
• expressoMail1_2/js/jscode/globals.js (modified) (1 diff)
• expressoMail1_2/js/jscode/load_lang.js (modified) (1 diff)
• expressoMail1_2/js/jscode/main.js (modified) (2 diffs)
• expressoMail1_2/js/jscode/rich_text_editor.js (modified) (1 diff)
• expressoMail1_2/js/modal/modal.js (modified) (1 diff)
• filemanager/js/draw_api.js (modified) (17 diffs)
• filemanager/js/global.js (modified) (1 diff)
• filemanager/js/jscode/draw_api.js (modified) (17 diffs)
• filemanager/js/jscode/global.js (modified) (1 diff)
• filemanager/js/jscode/load_lang.js (modified) (1 diff)
• filemanager/js/load_lang.js (modified) (1 diff)
• phpgwapi/inc/class.common.inc.php (modified) (1 diff)
• phpgwapi/js/expressoAjax/dom.js (modified) (1 diff)
• phpgwapi/js/expressoAjax/expressoAjax.js (modified) (3 diffs)
• phpgwapi/js/tools/xlink.js (modified) (3 diffs)
• phpgwapi/js/tools/xscript.js (modified) (1 diff)

trunk/calendar/js/edit_exmail.js

@@ -227 +227 @@
         }
 
-        scriptPath = URL_SERVER + '/' + scriptPath;
+        scriptPath = URL_SERVER + scriptPath;
 
         expresso.connector.oxmlhttp.open("GET", scriptPath, false);

trunk/contactcenter/js/cc.js

@@ -293 +293 @@
 
         };
-        Connector.newRequest('populateSharingSelect', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cards_data', 'POST', handler);
+        Connector.newRequest('populateSharingSelect', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cards_data', 'POST', handler);
 }
 
@@ -398 +398 @@
                 //populateRelations(data['relations']);
         };
-        Connector.newRequest('populateFullEdit', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_full_data&id=' + id + "&catalog="+catalog, 'GET', handler);
+        Connector.newRequest('populateFullEdit', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=get_full_data&id=' + id + "&catalog="+catalog, 'GET', handler);
 }
 
@@ -443 +443 @@
         ccAddGroup.clear(true);                 
         if(!shared)
-                Connector.newRequest('populateEditGroup', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_group&id='+id, 'GET', handler);
+                Connector.newRequest('populateEditGroup', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=get_group&id='+id, 'GET', handler);
         else
-                Connector.newRequest('populateEditGroup', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_group&id='+id+'&shared_from='+shared, 'GET', handler);
+                Connector.newRequest('populateEditGroup', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=get_group&id='+id+'&shared_from='+shared, 'GET', handler);
 }
 
@@ -462 +462 @@
         /* Personal Data */
         Element('cc_full_add_contact_id').value = null;
-        Element('cc_pd_photo').src = URL_SERVER + '/contactcenter/templates/default/images/photo.png';
+        Element('cc_pd_photo').src = URL_SERVER + 'contactcenter/templates/default/images/photo.png';
 
         /* Addresses */
@@ -1006 +1006 @@
         };
 
-        Connector.newRequest('populateStates', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_states&country='+Element('cc_addr_countries').value, 'GET', handler);
+        Connector.newRequest('populateStates', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=get_states&country='+Element('cc_addr_countries').value, 'GET', handler);
 }
 
@@ -1121 +1121 @@
         };
 
-        Connector.newRequest('populateCities', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cities&'+requestStr, 'GET', handler);
+        Connector.newRequest('populateCities', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cities&'+requestStr, 'GET', handler);
 }
 
@@ -1391 +1391 @@
                         '<td style="width: 10px;" align="right"><input id="cc_conn_name_'+CC_conn_count+'" type="hidden"><td style="width: 100px;" align="right"><span style="width: 150px;" id="cc_conn_label_'+CC_conn_count+'">'+_label+'</span></td>' +
                         '<td align="left"><input id="cc_conn_value_'+ CC_conn_count +'" style="width: 150px;" maxlength="100" type="text">&nbsp;' +
-                        '<img align="top" alt="X" src="' + URL_SERVER + '/contactcenter/templates/default/images/x.png" style="width:18px; height:18px" onclick="javascript:removeConnField(\'cc_conn_tr_' + CC_conn_count + '\')"></td>';
+                        '<img align="top" alt="X" src="' + URL_SERVER + 'contactcenter/templates/default/images/x.png" style="width:18px; height:18px" onclick="javascript:removeConnField(\'cc_conn_tr_' + CC_conn_count + '\')"></td>';
                 }
                 else if (Element("cc_conn_type_2").checked)
@@ -1399 +1399 @@
                         '<td style="width: 10px;" align="right"><input id="cc_conn_name_'+CC_conn_count+'" type="hidden"><td style="width: 100px;" align="right"><span style="width: 150px;" id="cc_conn_label_'+CC_conn_count+'">'+_label+'</span></td>' +
                         '<td align="left"><input id="cc_conn_value_'+ CC_conn_count +'" style="width: 150px;" maxlength="30" type="text" onkeyup="formatPhone(this)">&nbsp;' +
-                        '<img align="top" alt="X" src="' + URL_SERVER + '/contactcenter/templates/default/images/x.png" style="width:18px; height:18px" onclick="javascript:removeConnField(\'cc_conn_tr_' + CC_conn_count + '\')"></td>';
+                        '<img align="top" alt="X" src="' + URL_SERVER + 'contactcenter/templates/default/images/x.png" style="width:18px; height:18px" onclick="javascript:removeConnField(\'cc_conn_tr_' + CC_conn_count + '\')"></td>';
                 }
         }
@@ -1419 +1419 @@
                 var remove_id = 'cc_conn_tr_'+CC_conn_count;
                 img.alt = 'X';
-                img.src = URL_SERVER + '/contactcenter/templates/default/images/x.png';
+                img.src = URL_SERVER + 'contactcenter/templates/default/images/x.png';
                 img.style.width = '18px';
                 img.style.height = '18px';
@@ -1799 +1799 @@
         if(result) {
                 if(result.toLowerCase() == number)
-                        Connector.newRequest('removeAllEntries', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=remove_all_entries', 'GET', handler);
+                        Connector.newRequest('removeAllEntries', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=remove_all_entries', 'GET', handler);
                 else
                         alert('Código Incorreto');
@@ -1835 +1835 @@
         typeArg = (type == 'groups' ? 'group' : 'entry');
 
-        Connector.newRequest('removeEntry', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=remove_'+typeArg+'&remove=' + id, 'GET', handler);
+        Connector.newRequest('removeEntry', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=remove_'+typeArg+'&remove=' + id, 'GET', handler);
 }
 
@@ -2142 +2142 @@
                                                                 Element(id+':cc_photo').src = '../index.php?menuaction=contactcenter.ui_data.data_manager&method=get_photo' + (data[4][pos] != 0 ? '&id='+data[3][pos][k] : '');
                                                                 if(ccTree.catalog_perms == 1)
-                                                                        Element(id+':cc_icon_data').innerHTML =  '<span title="'+Element('cc_msg_copy_to_catalog').value+'" id="' + id + ':ccQuickAdd" onmouseout="window.status=\'\';" onclick="ccQuickAddContact.showList(\''+ Element(id+':cc_id').value + '\');return true;" style="cursor: pointer; cursor: hand; z-index: 1"><img src="' + URL_SERVER + '/contactcenter/templates/default/images/address-conduit-16.png" align="center"></span>';
+                                                                        Element(id+':cc_icon_data').innerHTML =  '<span title="'+Element('cc_msg_copy_to_catalog').value+'" id="' + id + ':ccQuickAdd" onmouseout="window.status=\'\';" onclick="ccQuickAddContact.showList(\''+ Element(id+':cc_id').value + '\');return true;" style="cursor: pointer; cursor: hand; z-index: 1"><img src="' + URL_SERVER + 'contactcenter/templates/default/images/address-conduit-16.png" align="center"></span>';
                                                                 break;
 
@@ -2151 +2151 @@
                                                                         break;
 
-                                                                Element(id+':cc_icon_group').innerHTML =  '<span title="'+Element('cc_participants').value+'"  onmouseout="window.status=\'\';" onclick="ccListParticipants.showList(\''+ Element(id+':cc_id').value + '\',null,null,null,\''+account_type+'\');return true;" style="cursor: pointer; cursor: hand; z-index: 1"><img src="' + URL_SERVER + '/contactcenter/templates/default/images/people-mini.png" align="center">&nbsp;&nbsp;</span>';
+                                                                Element(id+':cc_icon_group').innerHTML =  '<span title="'+Element('cc_participants').value+'"  onmouseout="window.status=\'\';" onclick="ccListParticipants.showList(\''+ Element(id+':cc_id').value + '\',null,null,null,\''+account_type+'\');return true;" style="cursor: pointer; cursor: hand; z-index: 1"><img src="' + URL_SERVER + 'contactcenter/templates/default/images/people-mini.png" align="center">&nbsp;&nbsp;</span>';
                                                                 break;
 
@@ -2299 +2299 @@
                                                                 }
 
-                                                                Element(id+':cc_participantes').innerHTML = '<span title="Ver Participantes" id="' + id + ':ccQuickAdd" onmouseout="window.status=\'\';" onclick="ccListParticipants.showList(\''+ Element(id+':cc_id').value+'value\', \''+contact+'\', \''+email+'\', \''+title+'\', \''+id_group+'\');return true;" style="cursor: pointer; cursor: hand; z-index: 1"><img title="Ver participantes" align="center" src="' + URL_SERVER + '/contactcenter/templates/default/images/people-mini.png">&nbsp;&nbsp</span>';
+                                                                Element(id+':cc_participantes').innerHTML = '<span title="Ver Participantes" id="' + id + ':ccQuickAdd" onmouseout="window.status=\'\';" onclick="ccListParticipants.showList(\''+ Element(id+':cc_id').value+'value\', \''+contact+'\', \''+email+'\', \''+title+'\', \''+id_group+'\');return true;" style="cursor: pointer; cursor: hand; z-index: 1"><img title="Ver participantes" align="center" src="' + URL_SERVER + 'contactcenter/templates/default/images/people-mini.png">&nbsp;&nbsp</span>';
 
                                                                 break;
@@ -2362 +2362 @@
         };
 
-        Connector.newRequest('setMaxCards', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=set_n_cards&ncards=' + ncards, 'GET');
+        Connector.newRequest('setMaxCards', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=set_n_cards&ncards=' + ncards, 'GET');
 }
 
@@ -2397 +2397 @@
                         html_card = '<td id="' + id + '" style="width: ' + CC_card_image_width + 'px; height: ' + CC_card_image_height + '">' +
             '<div style="border: 0px solid #999; position: relative;">' +
-                                '<img src="' + URL_SERVER + '/contactcenter/templates/default/images/card.png" border="0" width="' + CC_card_image_width +'" height="' + CC_card_image_height + '"i ondblclick="editContact(Element(\'' + id + ':cc_id\').value);">' +
-                                '<img title="'+Element('cc_msg_group_edit').value+'" id="' + id + ':cc_card_edit" style="position: absolute; top: 35px; left: 222px; width: 18px; height: 18px; cursor: pointer; cursor: hand; z-index: 1" onclick="editGroup(Element(\'' + id + ':cc_id\').value);" onmouseover="resizeIcon(\''+id+':cc_card_edit\',0)" onmouseout="resizeIcon(\''+id+':cc_card_edit\',1)" src="' + URL_SERVER + '/contactcenter/templates/default/images/cc_card_edit.png">' +
-                                '<img title="'+Element('cc_msg_group_remove').value+'" id="' + id + ':cc_card_remove" style="position: absolute; top: 78px; left: 223px; width: 15px; height: 14px; cursor: pointer; cursor: hand; z-index: 1" onclick="removeEntry(Element(\'' + id + ':cc_id\').value,\'groups\');" onmouseover="resizeIcon(\''+id+':cc_card_remove\',0)" onmouseout="resizeIcon(\''+id+':cc_card_remove\',1)" src="' + URL_SERVER + '/contactcenter/templates/default/images/cc_x.png">' +
+                                '<img src="' + URL_SERVER + 'contactcenter/templates/default/images/card.png" border="0" width="' + CC_card_image_width +'" height="' + CC_card_image_height + '"i ondblclick="editContact(Element(\'' + id + ':cc_id\').value);">' +
+                                '<img title="'+Element('cc_msg_group_edit').value+'" id="' + id + ':cc_card_edit" style="position: absolute; top: 35px; left: 222px; width: 18px; height: 18px; cursor: pointer; cursor: hand; z-index: 1" onclick="editGroup(Element(\'' + id + ':cc_id\').value);" onmouseover="resizeIcon(\''+id+':cc_card_edit\',0)" onmouseout="resizeIcon(\''+id+':cc_card_edit\',1)" src="' + URL_SERVER + 'contactcenter/templates/default/images/cc_card_edit.png">' +
+                                '<img title="'+Element('cc_msg_group_remove').value+'" id="' + id + ':cc_card_remove" style="position: absolute; top: 78px; left: 223px; width: 15px; height: 14px; cursor: pointer; cursor: hand; z-index: 1" onclick="removeEntry(Element(\'' + id + ':cc_id\').value,\'groups\');" onmouseover="resizeIcon(\''+id+':cc_card_remove\',0)" onmouseout="resizeIcon(\''+id+':cc_card_remove\',1)" src="' + URL_SERVER + 'contactcenter/templates/default/images/cc_x.png">' +
                                 '<span id="' + id + ':cc_title" style="position: absolute; top: 30px; left: 75px; width: 135px; border: 0px solid #999; font-weight: bold; font-size: 10px; text-align: center; height: 10px;" onmouseover="//Element(\''+id+':cc_name_full\').style.visibility=\'visible\'" onmouseout="//Element(\''+id+':cc_name_full\').style.visibility=\'hidden\'"></span>' +
                                 '<span id="' + id + ':cc_participantes" style="cursor: pointer; cursor: hand; z-index: 1;position: absolute; top: 15px; left: 15px"></span>' +
@@ -2410 +2410 @@
                         html_card = '<td id="' + id + '" style="width: ' + CC_card_image_width + 'px; height: ' + CC_card_image_height + '">' +
                                 '<div style="border: 0px solid #999; position: relative;">' +
-                                        '<img src="' + URL_SERVER + '/contactcenter/templates/default/images/card.png" border="0" width="' + CC_card_image_width +'" height="' + CC_card_image_height + '"i ondblclick="editContact(Element(\'' + id + ':cc_id\').value);">' +
+                                        '<img src="' + URL_SERVER + 'contactcenter/templates/default/images/card.png" border="0" width="' + CC_card_image_width +'" height="' + CC_card_image_height + '"i ondblclick="editContact(Element(\'' + id + ':cc_id\').value);">' +
                                                 ( ccTree.catalog_perms == 1 ?
                                                 '<span id="' + id + ':cc_icon_data" style="position: absolute; top: 35px; left: 222px; width: 18px; height: 18px; cursor: pointer; cursor: hand; z-index: 1"></span>':'') +
                                                 (ccTree.catalog_perms & 2 ?
-                                                '<img title="'+Element('cc_msg_card_edit').value+'" id="' + id + ':cc_card_edit" style="position: absolute; top: 35px; left: 222px; width: 18px; height: 18px; cursor: pointer; cursor: hand; z-index: 1" onclick="editContact(Element(\'' + id + ':cc_id\').value);" onmouseover="resizeIcon(\''+id+':cc_card_edit\',0)" onmouseout="resizeIcon(\''+id+':cc_card_edit\',1)" src="' + URL_SERVER + '/contactcenter/templates/default/images/cc_card_edit.png">' +
-                                                '<img title="'+Element('cc_msg_card_remove').value+'" id="' + id + ':cc_card_remove" style="position: absolute; top: 78px; left: 223px; width: 15px; height: 14px; cursor: pointer; cursor: hand; z-index: 1" onclick="removeEntry(Element(\'' + id + ':cc_id\').value);" onmouseover="resizeIcon(\''+id+':cc_card_remove\',0)" onmouseout="resizeIcon(\''+id+':cc_card_remove\',1)" src="' + URL_SERVER + '/contactcenter/templates/default/images/cc_x.png">' : '') +
+                                                '<img title="'+Element('cc_msg_card_edit').value+'" id="' + id + ':cc_card_edit" style="position: absolute; top: 35px; left: 222px; width: 18px; height: 18px; cursor: pointer; cursor: hand; z-index: 1" onclick="editContact(Element(\'' + id + ':cc_id\').value);" onmouseover="resizeIcon(\''+id+':cc_card_edit\',0)" onmouseout="resizeIcon(\''+id+':cc_card_edit\',1)" src="' + URL_SERVER + 'contactcenter/templates/default/images/cc_card_edit.png">' +
+                                                '<img title="'+Element('cc_msg_card_remove').value+'" id="' + id + ':cc_card_remove" style="position: absolute; top: 78px; left: 223px; width: 15px; height: 14px; cursor: pointer; cursor: hand; z-index: 1" onclick="removeEntry(Element(\'' + id + ':cc_id\').value);" onmouseover="resizeIcon(\''+id+':cc_card_remove\',0)" onmouseout="resizeIcon(\''+id+':cc_card_remove\',1)" src="' + URL_SERVER + 'contactcenter/templates/default/images/cc_x.png">' : '') +
                                                 '<img id="' + id + ':cc_photo" style="position: absolute; top: 15px; left: 7px;" src="" border="0" ondblclick="editContact(Element(\'' + id + ':cc_id\').value);">' +
                                                 '<span id="' + id + ':cc_company" style="position: absolute; top: 5px; left: 75px; width: 135px; border: 0px solid #999; font-weight: bold; font-size: 14px; text-align: center; height: 10px;" onmouseover="//Element(\''+id+':cc_company_full\').style.visibility=\'visible\'" onmouseout="//Element(\''+id+':cc_company_full\').style.visibility=\'hidden\'"></span>' +
@@ -2462 +2462 @@
                                         '<td width="40%" style="solid #999; font-weight: normal; font-size: 10px; text-align: left; height: 10px"><span onMouseOver="this.title = \''+Element('cc_send_mail').value+'\'"  id="' + id + ':cc_short_name"></span></td>' +
                                         '<td align="left" width="55px">'+
-                                        '<img  title="'+Element('cc_msg_group_edit').value+'" id="' + id + ':cc_card_edit" style=" cursor: pointer; cursor: hand; z-index: 1;width: 18px; height: 18px;"  onclick="editGroup(Element(\'' + id + ':cc_id\').value);" src="' + URL_SERVER + '/contactcenter/templates/default/images/cc_card_edit.png">' +
+                                        '<img  title="'+Element('cc_msg_group_edit').value+'" id="' + id + ':cc_card_edit" style=" cursor: pointer; cursor: hand; z-index: 1;width: 18px; height: 18px;"  onclick="editGroup(Element(\'' + id + ':cc_id\').value);" src="' + URL_SERVER + 'contactcenter/templates/default/images/cc_card_edit.png">' +
                                         '&nbsp;&nbsp;|&nbsp;&nbsp;'+
-                                        '<img  title="'+Element('cc_msg_group_remove').value+'" id="' + id + ':cc_card_remove" style="width: 15px; height: 14px; cursor: pointer; cursor: hand; z-index: 1" onclick="removeEntry(Element(\'' + id + ':cc_id\').value,\'groups\');" src="' + URL_SERVER + '/contactcenter/templates/default/images/cc_x.png">'  +
+                                        '<img  title="'+Element('cc_msg_group_remove').value+'" id="' + id + ':cc_card_remove" style="width: 15px; height: 14px; cursor: pointer; cursor: hand; z-index: 1" onclick="removeEntry(Element(\'' + id + ':cc_id\').value,\'groups\');" src="' + URL_SERVER + 'contactcenter/templates/default/images/cc_x.png">'  +
                                         '<input id="' + id + ':cc_id" type="hidden">'+
                                         '</td></tr>';
@@ -2487 +2487 @@
                                         '<td align="left" >'+
                                         (ccTree.catalog_perms & 2 ?
-                                        '<img  title="'+Element('cc_msg_card_edit').value+'" id="' + id + ':cc_card_edit" style=" cursor: pointer; cursor: hand; z-index: 1;width: 18px; height: 18px;"  onclick="editContact(Element(\'' + id + ':cc_id\').value);" src="' + URL_SERVER + '/contactcenter/templates/default/images/cc_card_edit.png">' +
+                                        '<img  title="'+Element('cc_msg_card_edit').value+'" id="' + id + ':cc_card_edit" style=" cursor: pointer; cursor: hand; z-index: 1;width: 18px; height: 18px;"  onclick="editContact(Element(\'' + id + ':cc_id\').value);" src="' + URL_SERVER + 'contactcenter/templates/default/images/cc_card_edit.png">' +
                                         '&nbsp;&nbsp;|&nbsp;&nbsp;'+
-                                        '<img title="'+Element('cc_msg_card_remove').value+'" id="' + id + ':cc_card_remove" style="width: 15px; height: 14px; cursor: pointer; cursor: hand; z-index: 1" onclick="removeEntry(Element(\'' + id + ':cc_id\').value);" src="' + URL_SERVER + '/contactcenter/templates/default/images/cc_x.png">' : '') +
+                                        '<img title="'+Element('cc_msg_card_remove').value+'" id="' + id + ':cc_card_remove" style="width: 15px; height: 14px; cursor: pointer; cursor: hand; z-index: 1" onclick="removeEntry(Element(\'' + id + ':cc_id\').value);" src="' + URL_SERVER + 'contactcenter/templates/default/images/cc_x.png">' : '') +
                                         '<input id="' + id + ':cc_id" type="hidden">'+
                                         '<input type="hidden" id="' + id + ':cc_photo">' +
@@ -2681 +2681 @@
 
         var info = "letter="+letter+"&page="+CC_actual_page+"&ids="+ids;
-        Connector.newRequest('showCards', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cards_data', 'POST', handler, info);
+        Connector.newRequest('showCards', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cards_data', 'POST', handler, info);
 }
 
@@ -2831 +2831 @@
         resetQuickAdd();
 
-        Connector.newRequest('quickAdd', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=quick_add', 'POST', handler, 'add='+escape(str));
+        Connector.newRequest('quickAdd', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=quick_add', 'POST', handler, 'add='+escape(str));
 }
 
@@ -2845 +2845 @@
         }
         }
-        Connector.newRequest('voip', URL_SERVER + "/expressoMail1_2/controller.php?action=expressoMail1_2.functions.callVoipconnect&to="+phoneUser+"&typePhone="+typePhone, 'POST', handler_voip);
-        }
+        Connector.newRequest('voip', URL_SERVER + "expressoMail1_2/controller.php?action=expressoMail1_2.functions.callVoipconnect&to="+phoneUser+"&typePhone="+typePhone, 'POST', handler_voip);
+        }

trunk/contactcenter/js/ccIEContacts.js

@@ -238 +238 @@
                         var typeImport = Element('typeImport').value;
 
-                        Connector.newRequest('import_contacts', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=import_contacts&typeImport='+typeImport,'GET',handler_import);
+                        Connector.newRequest('import_contacts', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=import_contacts&typeImport='+typeImport,'GET',handler_import);
                 }
 
@@ -280 +280 @@
                 var typeExport = Element("typeExport");
                 Element('export_button').disabled = true;
-                Connector.newRequest('export_contacts', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=export_contacts', 'POST', handler_export, 'typeExport='+typeExport.value);
+                Connector.newRequest('export_contacts', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=export_contacts', 'POST', handler_export, 'typeExport='+typeExport.value);
         }
 

trunk/contactcenter/js/ccMain.js

@@ -57 +57 @@
                         }
 
-                        Connector.newRequest('ViewLdap', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_visible_all_ldap', 'GET', ViewLdap);         
+                        Connector.newRequest('ViewLdap', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=get_visible_all_ldap', 'GET', ViewLdap);          
                         
                         ccTree.Connector = Connector;                                           

trunk/contactcenter/js/ccQuickAddContact.js

@@ -61 +61 @@
                         this.showWindow(div);
                 else {
-                        Connector.newRequest('get_catalog_add_contact', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_catalog_add_contact', 'POST', handler, 'id='+id);
+                        Connector.newRequest('get_catalog_add_contact', URL_SERVER + 'index.php?menuaction=contactcenter.ui_data.data_manager&method=get_catalog_add_contact', 'POST', handler, 'id='+id);
                 }
         }

trunk/expressoAdmin1_2/js/jscode/globals.js

@@ -1 +1 @@
 var _controller = new XConnector( {
-        "path" : URL_SERVER + "/expressoAdmin1_2",
+        "path" : URL_SERVER + "expressoAdmin1_2",
         "controller" : "controller.php?action="
 } );

trunk/expressoMail1_2/js/jscode/InfoContact.js

@@ -11 +11 @@
 emInfoContact.prototype.createCard = function(){
         var pic= new Image(); 
-        pic.src=URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/card.gif"; 
+        pic.src=URL_SERVER + "expressoMail1_2/templates/"+template+"/images/card.gif"; 
         card = document.createElement("DIV");
         card.id = "card_cc";
@@ -91 +91 @@
         Element("card_cc_td").innerHTML = "<table cellpadding=0 cellspacing=0 border=0 height='100%' width='100%'><tr><td width='70' height='93' style='padding-top:5px;padding-left:6px' align='center' valign='center'>"+
                                                                                 "<img src='./inc/show_img.php?email="+data.email+"'></td><td style='padding-left:2px' align='left' valign='top'>"+
-                                                                                "<br><img align='center' src='"+URL_SERVER+"/expressoMail1_2/templates/"+template+"/images/"+(data.type)+"_catalog.png'><font size=1 color=BLACK>&nbsp;<b>"+get_lang("Sender's Information")+"</b></font>"+
+                                                                                "<br><img align='center' src='"+URL_SERVER+"expressoMail1_2/templates/"+template+"/images/"+(data.type)+"_catalog.png'><font size=1 color=BLACK>&nbsp;<b>"+get_lang("Sender's Information")+"</b></font>"+
                                                                                 _this.verifyIM(data.uid,data.email)+
-                                                                                "<br><img align='center' src='"+URL_SERVER+"/expressoMail1_2/templates/"+template+"/images/phone.gif'>&nbsp;<font  size=1  color=BLACK>"+(phoneUser ? phoneUser : get_lang("None") )+"</font>"+
+                                                                                "<br><img align='center' src='"+URL_SERVER+"expressoMail1_2/templates/"+template+"/images/phone.gif'>&nbsp;<font  size=1  color=BLACK>"+(phoneUser ? phoneUser : get_lang("None") )+"</font>"+
                                                                                 "</td></tr><tr><td valign='top' align='center' colspan='2'>"+
                                                                                 "<font size=1 color=BLACK>"+cn+"</font>"+

trunk/expressoMail1_2/js/jscode/abas.js

@@ -140 +140 @@
                 borderTitle = borderTitle.substring(0, resize*0.08);
 
-        td.innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + ID+" class='font-menu' width=*>" + borderTitle + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='"+URL_SERVER+"/expressoMail1_2/templates/"+template+"/images/close_button.gif'></td></tr></table>";
+        td.innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + ID+" class='font-menu' width=*>" + borderTitle + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='"+URL_SERVER+"expressoMail1_2/templates/"+template+"/images/close_button.gif'></td></tr></table>";
 
         bb = document.getElementById("border_blank");

trunk/expressoMail1_2/js/jscode/doiMenuData.js

@@ -1 @@
-_icon_dir = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/menu/';
+_icon_dir = URL_SERVER + 'expressoMail1_2/templates/'+template+'/images/menu/';
 
 function ConstructMenuTools(){

trunk/expressoMail1_2/js/jscode/drag_area.js

@@ -23 +23 @@
         this.div_dd.style.display ='none';
         this.envelope = new Image();
-        this.envelope.src = URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/envelope.png";
+        this.envelope.src = URL_SERVER + "expressoMail1_2/templates/"+template+"/images/envelope.png";
         document.body.appendChild(this.div_dd);
 

trunk/expressoMail1_2/js/jscode/draw_api_folders.js

@@ -80 +80 @@
         td_element5.align = "center";
         td_element5.innerHTML = "<B>"+get_lang("Date")+"</B>";  
-        td_element5.innerHTML += '<img src ="' + URL_SERVER + '/expressoMail1_2/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%");
@@ -206 +206 @@
 
         var sm_envelope_img1 = '<img style="cursor:'+ (is_ie ? 'hand' : 'pointer') +'" title="' + get_lang("Add Contact") +
-                '" onclick="ccQuickAddOne.showList(\''+cc_data+'\')" src="' + URL_SERVER + '/expressoMail1_2/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;
@@ -251 +251 @@
                 td21.height="15";
                 td22 = document.createElement("TD");    
-                td21.setAttribute("background", URL_SERVER + '/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");
@@ -271 +271 @@
                 }
                 else if(value > 80)
-                        td221.setAttribute("background", URL_SERVER + '/expressoMail1_2/templates/' + template + '/images/dswarn.gif');
+                        td221.setAttribute("background", URL_SERVER + 'expressoMail1_2/templates/' + template + '/images/dswarn.gif');
                 else
                         td221.className = 'dsused';
@@ -633 +633 @@
 
 if (trash_span)
-        trash_span.style.backgroundImage="url(" + URL_SERVER + "/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(" + URL_SERVER + "/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(" + URL_SERVER + "/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(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_spam.png)";
+        spam_span.style.backgroundImage="url(" + URL_SERVER + "phpgwapi/templates/"+template+"/images/foldertree_spam.png)";
 
 
@@ -759 +759 @@
                         }
                 }
-                expresso.connector.newRequest('error.html', URL_SERVER + '/expressoMail1_2/templates/'+template+'/error.html', 'GET',
+                expresso.connector.newRequest('error.html', URL_SERVER + 'expressoMail1_2/templates/'+template+'/error.html', 'GET',
                                 function(data)
                                 {
@@ -920 +920 @@
         td_element2.setAttribute("width", "2%");
         if (headers_msgs.attachment && headers_msgs.attachment.number_attachments > 0)
-                td_element2.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/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");
@@ -932 +932 @@
                 {
                         if (url_decode(attach_name[item]) != 'smime.p7s' && url_decode(attach_name[item]) != 'smime.p7m'){
-                                td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/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;
                         }
@@ -939 +939 @@
 
         if ((headers_msgs.Forwarded == 'F')  || (headers_msgs.Draft == 'X' && headers_msgs.Answered == 'A')){
-                td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/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 = '';
@@ -945 +945 @@
         }
         else if (headers_msgs.Draft == 'X')
-                td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/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 ="' + URL_SERVER + '/expressoMail1_2/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;";
@@ -963 +963 @@
                 case "signature":
                 {
-                        td_element22.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/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 ="' + URL_SERVER + '/expressoMail1_2/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;
                 }
@@ -984 +984 @@
         if (headers_msgs.Flagged == 'F' || (headers_msgs.Importance.toLowerCase().indexOf("high") != -1 && parseInt(preferences.use_important_flag)))
         {
-                td_element23.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/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
@@ -996 +996 @@
         // preload image
         var _img_sent = new Image();
-        _img_sent.src    = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/sent.gif';
+        _img_sent.src    = URL_SERVER + 'expressoMail1_2/templates/'+template+'/images/sent.gif';
 
         td_element3 = document.createElement("TD");
@@ -1015 +1015 @@
                 else{                           
                         if(headers_msgs.to.email != null && headers_msgs.to.email.toLowerCase() != Element("user_email").value)
-                                td_element24.innerHTML = '<img valign="center" src ="' + URL_SERVER + '/expressoMail1_2/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))

trunk/expressoMail1_2/js/jscode/draw_api_messages.js

@@ -77 +77 @@
         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 ="' + URL_SERVER + '/expressoMail1_2/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){
@@ -95 +95 @@
         var img_next_msg = document.createElement("IMG");
         img_next_msg.id = 'msg_opt_next_' + ID;
-        img_next_msg.src = URL_SERVER + '/expressoMail1_2/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';
@@ -125 +125 @@
                 else
                 {
-                        img_next_msg.src = URL_SERVER + '/expressoMail1_2/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';
 
@@ -132 +132 @@
         else
         {
-                img_next_msg.src = URL_SERVER + '/expressoMail1_2/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
@@ -151 +151 @@
         var img_previous_msg = document.createElement("IMG");
         img_previous_msg.id = 'msg_opt_previous_' + ID;
-        img_previous_msg.src = URL_SERVER + '/expressoMail1_2/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';
@@ -180 +180 @@
                 else
                 {
-                        img_previous_msg.src = URL_SERVER + '/expressoMail1_2/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';
                 }
@@ -186 +186 @@
         else
         {
-                img_previous_msg.src = URL_SERVER + '/expressoMail1_2/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
@@ -235 +235 @@
         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 ='" + URL_SERVER + "/expressoMail1_2/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="' + URL_SERVER + '/expressoMail1_2/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='" + URL_SERVER + "/expressoMail1_2/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="' + URL_SERVER + '/expressoMail1_2/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">';
         }
 
@@ -319 +319 @@
                 option_reply_options.id = 'msg_opt_reply_options_'+ID;
                 option_reply_options.onmouseover = function(){
-                                option_reply_options.src= URL_SERVER+'/expressoMail1_2/templates/default/images/over.png';
+                                option_reply_options.src= URL_SERVER+'expressoMail1_2/templates/default/images/over.png';
                 };
                 option_reply_options.onmouseout = function(){
                         if (this.value == 'show')
                         {
-                                option_reply_options.src= URL_SERVER+'/expressoMail1_2/templates/default/images/down.png';
+                                option_reply_options.src= URL_SERVER+'expressoMail1_2/templates/default/images/down.png';
                         }
                         else
                         {
-                                option_reply_options.src= URL_SERVER+'/expressoMail1_2/templates/default/images/pressed.png';
+                                option_reply_options.src= URL_SERVER+'expressoMail1_2/templates/default/images/pressed.png';
                         }
                 };
@@ -334 +334 @@
                         if (this.value == 'show'){
                                 this.value = 'hide';
-                                option_reply_options.src= URL_SERVER+'/expressoMail1_2/templates/default/images/pressed.png';
+                                option_reply_options.src= URL_SERVER+'expressoMail1_2/templates/default/images/pressed.png';
                                 Element('tr_other_options_'+ID).style.display = '';
 
@@ -340 +340 @@
                         else{
                                 this.value = 'show';
-                                option_reply_options.src= URL_SERVER+'/expressoMail1_2/templates/default/images/down.png';
+                                option_reply_options.src= URL_SERVER+'expressoMail1_2/templates/default/images/down.png';
                                 Element('tr_other_options_'+ID).style.display = 'none';
                         }
                 };
-                option_reply_options.src= URL_SERVER+'/expressoMail1_2/templates/default/images/down.png';
+                option_reply_options.src= URL_SERVER+'expressoMail1_2/templates/default/images/down.png';
                 option_reply_options.value = 'show';
                 var option_reply = document.createElement("SPAN");
@@ -413 +413 @@
                         if(signature_status_pos < 0 )
                         {
-                                td.innerHTML += '&nbsp;<img style="cursor:pointer" src="' + URL_SERVER + '/expressoMail1_2/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="' + URL_SERVER + '/expressoMail1_2/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(){
@@ -861 +861 @@
                                 if (forbidden)
                                 {
-                                        newBody = newBody.replace(imgTag[j],"<img src='" + URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/forbidden.jpg'>");
+                                        newBody = newBody.replace(imgTag[j],"<img src='" + URL_SERVER + "expressoMail1_2/templates/"+template+"/images/forbidden.jpg'>");
                                         blocked=true;
                                 }
@@ -939 +939 @@
                 }
 
-                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><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>";
 
@@ -1159 +1159 @@
         if (!expresso_offline) {
                 var img_search = document.createElement("IMG");
-                img_search.src = URL_SERVER + '/expressoMail1_2/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);};
@@ -1283 +1283 @@
         td_cc.appendChild(input_cc);
         var img_search = document.createElement("IMG");
-        img_search.src = URL_SERVER + '/expressoMail1_2/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.');
@@ -1366 +1366 @@
         td_cco.appendChild(input_cco);
         var img_search = document.createElement("IMG");
-        img_search.src = URL_SERVER + '/expressoMail1_2/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);};
@@ -1733 +1733 @@
         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='" + URL_SERVER + "/expressoMail1_2/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/filters.js

@@ -7 +7 @@
                 // Images
                 this.grp_open_img = new Image();
-                this.grp_open_img.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/filtro/group_open.gif';
+                this.grp_open_img.src = URL_SERVER + 'expressoMail1_2/templates/'+template+'/images/filtro/group_open.gif';
                 this.grp_close_img = new Image();
-                this.grp_close_img.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/filtro/group_close.gif';
+                this.grp_close_img.src = URL_SERVER + 'expressoMail1_2/templates/'+template+'/images/filtro/group_close.gif';
                 this.filter_img = new Image();
-                this.filter_img.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/filtro/filters.gif';
+                this.filter_img.src = URL_SERVER + 'expressoMail1_2/templates/'+template+'/images/filtro/filters.gif';
                 this.for_email_img = new Image();
-                this.for_email_img.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/filtro/answered.gif';
+                this.for_email_img.src = URL_SERVER + 'expressoMail1_2/templates/'+template+'/images/filtro/answered.gif';
                 this.telephone_voip = new Image();
-                this.telephone_voip.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/filtro/telephone_voip.jpg';
+                this.telephone_voip.src = URL_SERVER + 'expressoMail1_2/templates/'+template+'/images/filtro/telephone_voip.jpg';
         }               
 

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="' + URL_SERVER + '/expressoMail1_2/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="' + URL_SERVER + '/expressoMail1_2/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="' + URL_SERVER + '/expressoMail1_2/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="' + URL_SERVER + '/expressoMail1_2/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/load_lang.js

@@ -5 +5 @@
 
         var request = _connector.cache( ).go( {
-                'access' : URL_SERVER + '/expressoMail1_2/inc/load_lang.php?lang=' + lang,
+                'access' : URL_SERVER + 'expressoMail1_2/inc/load_lang.php?lang=' + lang,
                 'handler' : function( data )
                 {

trunk/expressoMail1_2/js/jscode/main.js

@@ -1421 +1421 @@
                 title = title.substring(0, parseInt(resize)*0.08);
 
-        Element("border_id_" + new_border_ID).innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + new_border_ID +" class='font-menu' width=*>" +title + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + new_border_ID + "','false') src='"+URL_SERVER+"/expressoMail1_2/templates/"+template+"/images/close_button.gif'></td></tr></table>";
+        Element("border_id_" + new_border_ID).innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + new_border_ID +" class='font-menu' width=*>" +title + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + new_border_ID + "','false') src='"+URL_SERVER+"expressoMail1_2/templates/"+template+"/images/close_button.gif'></td></tr></table>";
         return new_border_ID; //Preciso retornar o ID da nova mensagem.
 }
@@ -2068 +2068 @@
                 if (data.status && Element("td_message_answered_"+msg_number)) {        
                         if(flag == 'answered')
-                                Element("td_message_answered_"+msg_number).innerHTML = '<img src="'+URL_SERVER+'/expressoMail1_2/templates/'+template+'/images/answered.gif" title="Respondida">';
+                                Element("td_message_answered_"+msg_number).innerHTML = '<img src="'+URL_SERVER+'expressoMail1_2/templates/'+template+'/images/answered.gif" title="Respondida">';
                         else if(flag == 'forwarded')
-                                Element("td_message_answered_"+msg_number).innerHTML = '<img src="'+URL_SERVER+'/expressoMail1_2/templates/'+template+'/images/forwarded.gif" title="Encaminhada">';
+                                Element("td_message_answered_"+msg_number).innerHTML = '<img src="'+URL_SERVER+'expressoMail1_2/templates/'+template+'/images/forwarded.gif" title="Encaminhada">';
                 }
         };

trunk/expressoMail1_2/js/jscode/rich_text_editor.js

@@ -179 +179 @@
                 img.className = 'imagebutton';
                 img.align = 'center';
-                img.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/'+buttons[i]+'.gif';
+                img.src = URL_SERVER + 'expressoMail1_2/templates/'+template+'/images/'+buttons[i]+'.gif';
                 img.title = get_lang(buttons[i]);
                 img.style.cursor = 'pointer';

trunk/expressoMail1_2/js/modal/modal.js

@@ -166 +166 @@
         cssNode.rel = 'stylesheet';
         if (navigator.userAgent.toLowerCase().indexOf("msie") != -1)
-                cssNode.href = URL_SERVER + "/expressoMail1_2/js/modal/css/modal_ie.css";
+                cssNode.href = URL_SERVER + "expressoMail1_2/js/modal/css/modal_ie.css";
         else
-                cssNode.href = URL_SERVER + "/expressoMail1_2/js/modal/css/modal_fx.css";
+                cssNode.href = URL_SERVER + "expressoMail1_2/js/modal/css/modal_fx.css";
         
         cssNode.media = 'screen';

trunk/filemanager/js/draw_api.js

@@ -12 +12 @@
 
 function loadHistory(filename){
-        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.history&file='+base64_encode(filename)+"&path="+base64_encode(currentPath),draw_window);
+        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.history&file='+base64_encode(filename)+"&path="+base64_encode(currentPath),draw_window);
 }
 
@@ -163 +163 @@
         window.onresize = resizeDiv;
         document.body.style.overflow = "hidden";
-        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);
+        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);
 }
 
@@ -216 +216 @@
                 newpage += '<td></td><td></td>';
                 newpage += fl.td+'<img src="'+files[i].icon+'">';
-                newpage += '<a id="name_'+files[i].name+'" href="' + URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(files[i].name)+'&path='+base64_encode(files[i].directory)+'" target="_blank">'+files[i].name+'</a>&nbsp;</td>';
+                newpage += '<a id="name_'+files[i].name+'" href="' + URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(files[i].name)+'&path='+base64_encode(files[i].directory)+'" target="_blank">'+files[i].name+'</a>&nbsp;</td>';
                 newpage += fl.td+files[i].directory+'</td>';
                 if (preferences.mime_type =='1') newpage += fl.td+files[i].mime_type+'</td>';
@@ -246 +246 @@
                 {
                         case 'text/html':
-                                retBuff += '<td><a href="' + URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.export&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'"><div class="exportButton" alt="'+get_lang('export')+'" title="'+get_lang('export')+'"></div></a></td>';
+                                retBuff += '<td><a href="' + URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.export&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'"><div class="exportButton" alt="'+get_lang('export')+'" title="'+get_lang('export')+'"></div></a></td>';
                                 break;
                         case 'application/zip':
@@ -259 +259 @@
                 else
                         var mousefunc = 'hide_card()';
-                retBuff += '<a onmouseover="'+mousefunc+'" id="name_'+file.name+'" href="' + URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'" target="_blank">'+file.name+'</a></div></td>';
+                retBuff += '<a onmouseover="'+mousefunc+'" id="name_'+file.name+'" href="' + URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'" target="_blank">'+file.name+'</a></div></td>';
                 if (preferences.mime_type =='1') retBuff += fl.td+file.mime_type+'</td>';
                 if (preferences.size =='1') retBuff += fl.td+borkb(file.size)+'</td>';
@@ -319 +319 @@
                 var contentQuota = document.getElementById('content_quota');
                 if (contentQuota != null)
-                        contentQuota.innerHTML = '<table width="102" cellspacing="0" cellpadding="0" border="0" id="table_quota"><tbody><tr><td width="102" nowrap="true" height="15" background="' + URL_SERVER + '/phpgwapi/templates/default/images/dsunused.gif"><table cellspacing="0" cellpadding="0" border="0" style="width: '+parseInt((usedSpace/quotaSize)*100)+'%;"><tbody><tr><td height="15" class="dsused"/></tr></tbody></table></td><td nowrap="true" align="center"><span class="boxHeaderText">'+parseInt(usedSpace/quotaSize*100)+'% ('+borkb(usedSpace)+'/'+borkb(quotaSize)+')</span></td></tr></tbody></table></td></tr></table>';
+                        contentQuota.innerHTML = '<table width="102" cellspacing="0" cellpadding="0" border="0" id="table_quota"><tbody><tr><td width="102" nowrap="true" height="15" background="' + URL_SERVER + 'phpgwapi/templates/default/images/dsunused.gif"><table cellspacing="0" cellpadding="0" border="0" style="width: '+parseInt((usedSpace/quotaSize)*100)+'%;"><tbody><tr><td height="15" class="dsused"/></tr></tbody></table></td><td nowrap="true" align="center"><span class="boxHeaderText">'+parseInt(usedSpace/quotaSize*100)+'% ('+borkb(usedSpace)+'/'+borkb(quotaSize)+')</span></td></tr></tbody></table></td></tr></table>';
         }
 }
@@ -335 +335 @@
                 {
                         newicon = '<div class="icon">';
-                        newicon += '<a href="' + URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(files[i].name)+'&path='+base64_encode(currentPath)+'" target="_blank">';
+                        newicon += '<a href="' + URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(files[i].name)+'&path='+base64_encode(currentPath)+'" target="_blank">';
                         newicon += '<div style="width:64; height:64; background-image:url('+files[i].icon+'); background-repeat: no-repeat;"></div>';
                         newicon += '<span class="iconCaption">'+files[i].name+'</span>';
@@ -483 +483 @@
                                         inputName.value = filename;
                                         inputName.onclick = function () { oldValue = inputName.value; }
-                                        inputName.onblur = function () { if (inputName.value == oldValue) handler.rename(); else cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.rename&file='+base64_encode(this.id.substr(6))+'&to='+base64_encode(this.value)+"&path="+base64_encode(currentPath),handler.rename) };
+                                        inputName.onblur = function () { if (inputName.value == oldValue) handler.rename(); else cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.rename&file='+base64_encode(this.id.substr(6))+'&to='+base64_encode(this.value)+"&path="+base64_encode(currentPath),handler.rename) };
                                         inputName.onkeydown=function (event) {if (event.keyCode == KEY_ENTER) this.blur(); };
                                         nameLink.parentNode.appendChild(inputName);
@@ -502 +502 @@
                                 address = document.location.toString();
                                 address = address.split("&");
-                                document.location = URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.index&'+arg+".x=1&filename="+base64_encode(filename)+".&path="+base64_encode(currentPath);
+                                document.location = URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.index&'+arg+".x=1&filename="+base64_encode(filename)+".&path="+base64_encode(currentPath);
                         }
                         else
@@ -512 +512 @@
                 case 'delete':
                         var filesUrl = this.getCheckedFiles();
-                        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.delete&path='+
+                        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.delete&path='+
                                         base64_encode(currentPath)+filesUrl,handler.del);
                         break;
@@ -530 +530 @@
                         }
                         var pswd = crypt.encode(password);
-                        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.archive&pswd='+base64_encode(pswd.toString())+'&path='+base64_encode(currentPath)+filesUrl,handler.archive);
+                        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.archive&pswd='+base64_encode(pswd.toString())+'&path='+base64_encode(currentPath)+filesUrl,handler.archive);
                         break;
                 case 'move_to':
@@ -549 +549 @@
                         last_folder = last_folder ? last_folder : currentPath;
                         current_folder = current_folder ? current_folder : currentPath;
-                        cExecute_( URL_SERVER  + '/index.php?menuaction=filemanager.uifilemanager.dir_ls&path='+base64_encode(currentPath)+'&criteria='+criteria+'&otype='+order_type+'&limit='+preferences.files_per_page+'&offset='+offset,folderList.drawFiles);
+                        cExecute_( URL_SERVER  + 'index.php?menuaction=filemanager.uifilemanager.dir_ls&path='+base64_encode(currentPath)+'&criteria='+criteria+'&otype='+order_type+'&limit='+preferences.files_per_page+'&offset='+offset,folderList.drawFiles);
                         return;
                 case 'tools':
                         elements = new Array();
                         elements[0] = { 'text' : get_lang('Preferences'),
-                                        'url' : URL_SERVER + '/preferences/preferences.php?appname=filemanager',
+                                        'url' : URL_SERVER + 'preferences/preferences.php?appname=filemanager',
                                         'img' : templatePath+'images/preferences.png'};
                         elements[1] = { 'text' : get_lang('Search'),
@@ -564 +564 @@
                                         'img' : templatePath+'images/button_createdir.png'};
                         elements[3] = { 'text' : get_lang('Share Folders'),
-                                        'url' : URL_SERVER + "/index.php?menuaction=preferences.uiaclprefs.index&acl_app=filemanager",
+                                        'url' : URL_SERVER + "index.php?menuaction=preferences.uiaclprefs.index&acl_app=filemanager",
                                         'img' : templatePath+'images/mime16_directory.png'};
                         elements[4] = { 'text' : get_lang('View'),
@@ -584 +584 @@
         if (password == null)
                 return;
-        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.unarchive&pswd='+base64_encode(password)+'&path='+base64_encode(currentPath)+'&file='+base64_encode(filename),handler.archive);
+        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.unarchive&pswd='+base64_encode(password)+'&path='+base64_encode(currentPath)+'&file='+base64_encode(filename),handler.archive);
 }
 function move_to(to,filesUrl){
-        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.moveto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.moveto);
+        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.moveto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.moveto);
 }
 function copy_to(to,filesUrl){
-        cExecute_(URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.copyto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.copyto);
+        cExecute_(URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.copyto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.copyto);
 }
 
@@ -597 +597 @@
         switch(type){
                 case 'preview':
-                        var url = URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.summary&file='+base64_encode(name)+"&path="+base64_encode(currentPath);
+                        var url = URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.summary&file='+base64_encode(name)+"&path="+base64_encode(currentPath);
                         var htmlData = '<img src=\"'+url+'\">';
                         menuTimeout = setTimeout("draw_window_card(\'"+htmlData+"\')",500);
                         break;
                 case 'user':
-                        var url = URL_SERVER + '/index.php?menuaction=filemanager.user.card&lid='+base64_encode(name);
+                        var url = URL_SERVER + 'index.php?menuaction=filemanager.user.card&lid='+base64_encode(name);
                         menuTimeout = setTimeout("cExecute_('"+url+"',draw_window_card)",500);
                         break;
@@ -616 +616 @@
                 {
                         var parentDir = document.getElementById('folders_box').value;
-                        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.createdir&path='+base64_encode(parentDir)+'&filename='+base64_encode(name),handler.refreshDir);
+                        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.createdir&path='+base64_encode(parentDir)+'&filename='+base64_encode(name),handler.refreshDir);
                         currentPath = parentDir+'/'+name;
                         close_window();
@@ -626 +626 @@
                         if (confirm(get_lang('Do you really want to remove folder: %1?',Dfolder), ''))
                         {
-                                cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.removedir&path='+base64_encode(crypt.encode(Dfolder)),handler.refreshDir);
+                                cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.removedir&path='+base64_encode(crypt.encode(Dfolder)),handler.refreshDir);
                                 var lastIndex = Dfolder.lastIndexOf('/');
                                 currentPath = Dfolder.substr(0,lastIndex);

trunk/filemanager/js/global.js

@@ -9 +9 @@
 var oldValue;
 
-var templatePath = URL_SERVER + '/filemanager/templates/default/';
+var templatePath = URL_SERVER + 'filemanager/templates/default/';
 
 var menuTimeout;

trunk/filemanager/js/jscode/draw_api.js

@@ -12 +12 @@
 
 function loadHistory(filename){
-        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.history&file='+base64_encode(filename)+"&path="+base64_encode(currentPath),draw_window);
+        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.history&file='+base64_encode(filename)+"&path="+base64_encode(currentPath),draw_window);
 }
 
@@ -163 +163 @@
         window.onresize = resizeDiv;
         document.body.style.overflow = "hidden";
-        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);
+        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);
 }
 
@@ -216 +216 @@
                 newpage += '<td></td><td></td>';
                 newpage += fl.td+'<img src="'+files[i].icon+'">';
-                newpage += '<a id="name_'+files[i].name+'" href="' + URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(files[i].name)+'&path='+base64_encode(files[i].directory)+'" target="_blank">'+files[i].name+'</a>&nbsp;</td>';
+                newpage += '<a id="name_'+files[i].name+'" href="' + URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(files[i].name)+'&path='+base64_encode(files[i].directory)+'" target="_blank">'+files[i].name+'</a>&nbsp;</td>';
                 newpage += fl.td+files[i].directory+'</td>';
                 if (preferences.mime_type =='1') newpage += fl.td+files[i].mime_type+'</td>';
@@ -246 +246 @@
                 {
                         case 'text/html':
-                                retBuff += '<td><a href="' + URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.export&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'"><div class="exportButton" alt="'+get_lang('export')+'" title="'+get_lang('export')+'"></div></a></td>';
+                                retBuff += '<td><a href="' + URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.export&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'"><div class="exportButton" alt="'+get_lang('export')+'" title="'+get_lang('export')+'"></div></a></td>';
                                 break;
                         case 'application/zip':
@@ -259 +259 @@
                 else
                         var mousefunc = 'hide_card()';
-                retBuff += '<a onmouseover="'+mousefunc+'" id="name_'+file.name+'" href="' + URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'" target="_blank">'+file.name+'</a></div></td>';
+                retBuff += '<a onmouseover="'+mousefunc+'" id="name_'+file.name+'" href="' + URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'" target="_blank">'+file.name+'</a></div></td>';
                 if (preferences.mime_type =='1') retBuff += fl.td+file.mime_type+'</td>';
                 if (preferences.size =='1') retBuff += fl.td+borkb(file.size)+'</td>';
@@ -319 +319 @@
                 var contentQuota = document.getElementById('content_quota');
                 if (contentQuota != null)
-                        contentQuota.innerHTML = '<table width="102" cellspacing="0" cellpadding="0" border="0" id="table_quota"><tbody><tr><td width="102" nowrap="true" height="15" background="' + URL_SERVER + '/phpgwapi/templates/default/images/dsunused.gif"><table cellspacing="0" cellpadding="0" border="0" style="width: '+parseInt((usedSpace/quotaSize)*100)+'%;"><tbody><tr><td height="15" class="dsused"/></tr></tbody></table></td><td nowrap="true" align="center"><span class="boxHeaderText">'+parseInt(usedSpace/quotaSize*100)+'% ('+borkb(usedSpace)+'/'+borkb(quotaSize)+')</span></td></tr></tbody></table></td></tr></table>';
+                        contentQuota.innerHTML = '<table width="102" cellspacing="0" cellpadding="0" border="0" id="table_quota"><tbody><tr><td width="102" nowrap="true" height="15" background="' + URL_SERVER + 'phpgwapi/templates/default/images/dsunused.gif"><table cellspacing="0" cellpadding="0" border="0" style="width: '+parseInt((usedSpace/quotaSize)*100)+'%;"><tbody><tr><td height="15" class="dsused"/></tr></tbody></table></td><td nowrap="true" align="center"><span class="boxHeaderText">'+parseInt(usedSpace/quotaSize*100)+'% ('+borkb(usedSpace)+'/'+borkb(quotaSize)+')</span></td></tr></tbody></table></td></tr></table>';
         }
 }
@@ -335 +335 @@
                 {
                         newicon = '<div class="icon">';
-                        newicon += '<a href="' + URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(files[i].name)+'&path='+base64_encode(currentPath)+'" target="_blank">';
+                        newicon += '<a href="' + URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.view&file='+base64_encode(files[i].name)+'&path='+base64_encode(currentPath)+'" target="_blank">';
                         newicon += '<div style="width:64; height:64; background-image:url('+files[i].icon+'); background-repeat: no-repeat;"></div>';
                         newicon += '<span class="iconCaption">'+files[i].name+'</span>';
@@ -483 +483 @@
                                         inputName.value = filename;
                                         inputName.onclick = function () { oldValue = inputName.value; }
-                                        inputName.onblur = function () { if (inputName.value == oldValue) handler.rename(); else cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.rename&file='+base64_encode(this.id.substr(6))+'&to='+base64_encode(this.value)+"&path="+base64_encode(currentPath),handler.rename) };
+                                        inputName.onblur = function () { if (inputName.value == oldValue) handler.rename(); else cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.rename&file='+base64_encode(this.id.substr(6))+'&to='+base64_encode(this.value)+"&path="+base64_encode(currentPath),handler.rename) };
                                         inputName.onkeydown=function (event) {if (event.keyCode == KEY_ENTER) this.blur(); };
                                         nameLink.parentNode.appendChild(inputName);
@@ -502 +502 @@
                                 address = document.location.toString();
                                 address = address.split("&");
-                                document.location = URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.index&'+arg+".x=1&filename="+base64_encode(filename)+".&path="+base64_encode(currentPath);
+                                document.location = URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.index&'+arg+".x=1&filename="+base64_encode(filename)+".&path="+base64_encode(currentPath);
                         }
                         else
@@ -512 +512 @@
                 case 'delete':
                         var filesUrl = this.getCheckedFiles();
-                        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.delete&path='+
+                        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.delete&path='+
                                         base64_encode(currentPath)+filesUrl,handler.del);
                         break;
@@ -530 +530 @@
                         }
                         var pswd = crypt.encode(password);
-                        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.archive&pswd='+base64_encode(pswd.toString())+'&path='+base64_encode(currentPath)+filesUrl,handler.archive);
+                        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.archive&pswd='+base64_encode(pswd.toString())+'&path='+base64_encode(currentPath)+filesUrl,handler.archive);
                         break;
                 case 'move_to':
@@ -549 +549 @@
                         last_folder = last_folder ? last_folder : currentPath;
                         current_folder = current_folder ? current_folder : currentPath;
-                        cExecute_( URL_SERVER  + '/index.php?menuaction=filemanager.uifilemanager.dir_ls&path='+base64_encode(currentPath)+'&criteria='+criteria+'&otype='+order_type+'&limit='+preferences.files_per_page+'&offset='+offset,folderList.drawFiles);
+                        cExecute_( URL_SERVER  + 'index.php?menuaction=filemanager.uifilemanager.dir_ls&path='+base64_encode(currentPath)+'&criteria='+criteria+'&otype='+order_type+'&limit='+preferences.files_per_page+'&offset='+offset,folderList.drawFiles);
                         return;
                 case 'tools':
                         elements = new Array();
                         elements[0] = { 'text' : get_lang('Preferences'),
-                                        'url' : URL_SERVER + '/preferences/preferences.php?appname=filemanager',
+                                        'url' : URL_SERVER + 'preferences/preferences.php?appname=filemanager',
                                         'img' : templatePath+'images/preferences.png'};
                         elements[1] = { 'text' : get_lang('Search'),
@@ -564 +564 @@
                                         'img' : templatePath+'images/button_createdir.png'};
                         elements[3] = { 'text' : get_lang('Share Folders'),
-                                        'url' : URL_SERVER + "/index.php?menuaction=preferences.uiaclprefs.index&acl_app=filemanager",
+                                        'url' : URL_SERVER + "index.php?menuaction=preferences.uiaclprefs.index&acl_app=filemanager",
                                         'img' : templatePath+'images/mime16_directory.png'};
                         elements[4] = { 'text' : get_lang('View'),
@@ -584 +584 @@
         if (password == null)
                 return;
-        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.unarchive&pswd='+base64_encode(password)+'&path='+base64_encode(currentPath)+'&file='+base64_encode(filename),handler.archive);
+        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.unarchive&pswd='+base64_encode(password)+'&path='+base64_encode(currentPath)+'&file='+base64_encode(filename),handler.archive);
 }
 function move_to(to,filesUrl){
-        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.moveto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.moveto);
+        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.moveto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.moveto);
 }
 function copy_to(to,filesUrl){
-        cExecute_(URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.copyto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.copyto);
+        cExecute_(URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.copyto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.copyto);
 }
 
@@ -597 +597 @@
         switch(type){
                 case 'preview':
-                        var url = URL_SERVER + '/index.php?menuaction=filemanager.vfs_functions.summary&file='+base64_encode(name)+"&path="+base64_encode(currentPath);
+                        var url = URL_SERVER + 'index.php?menuaction=filemanager.vfs_functions.summary&file='+base64_encode(name)+"&path="+base64_encode(currentPath);
                         var htmlData = '<img src=\"'+url+'\">';
                         menuTimeout = setTimeout("draw_window_card(\'"+htmlData+"\')",500);
                         break;
                 case 'user':
-                        var url = URL_SERVER + '/index.php?menuaction=filemanager.user.card&lid='+base64_encode(name);
+                        var url = URL_SERVER + 'index.php?menuaction=filemanager.user.card&lid='+base64_encode(name);
                         menuTimeout = setTimeout("cExecute_('"+url+"',draw_window_card)",500);
                         break;
@@ -616 +616 @@
                 {
                         var parentDir = document.getElementById('folders_box').value;
-                        cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.createdir&path='+base64_encode(parentDir)+'&filename='+base64_encode(name),handler.refreshDir);
+                        cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.createdir&path='+base64_encode(parentDir)+'&filename='+base64_encode(name),handler.refreshDir);
                         currentPath = parentDir+'/'+name;
                         close_window();
@@ -626 +626 @@
                         if (confirm(get_lang('Do you really want to remove folder: %1?',Dfolder), ''))
                         {
-                                cExecute_( URL_SERVER + '/index.php?menuaction=filemanager.uifilemanager.removedir&path='+base64_encode(crypt.encode(Dfolder)),handler.refreshDir);
+                                cExecute_( URL_SERVER + 'index.php?menuaction=filemanager.uifilemanager.removedir&path='+base64_encode(crypt.encode(Dfolder)),handler.refreshDir);
                                 var lastIndex = Dfolder.lastIndexOf('/');
                                 currentPath = Dfolder.substr(0,lastIndex);

trunk/filemanager/js/jscode/global.js

@@ -9 +9 @@
 var oldValue;
 
-var templatePath = URL_SERVER + '/filemanager/templates/default/';
+var templatePath = URL_SERVER + 'filemanager/templates/default/';
 
 var menuTimeout;

trunk/filemanager/js/jscode/load_lang.js

@@ -5 +5 @@
 
         var request = _connector.cache( ).go( {
-                'access' : URL_SERVER + '/filemanager/inc/load_lang.php?lang=' + lang,
+                'access' : URL_SERVER + 'filemanager/inc/load_lang.php?lang=' + lang,
                 'handler' : function( data )
                 {

trunk/filemanager/js/load_lang.js

@@ -5 +5 @@
 
         var request = _connector.cache( ).go( {
-                'access' : URL_SERVER + '/filemanager/inc/load_lang.php?lang=' + lang,
+                'access' : URL_SERVER + 'filemanager/inc/load_lang.php?lang=' + lang,
                 'handler' : function( data )
                 {

trunk/phpgwapi/inc/class.common.inc.php

@@ -386 +386 @@
                                                 $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = '';
 
+                                        $webserver_url = ( ! empty( $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] ) ) ?
+                                                $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] : '/';
+
+                                        if ( strpos( $webserver_url, '/' ) != ( strlen( $webserver_url ) - 1 ) )
+                                                $webserver_url .= '/';
+
                                         $GLOBALS['phpgw_info']['flags']['java_script_thirst'] .= '<script type="text/javascript">'
-                                                . 'var URL_SERVER = "' . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] . '";'
+                                                . 'var URL_SERVER = "' . $webserver_url . '";'
                                                 . 'var template = "' . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ] . '";</script>';
 

trunk/phpgwapi/js/expressoAjax/dom.js

@@ -244 +244 @@
         extra = document.getElementById("extraButton");
         extra.style.visibility = "hidden";
-        but.innerHTML='<a title="' +title + '" onClick="javascript:changeBar()"><img src="' + URL_SERVER + '/phpgwapi/templates/default/images/up.button.png"></a>';
+        but.innerHTML='<a title="' +title + '" onClick="javascript:changeBar()"><img src="' + URL_SERVER + 'phpgwapi/templates/default/images/up.button.png"></a>';
         var neverExpires = new Date("January 01, 2100 00:00:00");
         document.cookie = "showHeader=true"+

trunk/phpgwapi/js/expressoAjax/expressoAjax.js

@@ -337 +337 @@
                 if(is_ie) {
 
-                        this.oxmlhttp.open("GET", URL_SERVER + "/expressoMail1_2/js/"+scriptPath+".js?"+this.updateVersion, false);
+                        this.oxmlhttp.open("GET", URL_SERVER + "expressoMail1_2/js/"+scriptPath+".js?"+this.updateVersion, false);
                         this.oxmlhttp.setRequestHeader('Content-Type','text/plain');
                         this.oxmlhttp.send(null);
@@ -345 +345 @@
                 }
                 else {
-                        script.src =  URL_SERVER + "/expressoMail1_2/js/"+scriptPath+".js?"+this.updateVersion;
+                        script.src =  URL_SERVER + "expressoMail1_2/js/"+scriptPath+".js?"+this.updateVersion;
                 }
 
@@ -353 +353 @@
 //------------------------------------  END: Functions for Progress Bar  -------------------------------------------------//
         // Default Controller File
-        var URL_DEFAULT = URL_SERVER + "/controller.php?menuaction=";
+        var URL_DEFAULT = URL_SERVER + "controller.php?menuaction=";
         // connector object
         var _onmouseup = document.onmouseup;

trunk/phpgwapi/js/tools/xlink.js

@@ -7 +7 @@
         var _divAppboxHeader = null;
         var _loading = new Image( );
-        _loading.src = URL_SERVER + '/phpgwapi/images/loading.gif';
+        _loading.src = URL_SERVER + 'phpgwapi/images/loading.gif';
 
         function handler( pLink )
@@ -68 +68 @@
                                                         else
                                                                 _script.add( _new_scripts[ i ][ 2 ].substr(
-                                                                        URL_SERVER.length,
-                                                                        _new_scripts[ i ][ 2 ].indexOf( '?' ) - URL_SERVER.length
+                                                                        URL_SERVER.length - 1,
+                                                                        _new_scripts[ i ][ 2 ].indexOf( '?' ) - URL_SERVER.length + 1
                                                                 ) );
 
@@ -94 +94 @@
                         if ( _scripts.item( i ).getAttribute( 'src' ) != null )
                                 _loaded[ _loaded.length ] = _scripts.item( i ).getAttribute( 'src' ).substr(
-                                        URL_SERVER.length,
-                                        _scripts.item( i ).getAttribute( 'src' ).indexOf( '?' ) - URL_SERVER.length
+                                        URL_SERVER.length - 1,
+                                        _scripts.item( i ).getAttribute( 'src' ).indexOf( '?' ) - URL_SERVER.length + 1
                                 );
 

trunk/phpgwapi/js/tools/xscript.js

@@ -26 +26 @@
 
                 _connector.go( {
-                        "access" : URL_SERVER + '/controller.php?action=phpgwapi.javascript.get_source&source=' + _new.join( ';' ),
+                        "access" : URL_SERVER + 'controller.php?action=phpgwapi.javascript.get_source&source=' + _new.join( ';' ),
                         "handler" : function( data )
                         {