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

diff --git a/ihtml/themes/default/setup_introduction.tpl b/ihtml/themes/default/setup_introduction.tpl
index abdf49860c2f124ace51b5f2747bc68f706fea74..451855b523207da276b76e8eb7cc659a5ed05027 100644 (file)
--- a/ihtml/themes/default/setup_introduction.tpl
+++ b/ihtml/themes/default/setup_introduction.tpl
@@ -9,7 +9,7 @@
 </div>
 <p class="plugbottom">
  <input type="hidden" name="next" value="2">
- <input type='submit' name='continue' value='{t}Continue{/t}'>
+ <input type='submit' name='continue' value='{t}Continue{/t}' {$mode}>
 </p>
 
 <p class="seperator">&nbsp;</p>

diff --git a/ihtml/themes/default/setup_step2.tpl b/ihtml/themes/default/setup_step2.tpl
index 6d23e42efe2e85688544fbe3c855977f4ac7adbc..763b3f1f5278a384ebd3e0b0eebcc507ba163bd7 100644 (file)
--- a/ihtml/themes/default/setup_step2.tpl
+++ b/ihtml/themes/default/setup_step2.tpl
@@ -10,5 +10,5 @@
 <p class="plugbottom">
  <input type="hidden" name="next" value="3">
  <input type='submit' name='back' value='{t}Back{/t}'>
- <input type='submit' name='continue2' value='{t}Continue{/t}'>
+ <input type='submit' name='continue2' value='{t}Continue{/t}' {$mode}>
 </p>

diff --git a/include/functions_setup.inc b/include/functions_setup.inc
index 8c19f8fa25c663d929fc843258029e0d708fd254..8dac4a887251575c429fca4f54059b077f0b7125 100644 (file)
--- 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));