Moved copy & paste option

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

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 5023cec51060cd006607ca6e4702cad409baf3ea..4f4a9065da90662c715853215319ca26fc59b60b 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -33,7 +33,8 @@ class Step_Config2 extends setup_step
   var $mail_settings = array("vacationdir"        => "/etc/gosa/vacation",
                              "vacationdir_active" => FALSE);
 
-  var $generic_settings  = array( "wws_ou"        => "ou=winstations",
+  var $generic_settings  = array( "enableCopyPaste" => false,
+                                  "wws_ou"        => "ou=winstations",
                                   "wws_ou_active" => FALSE,
                                   "snapshot_active"     => FALSE,
                                   "snapshot_base"       => "ou=snapshots,%base%",
@@ -113,6 +114,10 @@ class Step_Config2 extends setup_step
         $this->mail_settings['vacationdir_active'] = FALSE;
       }
 
+      if(isset($_POST['enableCopyPaste'])){
+        $this->generic_settings['enableCopyPaste'] = $_POST['enableCopyPaste'];
+      }
+
       if(isset($_POST['wws_ou_active'])){
         $this->generic_settings['wws_ou_active'] = TRUE;
         if(isset($_POST['wws_ou'])){

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index a71b13c518a4ce1ad17f161087abebc029ed294c..1721d561a6b549bd05e662cec2c9b9e49bc546db 100644 (file)
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -23,7 +23,6 @@
 class Step_Config3 extends setup_step
 {
   var $optional = array(
-              "enableCopyPaste" => false,
               "strict_units" => false,
               "forceglobals" => true,
               "forcessl" => false,
@@ -97,7 +96,7 @@ class Step_Config3 extends setup_step
         }
       }
       
-      foreach(array("strict_units","noprimarygroup","enableCopyPaste","forceglobals","forcessl","warnssl","compile","debuglevel","session_lifetime","smbhash") as $name){
+      foreach(array("strict_units","noprimarygroup","forceglobals","forcessl","warnssl","compile","debuglevel","session_lifetime","smbhash") as $name){
         if(isset($_POST[$name])){
           $this->optional[$name] = stripslashes($_POST[$name]);
         }

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index 7e0079264a0f4ccf40e001ebe26dbc04c515b502..2e07a049cfb62ab8f1b06267898d26f5d2fc91a7 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -58,6 +58,18 @@
     </div>
 
     <p><b>{t}Additional GOsa settings{/t}</b></p>
+
+       <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Enable Copy & Paste{/t}
+        </div>
+        <div class='step4_value'>
+
+            <select name="enableCopyPaste" size="1" title="">
+                {html_options options=$bool selected=$generic_settings.enableCopyPaste}
+            </select>
+        </div>
+    </div>
        
     <div class='step4_container'>
         <div class='step4_name'>

diff --git a/setup/setup_config3.tpl b/setup/setup_config3.tpl
index 45424af878ee96114d4aab25ac887fb2679ba632..56b6e8001d547107416685e662cdbe11f7a0f89c 100644 (file)
--- a/setup/setup_config3.tpl
+++ b/setup/setup_config3.tpl
@@ -4,22 +4,6 @@
                <b>{t}Optional settings{/t}</b>
        </div>
 
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Enable Copy & Paste{/t}
-        </div>
-        <div class='step4_value'>
-       
-            <select name="enableCopyPaste" size="1" title="">
-               {html_options options=$bool selected=$optional.enableCopyPaste}
-            </select>
-        </div>
-        <div class='step4_status'>
-            {t}Infos in FAQ{/t}&nbsp;
-            <img class='center' alt='!'  src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
-        </div>
-    </div>
-
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Disable primary group filter{/t}