Updated for R5744

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

diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc
index 5753ba39a3e7c1394ae2c21bde5bf2a62540fb60..7adb0c3054f4f53d346c036916692f15285147aa 100644 (file)
--- a/plugins/admin/groups/tabs_group.inc
+++ b/plugins/admin/groups/tabs_group.inc
@@ -88,16 +88,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 f19629928567c7ec65ea724aa1f4cadfca975d53..27a4e6e0f7686aa3b20d9ce46996a0ce0e5543eb 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -902,7 +902,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 bc5217c17aeed4e2cb9dd81ec04d6bcffe8f9cdb..bd426084bfb2a5e2262816df10b9bc2c46810342 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -45,9 +45,9 @@ class workgeneric extends plugin
       "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser", "l","FAIscript");
   var $objectclasses= array("top", "gotoWorkstation", "GOhard","FAIobject");
 
-  var $mapActions   = array("reboot"          => "localboot",
+  var $mapActions   = array("reboot"          => "",
                             "localboot"       => "localboot",
-                            "halt"            => "localboot",
+                            "halt"            => "",
                             "instant_update"  => "softupdate",
                             "update"          => "scheduledupdate",
                             "reinstall"       => "install",
@@ -158,8 +158,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']];
             }