mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 00:54:15 +01:00
Make addressbook_merge respect addressbook's extra export limit
This commit is contained in:
parent
0eeb67f90a
commit
4f3dc53cb6
@ -22,6 +22,12 @@ class addressbook_merge extends bo_merge
|
|||||||
*/
|
*/
|
||||||
var $public_functions = array('show_replacements' => true);
|
var $public_functions = array('show_replacements' => true);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Addressbook defines its own export limit, which should take precidence over
|
||||||
|
* global limit.
|
||||||
|
*/
|
||||||
|
private $exported = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*
|
*
|
||||||
@ -30,6 +36,7 @@ class addressbook_merge extends bo_merge
|
|||||||
function __construct()
|
function __construct()
|
||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
$GLOBALS['egw_info']['server']['contact_export_limit'];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -41,6 +48,11 @@ class addressbook_merge extends bo_merge
|
|||||||
*/
|
*/
|
||||||
protected function get_replacements($id,&$content=null)
|
protected function get_replacements($id,&$content=null)
|
||||||
{
|
{
|
||||||
|
if($GLOBALS['egw_info']['server']['contact_export_limit'] && !$GLOBALS['egw_info']['user']['apps']['admin'])
|
||||||
|
{
|
||||||
|
if($GLOBALS['egw_info']['server']['contact_export_limit'] == 'no') return false;
|
||||||
|
if($this->exported > $GLOBALS['egw_info']['server']['contact_export_limit']) return false;
|
||||||
|
}
|
||||||
if (!($replacements = $this->contact_replacements($id)))
|
if (!($replacements = $this->contact_replacements($id)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
@ -49,6 +61,7 @@ class addressbook_merge extends bo_merge
|
|||||||
{
|
{
|
||||||
$replacements += $this->calendar_replacements($id,!(strpos($content,'$$calendar/-1/') === false));
|
$replacements += $this->calendar_replacements($id,!(strpos($content,'$$calendar/-1/') === false));
|
||||||
}
|
}
|
||||||
|
$this->exported++;
|
||||||
return $replacements;
|
return $replacements;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user