From 346f5e6be18d96171811c70eb0bb031e7d0d6037 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 15 Apr 2007 13:06:21 +0000 Subject: [PATCH] pref to hide accounts from the addressbook for non-admins --- addressbook/inc/class.contacts_admin_prefs.inc.php | 10 ++++++++++ addressbook/inc/class.socontacts.inc.php | 6 ++++-- addressbook/setup/phpgw_de.lang | 5 +++++ addressbook/setup/phpgw_en.lang | 5 +++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/addressbook/inc/class.contacts_admin_prefs.inc.php b/addressbook/inc/class.contacts_admin_prefs.inc.php index a0925d5445..86460c4687 100644 --- a/addressbook/inc/class.contacts_admin_prefs.inc.php +++ b/addressbook/inc/class.contacts_admin_prefs.inc.php @@ -207,6 +207,16 @@ class contacts_admin_prefs 'xmlrpc' => True, 'admin' => false, ); + //show accounts in listing + $GLOBALS['settings']['hide_accounts'] = array( + 'type' => 'check', + 'label' => 'Hide accounts from addressbook', + 'name' => 'hide_accounts', + 'help' => 'Hides accounts completly from the adressbook for non administrators!', + 'xmlrpc' => True, + 'admin' => false, + ); + return true; // otherwise prefs say it cant find the file ;-) } diff --git a/addressbook/inc/class.socontacts.inc.php b/addressbook/inc/class.socontacts.inc.php index 0e44f9fccb..34d6399e2c 100755 --- a/addressbook/inc/class.socontacts.inc.php +++ b/addressbook/inc/class.socontacts.inc.php @@ -233,9 +233,11 @@ class socontacts $this->account_extra_search = array('uid'); } } - // add grants for accounts: if account_selection not in ('none','groupmembers'): everyone has read access + // add grants for accounts: if account_selection not in ('none','groupmembers'): everyone has read access, + // if he has not set the hide_accounts preference // ToDo: be more specific for 'groupmembers', they should be able to see the groupmembers - if (!in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'],array('none','groupmembers'))) + if (!in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'],array('none','groupmembers')) && + !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) { $this->grants[0] = EGW_ACL_READ; } diff --git a/addressbook/setup/phpgw_de.lang b/addressbook/setup/phpgw_de.lang index 43cb3d2459..8b64b72ea1 100644 --- a/addressbook/setup/phpgw_de.lang +++ b/addressbook/setup/phpgw_de.lang @@ -18,6 +18,7 @@ add a new list addressbook de Neuen Verteiler hinzf add a single entry by passing the fields. addressbook de Hinzufügen eines einzelnen Eintrags durch Übergeben der Felder. add custom field addressbook de Benutzerdefiniertes Feld hinzufügen add to distribution list: addressbook de Hinzufügen zu Verteiler: +added by synchronisation addressbook de Hinzugefügt über die Synchronisation added to distribution list addressbook de hinzugefügt zum Verteiler additional information about using ldap as contact repository admin de Zusätzliche Information über die Nutzung von LDAP zum Speichern der Kontakte address book common de Adressbuch @@ -26,6 +27,7 @@ address book - view addressbook de Adressbuch - Anzeigen address line 2 addressbook de Adresszeile 2 address type addressbook de Adresstyp addressbook common de Adressbuch +addressbook csv export addressbook de Adressbuch CSV Export addressbook menu addressbook de Adressbuch Menü addressbook preferences addressbook de Adressbuch Einstellungen addressbook the contact should be saved to addressbook de Adressbuch in das der Kontakt gespeichert werden soll @@ -133,6 +135,7 @@ export file name addressbook de Dateiname zum Exportieren export from addressbook addressbook de Export vom Adressbuch export selection addressbook de Auswahl exportieren exported addressbook de exportiert +exports contacts from your addressbook into a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators. addressbook de Exportiert Kontakte vom Adressbuch in eine CSV Datei. CSV bedeutet 'Komma getrennte Werte'. Im Optionen Reiter können Sie aber auch ein anderes Trennzeichen wählen. extra addressbook de Extra failed to change %1 organisation member(s) (insufficent rights) !!! addressbook de %1 Mitglied(er) der Organisation nicht geändert (fehlende Rechte) !!! fax addressbook de Telefax @@ -152,6 +155,8 @@ geo addressbook de GEO global categories addressbook de Globale Kategorien grant addressbook access common de Berechtigungen group %1 addressbook de Gruppe %1 +hide accounts from addressbook addressbook de Benutzer im Adressbuch ausblenden +hides accounts completly from the adressbook for non administrators! addressbook de Entfernt die Benutzer komplett aus dem Adressbuch für nicht Administratoren! home address addressbook de Privatadresse home address, birthday, ... addressbook de Privatadresse, Geburtstag, ... home city addressbook de Stadt privat diff --git a/addressbook/setup/phpgw_en.lang b/addressbook/setup/phpgw_en.lang index e4be973931..a5c027ef1c 100644 --- a/addressbook/setup/phpgw_en.lang +++ b/addressbook/setup/phpgw_en.lang @@ -18,6 +18,7 @@ add a new list addressbook en Add a new list add a single entry by passing the fields. addressbook en Add a single entry by passing the fields. add custom field addressbook en Add Custom Field add to distribution list: addressbook en Add to distribution list: +added by synchronisation addressbook en added by synchronisation added to distribution list addressbook en added to distribution list additional information about using ldap as contact repository admin en Additional information about using LDAP as contact repository address book common en Address Book @@ -26,6 +27,7 @@ address book - view addressbook en Address book - view address line 2 addressbook en Address Line 2 address type addressbook en Address Type addressbook common en Addressbook +addressbook csv export addressbook en Addressbook CSV export addressbook menu addressbook en Addressbook menu addressbook preferences addressbook en Addressbook preferences addressbook the contact should be saved to addressbook en Addressbook the contact should be saved to @@ -133,6 +135,7 @@ export file name addressbook en Export file name export from addressbook addressbook en Export from Addressbook export selection addressbook en Export selection exported addressbook en exported +exports contacts from your addressbook into a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators. addressbook en Exports contacts from your Addressbook into a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators. extra addressbook en Extra failed to change %1 organisation member(s) (insufficent rights) !!! addressbook en failed to change %1 organisation member(s) (insufficent rights) !!! fax addressbook en Fax @@ -152,6 +155,8 @@ geo addressbook en GEO global categories addressbook en Global Categories grant addressbook access common en Grant Addressbook Access group %1 addressbook en Group %1 +hide accounts from addressbook addressbook en Hide accounts from addressbook +hides accounts completly from the adressbook for non administrators! addressbook en Hides accounts completly from the adressbook for non administrators! home address addressbook en Home address home address, birthday, ... addressbook en Home address, Birthday, ... home city addressbook en Home City