silence some export-limits warnings

This commit is contained in:
Klaus Leithoff 2011-08-29 11:33:10 +00:00
parent 4a1f4fff8c
commit c86a85636a

View File

@ -800,7 +800,7 @@ class addressbook_ui extends addressbook_bo
$action = substr($action,0,7); $action = substr($action,0,7);
} }
// Security: stop non-admins to export more then the configured number of contacts // Security: stop non-admins to export more then the configured number of contacts
$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 = count(array_intersect(array($GLOBALS['egw_info']['user']['account_id']) + $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true), (array)unserialize($GLOBALS['egw_info']['server']['export_limit_excepted']))) > 0;
if (in_array($action,array('csv','vcard')) && $this->config['contact_export_limit'] && if (in_array($action,array('csv','vcard')) && $this->config['contact_export_limit'] &&
!(isset($GLOBALS['egw_info']['user']['apps']['admin']) || $exception) && !(isset($GLOBALS['egw_info']['user']['apps']['admin']) || $exception) &&
(!is_numeric($this->config['contact_export_limit']) || count($checked) > $this->config['contact_export_limit'])) (!is_numeric($this->config['contact_export_limit']) || count($checked) > $this->config['contact_export_limit']))
@ -888,7 +888,7 @@ class addressbook_ui extends addressbook_bo
$msg = ''; // no message, as we send none in javascript too and users sees opening popup $msg = ''; // no message, as we send none in javascript too and users sees opening popup
return false; return false;
} }
foreach($checked as $id) foreach((array)$checked as $id)
{ {
switch($action) switch($action)
{ {