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

adapting missed export_limit_excepted processing to static bo_merge::is_export_limit_excepted

Browse Source
This commit is contained in:
Klaus Leithoff 2011-08-30 14:02:00 +00:00
parent 0bb328dc6d
commit 1cc3692bfd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.addressbook_export_contacts_csv.inc.php
View File

@ -39,7 +39,7 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
$selection = array();
// Addressbook defines its own export imits
$limit_exception = count(array_intersect(array($GLOBALS['egw_info']['user']['account_id']) + $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true), unserialize($GLOBALS['egw_info']['server']['export_limit_excepted']))) > 0;
$limit_exception = bo_merge::is_export_limit_excepted();
if($GLOBALS['egw_info']['server']['contact_export_limit'] == 'no' && !($GLOBALS['egw_info']['user']['apps']['admin'] || $limit_exception)) {
return;
}

2
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -569,7 +569,7 @@ class addressbook_ui extends addressbook_bo
}
// check if user is an admin or the export is not generally turned off (contact_export_limit is non-numerical, eg. no)
$exception = count(@array_intersect(array($GLOBALS['egw_info']['user']['account_id']) + $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true), unserialize($GLOBALS['egw_info']['server']['export_limit_excepted']))) > 0;
$exception = bo_merge::is_export_limit_excepted();
if ((isset($GLOBALS['egw_info']['user']['apps']['admin']) || $exception) || !$this->config['contact_export_limit'] || (int)$this->config['contact_export_limit'])
{
$actions['export'] = array(