Added DNS and DHCP enable disable options into setup step 2

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 86e1d7b9f65a7254a4c769e005a954940958855b..3bbcdd2e0014a5d8065309258f314d6eb1cd6f7f 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -173,6 +173,16 @@
            <tab class="faiSummaryTab" name="FAI summary" />
 {else}
 <!--    <tab class="faiSummaryTab" name="FAI summary" /> -->
+{/if}
+{if $cv.generic_settings.enableDNS}
+          <tab class="servdns" name="DNS" />
+{else}
+<!--   <tab class="servdns" name="DNS" /> -->
+{/if}
+{if $cv.generic_settings.enableDHCP}
+          <tab class="servdhcp" name="DHCP" />
+{else}
+<!--   <tab class="servdhcp" name="DHCP" /> -->
 {/if}
                <tab class="terminfo" name="Information" />
                <tab class="glpiAccount" name="Inventory" />

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index aa60c34c822a0bbcad17c36300243352c2022453..553bdef897dd05cc3c310e2162e882864fd6f6e2 100644 (file)
--- 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,
@@ -122,6 +124,14 @@ class Step_Config2 extends setup_step
 #        $this->enableFAI_management = 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;
     }
 
@@ -179,6 +189,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;

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index bce647ec1fb008357f2cb30b192091072455b24f..e216ddcdcd369d1d3d1e3d40d8e864af3b774d58 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -98,6 +98,30 @@
         </div>
     </div>
 
+       <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Enable DNS extension{/t}
+        </div>
+        <div class='step4_value'>
+
+            <select name="enableDNS" size="1" title="">
+                {html_options options=$bool selected=$generic_settings.enableDNS}
+            </select>
+        </div>
+    </div>
+
+       <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Enable DHCP extension{/t}
+        </div>
+        <div class='step4_value'>
+
+            <select name="enableDHCP" size="1" title="">
+                {html_options options=$bool selected=$generic_settings.enableDHCP}
+            </select>
+        </div>
+    </div>
+
        <div class='step4_container'>
         <div class='step4_name'>
             {t}Enable FAI release management{/t}