From: cajus Date: Mon, 13 Nov 2006 09:27:30 +0000 (+0000) Subject: Fixed object locking X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c7265e3d999c1299597fdddf1a7054b82d396ae1;p=gosa.git Fixed object locking git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5079 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/html/include/focus.js b/html/include/focus.js index 2ee14d6b6..1dbb364ee 100644 --- a/html/include/focus.js +++ b/html/include/focus.js @@ -1,4 +1,5 @@ var browserType; +var timeout; if (document.layers) {browserType = "nn4"} if (document.all) {browserType = "ie"} @@ -15,6 +16,11 @@ for (iln = 0; iln < len; iln++){ netscape= (ver.charAt(iln+1).toUpperCase() != "C"); +function scrollDown() { + document.body.scrollTop = document.body.scrollHeight - document.body.clientHeight; + timeout= setTimeout("scrollDown()", 500); +} + function keyPress(DnEvents) { // determines whether Netscape or Internet Explorer k = (netscape) ? DnEvents.keyCode : window.event.keyCode; diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index 4c8464826..113894274 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -810,6 +810,12 @@ class appgroup extends plugin $ret[$attrs['dn']] = $name; } } + + /* Set releases to / id nor presenet */ + if (!count($ret)){ + $ret['/']= '/'; + } + return($ret); } diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc index 9a1b941a2..a039c2ecc 100644 --- a/plugins/admin/systems/class_systemManagement.inc +++ b/plugins/admin/systems/class_systemManagement.inc @@ -226,12 +226,65 @@ class systems extends plugin Create FAI CD ... ********************/ if ($s_action=="gen_cd"){ +echo "ACL CHECK!"; $this->dn= $this->terminals[$s_entry]['dn']; $_SESSION['objectinfo']= $this->dn; return ($smarty->fetch(get_template_path('gencd.tpl', TRUE))); } + /* Start CD-Creation */ + if (isset($_POST["cd_create"])){ +echo "ACL CHECK!"; + $smarty->assign("src", "?plug=".$_GET['plug']."&PerformIsoCreation"); + return ($smarty->fetch(get_template_path('gencd_frame.tpl', TRUE))); + } + + if ($this->dn != "" && isset($_GET['PerformIsoCreation'])){ +echo "ACL CHECK!"; + + $command= search_config($this->config->data['TABS'], "workgeneric", "ISOCMD"); + if (check_command($command)){ + @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute"); + + $dsc= array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => array("pipe", "w")); + echo ""; + echo ""; + echo ""; + echo "

";
+        $process= proc_open($command, $dsc, $pipes, '/tmp');
+        if (is_resource($process)) {
+          fclose($pipes[0]);
+          while (!feof($pipes[1])){
+            echo fgets($pipes[1], 1024);
+            flush();
+          }
+        }
+        $buffer= stream_get_contents($pipes[2]);
+        fclose($pipes[1]);
+        fclose($pipes[2]);
+        $ret= proc_close($process);
+        echo "

"; + + if ($ret == 0){ + echo "hier der runterladen button"; + } else { + echo "

"._("Creating the image failed. Please see the report below.")."

"; + echo "

$buffer

"; + } + + } else { + $tmp= "

".sprintf(_("Command '%s', specified for ISO creation doesn't seem to exist."), $command)."

"; + echo $tmp; + } + + echo ""; + echo ""; + + exit; + } + + /******************** Change password ... diff --git a/plugins/admin/systems/gencd.tpl b/plugins/admin/systems/gencd.tpl index d5f3bc341..46d55e558 100644 --- a/plugins/admin/systems/gencd.tpl +++ b/plugins/admin/systems/gencd.tpl @@ -1,5 +1,8 @@

- {t}This dialog is not ready yet. Please hold the line.{/t} + {t}CD-Install-Image generation{/t} +

+ {t}This option enables you to generate FAI install CD images for the selected workstation. The procedure may take about 10 minutes to complete, so please be patient after pressing the "Create ISO-Image" button.{/t}