X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fdepartments%2Fclass_departmentManagement.inc;h=79ec8eb4fbe3a89167fe106d6700f61c8f83b53d;hb=f4a6588f33b5886afaa20db8b01517b8eafbafed;hp=056569d7e8bdcb29ebea16b14bcaa3814eb70b77;hpb=e1be3c2a19181471cdb8852045d3c3ff479f02cd;p=gosa.git

diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
index 056569d7e..79ec8eb4f 100644
--- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
@@ -22,8 +22,8 @@
 
 class departmentManagement extends management
 {
-  var $plHeadline     = "Departments";
-  var $plDescription  = "Manage Departments";
+  var $plHeadline     = "Directory structure";
+  var $plDescription  = "Manage organizations, organizational units, localities, countries and more";
   var $plIcon         = "plugins/departments/images/plugin.png";
 
   // Tab definition 
@@ -53,10 +53,10 @@ class departmentManagement extends management
     $this->setFilter($filter);
 
     // Add copy&paste and snapshot handler.
-    if ($this->config->boolValueIsTrue("main", "copyPaste")){
+    if ($this->config->boolValueIsTrue("core", "copyPaste")){
       $this->cpHandler = new CopyPasteHandler($this->config);
     }
-    if($this->config->get_cfg_value("enableSnapshots") == "true"){
+    if($this->config->get_cfg_value("core","enableSnapshots") == "true"){
       $this->snapHandler = new SnapshotHandler($this->config);
     }
 
@@ -114,9 +114,12 @@ class departmentManagement extends management
     $str = management::saveChanges();
     if(!empty($str)) return($str);
 
+    $plugname = (isset($this->last_tabObject->base_name))? $this->last_tabObject->base_name : '';
+
     $this->refreshDeps(); 
-    $plugname = $this->last_tabObject->base_name;
-    if($this->last_tabObject->by_object[$plugname]->must_be_tagged()){
+    if(isset($this->last_tabObject->by_object[$plugname]) &&
+       is_object($this->last_tabObject->by_object[$plugname])      &&
+            $this->last_tabObject->by_object[$plugname]->must_be_tagged()){
       $smarty = get_smarty();
       $smarty->assign("src","?plug=".$_GET['plug']."&TagDepartment&no_output_compression");
       $smarty->assign("message",_("As soon as the tag operation has finished, you can scroll down to end of the page and    press the 'Continue' button to continue with the department management dialog."));
@@ -156,7 +159,7 @@ class departmentManagement extends management
   static function filterDepLabel($row,$dn,$params,$ou,$pid,$base)
   {
     $ou = $ou[0];
-    if($dn == $base){
+    if(LDAP::convert($dn) == $base){
       $ou =".";
     }
     $dn= LDAP::fix(func_get_arg(1));