We don't need a dhcp and dns activation in the gosa.conf anymore, since GOsa is split...

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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index c4d668ce8276f4dc81003bc1eb3541beebb1799b..b90d95454777f7fd9206be0398c2e7d8f351996c 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -38,11 +38,7 @@
       <plugin acl="users/environment:self" class="environment" {if $cv.optional.kioskpath_active} kioskPath="{$cv.optional.kioskpath}"{/if} />
       <plugin acl="users/mailAccount:self" class="mailAccount" />
       <plugin acl="users/sambaAccount:self" class="sambaAccount" />
-{if $cv.use_netatalk}
       <plugin acl="users/netatalk:self" class="netatalk" />
-{else}
-      <!--  <plugin acl="users/netatalk:self" class="netatalk" />  -->
-{/if}
       <plugin acl="users/connectivity:self" class="connectivity" />
       <plugin acl="users/gofaxAccount:self" class="gofaxAccount" />
       <plugin acl="users/phoneAccount:self" class="phoneAccount" />
@@ -58,21 +54,13 @@
       <plugin acl="groups" class="groupManagement" />
       <plugin acl="ogroups" class="ogroupManagement" />
       <plugin acl="application" class="applicationManagement" />
-{if $cv.enableMimeType}
       <plugin acl="mimetypes" class="mimetypeManagement" />
-{else}
-      <!--  <plugin acl="mimetypes"  class="mimetypeManagement" /> -->
-{/if}
       <plugin acl="devices" class="deviceManagement" />
       <plugin acl="terminal/termgeneric,workstation/workgeneric,server/servgeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric,opsi/opsiGeneric" class="systems" />
       <!-- Use 'lockDn'      for dn
                'lockName'    for name
                'lockType'    for branch/freeze -->
-{if $cv.enableFAI_management}
       <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile,fai/faiManagement,opsi/opsiProperties" class="faiManagement" />
-{else}
-      <!--  <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile" class="faiManagement" /> -->
-{/if}
       <plugin acl="gofaxlist" class="blocklist" />
       <plugin acl="gofonmacro" class="goFonMacro" />
       <plugin acl="gofonconference" class="phoneConferenceManagment" />
@@ -119,7 +107,7 @@
      <tab class="environment" name="Environment" />
      <tab class="mailAccount" name="Mail" />
      <tab class="sambaAccount" name="Samba" />
-{if $cv.use_netatalk}     <tab class="netatalk" name="Netatalk" /> {else}<!-- <tab class="netatalk" name="Netatalk" /> --> {/if}
+     <tab class="netatalk" name="Netatalk" />
      <tab class="connectivity" name="Connectivity" />
      <tab class="gofaxAccount" name="Fax" />
      <tab class="phoneAccount" name="Phone" />
@@ -191,13 +179,8 @@
      <tab class="servgeneric" name="Generic" />
      <tab class="workstartup" name="Startup" />
      <tab class="ServerService" name="Services" />
-{if $cv.enableFAI_management}
      <tab class="faiSummaryTab" name="Deployment summary" />
      <tab class="gotoLogView" name="Installation logs" />
-{else}
-     <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
-     <!-- <tab class="gotoLogView" name="Installation logs" /> -->
-{/if}
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </servtabs>
@@ -208,13 +191,8 @@
      <tab class="workservice" name="Devices" />
      <tab class="printgeneric" name="Printer" />
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
-{if $cv.enableFAI_management}
      <tab class="faiSummaryTab" name="Deployment summary" />
      <tab class="gotoLogView" name="Installation logs" />
-{else}
-     <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
-     <!-- <tab class="gotoLogView" name="Installation logs" /> -->
-{/if}
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </worktabs>
 
@@ -326,48 +304,6 @@
     <tab class="csvimport" name="CSV Import" />
   </ldiftab>
 
-  <!-- FAI plugins -->
-{if $cv.enableFAI_management}
-  <faipartitiontabs>
-    <tab class="faiPartitionTable" name="Partitions" />
-  </faipartitiontabs>
-
-  <faiscripttabs>
-    <tab class="faiScript" name="Script" />
-  </faiscripttabs>
-
-  <faihooktabs>
-    <tab class="faiHook" name="Hooks" />
-  </faihooktabs>
-
-  <faivariabletabs>
-    <tab class="faiVariable" name="Variables" />
-  </faivariabletabs>
-
-  <faitemplatetabs>
-    <tab class="faiTemplate" name="Templates" />
-  </faitemplatetabs>
-
-  <faiprofiletabs>
-    <tab class="faiProfile" name="Profiles" />
-    <tab class="faiSummaryTab" name="Summary" />
-  </faiprofiletabs>
-
-  <faipackagetabs>
-    <tab class="faiPackage" name="Packages" />
-  </faipackagetabs>
-
-  <opsitabs>
-    <tab class="opsiGeneric" name="Opsi" />
-    <tab class="opsiSoftware" name="Hardware information" />
-    <tab class="opsiHardware" name="software information" />
-  </opsitabs>
-
-  <opsiprodconfig>
-    <tab class="opsiProperties" name="Config" />
-  </opsiprodconfig>
-{else}
-  <!-- 
   <faipartitiontabs>
     <tab class="faiPartitionTable" name="Partitions" />
   </faipartitiontabs>
@@ -406,9 +342,6 @@
   <opsiprodconfig>
     <tab class="opsiProperties" name="Config" />
   </opsiprodconfig>
-  -->
-{/if}
-
 
   <!-- Logging plugin -->
   <logtabs>

diff --git a/gosa-core/setup/class_setupStep_Config2.inc b/gosa-core/setup/class_setupStep_Config2.inc
index 7a9a1cb8e02edc4dc7ff8637b3d6d2ca0b5657ac..2ec4ede3349fdad879f48aaad3b8508a57c23610 100644 (file)
--- a/gosa-core/setup/class_setupStep_Config2.inc
+++ b/gosa-core/setup/class_setupStep_Config2.inc
@@ -34,8 +34,6 @@ 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,
@@ -52,14 +50,10 @@ class Step_Config2 extends setup_step
                                   "samba_rid_active" => FALSE); 
 
   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("mail_attrib","governmentmode","sambaidmapping","cyrusunixstyle","mail","use_netatalk","enableFAI_management","timezone","enableMimeType");
+  var $attributes = array("mail_attrib","governmentmode","sambaidmapping","cyrusunixstyle","mail","timezone");
   var $called = FALSE;
 
   function Step_Config2()
@@ -116,30 +110,6 @@ class Step_Config2 extends setup_step
         $this->samba_settings['samba_rid_active'] = TRUE;
       }
   
-      /* Check if we can enable netatalk plugin */
-      $tmp = $ldap->get_objectclasses();
-      if(is_array($tmp) && isset($tmp['apple-user'])) {
-        $this->use_netatalk = TRUE;
-      }
-
-      /* Check the FAI schema is used */
-      if(is_array($tmp) && isset($tmp['FAIclass'])){
-#        $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;
     }
 
@@ -213,12 +183,6 @@ 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/gosa-core/setup/setup_config2.tpl b/gosa-core/setup/setup_config2.tpl
index b6d806b310c3d217ba95285573a14609bf10c2cd..f815366403bb61e94e04dd556b26c714c5eb0fc4 100644 (file)
--- a/gosa-core/setup/setup_config2.tpl
+++ b/gosa-core/setup/setup_config2.tpl
@@ -107,65 +107,6 @@
         </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 mime type management{/t}
-        </div>
-        <div class='step4_value'>
-
-            <select name="enableMimeType" size="1" title="">
-                {html_options options=$bool selected=$enableMimeType}
-            </select>
-        </div>
-    </div>
-
-       <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Enable FAI release management{/t}
-        </div>
-        <div class='step4_value'>
-
-            <select name="enableFAI_management" size="1" title="">
-                {html_options options=$bool selected=$enableFAI_management}
-            </select>
-        </div>
-    </div>
-
-       <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Enable user netatalk plugin{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="use_netatalk" size="1" title="">
-                {html_options options=$bool selected=$use_netatalk}
-            </select>
-        </div>
-    </div>
-
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Government mode{/t}