[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ccdf6fb)
Removed hard coded acl class 'all'
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 5 May 2010 07:47:48 +0000 (07:47 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 5 May 2010 07:47:48 +0000 (07:47 +0000)
-Added class core

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

gosa-core/include/class_acl.inc patch | blob | history
gosa-core/include/class_core.inc [new file with mode: 0644] patch | blob
gosa-core/include/class_pluglist.inc patch | blob | history
gosa-core/include/class_userinfo.inc patch | blob | history

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index 0c3448e09f2a086c79025df542b1aa1eceec9de3..2012f1d134948af43c653b646e1ddd5754ee8314 100644 (file)
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -216,8 +216,6 @@ class acl extends plugin
         }
       }
     }
-    $this->aclObjects['all']= '*&nbsp;'._("All categories");
-    $this->ocMapping['all']= array('0' => 'all');
 
     /* Sort categories */
     asort($this->aclObjects);
@@ -642,9 +640,6 @@ class acl extends plugin
         }
         $aclObjects[$this->aclObject.'/'.$class]= $plist[$class]['plDescription'];
       }
-      if ($this->aclObject == 'all'){
-        $aclObjects['all']= _("All objects in current subtree");
-      }
 
       /* Role selector if scope is base */
       if ($this->aclType == 'role'){
diff --git a/gosa-core/include/class_core.inc b/gosa-core/include/class_core.inc
new file mode 100644 (file)
index 0000000..f470f34
--- /dev/null
+++ b/gosa-core/include/class_core.inc
@@ -0,0 +1,704 @@
+<?php
+
+
+class all extends plugin {
+    static function plInfo()
+    {
+        return (array(
+                    "plShortName"   => _("All"),
+                    "plDescription" => _("All objects in this category"),
+                    "plSelfModify"  => TRUE,
+                    "plDepends"     => array(),
+                    "plPriority"    => 0,
+                    "plSection"     => array("administration"),
+                    "plCategory"    => array("all" => array("objectClass" => "none", "description" => '*&nbsp;'._("All"))),
+                    "plProvidedAcls"    => array())
+               );
+    }
+}
+
+class core extends plugin {
+
+
+    /*! \brief  Add ACL object
+      @return Returns the ACL object.
+     */
+    static function plInfo()
+    {
+        return (array(
+                    "plShortName" => _("Sudo"),
+                    "plDescription" => _("Sudo role"),
+                    "plSelfModify"  => FALSE,
+                    "plDepends"     => array(),
+                    "plPriority"    => 0,
+                    "plSection"     => array("administration"),
+                    "plCategory"    => array("sudo" => array("objectClass" => "sudoRole", "description" => _("Sudo role"))),
+
+                    "plProperties"  => array(
+
+
+                        array(
+                            "name"          => "logging",
+                            "type"          => "string",
+                            "default"       => "",
+                            "description"   => "",
+                            "check"         => "",
+                            "migrate"       => "",
+                            "group"         => "core",
+                            "mandatory"     => FALSE),
+
+                        array(
+                            "name"          => "listSummary",
+                            "type"          => "string",
+                            "default"       => "",
+                            "description"   => "",
+                            "check"         => "",
+                            "migrate"       => "",
+                            "group"         => "core",
+                            "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "passwordMinLength",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "passwordMinDiffer",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "passwordHook",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "displayErrors",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "schemaCheck",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "copyPaste",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "forceGlobals",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "forceSSL",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "ldapStats",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "warnSSL",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "ppdGzip",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "ppdPath",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "ldapMaxQueryTime",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "primaryGroupFilter",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "mailQueueScriptPath",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "storeFilterSettings",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "sendCompressedOutput",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "modificationDetectionAttribute",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "language",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "theme",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "sessionLifetime",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "templateCompileDirectory",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "debugLevel",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "sambaHashHook",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "passwordDefaultHash",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "accountPrimaryAttribute",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "userRDN",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "groupRDN",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "gidNumberBase",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "uidNumberBase",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "sudoRDN",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "gosaSupportURI",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "gosaSupportTimeout",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "loginAttribute",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "timezone",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "honourUnitTags",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "useSaslForKerberos",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "rfc2307bis",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "personalTitleInDN",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "nextIdHook",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "sambaMachineAccountRDN",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "idGenerator",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "strictNamingRules",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "minId",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "mailAttribute",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "gosaSharedPrefix",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "mailUserCreation",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "mailFolderCreation",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "imapTimeout",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "mailMethod",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "cyrusUseSlashes",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "vacationTemplateDirectory",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "ldapTLS",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "honourIvbbAttributes",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "sambaIdMapping",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "handleExpiredAccounts",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "sambaSID",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "sambaRidBase",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "enableSnapshots",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "snapshotBase",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "snapshotAdminDn",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "snapshotAdminPassword",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
+                        array(
+                                "name"          => "snapshotURI",
+                                "type"          => "string",
+                                "default"       => "",
+                                "description"   => "",
+                                "check"         => "",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE)
+                            ),
+
+                        "plProvidedAcls"    => array(
+                                "accessTo"          => _("System trust"),
+                                "cn"                => _("Name"),
+                                "description"       => _("Description"),
+                                "sudoUser"          => _("Users"),
+                                "sudoHost"          => _("Host"),
+                                "sudoCommand"       => _("Command"),
+                                "sudoRunAs"         => _("Run as user"),
+                                "trustModel"        => _("Access control list"))
+                            )
+                            );
+    }
+}
+?>
diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index ee593b34ba9b2a60c558783e523a4539d22cbe5d..0f89f3b611bb05aeda5ba7c67a386a0236578d9b 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -68,12 +68,6 @@ class pluglist
                        }
                }
 
-               /* Provide field for 'all' */
-               $this->info['all']= array();
-               $this->info['all']['plProvidedAcls']= array();
-               $this->info['all']['plDescription']= _("All objects in this category");
-               $this->info['all']['plSelfModify']= FALSE;
-
     if(!session::is_set('maxC')){
       session::set('maxC',"RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP");
     }
diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 517ca272dbf01ee832a0877cdf991b573ee10f0e..63f82ac3748e75d54ca1534bf6043aae6d0ede57 100644 (file)
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -499,6 +499,12 @@ class userinfo
           }
 
           /* Global ACL? */
+          if (isset($subacl['acl']['all/all'][0])){
+            $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']['all/all'][0]);
+            continue;
+          }
+
+          /* Global ACL? - Old style global ACL - Was removed since class_core.inc was created */
           if (isset($subacl['acl']['all'][0])){
             $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']['all'][0]);
             continue;
GONICUS system administrator (SVN clone)