Updated implicit_flush detection, it should be turned off not on

[gosa.git] / setup / class_setupStep_Config2.inc

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 78d6094567a199d6093f78612d7cdac1417374c1..d238af0455f89790251f38bde337ef73bef07166 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -24,7 +24,6 @@ class Step_Config2 extends setup_step
 {
   var $governmentmode = FALSE;
   var $sambaidmapping = FALSE;
-  var $strict         = TRUE;
   var $header_image = "images/ldapserver.png";
 
   var $cyrusunixstyle = FALSE;
@@ -38,16 +37,21 @@ class Step_Config2 extends setup_step
                                   "wws_ou_active" => FALSE,
                                   "snapshot_active"     => FALSE,
                                   "snapshot_base"       => "ou=snapshots,%base%",
-                                  "snapshot_user"       => "cn=ldapadmin,%base%",
+                                  "snapshot_user"       => "%admin%",
                                   "snapshot_password"   => "",
                                   "snapshot_server"     => "%connection%");
 
   var $samba_settings    = array( "samba_sid"        => "0-815-4711",
                                   "samba_sid_active" => FALSE,
                                   "samba_rid"        => 1000,
+                                  "smbhash"          => 'SMBHASH',
                                   "samba_rid_active" => FALSE); 
 
-  var $attributes = array("strict","governmentmode","sambaidmapping","cyrusunixstyle","mail");
+  var $sambaDomain_found = FALSE;
+
+  var $attributes = array("governmentmode","sambaidmapping","cyrusunixstyle","mail");
+  var $called = FALSE;
+
 
   function Step_Config2()
   {
@@ -56,6 +60,17 @@ class Step_Config2 extends setup_step
     foreach($tmp['name'] as $name){
       $this->mail_methods[$name] = $name;
     }
+
+    /* Look for samba password generation method */
+    if(file_exists("/usr/bin/mkntpasswd")){
+      $pwdhash  = "/usr/bin/mkntpasswd";
+    } elseif (preg_match("/^Usage: mkntpwd /", shell_exec ("mkntpwd 2>&1"))){
+      $pwdhash= "mkntpwd";
+    } else {
+      $pwdhash= 'perl -MCrypt::SmbHash -e "print join(q[:], ntlmgen \$ARGV[0]), $/;"';
+    }
+
+    $this->samba_settings['smbhash'] = $pwdhash;
   }
 
  
@@ -69,6 +84,31 @@ class Step_Config2 extends setup_step
  
   function execute()
   {
+    /* On first call check for rid/sid base */
+    $cv = $this->parent->captured_values;
+    $ldap = new LDAP($cv['admin'],
+        $cv['password'],
+        $cv['connection'],
+        FALSE,
+        $cv['tls']);
+
+    $ldap->cd($cv['base']);
+    $ldap->search("(objectClass=sambaDomain)",array("dn"));
+    if($ldap->count()){
+      $this->sambaDomain_found =TRUE;
+    }else{
+      $this->sambaDomain_found =FALSE;
+    }
+
+    if(!$this->called){
+      if(!$this->sambaDomain_found){
+        $this->samba_settings['samba_sid_active'] = TRUE;
+        $this->samba_settings['samba_rid_active'] = TRUE;
+      }
+   
+      $this->called = TRUE;
+    }
+
     /* Update snapshot values, with already collected values */
     foreach($this->generic_settings as $key => $value){
       foreach(array("snapshot_base","snapshot_user","snapshot_server") as $attr){
@@ -81,6 +121,7 @@ class Step_Config2 extends setup_step
     }
 
     $smarty = get_smarty();
+    $smarty->assign("sambaDomain_found",$this->sambaDomain_found);
     $smarty->assign("generic_settings",$this->generic_settings);
     $smarty->assign("mail_settings",$this->mail_settings);
     $smarty->assign("mail_methods",$this->mail_methods);
@@ -99,7 +140,7 @@ class Step_Config2 extends setup_step
       /* Get attributes */
       foreach($this->attributes as $attr){
         if(isset($_POST[$attr])){
-          $this->$attr = validate($_POST[$attr]);
+          $this->$attr = validate(get_post($attr));
         }
       }
 
@@ -107,20 +148,20 @@ class Step_Config2 extends setup_step
       if(isset($_POST['vacationdir_active'])){
         $this->mail_settings['vacationdir_active'] = TRUE;
         if(isset($_POST['vacationdir'])){
-          $this->mail_settings['vacationdir'] = $_POST['vacationdir'];
+          $this->mail_settings['vacationdir'] = get_post('vacationdir');
         }
       }else{
         $this->mail_settings['vacationdir_active'] = FALSE;
       }
 
       if(isset($_POST['enableCopyPaste'])){
-        $this->generic_settings['enableCopyPaste'] = $_POST['enableCopyPaste'];
+        $this->generic_settings['enableCopyPaste'] = get_post('enableCopyPaste');
       }
 
       if(isset($_POST['wws_ou_active'])){
         $this->generic_settings['wws_ou_active'] = TRUE;
         if(isset($_POST['wws_ou'])){
-          $this->generic_settings['wws_ou'] = $_POST['wws_ou'];
+          $this->generic_settings['wws_ou'] = get_post('wws_ou');
         }
       }else{
         $this->generic_settings['wws_ou_active'] = FALSE;
@@ -129,16 +170,16 @@ class Step_Config2 extends setup_step
       if(isset($_POST['snapshot_active'])){
         $this->generic_settings['snapshot_active'] = TRUE;
         if(isset($_POST['snapshot_base'])){
-          $this->generic_settings['snapshot_base'] = $_POST['snapshot_base'];
+          $this->generic_settings['snapshot_base'] = get_post('snapshot_base');
         }
         if(isset($_POST['snapshot_user'])){
-          $this->generic_settings['snapshot_user'] = $_POST['snapshot_user'];
+          $this->generic_settings['snapshot_user'] = get_post('snapshot_user');
         }
         if(isset($_POST['snapshot_password'])){
-          $this->generic_settings['snapshot_password'] = $_POST['snapshot_password'];
+          $this->generic_settings['snapshot_password'] = get_post('snapshot_password');
         }
         if(isset($_POST['snapshot_server'])){
-          $this->generic_settings['snapshot_server'] = $_POST['snapshot_server'];
+          $this->generic_settings['snapshot_server'] = get_post('snapshot_server');
         }
       }else{
         $this->generic_settings['snapshot_active'] = FALSE;
@@ -148,7 +189,7 @@ class Step_Config2 extends setup_step
       if(isset($_POST['samba_sid_active'])){
         $this->samba_settings['samba_sid_active'] = TRUE;
         if(isset($_POST['samba_sid'])){
-          $this->samba_settings['samba_sid'] = $_POST['samba_sid'];
+          $this->samba_settings['samba_sid'] = get_post('samba_sid');
         }
       }else{
         $this->samba_settings['samba_sid_active'] = FALSE;
@@ -156,12 +197,19 @@ class Step_Config2 extends setup_step
       if(isset($_POST['samba_rid_active'])){
         $this->samba_settings['samba_rid_active'] = TRUE;
         if(isset($_POST['samba_rid'])){
-          $this->samba_settings['samba_rid'] = $_POST['samba_rid'];
+          $this->samba_settings['samba_rid'] = get_post('samba_rid');
         }
       }else{
         $this->samba_settings['samba_rid_active'] = FALSE;
       }
+      if(isset($_POST['smbhash'])){
+        $this->samba_settings['smbhash'] = get_post('smbhash');
+      }
 
+      if(!$this->sambaDomain_found){
+        $this->samba_settings['samba_sid_active'] = TRUE;
+        $this->samba_settings['samba_rid_active'] = TRUE;
+      }
     }
 
     $tmp = $this->check();