From 7ab71c0c04d818241b59cd8328b718059911a2b4 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 26 Jun 2008 08:21:25 +0000 Subject: [PATCH] Updated departments -Allow deparments of different type and and same name, like l=test o=test git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11448 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../departments/class_departmentGeneric.inc | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc index 09509b9c6..45b5a52be 100644 --- a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc @@ -691,47 +691,6 @@ class department extends plugin } } - - - /*! \brief Returns a list of all available departments for this object. - If this object is new, all departments we are allowed to create a new user in are returned. - If this is an existing object, return all deps. we are allowed to move tis object too. - - @return Array [dn] => "..name" // All deps. we are allowed to act on. - */ - function get_allowed_bases() - { - $ui = get_userinfo(); - $deps = array(); - - /* Is this a new object ? Or just an edited existing object */ - if(!$this->initially_was_account && $this->is_account){ - $new = true; - }else{ - $new = false; - } - - $ideps = $this->config->idepartments; - if(!isset($ideps[$this->base])){ - $ideps[$this->base] = "."; - } - foreach($deps as $dn => $name){ - if($new && $this->acl_is_createable($dn)){ - $deps[$dn] = $name; - }elseif(!$new && $this->acl_is_moveable($dn)){ - $deps[$dn] = $name; - } - } - - /* Add current base */ - if(isset($this->base) && isset($ideps[$this->base])){ - $deps[$this->base] = $ideps[$this->base]; - }else{ - trigger_error("Cannot return list of departments, no default base found in class ".get_class($this).". ".$this->base); - } - return($deps); - } - } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: -- 2.30.2