diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index f6e2c6179e..166ea6d3c6 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -1715,7 +1715,7 @@ class addressbook_ui extends addressbook_bo if (!$id_only && $rows) { $show_custom_fields = (in_array('customfields',$columselection)) && $this->customfields; - $show_calendar = !$this->config['disable_event_column'] && in_array('calendar_calendar',$columselection); + $show_calendar = $this->config['disable_event_column'] != 'True' && in_array('calendar_calendar',$columselection); $show_distributionlist = in_array('distrib_lists',$columselection) || count($available_distib_lists); if ($show_calendar || $show_custom_fields || $show_distributionlist) { @@ -1872,7 +1872,7 @@ class addressbook_ui extends addressbook_bo } // Disable next/last date if so configured - if($this->config['disable_event_column']) + if($this->config['disable_event_column'] == 'True') { $rows['no_event_column'] = true; } diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang index 45d6ef76fe..7d8c46bb68 100644 --- a/addressbook/lang/egw_en.lang +++ b/addressbook/lang/egw_en.lang @@ -66,6 +66,7 @@ all contacts addressbook en All contacts all in one field addressbook en All in one field all types addressbook en All types allow addressbook en Allow +allow for contacts only addressbook en Allow for contacts only allow members of following groups to edit contact-data of accounts addressbook en Allow members of following groups to edit contact-data of accounts allow users to maintain their own account-data admin en Allow users to maintain their own account data alt. csv import addressbook en Alt. CSV Import diff --git a/addressbook/templates/default/config.xet b/addressbook/templates/default/config.xet index e818620d67..89f0aa8393 100644 --- a/addressbook/templates/default/config.xet +++ b/addressbook/templates/default/config.xet @@ -34,6 +34,7 @@ diff --git a/api/src/Contacts.php b/api/src/Contacts.php index 96d614a67e..89cbeccb2c 100755 --- a/api/src/Contacts.php +++ b/api/src/Contacts.php @@ -1678,6 +1678,10 @@ class Contacts extends Contacts\Storage foreach($uids as $id => $uid) { $type = is_numeric($uid[0]) ? 'u' : $uid[0]; + if($GLOBALS['egw_info']['server']['disable_event_column'] == 'contacts' && $type == 'u') + { + continue; + } $split_uids[$type][$id] = str_replace($type, '', $uid); }