X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_systemManagement.inc;h=27a4e6e0f7686aa3b20d9ce46996a0ce0e5543eb;hb=c30fdf675865a86365275ed6fb9f8a0cc06e41af;hp=e18dc1a5de908c0480ae8b1c1b7e9393dec9b8cc;hpb=5fcb9c34b3de4dcc49c9378da360407f9af09a24;p=gosa.git diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc index e18dc1a5d..27a4e6e0f 100644 --- a/plugins/admin/systems/class_systemManagement.inc +++ b/plugins/admin/systems/class_systemManagement.inc @@ -239,7 +239,7 @@ class systems extends plugin if ($this->dn != "" && isset($_GET['PerformIsoCreation'])){ - $return_button = "
+ $return_button = "
"; @@ -248,24 +248,22 @@ class systems extends plugin /* Get and check command */ $command= search_config($this->config->data['TABS'], "workgeneric", "ISOCMD"); -// $command = "/bin/sh /home/hickert/gen_stuff.sh"; if (check_command($command)){ @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute"); /* Print out html introduction */ - echo ' - '; - echo ""; - echo ""; - echo " - - 
";
+        echo '  
+                
+                  
+                    
+                    
+                    
+                  
+                  
+                  
';
 
         /* Open process handle and check if it is a valid process */
-        $process= proc_open($command, $dsc, $pipes, '/tmp');
+        $process= proc_open($command." '".$this->dn."'", $dsc, $pipes);
         if (is_resource($process)) {
           fclose($pipes[0]);
 
@@ -273,13 +271,17 @@ class systems extends plugin
           while (!feof($pipes[1])){
             $cur_dat = fgets($pipes[1], 1024);
             echo $cur_dat;
-            echo "" ;
+            echo '' ;
             flush();
           }
         }
     
         /* Get error string && close streams */
-        $buffer= stream_get_contents($pipes[2]);
+        $buffer = "";
+        while (!feof($pipes[2])){
+          $buffer .= fgets($pipes[2],256);
+        }
+      
         fclose($pipes[1]);
         fclose($pipes[2]);
         echo "
";
@@ -299,8 +301,8 @@ class systems extends plugin
       }
 
       /* Scroll down completly */
-      echo "" ;
-      echo "";
+      echo '' ;
+      echo '';
       flush();
       exit;
     }
@@ -654,7 +656,7 @@ class systems extends plugin
     $responsible= array();
     foreach ($this->config->departments as $key => $value){
       if (get_module_permission(get_permissions ($value, $this->ui->subtreeACL),
-            "terminal", $value) == "#all#"){
+            "systems", $value) != ""){
         $responsible[$key]= $value;
       }
     }
@@ -696,14 +698,14 @@ class systems extends plugin
       if($this->DivListSystem->$checkBox){
         if($this->DivListSystem->SubSearch){
           if($oc['CLASS'] != ""){
-            $filter = "(|(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex.")))";
+            $filter = "(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex."))";
             $res = array_merge($res,get_list($filter,$this->ui->subtreeACL, $base,
                   array("cn", "description", "macAddress", "objectClass", "sambaDomainName", "FAIstate"), GL_NONE | GL_SUBSEARCH | GL_SIZELIMIT));
           }
         }else{
           /* User filter? */
           if($oc['CLASS'] != ""){
-            $filter = "(|(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex.")))";
+            $filter = "(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex."))";
             $res = array_merge($res,get_list($filter,$this->ui->subtreeACL, $oc['TREE'].$base,
                   array("cn", "description", "macAddress", "objectClass", "sambaDomainName", "FAIstate"), GL_NONE | GL_SIZELIMIT));
           }
@@ -898,12 +900,9 @@ class systems extends plugin
                 $type= 'R'.$type;
                 break;
       case 'install':
-                $type= 'Y'.$type;
-                break;
       case 'sysinfo':
-                $type= 'Y'.$type;
-                break;
       case 'softupdate':
+      case 'scheduledupdate':
                 $type= 'Y'.$type;
                 break;
     }