Fix for bug #2090: fmail problem, if no filemanager rights

This commit is contained in:
Ralf Becker 2009-05-21 07:22:50 +00:00
parent 87137a2f71
commit e2994725d6
2 changed files with 9 additions and 1 deletions

View File

@ -252,6 +252,10 @@
<img src="'.$GLOBALS['egw']->common->image('filemanager','navbar').'" height="18">
</button>');
}
else
{
$this->t->set_var('vfs_attach_button','');
}
$linkData = array
(
'menuaction' => 'felamimail.uicompose.action',

View File

@ -692,6 +692,10 @@
}
$this->t->set_var('vfs_save',$vfs_save);
}
else
{
$this->t->set_var('vfs_save','');
}
$this->t->parse('attachment_rows','message_attachement_row',True);
}
} else {
@ -1089,7 +1093,7 @@
// create links for ftp sites
#$newBody = preg_replace("/((ftp:\/\/)|(ftp\.))([\w\.,-.,\/.,\?.,\=.,&amp;]+)/i",
# "<a href=\"ftp://$3$4\" target=\"_blank\"><font color=\"blue\">ftp://$3$4</font></a>", $newBody);
$newBody = html::activate_links($newBody);
$newBody = html::activate_links($newBody);
// create links for email addresses
$this->parseEmail($newBody);
$newBody = $this->highlightQuotes($newBody);