From 6a1a66d8a6cd5da5cd6b48c3e9719db322f96435 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 13 Dec 2006 06:08:45 +0000 Subject: [PATCH] Added some fixes for iframe scrolling git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5369 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/include/focus.js | 12 ++++++ .../admin/systems/class_systemManagement.inc | 37 +++++++++---------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/html/include/focus.js b/html/include/focus.js index cb9f8c195..1a1fb7748 100644 --- a/html/include/focus.js +++ b/html/include/focus.js @@ -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) { diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc index 29edf92b9..abb6651c0 100644 --- a/plugins/admin/systems/class_systemManagement.inc +++ b/plugins/admin/systems/class_systemManagement.inc @@ -141,7 +141,7 @@ class systems extends plugin if ($this->dn != "" && isset($_GET['PerformIsoCreation'])){ - $return_button = "
+ $return_button = "
"; @@ -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 ' - '; - echo ""; - echo ""; - echo " - -
";
+        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]);
 
@@ -175,26 +173,27 @@ class systems extends plugin
           while (!feof($pipes[1])){
             $cur_dat = fgets($pipes[1], 1024);
             echo $cur_dat;
-            echo "" ;
+            echo '' ;
             flush();
           }
         }
 
         /* Get error string && close streams */
         $buffer= stream_get_contents($pipes[2]);
+
         fclose($pipes[1]);
         fclose($pipes[2]);
         echo "
"; - /* Check return code */ $ret= proc_close($process); if ($ret != 0){ echo "

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

"; echo "
$buffer
"; } - - $this->dn = ""; + + + echo $return_button."
"; } else { @@ -203,8 +202,8 @@ class systems extends plugin } /* Scroll down completly */ - echo "" ; - echo ""; + echo '' ; + echo ''; flush(); exit; } -- 2.30.2