![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index e18dc1a5de908c0480ae8b1c1b7e9393dec9b8cc..27a4e6e0f7686aa3b20d9ce46996a0ce0e5543eb 100644 (file)
if ($this->dn != "" && isset($_GET['PerformIsoCreation'])){
- $return_button = "<form type='get' action='main.php' target='_parent'>
+ $return_button = "<form method='get' action='main.php' target='_parent'>
<input type='submit' value='"._("Back")."'>
<input type='hidden' name='plug' value='".$_GET['plug']."'/>
</form>";
/* 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 '<!-- headers.tpl--><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/transitional.dtd">
- <html><head><title></title><style type="text/css">@import url("themes/default/style.css");</style>';
- echo "<script language=\"javascript\" src=\"include/focus.js\" type=\"text/javascript\"></script>";
- echo "</head>";
- echo "<body style='background: none;'>
- <script language=\"javascript\" type=\"text/javascript\">
- document.body.scrollTop = document.body.scrollHeight - document.body.clientHeight;
- </script>
- <pre>";
+ echo ' <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+ <html>
+ <head>
+ <title></title>
+ <style type="text/css">@import url("themes/default/style.css");</style>
+ <script language="javascript" src="include/focus.js" type="text/javascript"></script>
+ </head>
+ <body style="background: none; margin:4px;" id="body" >
+ <pre>';
/* 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]);
while (!feof($pipes[1])){
$cur_dat = fgets($pipes[1], 1024);
echo $cur_dat;
- echo "<script language=\"javascript\" type=\"text/javascript\">scrollDown2();</script>" ;
+ echo '<script language="javascript" type="text/javascript">scrollDown2();</script>' ;
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 "</pre>";
}
/* Scroll down completly */
- echo "<script language=\"javascript\" type=\"text/javascript\">scrollDown2();</script>" ;
- echo "</body></html>";
+ echo '<script language="javascript" type="text/javascript">scrollDown2();</script>' ;
+ echo '</body></html>';
flush();
exit;
}
$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;
}
}
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));
}
$type= 'R'.$type;
break;
case 'install':
- $type= 'Y'.$type;
- break;
case 'sysinfo':
- $type= 'Y'.$type;
- break;
case 'softupdate':
+ case 'scheduledupdate':
$type= 'Y'.$type;
break;
}