setup asks for base

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@373 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/ihtml/themes/default/setup_step4.tpl b/ihtml/themes/default/setup_step4.tpl
index dd9d4ce31d29899d8b5c0eb577e0422f7f7a93d8..194b40cd4e332bc2c6144d2dc0e1660618032b4d 100644 (file)
--- a/ihtml/themes/default/setup_step4.tpl
+++ b/ihtml/themes/default/setup_step4.tpl
@@ -35,6 +35,10 @@
 </p>
 
 <table>
+ <tr>
+  <td>{t}Base {/t}</td>
+  <td><input type='text' name='base' maxlength='40' size='20' value='{$base}'></td>
+ </tr>
  <tr>
   <td>{t}People storage ou{/t}</td>
   <td><input type='text' name='peopleou' maxlength='40' size='20' value='{$peopleou}'></td>

diff --git a/include/setup_checks.inc b/include/setup_checks.inc
index 5dedce74791cae3e02d944fe313f35f63851ea22..eb9138db75d15f2f80d9ed7917ce1b5464b4cd16 100644 (file)
--- a/include/setup_checks.inc
+++ b/include/setup_checks.inc
@@ -764,6 +764,10 @@ function show_setup_page4($withoutput = true)
 {
 
 
+
+  if(!isset($_SESSION['ldapconf']['base']))           $_SESSION['ldapconf']['base']         = $base;
+
+  if(!isset($_SESSION['ldapconf']['base']))           $_SESSION['ldapconf']['base']         = $base;
   require_once("class_password-methods.inc");
 
   error_reporting(E_ALL);
@@ -777,7 +781,7 @@ function show_setup_page4($withoutput = true)
   $ldapconf     = $_SESSION['ldapconf'];        // The ldap Configuration informations, we collected while setup 
   $arr_crypts   = array();                      // array which includes contains all possible password crypting methods
   $temp         = "";                           // Temp
-  $checkvars    = array("location","admin","password","peopleou","peopledn","arr_crypts","mail","uidbase");
+  $checkvars    = array("location","admin","password","peopleou","peopledn","arr_crypts","mail","uidbase","base");
 
 
   if(!isset($_SESSION['ldapconf']['arr_cryptkeys']))
@@ -888,7 +892,8 @@ function show_setup_page4($withoutput = true)
 
   }
 
-
+  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']);
@@ -947,6 +952,8 @@ function show_setup_page5($withoutput=true)
   // Get ldapconf
   $ldapconf= $_SESSION['ldapconf'];
 
+  print_a($_SESSION);
+
   // get smarty
   $smarty = get_smarty();