[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 02d58d4)
Fixed object locking
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 13 Nov 2006 09:27:30 +0000 (09:27 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 13 Nov 2006 09:27:30 +0000 (09:27 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5079 594d385d-05f5-0310-b6e9-bd551577e9d8

html/include/focus.js patch | blob | history
plugins/admin/groups/class_groupApplication.inc patch | blob | history
plugins/admin/systems/class_systemManagement.inc patch | blob | history
plugins/admin/systems/gencd.tpl patch | blob | history

diff --git a/html/include/focus.js b/html/include/focus.js
index 2ee14d6b63c2cc088f12346022fbc4120f1af1c0..1dbb364eefede325a221f6576d7cccc93f4e9a89 100644 (file)
--- 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 4c84648265be1e65665ad902c3c037b1317548f6..113894274e74ade2e1150f00eab33960b22180b3 100644 (file)
--- 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 9a1b941a230c1ef7c7145d6dd6c34319784ab119..a039c2ecca8e3ef1f5715b2cb9340b44c47e326c 100644 (file)
--- 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 "<html><head>";
+        echo "<script language=\"javascript\" src=\"include/focus.js\" type=\"text/javascript\"></script>";
+        echo "</head>";
+        echo "<body onLoad='scrollDown()'><pre>";
+        $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 "</pre>";
+        
+        if ($ret == 0){
+          echo "hier der runterladen button";
+        } else {
+          echo "<h1 style='color:red'>"._("Creating the image failed. Please see the report below.")."</h1>";
+          echo "<pre style='color:red'>$buffer</pre>";
+        }
+
+      } else {
+        $tmp= "<h1 style='color:red'>".sprintf(_("Command '%s', specified for ISO creation doesn't seem to exist."), $command)."</h1>";
+        echo $tmp;
+      }
+
+      echo "<button onClick='clearTimeout(timeout)'>"._("Disable auto scroll")."</button>";
+      echo "</body></html>";
+
+      exit;
+    }
+
+
 
     /********************
       Change password ...   
diff --git a/plugins/admin/systems/gencd.tpl b/plugins/admin/systems/gencd.tpl
index d5f3bc34122bf0a835d99c41337e0a885fe9d113..46d55e55840c0dc8c97f850ae980b88a9d885d35 100644 (file)
--- a/plugins/admin/systems/gencd.tpl
+++ b/plugins/admin/systems/gencd.tpl
@@ -1,5 +1,8 @@
 <p>
- <b>{t}This dialog is not ready yet. Please hold the line.{/t}</b>
+ <b>{t}CD-Install-Image generation{/t}</b>
+</p>
+<p>
+  {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}
 </p>
 
 <p class="plugbottom">
GONICUS system administrator (SVN clone)