diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 0d2bcd23e91076a3d23effbfdcaad5f689808b90..ca7937cb19a1e52600eb19b55deff333ee8de3ea 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -97,133 +97,121 @@ attributetype ( 1.3.6.1.4.1.38414.62.11.5 NAME 'fdSubscriptionName'
# plugin manager attributes
-attributetype ( 1.3.6.1.4.1.38414.62.12.1 NAME 'fdPluginInfoAuthors'
+attributetype ( 1.3.6.1.4.1.38414.62.12.1 NAME 'fdPluginManagerInfoAuthors'
DESC 'FusionDirectory - Plugin authors attribute'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.2 NAME 'fdPluginInfoVersion'
+attributetype ( 1.3.6.1.4.1.38414.62.12.2 NAME 'fdPluginManagerInfoVersion'
DESC 'FusionDirectory - Plugin Version attribute'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.3 NAME 'fdPluginSupportHomeUrl'
+attributetype ( 1.3.6.1.4.1.38414.62.12.3 NAME 'fdPluginManagerSupportHomeUrl'
DESC 'FusionDirectory - Plugin Support page url attribute'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.4 NAME 'fdPluginSupportTicketUrl'
+attributetype ( 1.3.6.1.4.1.38414.62.12.4 NAME 'fdPluginManagerSupportTicketUrl'
DESC 'FusionDirectory - Plugin Suuport ticket url attribute'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.5 NAME 'fdPluginSupportDiscussionUrl'
+attributetype ( 1.3.6.1.4.1.38414.62.12.5 NAME 'fdPluginManagerSupportDiscussionUrl'
DESC 'FusionDirectory - Pluging discussion url attribute'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.6 NAME 'fdPluginSupportSchemaUrl'
+attributetype ( 1.3.6.1.4.1.38414.62.12.6 NAME 'fdPluginManagerSupportSchemaUrl'
DESC 'FusionDirectory - Plugin schema url attribute needed if necessary'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.7 NAME 'fdPluginReqFdVersion'
+attributetype ( 1.3.6.1.4.1.38414.62.12.7 NAME 'fdPluginManagerReqFdVersion'
DESC 'FusionDirectory - Plugin Fusiondirectory Version requirement attribute'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.8 NAME 'fdPluginReqPhpVersion'
+attributetype ( 1.3.6.1.4.1.38414.62.12.8 NAME 'fdPluginManagerReqPhpVersion'
DESC 'FusionDirectory - Plugin PHP Version requirement attribute'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.9 NAME 'fdPluginReqPlugin'
- DESC 'FusionDirectory - Plugin Home Plugin list dependancy Attribute'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.38414.62.12.10 NAME 'fdPluginContentPhpClass'
+attributetype ( 1.3.6.1.4.1.38414.62.12.9 NAME 'fdPluginManagerContentPhpClass'
DESC 'FusionDirectory - Plugin Manager : list on php class provided'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.11 NAME 'fdPluginContentLdapObject'
+attributetype ( 1.3.6.1.4.1.38414.62.12.10 NAME 'fdPluginManagerContentLdapObject'
DESC 'FusionDirectory - Plugin Manager : list on Ldap Object needed'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.12 NAME 'fdPluginContentLdapAttributes'
+attributetype ( 1.3.6.1.4.1.38414.62.12.11 NAME 'fdPluginManagerContentLdapAttributes'
DESC 'FusionDirectory - Plugin Manager : list on Ldap attributes needed'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.13 NAME 'fdPluginContentFileList'
- DESC 'FusionDirectory - Plugin Manager : list of file provided'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.38414.62.12.14 NAME 'fdPluginInfoStatus'
+attributetype ( 1.3.6.1.4.1.38414.62.12.12 NAME 'fdPluginManagerInfoStatus'
DESC 'FusionDirectory - Plugin Manager : status of plugin : Dev / stable / dontuse '
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.15 NAME 'fdPluginSupportDownloadUrl'
+attributetype ( 1.3.6.1.4.1.38414.62.12.13 NAME 'fdPluginManagerSupportDownloadUrl'
DESC 'FusionDirectory - Plugin direct download url '
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.16 NAME 'fdPluginInfoTags'
+attributetype ( 1.3.6.1.4.1.38414.62.12.14 NAME 'fdPluginManagerInfoTags'
DESC 'FusionDirectory - Plugin Tag for identiy plugins goals'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.17 NAME 'fdPluginInfoLogoUrl'
+attributetype ( 1.3.6.1.4.1.38414.62.12.15 NAME 'fdPluginManagerInfoLogoUrl'
DESC 'FusionDirectory - Plugin Logo url '
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.18 NAME 'fdPluginInfoScreenshotUrl'
+attributetype ( 1.3.6.1.4.1.38414.62.12.16 NAME 'fdPluginManagerInfoScreenshotUrl'
DESC 'FusionDirectory - Plugin Screenshot Url '
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.19 NAME 'fdPluginInfoLicence'
+attributetype ( 1.3.6.1.4.1.38414.62.12.17 NAME 'fdPluginManagerInfoLicence'
DESC 'FusionDirectory - Plugin Licence'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.20 NAME 'fdPluginInfoOrigin'
+attributetype ( 1.3.6.1.4.1.38414.62.12.18 NAME 'fdPluginManagerInfoOrigin'
DESC 'FusionDirectory - Plugin Origin'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.21 NAME 'fdPluginSupportProvider'
+attributetype ( 1.3.6.1.4.1.38414.62.12.19 NAME 'fdPluginManagerSupportProvider'
DESC 'FusionDirectory - Plugin Support Provider'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.3.6.1.4.1.38414.62.12.22 NAME 'fdPluginSupportContractUrl'
+attributetype ( 1.3.6.1.4.1.38414.62.12.20 NAME 'fdPluginManagerSupportContractUrl'
DESC 'FusionDirectory - Plugin Support Contract url'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreSubstringsMatch
@@ -576,12 +564,11 @@ objectclass ( 1.3.6.1.4.1.38414.62.2.2 NAME 'fdSubscriptionInformation' SUP top
### Plugin manager Related Object Class ###
-objectclass (1.3.6.1.4.1.38414.62.2.3 NAME 'fdPlugin'
+objectclass (1.3.6.1.4.1.38414.62.2.3 NAME 'fdPluginManager'
DESC 'FusionDirectory - Plugins Manager ObjectClass'
- MUST ( cn $ description $ fdPluginInfoAuthors $ fdPluginInfoVersion $ fdPluginInfoStatus $ fdPluginInfoLicence $ fdPluginInfoOrigin $ fdPluginSupportDownloadUrl $
- fdPluginSupportHomeUrl $ fdPluginReqFdVersion $ fdPluginReqPhpVersion $ fdPluginSupportProvider )
- MAY ( fdPluginInfoScreenshotUrl $ fdPluginInfoLogoUrl $ fdPluginInfoTags $ fdPluginSupportTicketUrl $ fdPluginSupportDiscussionUrl $ fdPluginSupportSchemaUrl $
- fdPluginReqPlugin $ fdPluginContentPhpClass $ fdPluginContentLdapObject $ fdPluginContentLdapAttributes $ fdPluginContentFileList $ fdPluginSupportContractUrl ))
+ MUST ( cn $ description $ fdPluginManagerInfoAuthors $ fdPluginManagerInfoVersion $ fdPluginManagerInfoStatus $ fdPluginManagerInfoLicence $ fdPluginManagerInfoOrigin $ fdPluginManagerSupportDownloadUrl $
+ fdPluginManagerSupportHomeUrl $ fdPluginManagerReqFdVersion $ fdPluginManagerReqPhpVersion $ fdPluginManagerSupportProvider )
+ MAY ( fdPluginManagerInfoScreenshotUrl $ fdPluginManagerInfoLogoUrl $ fdPluginManagerInfoTags $ fdPluginManagerSupportTicketUrl $ fdPluginManagerSupportDiscussionUrl $ fdPluginManagerSupportSchemaUrl $ fdPluginManagerContentPhpClass $ fdPluginManagerContentLdapObject $ fdPluginManagerContentLdapAttributes $ fdPluginManagerSupportContractUrl ))
### Macro related objectclass ###
diff --git a/plugins/addons/dashboard/class_pluginsManager.inc b/plugins/addons/dashboard/class_pluginsManager.inc
index 8724a2666837718c82f59889d0348aa7f9f270e7..dc30ded1731bd7c6f9955da979d1a24d6cba9d88 100644
--- a/plugins/addons/dashboard/class_pluginsManager.inc
+++ b/plugins/addons/dashboard/class_pluginsManager.inc
@@ -57,7 +57,7 @@ class pluginsManager extends simplePlugin
$ldap = $config->get_ldap_link();
$ldap->cd($config->current['BASE']);
- $ldap->search('(objectClass=fdPlugin)', ['cn','description','fdPluginInfoVersion','fdPluginInfoAuthors','fdPluginInfoStatus','fdPluginInfoOrigin','fdPluginSupportProvider','fdPluginSupportHomeUrl','fdPluginReqPlugin']);
+ $ldap->search('(objectClass=fdPluginManager)', ['cn','description','fdPluginManagerInfoVersion','fdPluginManagerInfoAuthors','fdPluginManagerInfoStatus','fdPluginManagerInfoOrigin','fdPluginManagerSupportProvider','fdPluginManagerSupportHomeUrl']);
$id = 'pluginsStats';
$div = new divSelectBox('rows'.$id);
@@ -69,14 +69,12 @@ class pluginsManager extends simplePlugin
$fields = [
['string' => $plugin['cn'][0]],
['string' => $plugin['description'][0]],
- ['string' => $plugin['fdPluginInfoVersion'][0]],
- ['string' => $plugin['fdPluginInfoAuthors'][0]],
- ['string' => $plugin['fdPluginInfoStatus'][0]],
- ['string' => $plugin['fdPluginInfoOrigin'][0]],
- ['string' => $plugin['fdPluginSupportProvider'][0]],
- ['string' => $plugin['fdPluginReqPlugin'][0]],
- ['string' => $plugin['fdPluginSupportHomeUrl'][0]],
-
+ ['string' => $plugin['fdPluginManagerInfoVersion'][0]],
+ ['string' => $plugin['fdPluginManagerInfoAuthors'][0]],
+ ['string' => $plugin['fdPluginManagerInfoStatus'][0]],
+ ['string' => $plugin['fdPluginManagerInfoOrigin'][0]],
+ ['string' => $plugin['fdPluginManagerSupportProvider'][0]],
+ ['string' => $plugin['fdPluginManagerSupportHomeUrl'][0]],
];
$div->addEntry($fields);