diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema index da1b451a5af513c0d8b44cb641e3544f9724e8a3..a57a87e7ab15fc8d6a2cfe3c28fe70014c935fb5 100644 --- a/contrib/openldap/core-fd.schema +++ b/contrib/openldap/core-fd.schema @@ -123,4 +123,4 @@ objectclass ( 1.3.6.1.4.1.38414.62.2.1 NAME 'fdLockEntry' SUP top STRUCTURAL objectclass ( 1.3.6.1.4.1.38414.62.2.2 NAME 'fdSubscriptionInformation' SUP top STRUCTURAL DESC 'FusionDirectory - Information about current subscription' MUST ( cn ) - MAY ( fdSubscriptionStartDate $ fdSubscriptionEndDate $ fdSubscriptionType $ fdSubscriptionContractId $ fdSubscriptionName )) + MAY ( uid $ fdSubscriptionStartDate $ fdSubscriptionEndDate $ fdSubscriptionType $ fdSubscriptionContractId $ fdSubscriptionName )) diff --git a/plugins/addons/subscription/class_subscriptionInfo.inc b/plugins/addons/subscription/class_subscriptionInfo.inc index 723fd2f7bc6c62d48e20138dc5fe9aded2ee8e10..90b13b34e1922c5f0e601e81b1ea5486735f4527 100644 --- a/plugins/addons/subscription/class_subscriptionInfo.inc +++ b/plugins/addons/subscription/class_subscriptionInfo.inc @@ -23,6 +23,7 @@ class subscriptionInfo extends simplePlugin /* ldap attribute => ini variable */ public static $subscriptionAttributes = [ 'fdSubscriptionName' => 'Name', + 'uid' => 'Id', 'fdSubscriptionType' => 'Type', 'fdSubscriptionContractId' => 'Contract', 'fdSubscriptionStartDate' => 'StartDate', @@ -40,6 +41,7 @@ class subscriptionInfo extends simplePlugin 'plObjectType' => [ 'subscriptionInfo' => [ 'name' => _('Subscription information'), + 'ou' => get_ou('fusiondirectoryRDN'), ] ], 'plSection' => 'conf', @@ -62,6 +64,10 @@ class subscriptionInfo extends simplePlugin _('Name'), _('Subscription name'), 'fdSubscriptionName', TRUE ), + new DisplayLDAPAttribute( + _('Id'), _('Subscription id'), + 'uid', TRUE + ), new DisplayLDAPAttribute( _('Type'), _('Subscription type'), 'fdSubscriptionType', TRUE