extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch LDAP to o,ou,streetaddress, add access to functions.inc.php

Browse Source
This commit is contained in:
Miles Lott 2001-03-24 21:54:31 +00:00
parent 9b868cb86a
commit 8b605f50ff
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/export/phpgw_LDIF
View File

@ -28,6 +28,7 @@
"lid" => "uid", "lid" => "uid",
"tid" => "phpgwcontacttype", "tid" => "phpgwcontacttype",
"owner" => "phpgwowner", "owner" => "phpgwowner",
"access" => "phpgwaccess",
"fn" => "cn", // 'prefix given middle family suffix' "fn" => "cn", // 'prefix given middle family suffix'
"n_given" => "givenname", // firstname "n_given" => "givenname", // firstname
"n_family" => "sn", // lastname "n_family" => "sn", // lastname
@ -42,11 +43,11 @@
"url" => "url", "url" => "url",
"pubkey" => "publickey", "pubkey" => "publickey",
"org_name" => "phpgworgname", // company "org_name" => "o", // company
"org_unit" => "phpgworgunit", // division "org_unit" => "ou", // division
"title" => "title", "title" => "title",
"adr_one_street" => "street", "adr_one_street" => "streetaddress",
"adr_one_locality" => "locality", "adr_one_locality" => "locality",
"adr_one_region" => "st", "adr_one_region" => "st",
"adr_one_postalcode" => "postalcode", "adr_one_postalcode" => "postalcode",

6
addressbook/inc/class.contacts_ldap.inc.php
View File

@ -75,11 +75,11 @@
"url" => "url", "url" => "url",
"pubkey" => "publickey", "pubkey" => "publickey",
"org_name" => "phpgworgname", // company "org_name" => "o", // company
"org_unit" => "phpgworgunit", // division "org_unit" => "ou", // division
"title" => "title", "title" => "title",
"adr_one_street" => "street", "adr_one_street" => "streetaddress",
"adr_one_locality" => "locality", "adr_one_locality" => "locality",
"adr_one_region" => "st", "adr_one_region" => "st",
"adr_one_postalcode" => "postalcode", "adr_one_postalcode" => "postalcode",

21
addressbook/inc/functions.inc.php
View File

@ -15,10 +15,11 @@
// I don't think this is needed anymore // I don't think this is needed anymore
// Perform acl check, set $rights // Perform acl check, set $rights
if(!isset($owner)) { $owner = 0; } if(!isset($owner)) { $owner = 0; }
$grants = $phpgw->acl->get_grants('addressbook'); $grants = $phpgw->acl->get_grants('addressbook');
if(!isset($owner) || !$owner) { if(!isset($owner) || !$owner) {
$owner = $phpgw_info['user']['account_id']; $owner = $phpgw_info['user']['account_id'];
$rights = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE + 16; $rights = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE + 16;
@ -51,13 +52,13 @@
"adr_one_region" => "business state", "adr_one_region" => "business state",
"adr_one_postalcode" => "business zip code", "adr_one_postalcode" => "business zip code",
"adr_one_countryname" => "business country", "adr_one_countryname" => "business country",
"adr_one_type" => "", "adr_one_type" => "business address type",
"adr_two_street" => "home street", "adr_two_street" => "home street",
"adr_two_locality" => "home city", "adr_two_locality" => "home city",
"adr_two_region" => "home state", "adr_two_region" => "home state",
"adr_two_postalcode" => "home zip code", "adr_two_postalcode" => "home zip code",
"adr_two_countryname" => "home country", "adr_two_countryname" => "home country",
"adr_two_type" => "", "adr_two_type" => "home address type",
"tz" => "time zone", "tz" => "time zone",
"geo" => "geo", "geo" => "geo",
"tel_work" => "business phone", "tel_work" => "business phone",
@ -121,7 +122,7 @@
} }
} }
function addressbook_add_entry($userid,$fields) { function addressbook_add_entry($userid,$fields,$access) {
global $this,$rights; global $this,$rights;
if ($rights & PHPGW_ACL_ADD) { if ($rights & PHPGW_ACL_ADD) {
$this->add($userid,$fields); $this->add($userid,$fields);
@ -136,10 +137,10 @@
return $ab_id; return $ab_id;
} }
function addressbook_update_entry($id,$userid,$fields) { function addressbook_update_entry($id,$userid,$fields,$access) {
global $this,$rights; global $this,$rights;
if ($rights & PHPGW_ACL_EDIT) { if ($rights & PHPGW_ACL_EDIT) {
$this->update($id,$userid,$fields); $this->update($id,$userid,$fields,$access);
} }
return; return;
} }
@ -204,6 +205,13 @@
$department = $fields["org_unit"]; $department = $fields["org_unit"];
$url = $fields["url"]; $url = $fields["url"];
$pubkey = $fields["pubkey"]; $pubkey = $fields["pubkey"];
$access = $fields["access"];
if ($access == 'private') {
$access_check = ' checked';
} else {
$access_check = '';
}
if ($customfields) { if ($customfields) {
while(list($name,$value) = each($customfields)) { while(list($name,$value) = each($customfields)) {
@ -451,6 +459,7 @@
$t->set_var("label",$label); $t->set_var("label",$label);
$t->set_var("lang_pubkey",lang("Public Key")); $t->set_var("lang_pubkey",lang("Public Key"));
$t->set_var("pubkey",$pubkey); $t->set_var("pubkey",$pubkey);
$t->set_var("access_check",$access_check);
$t->set_var('lang_private',lang('Private')); $t->set_var('lang_private',lang('Private'));
if ($customfields) { if ($customfields) {