extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 22:01:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail: handle problem popup foldertree does not show subfolders of folders with umlauts

Browse Source
This commit is contained in:
Klaus Leithoff 2013-04-24 10:35:50 +00:00
parent fb0dc8d5be
commit a980a31d77
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
felamimail/inc/class.ajax_contacts.inc.php
View File

@ -20,6 +20,13 @@
$this->charset = $GLOBALS['egw']->translation->charset();
}
function decodeFolderName($_folderName) {
$folderName = translation::convert(html_entity_decode($_folderName, ENT_QUOTES, $this->charset),'UTF7-IMAP', $this->charset);
$response = new xajaxResponse();
$response->addScript("decodedFolder ='".$folderName."'");
return $response->getXML();
}
function searchAddress($_searchString) {
if ($GLOBALS['egw_info']['user']['apps']['addressbook']) {
if (method_exists($GLOBALS['egw']->contacts,'search')) {

10
felamimail/inc/class.uicompose.inc.php
View File

@ -13,7 +13,7 @@
/* $Id$ */
class uicompose
{
{
var $public_functions = array
(
'action' => True,
@ -424,14 +424,14 @@
foreach($signatures as $signature) {
$selectSignatures[$signature['fm_signatureid']] = lang('Signature').': '.$signature['fm_description'];
}
$bostationery = new felamimail_bostationery();
$selectStationeries = array(
'0' => lang('no stationery')
);
$showStationaries = false;
$validStationaries = $bostationery->get_valid_templates();
if (is_array($validStationaries) && count($validStationaries)>0)
if (is_array($validStationaries) && count($validStationaries)>0)
{
$showStationaries = true;
$selectStationeries += $validStationaries;
@ -640,8 +640,8 @@
lang('IMAP Server'),
$mailPreferences['username'].'@'.$mailPreferences['imapServerAddress'],
'divFolderTree',
false,
true
false//,
//true
);
print '<div id="divFolderTree" style="overflow:auto; width:320px; height:450px; margin-bottom: 0px;padding-left: 0px; padding-top:0px; z-index:100; border : 1px solid Silver;"></div>';
print $folderTree;

5
felamimail/js/jscode/composeMessage.js
View File

@ -36,6 +36,7 @@ var KEYCODE_DOWN=40;
// quickserach input field
var disabledKeys1 = new Array(KEYCODE_TAB, KEYCODE_ENTER, KEYCODE_UP, KEYCODE_DOWN);
//var disabledKeys1 = new Array(KEYCODE_ENTER, KEYCODE_UP, KEYCODE_DOWN);
var decodedFolder;
function initAll()
{
@ -522,7 +523,9 @@ function fm_compose_changeInputType(_selectBox) {
function fm_compose_setFolderSelectValue(_folderName) {
if(currentFolderSelectField) {
currentFolderSelectField.value = _folderName;
xajax_doXMLHTTPsync("felamimail.ajax_contacts.decodeFolderName",_folderName);
currentFolderSelectField.value = (decodedFolder?decodedFolder:_folderName);
if(!currentFolderSelectField.parentNode.parentNode.nextSibling) {
addAddressRow(currentFolderSelectField.parentNode.parentNode);
}