Code

Added some fixes for iframe scrolling
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 13 Dec 2006 06:08:45 +0000 (06:08 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 13 Dec 2006 06:08:45 +0000 (06:08 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5369 594d385d-05f5-0310-b6e9-bd551577e9d8

html/include/focus.js
plugins/admin/systems/class_systemManagement.inc

index cb9f8c1950a304e9eb6952dae699ea10b2588196..1a1fb7748de9704d9129fa72e7ad0e1e838862c3 100644 (file)
@@ -15,6 +15,18 @@ 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);
+}
+
+/* Scroll down the body frame */
+function scrollDown2()
+{
+    document.body.scrollTop = document.body.scrollHeight - document.body.clientHeight;
+}
+
+
 /* Toggle checkbox that matches regex */
 function acl_set_all(regex,value)
 {
index 29edf92b90be03d9c48c50e9e54271653777baa6..abb6651c0125351d9f92aedfef266402033582ba 100644 (file)
@@ -141,7 +141,7 @@ class systems extends plugin
 
     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>";
@@ -150,24 +150,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 '<!-- 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, $dsc, $pipes);
         if (is_resource($process)) {
           fclose($pipes[0]);
 
@@ -175,26 +173,27 @@ class systems extends plugin
           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]);
+
         fclose($pipes[1]);
         fclose($pipes[2]);
         echo "</pre>";
 
-
         /* Check return code */
         $ret= proc_close($process);
         if ($ret != 0){
           echo "<h1 style='color:red'>"._("Creating the image failed. Please see the report below.")."</h1>";
           echo "<pre style='color:red'>$buffer</pre>";
         }
-  
-        $this->dn = "";
+
+
+
         echo $return_button."<br>";
 
       } else {
@@ -203,8 +202,8 @@ class systems extends plugin
       }
 
       /* 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;
     }