From d95bc63eea9befa2ab237f3af670edbec31bed03 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 8 Nov 2006 06:38:24 +0000 Subject: [PATCH] Fixed grey out for setup step 1&2 git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5039 594d385d-05f5-0310-b6e9-bd551577e9d8 --- ihtml/themes/default/setup_introduction.tpl | 2 +- ihtml/themes/default/setup_step2.tpl | 2 +- include/functions_setup.inc | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ihtml/themes/default/setup_introduction.tpl b/ihtml/themes/default/setup_introduction.tpl index abdf49860..451855b52 100644 --- a/ihtml/themes/default/setup_introduction.tpl +++ b/ihtml/themes/default/setup_introduction.tpl @@ -9,7 +9,7 @@

- +

 

diff --git a/ihtml/themes/default/setup_step2.tpl b/ihtml/themes/default/setup_step2.tpl index 6d23e42ef..763b3f1f5 100644 --- a/ihtml/themes/default/setup_step2.tpl +++ b/ihtml/themes/default/setup_step2.tpl @@ -10,5 +10,5 @@

- +

diff --git a/include/functions_setup.inc b/include/functions_setup.inc index 8c19f8fa2..8dac4a887 100644 --- a/include/functions_setup.inc +++ b/include/functions_setup.inc @@ -622,11 +622,14 @@ function parse_contrib_conf() /* Show setup_page 1 */ function show_setup_page1($withoutput = true) { - $faults = false; + $faults = false; + $faults2 = false; $smarty = get_smarty(); $smarty->assign ("content", get_template_path('setup_introduction.tpl')); $smarty->assign ("tests", perform_php_checks($faults)); - $smarty->assign ("detailed_tests", perform_additional_function_checks($faults)); + $smarty->assign ("detailed_tests", perform_additional_function_checks($faults2)); + + $faults = $faults || $faults2; /* This var is true if anything went wrong */ if ($faults){ @@ -653,7 +656,7 @@ function show_setup_page1($withoutput = true) /* Show setup_page 2 */ function show_setup_page2($withoutput = true) { - $faults = array(); + $faults = false; $smarty = get_smarty(); $smarty->assign ("content", get_template_path('setup_step2.tpl')); $smarty->assign ("tests", perform_additional_checks($faults)); -- 2.30.2