mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 07:09:20 +01:00
fixed lost mail/http links in index-page and added felamimail, fix for bug #865511
This commit is contained in:
parent
348770c1cd
commit
64eb32d00e
@ -536,7 +536,7 @@
|
||||
$coldata = $entries[$i][$column];
|
||||
/* echo '<br>coldata="' . $coldata . '"'; */
|
||||
/* Some fields require special formatting. */
|
||||
if($column[0] == 'url')
|
||||
if($column == 'url')
|
||||
{
|
||||
if(!empty($coldata) && (substr($coldata,0,7) != 'http://'))
|
||||
{
|
||||
@ -545,7 +545,7 @@
|
||||
$ref='<a href="'.$coldata.'" target="_new">';
|
||||
$data=$coldata.'</a>';
|
||||
}
|
||||
elseif(($column[0] == 'email') || ($column[0] == 'email_home'))
|
||||
elseif(($column == 'email') || ($column == 'email_home'))
|
||||
{
|
||||
if($GLOBALS['phpgw_info']['user']['apps']['email'])
|
||||
{
|
||||
@ -553,6 +553,16 @@
|
||||
. $GLOBALS['phpgw']->link('/email/compose.php','to=' . urlencode($coldata))
|
||||
. '" target="_new">';
|
||||
}
|
||||
elseif($GLOBALS['phpgw_info']['user']['apps']['felamimail'])
|
||||
{
|
||||
$link_data = array(
|
||||
'menuaction' => 'felamimail.uicompose.compose',
|
||||
'send_to' => base64_encode($coldata)
|
||||
);
|
||||
$ref = '<a href="'
|
||||
. $GLOBALS['phpgw']->link('/index.php',$link_data)
|
||||
. '" target="_new">';
|
||||
}
|
||||
else
|
||||
{
|
||||
$ref = '<a href="mailto:' . $coldata . '">';
|
||||
|
Loading…
Reference in New Issue
Block a user