From cc6ce8550dcc13775eb670b7fd09eadafcdc390d Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Thu, 18 Jun 2009 18:42:45 +0000 Subject: [PATCH] Updates to system p set up wizard git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3603 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-web/lib/functions.php | 4 + xCAT-web/lib/phpinfo.php | 2 +- xCAT-web/lib/wizard.css | 2 +- xCAT-web/machines/discover.php | 156 +++++++++++++++++++-------------- 4 files changed, 97 insertions(+), 67 deletions(-) diff --git a/xCAT-web/lib/functions.php b/xCAT-web/lib/functions.php index 3f06126e7..5f4d65168 100644 --- a/xCAT-web/lib/functions.php +++ b/xCAT-web/lib/functions.php @@ -452,6 +452,10 @@ function dumpGlobals() { foreach ($_POST as $key => $val) { trace("$key=$val."); } trace('$_COOKIE:'); foreach ($_COOKIE as $key => $val) { trace("$key=$val."); } + trace('$_ENV:'); + foreach ($_ENV as $key => $val) { trace("$key=$val."); } + trace('$_SERVER:'); + foreach ($_SERVER as $key => $val) { trace("$key=$val."); } if (isset($_SESSION)) { trace('$_SESSION:'); foreach ($_SESSION as $key => $val) { trace("$key=$val."); } diff --git a/xCAT-web/lib/phpinfo.php b/xCAT-web/lib/phpinfo.php index 87f26f583..e97e4f660 100644 --- a/xCAT-web/lib/phpinfo.php +++ b/xCAT-web/lib/phpinfo.php @@ -11,7 +11,7 @@ echo "\n"; //insertLogin(); dumpGlobals(); -echo '

'; print_r($_SESSION['editable-hosts']); echo "

\n"; +//echo '

'; print_r($_SESSION['editable-hosts']); echo "

\n"; //foreach ($_SESSION['editable-deps'] as $key => $val) { trace("$key=$val."); } /* diff --git a/xCAT-web/lib/wizard.css b/xCAT-web/lib/wizard.css index 2378af087..918217f2f 100644 --- a/xCAT-web/lib/wizard.css +++ b/xCAT-web/lib/wizard.css @@ -52,7 +52,7 @@ .WizardProgressTable P#output { margin-left: 35px; } -.WizardProgressTable IFRAME#output { margin-left: 35px; width: 400px; } +.WizardProgressTable IFRAME#output { margin-left: 35px; width: 400px; height: 400px; } .WizardProgressOutput { margin: 0px; } diff --git a/xCAT-web/machines/discover.php b/xCAT-web/machines/discover.php index 59f1dd4b9..0d0773202 100644 --- a/xCAT-web/machines/discover.php +++ b/xCAT-web/machines/discover.php @@ -117,26 +117,6 @@ echo "