Updated plugin structure

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4161 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 469c3faef45c05d61587a3206bdbc728d28b8efc..e9a9493f0d12541817c3af5d1ba3b1c013ccba41 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -1359,6 +1359,8 @@ class plugin
     #var $plSelfModify= FALSE;
     #var $plOptions= array();
     #var $plSection= "";
+    #var $plProvidedCategory= array();
+    #var $plCategory= array();
     #var $plTask= array();
     #var $plPriority= 0;
     #var $plDepends= array();

diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index 5cb8f75ef70b71b8d01a3cea51d5e983a514ac24..33a7a5d51b691dbb605f3adf6edc26f9cbebb11c 100644 (file)
--- a/plugins/admin/groups/class_groupGeneric.inc
+++ b/plugins/admin/groups/class_groupGeneric.inc
@@ -858,20 +858,27 @@ class group extends plugin
   function plInfo()
   {
     return (array(  
-          "plDescription"     => _("Groups"),
-          "plSelfModify"      => FALSE,
-          "plDepends"         => array("objectClass" => "posixGroup","description"=>_("Groups")),
-          "cn"                => _("Name"),
-          "description"       => _("Description"),
-          "base"              => _("Base"),
-
-          "fon_group"         => _("Phone pickup group"),
-          "nagios_group"      => _("Nagios group"),
-
-          "gidNumber"         => _("GID"),
-          "memberUid"         => _("Group member"),
-          "sambaGroupType"    => _("Samba group type"),
-          "sambaSID"          => _("Samba SID")));
+          "plShortName" => _("Generic"),
+          "plDescription" => _("Generic group settings"),
+          "plSelfModify"  => FALSE,
+          "plDepends"     => array(),
+          "plPriority"    => 0,
+          "plSection"     => array("admin"),
+          "plCategory"    => array("groups" => _("Groups")),
+
+          "plProvidedAcls"    => array(
+            "cn"                => _("Name"),
+            "description"       => _("Description"),
+            "base"              => _("Base"),
+
+            "fon_group"         => _("Phone pickup group"),
+            "nagios_group"      => _("Nagios group"),
+
+            "gidNumber"         => _("GID"),
+            "memberUid"         => _("Group member"),
+            "sambaGroupType"    => _("Samba group type"),
+            "sambaSID"          => _("Samba SID"))
+        ));
   }
 }
 

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index c8a599c44e3713056d3fc1bbe62b4b41d4e4cfda..2b89b228f3b52b8b3ceaf1415f5c6dfb92be1e93 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -1251,18 +1251,25 @@ function printOutHotPlugDevices()
   {
     return (array("plDescription"   => _("Environment settings"),
                   "plSelfModify"    => TRUE,
-                  "plDepends"       => array("objectClass" => "gosaAccount"),
-
-                  "gotoProfileServer"   => _("Profile server") ,
-                  "gotoProfileFlag_L"   => "FIXME"._("Resolution changeable during session") ,  // These variable are flags 
-                  "gotoProfileFlag_C"   => "FIXME"._("Cache profile localy") ,                  // extracted from gotoProfileFlag
-                  "gotoXResolution"     => _("Resolution") ,
-                  "gotoProfileQuota"    => _("Profile quota") ,
-                  "gotoLogonScripts"    => _("Logon script") ,
-                  "gotoPrinter"         => _("Printer") ,
-                  "gosaDefaultPrinter"  => _("Default printer") ,
-                  "gotoKioskProfile"    => _("Kiosk profile") ,
-                  "gotoShare"           => _("Shares") ));
+                  "plDepends"       => array("user", "posixAccount"),
+                  "plPriority"      => 2,
+                  "plSection"       => "personal",
+                  "plCategory"      => array("users", "groups"),
+                  "plOptions"       => array("resolution_hook" => array("type" => "string",
+                                                                        "description" => _("Command to extend the list of possible screen resolutions"))),
+
+                  "plProvidedAcls"  => array(
+                    "gotoProfileServer"   => _("Profile server") ,
+                    "gotoProfileFlag_L"   => _("Resolution changeable during session") ,
+                    "gotoProfileFlag_C"   => _("Cache profile localy") ,
+                    "gotoXResolution"     => _("Resolution") ,
+                    "gotoProfileQuota"    => _("Profile quota") ,
+                    "gotoLogonScripts"    => _("Logon script") ,
+                    "gotoPrinter"         => _("Printer") ,
+                    "gosaDefaultPrinter"  => _("Default printer") ,
+                    "gotoKioskProfile"    => _("Kiosk profile") ,
+                    "gotoShare"           => _("Shares")),
+                   ));
     }
 }
 

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 4d03a9f2c024a2d5bf7e45029387350606675141..95b1f77289c732ec4cd83241bf028dc0cdb964f7 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -1305,46 +1305,51 @@ class user extends plugin
         "postalCode"                                =>  _("Postal code"));
 
     $ret = array(
+        "plShortName" => _("Generic"),
         "plDescription" => _("Generic user settings"),
         "plSelfModify"  => TRUE,
-        "plDepends"     => array("objectClass" => "gosaAccount", 
-                                 "description"   => _("Users")),
-
-        "userPassword"      => _("User password"), 
-        "sn"                => _("Surename"),
-        "givenName"         => _("Given name"),
-        "uid"               => _("User identification"),
-        "personalTitle"     => _("Personal title"),
-        "academicTitle"     => _("Academic title"),
-        "homePostalAddress" => _("Home postal address"),
-        "homePhone"         => _("Home phone number"),
-        "labeledURI"        => _("Homepage"),
-        "o"                 => _("Organization"),
-        "ou"                => _("Department"),
-        "dateOfBirth"       => _("Date of birth"),
-        "gender"            => _("Gender"),
-        "preferredLanguage" => _("Preferred language"),
-        "departmentNumber"  => _("Department number"),
-        "employeeNumber"    => _("Employee number"),
-        "employeeType"      => _("Employee type"),
-        "l"                 => _("Location"),
-        "st"                => _("State"),
-
-        "roomNumber"        => _("Room number"),
-        "telephoneNumber"   => _("Telefon number"),
-        "mobile"            => _("Mobile number"),
-        "pager"             => _("Pager number"),
-        "userPKCS12"        => _("User certificate PKCS12"),
-
-        "postalAddress"                => _("Postal address"),
-        "facsimileTelephoneNumber"     => _("Fax number"),
-        "userSMIMECertificate"         => _("User certificate SMIME"));
+        "plDepends"     => array(),
+        "plPriority"    => 0,
+        "plSection"     => array("personal" => _("My account"))),
+        "plCategory"    => array("users" => _("Users")),
+
+        "plProvidedAcls" => array(
+          "userPassword"      => _("User password"), 
+          "sn"                => _("Surename"),
+          "givenName"         => _("Given name"),
+          "uid"               => _("User identification"),
+          "personalTitle"     => _("Personal title"),
+          "academicTitle"     => _("Academic title"),
+          "homePostalAddress" => _("Home postal address"),
+          "homePhone"         => _("Home phone number"),
+          "labeledURI"        => _("Homepage"),
+          "o"                 => _("Organization"),
+          "ou"                => _("Department"),
+          "dateOfBirth"       => _("Date of birth"),
+          "gender"            => _("Gender"),
+          "preferredLanguage" => _("Preferred language"),
+          "departmentNumber"  => _("Department number"),
+          "employeeNumber"    => _("Employee number"),
+          "employeeType"      => _("Employee type"),
+          "l"                 => _("Location"),
+          "st"                => _("State"),
+
+          "roomNumber"        => _("Room number"),
+          "telephoneNumber"   => _("Telefon number"),
+          "mobile"            => _("Mobile number"),
+          "pager"             => _("Pager number"),
+          "userPKCS12"        => _("User certificate PKCS12"),
+
+          "postalAddress"                => _("Postal address"),
+          "facsimileTelephoneNumber"     => _("Fax number"),
+          "userSMIMECertificate"         => _("User certificate SMIME"))
+        );
 
     /* Append government attributes if required */
       global $config;
     if (isset($config->current['GOVERNMENTMODE']) &&  preg_match('/true/i', $config->current['GOVERNMENTMODE'])){
       foreach($govattrs as $attr => $desc){
-        $ret[$attr] = $desc;
+        $ret["plProvidedAcls"][$attr] = $desc;
       }
     }