Fixes: #2483 Cleaning categories and objectTypes

alias/admin/alias/class_aliasManagement.inc

@@ -31,16 +31,17 @@ class aliasManagement extends management
   public static function plInfo()
   {
     return array(
-      "plShortName"   => _("Aliases"),
-      "plDescription" => _("Alias management"),
-      "plIcon"        => "plugins/alias/images/icon.png",
-      "plSelfModify"  => FALSE,
-      "plSection"     => "admin",
-      "plPriority"    => 4,
-      "plCategory"    => array("alias" => array("description"  => _("Mail aliases"),
-                                                "objectClass"  => array("mailAliasRedirection","mailAliasDistribution"))),
-
-      "plProvidedAcls" => array()
+      'plShortName'   => _('Aliases'),
+      'plDescription' => _('Alias management'),
+      'plIcon'        => 'plugins/alias/images/icon.png',
+      'plSelfModify'  => FALSE,
+      'plSection'     => 'admin',
+      'plPriority'    => 4,
+      'plCategory'    => array('alias' => array('description'  => _('Mail aliases'),
+                                                'objectClass'  => array('mailAliasRedirection','mailAliasDistribution'))),
+      'plManages'     => array('mailAliasDistribution','mailAliasRedirection'),
+
+      'plProvidedAcls' => array()
     );
   }
 

alias/admin/alias/class_mailAliasDistribution.inc

@@ -31,9 +31,11 @@ class mailAliasDistribution extends simplePlugin
       'plShortName'   => _('Temporary mail distribution'),
       'plDescription' => _('Temporary mail distribution'),
       'plSelfModify'  => FALSE,
-      'plCategory'    => array('alias'),
-      'plObjectType'  => array('mailAliasDistribution' => array('name'  => _('Temporary mail distribution'),
-                                                              'filter'  => 'objectClass=mailAliasDistribution')),
+      'plObjectType'  => array('mailAliasDistribution' => array(
+        'name'        => _('Temporary mail distribution'),
+        'filter'      => 'objectClass=mailAliasDistribution',
+        'aclCategory' => 'alias'
+      )),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );

alias/admin/alias/class_mailAliasRedirection.inc

@@ -31,9 +31,11 @@ class mailAliasRedirection extends simplePlugin
       'plShortName'   => _('Temporary mail redirection'),
       'plDescription' => _('Temporary mail redirection'),
       'plSelfModify'  => FALSE,
-      'plCategory'    => array('alias'),
-      'plObjectType'  => array('mailAliasRedirection' => array('name'  => _('Temporary mail redirection'),
-                                                              'filter'  => 'objectClass=mailAliasRedirection')),
+      'plObjectType'  => array('mailAliasRedirection' => array(
+        'name'        => _('Temporary mail redirection'),
+        'filter'      => 'objectClass=mailAliasRedirection',
+        'aclCategory' => 'alias'
+      )),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );

apache2/admin/systems/services/apache2/class_serviceApacheVhost.inc

@@ -79,8 +79,6 @@ class serviceApache extends simpleService
       "plShortName"   => _("Apache service"),
       "plDescription" => _("Apache virtual host service")." ("._("Services").")",
       "plIcon"        => "plugins/apache2/images/iconMini.png",
-      "plSelfModify"  => FALSE,
-      "plCategory"    => array("server"),
 
       "plProvidedAcls"  => array(
         "VirtualHost" => _("Virtual hosts")

apache2/admin/systems/services/apache2/class_serviceApacheVhostEdit.inc

@@ -46,14 +46,16 @@ class serviceApacheVhostEdit extends simplePlugin
   static function plInfo ()
   {
     return array(
-      "plHeadline"    => _("Apache2"),
-      "plShortName"   => _("Apache2"),
-      "plDescription" => _("This Plugin is for Apache serveur"),
-      "plSelfModify"  => FALSE,                  // Does this plugin have an owner that might be able to edit its entry
-      "plCategory"    => array("server"),
-      "plObjectType"  => array("apacheVhost" => array("name" => _("Apache Vhost"), "filter" => "objectClass=apacheConfig")),
+      'plHeadline'    => _('Apache2'),
+      'plShortName'   => _('Apache2'),
+      'plDescription' => _('This Plugin is for Apache server'),
+      'plObjectType'  => array('apacheVhost' => array(
+        'name' => _('Apache Vhost'),
+        'filter' => 'objectClass=apacheConfig',
+        'aclCategory' => 'server'
+      )),
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );
   }
 

argonaut/admin/systems/services/argonaut/class_argonautFuseConfig.inc

@@ -32,7 +32,6 @@ class argonautFuseConfig extends simpleService
       "plDescription"   => _("Argonaut Fuse settings")." ("._("Services").")",
       "plIcon"          => "plugins/argonaut/images/iconMiniFuseConfig.png",
 
-      "plCategory"      => array("server"),
       "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );
   }

argonaut/admin/systems/services/argonaut/class_argonautServer.inc

@@ -31,7 +31,6 @@ class argonautServer extends simpleService
       'plShortName'   => _('Argonaut Server'),
       'plDescription' => _('Argonaut Server').' ('._('Services').')',
       'plIcon'        => 'plugins/argonaut/images/iconMini.png',
-      'plCategory'    => array('server'),
 
       'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );

asterisk/admin/systems/services/asterisk/class_serviceAsterisk.inc

@@ -140,9 +140,7 @@ class serviceAsterisk extends simpleService {
       "plShortName"     => _("VoIP service (asterisk)"),
       "plDescription"   => _("VoIP - asterisk management")." ("._("Services").")",
       "plIcon"          => "plugins/asterisk/images/iconMini.png",
-      "plSelfModify"    => FALSE,
       "plPriority"      => 92,
-      "plCategory"      => array("server"),
 
       "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );

autofs/admin/autofs/class_autofsManagement.inc

@@ -32,14 +32,14 @@ class autofsManagement extends management
   static function plInfo()
   {
     return array(
-      "plShortName"   => _("Auto fs"),
-      "plDescription" => _("Auto fs management"),
-      "plIcon"        => "plugins/autofs/images/icon.png",
-      "plPriority"    => 24,
-      "plSection"     => "admin",
-      "plCategory"    => array("autofs"),
-
-      "plProvidedAcls" => array()
+      'plShortName'   => _('Auto fs'),
+      'plDescription' => _('Auto fs management'),
+      'plIcon'        => 'plugins/autofs/images/icon.png',
+      'plPriority'    => 24,
+      'plSection'     => 'admin',
+      'plManages'     => array('autofs'),
+
+      'plProvidedAcls' => array()
     );
   }
 

autofs/admin/autofs/class_nisMap.inc

@@ -30,9 +30,11 @@ class nisMap extends simplePlugin
     return array(
       'plShortName'     => _('Mount point'),
       'plDescription'   => _('Autofs mount point'),
-      'plCategory'      => array('autofs'),
-      'plObjectType'    => array('nisMap' => array('name'    => _('Mount point'),
-                                                  'filter'  => 'objectClass=nisMap')),
+      'plObjectType'    => array('nisMap' => array(
+        'name'        => _('Mount point'),
+        'filter'      => 'objectClass=nisMap',
+        'aclCategory' => 'autofs'
+      )),
 
       'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );

autofs/admin/autofs/class_nisObject.inc

@@ -30,9 +30,11 @@ class nisObject extends simplePlugin
     return array(
       'plShortName'     => _('Directory'),
       'plDescription'   => _('Directory'),
-      'plCategory'      => array('autofs'),
-      'plObjectType'    => array('nisObject' => array('name'    => _('Directory'),
-                                                      'filter'  => 'objectClass=nisObject')),
+      'plObjectType'    => array('nisObject' => array(
+        'name'        => _('Directory'),
+        'filter'      => 'objectClass=nisObject',
+        'aclCategory' => 'autofs'
+      )),
 
       'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );

board/addons/board/class_board.inc

@@ -90,14 +90,12 @@ class board extends simplePlugin
   static function plInfo()
   {
     return array(
-      "plShortName"   => _("Dashboard"),
-      "plDescription" => _("Statistics and various informations"),
-      "plIcon"        => "plugins/board/images/icon.png",
-      "plSelfModify"  => FALSE,
-      "plCategory"    => array("board" => array("objectClass" => "", "description" => _("Dashboard"))),
-      "plObjectType"  => array("board" => array("name" => _("Dashboard"), "filter" => "")),
-      "plSection"     => "addons",
-      "plPriority"    => 2,
+      'plShortName'   => _('Dashboard'),
+      'plDescription' => _('Statistics and various informations'),
+      'plIcon'        => 'plugins/dashboard/images/icon.png',
+      'plObjectType'  => array('dashboard' => array('name' => _('Dashboard'))),
+      'plSection'     => 'addons',
+      'plPriority'    => 2,
 
       "plProvidedAcls"  => array()
     );

board/addons/board/class_boardNetwork.inc

@@ -119,11 +119,9 @@ class boardNetwork extends simplePlugin
   static function plInfo()
   {
     return array(
-      "plShortName"   => _("Network"),
-      "plDescription" => _("Statistics and various informations"),
-      "plSelfModify"  => FALSE,
-      "plCategory"    => array("board"),
-      "plObjectType"  => array("board"),
+      'plShortName'   => _('Network'),
+      'plDescription' => _('Statistics and various informations'),
+      'plObjectType'  => array('dashboard'),
 
       "plProvidedAcls"    => array()
     );

board/addons/board/class_boardSystems.inc

@@ -197,10 +197,8 @@ class boardSystems extends simplePlugin
     return array(
       'plShortName'   => _('Systems'),
       'plDescription' => _('Statistics and informations about systems'),
-      'plIcon'        => 'plugins/board/images/icon.png',
-      'plSelfModify'  => FALSE,
-      'plCategory'    => array('board'),
-      'plObjectType'  => array('board'),
+      'plIcon'        => 'plugins/dashboard/images/icon.png',
+      'plObjectType'  => array('dashboard'),
 
       'plProvidedAcls'  => array()
     );

board/addons/board/class_boardUserAccounts.inc

@@ -150,12 +150,9 @@ class boardUserAccounts extends simplePlugin
   static function plInfo()
   {
     return array(
-      "plShortName"   => _("User"),
-      "plDescription" => _("Statistics about users"),
-      "plSelfModify"  => FALSE,
-      "plCategory"    => array("board"),
-      "plObjectType"  => array("board"),
-
+      'plShortName'   => _('Users'),
+      'plDescription' => _('Statistics about users'),
+      'plObjectType'  => array('dashboard'),
       "plProvidedAcls"    => array()
     );
   }

debconf/admin/debconfProfile/class_debconfProfileManagement.inc

@@ -32,12 +32,12 @@ class debconfProfileManagement extends management
   static function plInfo()
   {
     return array(
-      'plShortName'   => _('Debconf'),
-      'plDescription' => _('Debconf profile management'),
-      'plIcon'        => 'plugins/debconf/images/icon.png',
-      'plPriority'    => 31,
-      'plSection'     => 'admin',
-      'plManages'    => array('debconfProfile'),
+      "plShortName"   => _("Debconf"),
+      "plDescription" => _("Debconf profile management"),
+      "plIcon"        => "plugins/debconf/images/icon.png",
+      "plPriority"    => 31,
+      "plSection"     => "admin",
+      "plManages"     => array("debconfProfile"),
 
       'plProvidedAcls' => array()
     );

desktop-management/admin/applications/class_applicationGeneric.inc

@@ -69,10 +69,10 @@ class application extends simplePlugin
       'plShortName'   => _('Generic'),
       'plDescription' => _('Application generic'),
       'plSelfModify'  => FALSE,
-      'plCategory'    => array('application' => array('description'  => _('Application'),
-                                                      'objectClass'  => 'gosaApplication')),
-      'plObjectType'  => array('application' => array('name'  => _('Application'),
-                                                      'filter'  => 'objectClass=gosaApplication')),
+      'plObjectType'  => array('application' => array(
+        'name'  => _('Application'),
+        'filter'  => 'objectClass=gosaApplication'
+      )),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );

desktop-management/admin/applications/class_applicationManagement.inc

@@ -40,7 +40,7 @@ class applicationManagement extends management
       "plIcon"        => "plugins/desktop-management/images/iconApplication.png",
       "plSection"     => "admin",
       "plPriority"    => 21,
-      "plCategory"    => array("application"),
+      "plManages"     => array("application"),
 
       "plProvidedAcls" => array()
     );

desktop-management/admin/applications/class_applicationParameters.inc

@@ -272,7 +272,6 @@ class applicationParameters extends plugin
       "plShortName"   => _("Parameter"),
       "plDescription" => _("Parameter configuration"),
       "plSelfModify"  => FALSE,
-      "plCategory"    => array("application"),
       "plObjectType"  => array("application"),
 
       "plProvidedAcls"=> array(

desktop-management/admin/mimetypes/class_mimetypeManagement.inc

@@ -41,6 +41,7 @@ class mimetypeManagement extends management
       "plSection"     => "admin",
       "plPriority"    => 22,
       "plCategory"    => array("mimetypes"),
+      "plManages"     => array("mimetype"),
 
       "plProvidedAcls" => array()
     );