X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_systemManagement.inc;h=25b8bd30daa089122b8ffc09382c2e13d1f5261b;hb=e1caeaac864e3118ac900e3fc2d697bd88da1326;hp=b19b57cb3dac446345303acab36a502602351dbe;hpb=408dda1f13eaab930b68d47cca237d2c866d9aa1;p=gosa.git
diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index b19b57cb3..25b8bd30d 100644
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -39,7 +39,6 @@ class systems extends plugin
var $ui= NULL;
var $acl= "";
var $DivListSystem;
- var $image_creation_log ="";
function systems ($config, $ui)
{
@@ -234,72 +233,67 @@ class systems extends plugin
/* Start CD-Creation */
if (isset($_POST["cd_create"])){
- $smarty->assign("src", "?plug=".$_GET['plug']."&PerformIsoCreation");
+ $smarty->assign("src", "?plug=".$_GET['plug']."&PerformIsoCreation");
return ($smarty->fetch(get_template_path('gencd_frame.tpl', TRUE)));
}
if ($this->dn != "" && isset($_GET['PerformIsoCreation'])){
- /* Initialize some attributes */
- $this->image_creation_log = "";
- $download_button = "
"; + echo ' + + ++ + + + + '; /* Open process handle and check if it is a valid process */ - $process= proc_open($command, $dsc, $pipes, '/tmp'); + $process= proc_open($command, $dsc, $pipes); if (is_resource($process)) { fclose($pipes[0]); /* Print out returned lines && write JS to scroll down each line */ while (!feof($pipes[1])){ $cur_dat = fgets($pipes[1], 1024); - $this->image_creation_log .= $cur_dat; 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 ""; /* Check return code */ $ret= proc_close($process); - if ($ret == 0){ - - /* No error */ - $this->image_creation_log.="\n\nSuccessfull finished image creation.\n\n"; - } else { - - /* Error */ + if ($ret != 0){ echo ""._("Creating the image failed. Please see the report below.")."
"; echo "$buffer"; - - $this->image_creation_log.="\n\nImage creation failed. Please see report below : \n\n"; - $this->image_creation_log.=$buffer."\n\n"; } - echo $return_button.$download_button; + echo $return_button."
"; } else { $tmp= "".sprintf(_("Command '%s', specified for ISO creation doesn't seem to exist."), $command)."
"; @@ -307,40 +301,13 @@ class systems extends plugin } /* Scroll down completly */ - echo "" ; - echo ""; + echo '' ; + echo ''; flush(); exit; } - /****************** - FAI Image creation logfile requested - ******************/ - if(isset($_GET['download_image_log'])){ - - /* force download dialog */ - header("Content-type: application/tiff\n"); - if (preg_match('/MSIE 5.5/', $HTTP_USER_AGENT) || - preg_match('/MSIE 6.0/', $HTTP_USER_AGENT)) { - header('Content-Disposition: filename="image.log"'); - } else { - header('Content-Disposition: attachment; filename="image.log"'); - } - header("Content-transfer-encoding: binary\n"); - header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); - header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - header("Cache-Control: no-cache"); - header("Pragma: no-cache"); - header("Cache-Control: post-check=0, pre-check=0"); - - echo $this->image_creation_log; - - exit(); - } - - - /******************** Change password ... ********************/