Applied patch from 2.5 Revision: 6516

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

diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc
index 7800319c5584869662698c9a288de848e6340fcd..51cb2cc8277c1da93edecbfafd6d5e659a69d395 100644 (file)
--- a/plugins/admin/groups/tabs_group.inc
+++ b/plugins/admin/groups/tabs_group.inc
@@ -84,16 +84,16 @@ class grouptabs extends tabs
        {
                tabs::saveCopyDialog();
                
-        /* Update reference, transfer variables */
-        $baseobject= $this->by_object['group'];
-        foreach ($this->by_object as $name => $obj){
-            /* Don't touch base object */
-            if ($name != 'group'){
-                $obj->parent= &$this;
-                $obj->cn= $baseobject->cn;
-                $this->by_object[$name]= $obj;
-            }
-        }
+               /* Update reference, transfer variables */
+               $baseobject= $this->by_object['group'];
+               foreach ($this->by_object as $name => $obj){
+                       /* Don't touch base object */
+                       if ($name != 'group'){
+                               $obj->parent= &$this;
+                               $obj->cn= $baseobject->cn;
+                               $this->by_object[$name]= $obj;
+                       }
+               }
        }
        
 }

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 44b51cf740a6c99cd0f563f2c53ebcd1351a041e..2327883611e9728053b8f06e9914fa9150887875 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -1181,7 +1181,7 @@ class systems extends plugin
       case 'install':
       case 'sysinfo':
       case 'softupdate':
-      case 'update':
+      case 'scheduledupdate':
                 $type= 'Y'.$type;
                 break;
     }

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 26050acde5bdba9d8167d3ddd2e8f92ecb8c4528..516c807a97637b4196e95a7119424e13b0a8fae8 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -51,10 +51,11 @@ class workgeneric extends plugin
       "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser", "l","FAIscript");
   var $objectclasses= array("top", "gotoWorkstation", "GOhard");
 
-  var $mapActions   = array("reboot"          => "localboot",
+  var $mapActions   = array("reboot"          => "",
                             "localboot"       => "localboot",
+                            "halt"            => "",
                             "instant_update"  => "softupdate",
-                            "update"          => "sceduledupdate",
+                            "update"          => "scheduledupdate",
                             "reinstall"       => "install",
                             "rescan"          => "",
                             "memcheck"        => "memcheck",
@@ -182,8 +183,8 @@ class workgeneric extends plugin
             $res = $ldap->fetch();
 
             $attrs = array();
-            $attrs['FAIstate'] = "";
-            if(isset($this->mapActions[$_POST['saction']])){
+            $attrs['FAIstate'] = $this->FAIstate;
+            if(isset($this->mapActions[$_POST['saction']]) && $this->mapActions[$_POST['saction']] != ""){
               $attrs['FAIstate'] = $this->mapActions[$_POST ['saction']];
             }