holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed lost mail/http links in index-page and added felamimail, fix for bug #865511

Browse Source
This commit is contained in:
Ralf Becker 2004-02-08 23:05:18 +00:00
parent 348770c1cd
commit 64eb32d00e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addressbook/inc/class.uiaddressbook.inc.php
View File

@ -536,7 +536,7 @@
$coldata = $entries[$i][$column]; $coldata = $entries[$i][$column];
/* echo '<br>coldata="' . $coldata . '"'; */ /* echo '<br>coldata="' . $coldata . '"'; */
/* Some fields require special formatting. */ /* Some fields require special formatting. */
if($column[0] == 'url') if($column == 'url')
{ {
if(!empty($coldata) && (substr($coldata,0,7) != 'http://')) if(!empty($coldata) && (substr($coldata,0,7) != 'http://'))
{ {
@ -545,7 +545,7 @@
$ref='<a href="'.$coldata.'" target="_new">'; $ref='<a href="'.$coldata.'" target="_new">';
$data=$coldata.'</a>'; $data=$coldata.'</a>';
} }
elseif(($column[0] == 'email') || ($column[0] == 'email_home')) elseif(($column == 'email') || ($column == 'email_home'))
{ {
if($GLOBALS['phpgw_info']['user']['apps']['email']) if($GLOBALS['phpgw_info']['user']['apps']['email'])
{ {
@ -553,6 +553,16 @@
. $GLOBALS['phpgw']->link('/email/compose.php','to=' . urlencode($coldata)) . $GLOBALS['phpgw']->link('/email/compose.php','to=' . urlencode($coldata))
. '" target="_new">'; . '" 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 else
{ {
$ref = '<a href="mailto:' . $coldata . '">'; $ref = '<a href="mailto:' . $coldata . '">';