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

allow email - merge print only for addressbook (by now); handle mergeprint for accounts stored with ldap as well

Browse Source
This commit is contained in:
Klaus Leithoff 2011-06-30 11:21:48 +00:00
parent 8e8aba371e
commit 51c6e79475
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etemplate/inc/class.bo_merge.inc.php
View File

@ -118,7 +118,8 @@ abstract class bo_merge
case 'application/xml': case 'application/xml':
return true; // alias for text/xml, eg. ms office 2003 word format return true; // alias for text/xml, eg. ms office 2003 word format
case 'message/rfc822': case 'message/rfc822':
return true; // ToDo: check if you are theoretical able to send mail if ($GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook') return true; // ToDo: check if you are theoretical able to send mail
else break;
default: default:
if (substr($mimetype,0,5) == 'text/') if (substr($mimetype,0,5) == 'text/')
{ {