From: cajus Date: Tue, 7 Nov 2006 13:32:11 +0000 (+0000) Subject: Commited grey out X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7a64ab67c5336ecb91cff441f9e22e8a1ef52fcf;p=gosa.git Commited grey out git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5036 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/html/setup.php b/html/setup.php index aec16d04d..b41669a23 100644 --- a/html/setup.php +++ b/html/setup.php @@ -22,14 +22,13 @@ session_start(); $_SESSION['DEBUGLEVEL']= 1; - if (!isset($_GET['js']) && !isset($_SESSION['js'])){ echo ''; $_SESSION['js']= FALSE; -} else { +} elseif(isset($_GET['js'])) { $_SESSION['js']= TRUE; } @@ -56,6 +55,10 @@ if (!file_exists(CONFIG_TEMPLATE_DIR."/gosa.conf")){ // No Errors occured yet $_SESSION['errors']= ""; +$_SESSION['errors'] = ""; +$_SESSION['errorsAlreadyPosted']= array(); +$_SESSION['LastError'] = ""; + // Print out gosa.conf //if(isset($_SESSION['classes'])) print "\$_SESSION['classes']=ok"; @@ -133,13 +136,13 @@ if($next < 1){ // and we call this func again, to output the error // I hope this will work fine ^^ -if((!show_setup_page1(false))||($next == 1)) { +if((show_setup_page1(false))||($next == 1)) { show_setup_page1(); -} elseif((!show_setup_page2(false))||($next==2)) { +} elseif((show_setup_page2(false))||($next==2)) { show_setup_page2(); -} elseif((!show_setup_page3(false))||($next==3)) { +} elseif((show_setup_page3(false))||($next==3)) { show_setup_page3(); -} elseif((!show_setup_page4(false))||($next==4)) { +} elseif((show_setup_page4(false))||($next==4)) { show_setup_page4(); } // This is called to test if we have an administrative Group with a User in it diff --git a/include/functions_setup.inc b/include/functions_setup.inc index cabcbbdb1..8c19f8fa2 100644 --- a/include/functions_setup.inc +++ b/include/functions_setup.inc @@ -622,7 +622,7 @@ function parse_contrib_conf() /* Show setup_page 1 */ function show_setup_page1($withoutput = true) { - $faults = array(); + $faults = false; $smarty = get_smarty(); $smarty->assign ("content", get_template_path('setup_introduction.tpl')); $smarty->assign ("tests", perform_php_checks($faults)); @@ -646,7 +646,7 @@ function show_setup_page1($withoutput = true) $smarty->display (get_template_path('setup.tpl')); } - return (!$faults); + return ($faults); } @@ -671,7 +671,7 @@ function show_setup_page2($withoutput = true) $smarty->display (get_template_path('setup.tpl')); } - return (!$faults); + return ($faults); } @@ -701,18 +701,7 @@ function show_setup_page3($withoutput = true) /* No error till now */ $fault = false; - /* If we pushed the Button continue */ - if(isset($_POST['continue3'])){ - if(!isset($uri)) { - $fault = true; - - /* Output the Error */ - if($withoutput) { - print_red (_("You've to specify an ldap server before continuing!")); - $smarty->assign ("content", get_template_path('setup_step3.tpl')); - } - } - } elseif (!$ds = @ldap_connect (validate($uri))) { + if (!$ds = @ldap_connect (validate($uri))) { $fault =true; /* Output the Error */ @@ -757,7 +746,7 @@ function show_setup_page3($withoutput = true) $smarty->display (get_template_path('setup.tpl')); } - return (!$fault); + return ($fault); } @@ -765,6 +754,34 @@ function show_setup_page4($withoutput = true) { $smarty= get_smarty(); + /* check POST data */ + if(isset($_POST['check'])) { + + /* Check if all needed vars are submitted */ + foreach($checkvars as $key) { + if($key == "peopleou"){ + continue; + } + if($key == "groupou"){ + continue; + } + + if((isset($_POST[$key]))&&($_POST[$key]!="")) { + $_SESSION['ldapconf'][$key] = $_POST[$key]; + } else { + if($withoutput) { + print_red(sprintf(_("You're missing the required attribute '%s' from this formular. Please complete!"), $key)); + } + $fault = true; + } + } + } + + /* Transfer base */ + if(isset($_POST['base'])){ + $_SESSION['ldapconf']['base']= $_POST['base']; + } + // ? if(!isset($_SESSION['ldapconf']['base'])){ $_SESSION['ldapconf']['base']= $base; @@ -797,7 +814,7 @@ function show_setup_page4($withoutput = true) /* If there are some empty vars in ldapconnect - these values also represent out default values */ - if(!$ds = @ldap_connect (validate($uri))){ + if(!$ds = @ldap_connect (validate($uri))){ $fault = true; if($withoutput){ print_red (_("Can't connect to the specified LDAP server! Please make sure that is reachable for GOsa.")); @@ -805,22 +822,21 @@ function show_setup_page4($withoutput = true) } elseif(!@ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3)){ $fault = true; if($withoutput){ - print_red (_("Can't bind to the specified LDAP server! Please make sure that it is reachable for GOsa.")); + print_red (_("Can't set ldap protocol version 3.")); } } elseif(!$r= @ldap_bind ($ds)){ $fault = true; if($withoutput){ - print_red (_("Can't bind to the specified LDAP server! Please make sure that it is reachable for GOsa.")); + print_red (_("Could not bind to the specified LDAP server! Please make sure that it is reachable for GOsa.")); } } else { - $sr= @ldap_search ($ds, NULL, "objectClass=*", array("namingContexts")); + $sr= @ldap_search ($r, NULL, "objectClass=*", array("namingContexts")); $attr= @ldap_get_entries($ds,$sr); if((empty($attr))) { - $base= "dc=example,dc=net"; if($withoutput){ - print_red(_("Bind to server successful, but the server seems to be completly empty, please check all information twice")); +# print_red(_("Bind to server successful, but the server seems to be completly empty, please check all information twice")); } } else { @@ -860,34 +876,6 @@ function show_setup_page4($withoutput = true) $_SESSION['ldapconf']['arr_crypts'] = $tmp['md5']; } - /* check POST data */ - if(isset($_POST['check'])) { - - /* Check if all needed vars are submitted */ - foreach($checkvars as $key) { - if($key == "peopleou"){ - continue; - } - if($key == "groupou"){ - continue; - } - - if((isset($_POST[$key]))&&($_POST[$key]!="")) { - $_SESSION['ldapconf'][$key] = $_POST[$key]; - } else { - if($withoutput) { - print_red(sprintf(_("You're missing the required attribute '%s' from this formular. Please complete!"), $key)); - } - $fault = true; - } - } - } - - /* Transfer base */ - if(isset($_POST['base'])){ - $_SESSION['ldapconf']['base']= $_POST['base']; - } - $smarty->assign("arr_cryptkeys",$_SESSION['ldapconf']['arr_cryptkeys']); $smarty->assign("mail_methods", $_SESSION['ldapconf']['mail_methods']); @@ -895,7 +883,7 @@ function show_setup_page4($withoutput = true) $smarty->assign($key,$val); } - if(isset($_POST['check'])) { + if(isset($_POST['check']) || (isset($_POST['admin'])) && isset($_POST['password'])) { $ldap= new LDAP($_SESSION['ldapconf']['admin'], $_SESSION['ldapconf']['password'], $_SESSION['ldapconf']['uri']); @@ -934,7 +922,8 @@ function show_setup_page4($withoutput = true) if($withoutput){ $smarty->display (get_template_path('setup.tpl')); } - return (!$fault); + + return ($fault); }