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

alter display of identities, as requested by support

Browse Source
This commit is contained in:
Klaus Leithoff 2013-02-07 08:47:43 +00:00
parent 2613b09067
commit dad6a08fdd
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,13 +523,26 @@
$allIdentities = $this->mailPreferences->getIdentity();
unset($allIdentities[0]);
//_debug_array($allIdentities);
if (is_null(felamimail_bo::$felamimailConfig)) felamimail_bo::$felamimailConfig = config::read('felamimail');
// not set? -> use default, means full display of all available data
if (!isset(felamimail_bo::$felamimailConfig['how2displayIdentities'])) felamimail_bo::$felamimailConfig['how2displayIdentities'] ='';
$globalIds = 0;
foreach($allIdentities as $key => $singleIdentity) {if ($singleIdentity->id<0){ $globalIds++; }/*else{ unset($allIdentities[$key]);}*/};
$defaultIdentity = 0;
$identities = array();
foreach($allIdentities as $key => $singleIdentity) {
//$identities[$singleIdentity->id] = $singleIdentity->realName.' <'.$singleIdentity->emailAddress.'>';
$iS = felamimail_bo::generateIdentityString($singleIdentity);
if (felamimail_bo::$felamimailConfig['how2displayIdentities']=='' || count($allIdentities) ==1 || count($allIdentities) ==$globalIds)
{
$id_prepend ='';
}
else
{
$id_prepend = '('.$singleIdentity->id.') ';
}
//error_log(__METHOD__.__LINE__.':'.$presetId.'->'.$key.'('.$singleIdentity->id.')'.'#'.$iS.'#');
if (array_search('('.$singleIdentity->id.') '.$iS,$identities)===false) $identities[$singleIdentity->id] = '('.$singleIdentity->id.') '.$iS;
if (array_search($id_prepend.$iS,$identities)===false) $identities[$singleIdentity->id] = $id_prepend.$iS;
if(!empty($singleIdentity->default) && $singleIdentity->default==1 && $defaultIdentity==0)
{
//_debug_array($singleIdentity);

21
felamimail/templates/default/composeForm.tpl
View File

@ -234,9 +234,14 @@ if (toFocus=='body')
var s = ckeditor.getSelection();
if (typeof s != 'undefined')
{
var selected_ranges = s.getRanges(); // save selected range
var selected_ranges = s.getRanges()[0]; // save selected range
// do something
s.selectRanges(selected_ranges); // restore it
//var spanCont = selected_ranges.startContainer.getAscendant({ span: 1, div: 1});
//var newRange = new CKEDIOR.dom.range(selected_ranges);
//newRange.setStart(spanCont,selected_ranges.StartOffset);
//newRange.setEnd(spanCont,selected_ranges.StartOffset+50);
//newRange.select();
//s.selectRanges(selected_ranges); // restore it
}
else
{
@ -255,9 +260,17 @@ if (toFocus=='body')
var s = ckeditor.getSelection();
if (typeof s != 'undefined')
{
var selected_ranges = s.getRanges(); // save selected range
var selected_ranges = s.getRanges()[0]; // save selected range
// do something
s.selectRanges(selected_ranges); // restore it
if (typeof selected_ranges != undefined)
{
//var spanCont = selected_ranges.startContainer.getAscendant({ span: 1, div: 1});
//var newRange = new CKEDIOR.dom.range(selected_ranges);
//newRange.setStart(spanCont,selected_ranges.StartOffset);
//newRange.setEnd(spanCont,selected_ranges.StartOffset+50);
//newRange.select();
//s.selectRanges(selected_ranges); // restore it
}
}
else
{