Added gotomasses to gosa.conf

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 3bbcdd2e0014a5d8065309258f314d6eb1cd6f7f..5da552ad44e5b8ca3889d9b3e2ce6fb74e9fbca5 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -95,11 +95,17 @@
                        <plugin acl="ldapmanager" class="ldif" icon="ldif.png"
                                path="plugins/addons/ldapmanager" />
                        <plugin acl="notifications" class="msgplug" icon="notifications.png"
-                                path="plugins/addons/notifications" />
+                               path="plugins/addons/notifications" />
+{if $cv.optional.gotomasses_active}
+                       <plugin acl="gotomasses" class="gotomasses" icon="system.png"
+                               path="{$cv.optional.gotomasses_file}" />
+{else}
 <!--
                        <plugin acl="gotomasses" class="gotomasses" icon="system.png"
-                                path="plugins/addons/gotomasses" />
+                               path="plugins/addons/gotomasses" />
 -->
+{/if}
+
                </section>
        </menu>
 

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index 8ed1d6df4b2dcaf0470a84454b94ec81f04bf16c..9148868ef95cd131e996bfec6dc7a0b17272de33 100644 (file)
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -53,6 +53,9 @@ class Step_Config3 extends setup_step
               "kioskpath" => "/var/spool/kiosk",
               "kioskpath_active" => FALSE,
 
+              "gotomasses_file"   => "/etc/gosa/gotomasses",
+              "gotomasses_active" => FALSE,
+
               "noprimarygroup"  => FALSE);
 
   var $attributes = array("errorlvl");
@@ -136,6 +139,15 @@ class Step_Config3 extends setup_step
         $this->optional['kioskpath_active'] = FALSE;
       }
 
+      if(isset($_POST['gotomasses_active'])){
+        $this->optional['gotomasses_active'] = TRUE;
+        if(isset($_POST['gotomasses_file'])){
+          $this->optional['gotomasses_file'] = get_post('gotomasses_file');
+        }
+      }else{
+        $this->optional['gotomasses_active'] = FALSE;
+      }
+
       if(isset($_POST['auto_network_hook_active'])){
         $this->optional['auto_network_hook_active'] = TRUE;
         if(isset($_POST['auto_network_hook'])){

diff --git a/setup/setup_config3.tpl b/setup/setup_config3.tpl
index 4f71c89373bf146c06881fc87c2ac9e3e907c242..47c2a42301f7d59faf7ccd6a6e87d756612e9bb4 100644 (file)
--- a/setup/setup_config3.tpl
+++ b/setup/setup_config3.tpl
@@ -80,6 +80,24 @@
         </div>
     </div>
 
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Enable system deployment{/t}
+        </div>
+        <div class='step4_value'>
+            {if $optional.gotomasses_active == FALSE}
+                <input type='checkbox' value='1' name='gotomasses_active'
+                    onClick='changeState("gotomasses_file");'>
+                <input size=40 id='gotomasses_file' name='gotomasses_file' 
+                                       type='text' value='{$optional.gotomasses_file}' disabled>
+            {else}
+                <input type='checkbox' value='1' name='gotomasses_active' checked>
+                <input size=40 id='gotomasses_file' name='gotomasses_file' 
+                                       type='text' value='{$optional.gotomasses_file}'  >
+            {/if}
+        </div>
+    </div>
+
 
     <div class='step4_container'>
         <div class='step4_name'>