X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fclass_setupStep_Config2.inc;h=e6b96b10cd333da4261ba4a26cda2fd7828709d3;hb=d6c1462b8f1edcd9381f25b969a7f8af3704673c;hp=872d8ccfa3f1fb5014480b09dbdc65ed2509094e;hpb=6e4835c17e05ba3c8ce607936ab8c48b44d33680;p=gosa.git

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 872d8ccfa..e6b96b10c 100644
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -33,6 +33,8 @@ class Step_Config2 extends setup_step
                              "vacationdir_active" => FALSE);
 
   var $generic_settings  = array( "enableCopyPaste" => false,
+                                  "enableDNS"      => false,
+                                  "enableDHCP"      => false,
                                   "wws_ou"        => "ou=winstations",
                                   "wws_ou_active" => FALSE,
                                   "snapshot_active"     => FALSE,
@@ -50,11 +52,12 @@ class Step_Config2 extends setup_step
   var $sambaDomain_found    = FALSE;
   var $use_netatalk         = FALSE;
   var $enableFAI_management = FALSE;
+  var $enableMimeType       = FALSE;
 
   var $timezone       = "Europe/Berlin";
   var $timezones      = array();
 
-  var $attributes = array("governmentmode","sambaidmapping","cyrusunixstyle","mail","use_netatalk","enableFAI_management","timezone");
+  var $attributes = array("governmentmode","sambaidmapping","cyrusunixstyle","mail","use_netatalk","enableFAI_management","timezone","enableMimeType");
   var $called = FALSE;
 
   function Step_Config2()
@@ -74,7 +77,7 @@ class Step_Config2 extends setup_step
       $pwdhash= 'perl -MCrypt::SmbHash -e "print join(q[:], ntlmgen \$ARGV[0]), $/;"';
     }
 
-    $this->timezones = get_timezones_array();
+    $this->timezones = _get_tz_zones();
     $this->samba_settings['smbhash'] = $pwdhash;
   }
 
@@ -122,6 +125,19 @@ class Step_Config2 extends setup_step
 #        $this->enableFAI_management = TRUE;
       }
 
+      /* Check the MimeType schema is used */
+      if(is_array($tmp) && isset($tmp['gotoMimeType'])){
+        $this->enableMimeType = TRUE;
+      }
+
+      if(is_array($tmp) && isset($tmp['dhcpClass'])){
+        $this->generic_settings['enableDHCP'] = TRUE;
+      }
+
+      if(is_array($tmp) && isset($tmp['dNSZone'])){
+        $this->generic_settings['enableDNS'] = TRUE;
+      }
+
       $this->called = TRUE;
     }
 
@@ -155,7 +171,7 @@ class Step_Config2 extends setup_step
   {
     if(isset($_POST['step6_posted'])){
 
-      if(isset($_POST['timezone']) && isset($this->timezones[$_POST['timezone']])){
+      if(isset($_POST['timezone']) && isset($this->timezones['TIMEZONES'][$_POST['timezone']])){
         $this->timezone = $_POST['timezone'];
       }
 
@@ -179,6 +195,12 @@ class Step_Config2 extends setup_step
       if(isset($_POST['enableCopyPaste'])){
         $this->generic_settings['enableCopyPaste'] = get_post('enableCopyPaste');
       }
+      if(isset($_POST['enableDNS'])){
+        $this->generic_settings['enableDNS'] = get_post('enableDNS');
+      }
+      if(isset($_POST['enableDHCP'])){
+        $this->generic_settings['enableDHCP'] = get_post('enableDHCP');
+      }
 
       if(isset($_POST['wws_ou_active'])){
         $this->generic_settings['wws_ou_active'] = TRUE;