mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-27 13:22:06 +02:00
moved private_addressbook attribute from addresbook_ui to addressbook_bo
This commit is contained in:
parent
f94a2a1851
commit
44d59931a2
@ -124,6 +124,12 @@ class addressbook_bo extends addressbook_so
|
|||||||
* @var boolean
|
* @var boolean
|
||||||
*/
|
*/
|
||||||
var $default_private;
|
var $default_private;
|
||||||
|
/**
|
||||||
|
* Use a separate private addressbook (former private flag), for contacts not shareable via regular read acl
|
||||||
|
*
|
||||||
|
* @var boolean
|
||||||
|
*/
|
||||||
|
var $private_addressbook = false;
|
||||||
/**
|
/**
|
||||||
* Categories object
|
* Categories object
|
||||||
*
|
*
|
||||||
@ -176,6 +182,7 @@ class addressbook_bo extends addressbook_so
|
|||||||
{
|
{
|
||||||
$this->default_addressbook = $this->user; // admin set a default or forced pref for personal addressbook
|
$this->default_addressbook = $this->user; // admin set a default or forced pref for personal addressbook
|
||||||
}
|
}
|
||||||
|
$this->private_addressbook = $this->contact_repository == 'sql' && $this->prefs['private_addressbook'];
|
||||||
|
|
||||||
$this->contact_fields = array(
|
$this->contact_fields = array(
|
||||||
'id' => lang('Contact ID'),
|
'id' => lang('Contact ID'),
|
||||||
@ -818,7 +825,7 @@ class addressbook_bo extends addressbook_so
|
|||||||
|
|
||||||
// Update country codes
|
// Update country codes
|
||||||
foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
|
foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
|
||||||
if($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
|
if($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
|
||||||
$code = $GLOBALS['egw']->country->country_code($contact[$c_prefix.'countryname']))
|
$code = $GLOBALS['egw']->country->country_code($contact[$c_prefix.'countryname']))
|
||||||
{
|
{
|
||||||
if(strlen($code) == 2)
|
if(strlen($code) == 2)
|
||||||
|
@ -29,12 +29,6 @@ class addressbook_ui extends addressbook_bo
|
|||||||
'admin_set_all_cleanup' => True,
|
'admin_set_all_cleanup' => True,
|
||||||
'cat_add' => True,
|
'cat_add' => True,
|
||||||
);
|
);
|
||||||
/**
|
|
||||||
* use a separate private addressbook (former private flag), for contacts not shareable via regular read acl
|
|
||||||
*
|
|
||||||
* @var boolean
|
|
||||||
*/
|
|
||||||
protected $private_addressbook = false;
|
|
||||||
protected $org_views;
|
protected $org_views;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -75,8 +69,6 @@ class addressbook_ui extends addressbook_bo
|
|||||||
|
|
||||||
$this->tmpl = new etemplate();
|
$this->tmpl = new etemplate();
|
||||||
|
|
||||||
$this->private_addressbook = $this->contact_repository == 'sql' && $this->prefs['private_addressbook'];
|
|
||||||
|
|
||||||
$this->org_views = array(
|
$this->org_views = array(
|
||||||
'org_name' => lang('Organisations'),
|
'org_name' => lang('Organisations'),
|
||||||
'org_name,adr_one_locality' => lang('Organisations by location'),
|
'org_name,adr_one_locality' => lang('Organisations by location'),
|
||||||
@ -284,7 +276,7 @@ class addressbook_ui extends addressbook_bo
|
|||||||
);
|
);
|
||||||
if($content['nm']['col_filter']['tid'] == 'D' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge')
|
if($content['nm']['col_filter']['tid'] == 'D' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge')
|
||||||
{
|
{
|
||||||
// User not allowed to purge
|
// User not allowed to purge
|
||||||
unset($sel_options['action']['delete']);
|
unset($sel_options['action']['delete']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user