Fixed user plugin

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

diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 4b2f11b2e2d6ea089e0fb319efc2884c63580ddc..c25cab419498e8b671e6b7b7c846b075b242af85 100644 (file)
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -69,31 +69,6 @@ class userinfo
 
   function loadACL()
   {
-
-#--------------------------------------------------------------------------OLD-BUT-ACTIVE-----------------------------
-    $ldap= $this->config->get_ldap_link();
-
-    /* Load ACL's from all groups we're in */
-    $this->subtreeACL= array();
-    $ldap->cd($this->config->current['BASE']);
-    if ($this->gidNumber == -1){
-      $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)".
-          "(memberUid=$this->username))");
-    } else {
-      $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)".
-          "(|(memberUid=$this->username)(gidNumber=$this->gidNumber)))");
-    }
-
-    while($attrs = $ldap->fetch()){
-      $base= preg_replace('/^[^,]+,ou=[^,]+,/i', "",$ldap->getDN());
-      $base= preg_replace("/[ ]*,[ ]*/", ",", $base);
-
-      for ($i= 0; $i<$attrs["gosaSubtreeACL"]["count"]; $i++){
-        $this->subtreeACL[$base][]= $attrs["gosaSubtreeACL"][$i];
-      }
-    }
-#echo "NEW ACL LOADING --------------------------------------------------------------------------------------------<br>";
-
     $this->ACL= array();    
     $this->groups= array();    
     $this->result_cache =array();
@@ -159,7 +134,6 @@ class userinfo
       }
 
     }
-
   }
 
 

diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc
index c434af47fa7a45ad60c1adb7a4b1c7ce8202ad94..367903914b48dcc1a2445b0c0c138e08ae12fd23 100644 (file)
--- a/plugins/personal/connectivity/class_intranetAccount.inc
+++ b/plugins/personal/connectivity/class_intranetAccount.inc
@@ -178,8 +178,7 @@ class intranetAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 25,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("Intranet account"),
-                                                  "objectClass" => "gosaIntranetAccount")),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
 
           "plDescription"       => _("Intranet account settings")."&nbsp;:&nbsp;<u>"._("Connectivity addon")."</u>",

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 85245ebdf0316de062cdc3b5476ad5c19cc2712a..b038cd9c741eb47eef94e9a951e01b4d75387c66 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -449,8 +449,7 @@ class kolabAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 20,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("Kolab account"),
-                                                  "objectClass" => "kolabAccount")),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
 
           "plProvidedAcls"  => array(

diff --git a/plugins/personal/connectivity/class_opengwAccount.inc b/plugins/personal/connectivity/class_opengwAccount.inc
index 558ce4c4ae22c48d2b1c3004d131439724a62212..5f6058e5a1071e4271285d1955b394acc5d21f5e 100644 (file)
--- a/plugins/personal/connectivity/class_opengwAccount.inc
+++ b/plugins/personal/connectivity/class_opengwAccount.inc
@@ -312,8 +312,7 @@ class opengwAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 26,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("Opengroupware"),
-                                                  "objectClass" => "openGroupwareAccount")),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
 
           "plProvidedAcls"  => array(

diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index 7a91e92ab3024843d3ad3937674e8eed1549b3a6..8553e16ff3f315a1d08dbd4a9f6b1801ab1f79b9 100644 (file)
--- a/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -952,8 +952,7 @@ class oxchangeAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 27,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("OpenExchange account"),
-                                                    "objectClass" => "OXUserObject")),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
 
           "plProvidedAcls"  => array(

diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc
index 143fcb8e52509ad3001f3a23913aa0b38b5f6548..ce14d589c42da20310a3d829a7dd8e2af64cd991 100644 (file)
--- a/plugins/personal/connectivity/class_phpgwAccount.inc
+++ b/plugins/personal/connectivity/class_phpgwAccount.inc
@@ -145,8 +145,7 @@ class phpgwAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 24,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("PHPgroupware"),
-                                                    "objectClass" => "phpgwAccount")),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
 
           "plProvidedAcls"  => array()

diff --git a/plugins/personal/connectivity/class_phpscheduleitAccount.inc b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
index 78da8dfb0c837e6642d80ff802927077af86566b..a744b2dae4b8a221dcb1848a73ea2ca847e94371 100644 (file)
--- a/plugins/personal/connectivity/class_phpscheduleitAccount.inc
+++ b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
@@ -146,8 +146,7 @@ class phpscheduleitAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 29,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("PHP schedule it"),
-                                                  "objectClass" => "phpscheduleitAccount")),
+          "plCategory"    => array("users"),
 
           "plOptions"       => array(),
 

diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc
index 22ef56389c4e1536b225ff7ba186ac7e86d629b2..96c8dea6c30954ae0a10c37a7efffa671b251922 100644 (file)
--- a/plugins/personal/connectivity/class_pptpAccount.inc
+++ b/plugins/personal/connectivity/class_pptpAccount.inc
@@ -161,8 +161,7 @@ class pptpAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 28,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("PPTP account"),
-                                                  "objectClass" => "pptpServerAccount")),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
 
           "plProvidedAcls"  => array()

diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc
index 7b333061ebafd7e3426e24cb238ccb1377493825..dbb0f79354fa5d85bfd137e525b8959b54a63d69 100644 (file)
--- a/plugins/personal/connectivity/class_proxyAccount.inc
+++ b/plugins/personal/connectivity/class_proxyAccount.inc
@@ -294,8 +294,7 @@ class proxyAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 21,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("Proxy account"),
-                                                  "objectClass" => "gosaProxyAccount")),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
 
           "plProvidedAcls"  => array(

diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc
index fc967e85637fa8fd1a397a64ae93745c1463038a..1069f60c91062d202626a348f834659249aa2ed5 100644 (file)
--- a/plugins/personal/connectivity/class_pureftpdAccount.inc
+++ b/plugins/personal/connectivity/class_pureftpdAccount.inc
@@ -221,8 +221,7 @@ class pureftpdAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 22,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("FTP account"),
-                                                  "objectClass" => "PureFTPdUser")),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
 
           "plProvidedAcls"  => array(

diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc
index 7460e4bdee84a9a00f9614e19e1660388e6f4b8f..dfc9352be5122e93666683c24e294dfd8e062e18 100644 (file)
--- a/plugins/personal/connectivity/class_webdavAccount.inc
+++ b/plugins/personal/connectivity/class_webdavAccount.inc
@@ -144,8 +144,7 @@ class webdavAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 23,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("WebDAV account"),
-                                                  "objectClass" => "gosaWebdavAccount")),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
 
           "plProvidedAcls"  => array()

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index a0fd23c6d49adb489c0fc083a916c12295eb5dc2..9c2676155486316610a9fcf68be6a0b6bd4695de 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -1272,10 +1272,8 @@ class environment extends plugin
           "plDepends"       => array("user", "posixAccount"),     // This plugin depends on 
           "plPriority"      => 3,                                 // Position in tabs 
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("Environment settings"),
-                                                    "objectClass" => "gotoEnvironment"),
-                                   "groups" => array("description" => _("Environment settings"),
-                                                    "objectClass" => "gotoEnvironment")),
+          "plCategory"    => array("users",
+                                   "groups"),
           "plOptions"       => array("resolution_hook" => array("type" => "string",
               "description" => _("Command to extend the list of possible screen resolutions"))),
 

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index a1a60c50a8ec4bb6e9cd6f332146ce276756a578..d9c2039274ed77986a136cf1256d410be10108d5 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -1010,8 +1010,7 @@ class mailAccount extends plugin
           "plDepends"       => array("user"),                     // This plugin depends on
           "plPriority"      => 4,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("Mail account"),
-                                                    "objectClass" => "gosaMailAccount")),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
   
           "plProvidedAcls"  => array(

diff --git a/plugins/personal/nagios/class_nagiosAccount.inc b/plugins/personal/nagios/class_nagiosAccount.inc
index a19d0b1a7fbec53d9fb670c6c86f4eca919e127f..9f32138a1021369a527ee56b28d77a008e6cc21f 100644 (file)
--- a/plugins/personal/nagios/class_nagiosAccount.inc
+++ b/plugins/personal/nagios/class_nagiosAccount.inc
@@ -262,8 +262,7 @@ class nagiosAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 8,                                 // Position in tabs
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("Nagios account"),
-                                                    "objectClass" => array("nagiosContact", "nagiosAuth"))),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
 
           "plProvidedAcls"  => array(

diff --git a/plugins/personal/netatalk/class_netatalk.inc b/plugins/personal/netatalk/class_netatalk.inc
index 96f88fd72ad12894dd1b84328bc2eeec4f1f04ad..1d06faac49c81968c6b56a138208819cdbe65b48 100644 (file)
--- a/plugins/personal/netatalk/class_netatalk.inc
+++ b/plugins/personal/netatalk/class_netatalk.inc
@@ -357,8 +357,7 @@ class netatalk extends plugin {
           "plDepends"         => array("user"),
           "plPriority"        => 6,
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("Netatalk account"),
-                                                    "objectClass" => "apple-user")),
+          "plCategory"    => array("users"),
           "plOptions"         => array(),
 
           "plProvidedAcls"  => array(

diff --git a/plugins/personal/password/class_password.inc b/plugins/personal/password/class_password.inc
index 94f64e7bcc9064b6c5e85f037e5d4df7fd08efd2..46cf8a0488813481f93d6434bc130684e55e70e7 100644 (file)
--- a/plugins/personal/password/class_password.inc
+++ b/plugins/personal/password/class_password.inc
@@ -14,8 +14,7 @@ class password
           "plDepends"         => array("user"),
           "plPriority"        => 10,
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("Password"),
-                                                    "objectClass" => "gosaAccount")),
+          "plCategory"    => array("users"),
           "plOptions"         => array(),
 
           "plProvidedAcls"  => array())

diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 427add565164f9da0e8d660260b099ada6550389..4df29ad4ad0aac584aea4de89f41e1eb3f556fac 100644 (file)
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -1324,8 +1324,7 @@ class posixAccount extends plugin
           "plDepends"         => array("user"),
           "plPriority"        => 2,
           "plSection"         => array("personal" => _("My account")),
-          "plCategory"        => array("users" => array("description" => _("Posix Account"),
-                                                        "objectClass" => "posixAccount")),
+          "plCategory"        => array("users"),
           "plOptions"         => array(),
 
           "plProvidedAcls"  => array(

diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index 87712a9636cd32f97252514918395b9ff2b38a3d..c99544ea53285d363d241fc6c763ccf8130f8ffe 100644 (file)
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -1070,8 +1070,7 @@ class sambaAccount extends plugin
           "plDepends"       => array("user"),
           "plPriority"      => 5,
           "plSection"     => array("personal" => _("My account")),
-          "plCategory"    => array("users" => array("description" => _("Samba account"),
-                                                    "objectClass" => array("sambaSamAccount"))),
+          "plCategory"    => array("users"),
           "plOptions"       => array(),
 
           "plProvidedAcls"  => array(