Removed snapshot settings from setup

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 89922723ff491ae03964f332d663ada13a249d9a..2fc84e3cca28ecc31b32bc7ccdc18ef416b26847 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -409,21 +409,6 @@
 {if $cv.samba_settings.samba_rid_active}
                        RIDBASE="{$cv.samba_settings.samba_rid_active}"
 {/if}
-{if $cv.generic_settings.snapshot_active}      
-                       enable_snapshot="true"
-{if $cv.generic_settings.snapshot_base != ""}
-                       snapshot_base="{$cv.generic_settings.snapshot_base}"
-{/if}
-{if $cv.generic_settings.snapshot_user != ""}
-                       snapshot_user="{$cv.generic_settings.snapshot_user}"
-{/if}
-{if $cv.generic_settings.snapshot_password != ""}
-                       snapshot_password="{$cv.generic_settings.snapshot_password}"
-{/if}
-{if $cv.generic_settings.snapshot_server != ""}
-                       snapshot_server="{$cv.generic_settings.snapshot_server}"
-{/if}
-{/if}
 {if $cv.samba_version != 0}
                        sambaversion="{$cv.samba_version}"
 {/if}

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index d238af0455f89790251f38bde337ef73bef07166..1e3bdea5e104c1a59964ab39161707c8ec4b1a97 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -34,12 +34,7 @@ class Step_Config2 extends setup_step
 
   var $generic_settings  = array( "enableCopyPaste" => false,
                                   "wws_ou"        => "ou=winstations",
-                                  "wws_ou_active" => FALSE,
-                                  "snapshot_active"     => FALSE,
-                                  "snapshot_base"       => "ou=snapshots,%base%",
-                                  "snapshot_user"       => "%admin%",
-                                  "snapshot_password"   => "",
-                                  "snapshot_server"     => "%connection%");
+                                  "wws_ou_active" => FALSE);
 
   var $samba_settings    = array( "samba_sid"        => "0-815-4711",
                                   "samba_sid_active" => FALSE,
@@ -109,17 +104,6 @@ class Step_Config2 extends setup_step
       $this->called = TRUE;
     }
 
-    /* Update snapshot values, with already collected values */
-    foreach($this->generic_settings as $key => $value){
-      foreach(array("snapshot_base","snapshot_user","snapshot_server") as $attr){
-        foreach($this->parent->captured_values as $replace_name => $replace_value){
-          if(is_string($replace_value))  {
-            $this->generic_settings[$attr] = preg_replace("/%".$replace_name."%/",$replace_value,$this->generic_settings[$attr]);
-          }
-        }
-      }
-    }
-
     $smarty = get_smarty();
     $smarty->assign("sambaDomain_found",$this->sambaDomain_found);
     $smarty->assign("generic_settings",$this->generic_settings);
@@ -167,24 +151,6 @@ class Step_Config2 extends setup_step
         $this->generic_settings['wws_ou_active'] = FALSE;
       }
 
-      if(isset($_POST['snapshot_active'])){
-        $this->generic_settings['snapshot_active'] = TRUE;
-        if(isset($_POST['snapshot_base'])){
-          $this->generic_settings['snapshot_base'] = get_post('snapshot_base');
-        }
-        if(isset($_POST['snapshot_user'])){
-          $this->generic_settings['snapshot_user'] = get_post('snapshot_user');
-        }
-        if(isset($_POST['snapshot_password'])){
-          $this->generic_settings['snapshot_password'] = get_post('snapshot_password');
-        }
-        if(isset($_POST['snapshot_server'])){
-          $this->generic_settings['snapshot_server'] = get_post('snapshot_server');
-        }
-      }else{
-        $this->generic_settings['snapshot_active'] = FALSE;
-      }
-
       /* Samba settings */
       if(isset($_POST['samba_sid_active'])){
         $this->samba_settings['samba_sid_active'] = TRUE;

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index 5b35c4ecb0c9fca889a0bfe497a9bdcd63bb3ecb..c3925f22aeeffcb35ac55635816c19dabd715c2c 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -135,103 +135,6 @@
         </div>
     </div>
 
-
-        <p><b>{t}Snapshots / Undo{/t}</b></p>
-            {if $generic_settings.snapshot_active == FALSE}
-        <div class='step4_container'>
-         <div class='step4_name'>
-                <input type='checkbox' value='1' name='snapshot_active'
-                    onClick='
-                                                                changeState("snapshot_base");
-                                                                changeState("snapshot_server");
-                                                                changeState("snapshot_user");
-                                                                changeState("snapshot_password");'>{t}Enable snapshots{/t}
-         </div>
-        </div>
-        <div style='margin-left:10px;'>
-        <div class='step4_container'>
-         <div class='step4_name'>
-                {t}Snapshot base{/t}
-         </div>
-         <div class='step4_value'>
-                <input style='width:220' id='snapshot_base' name='snapshot_base'
-                                        type='text' value='{$generic_settings.snapshot_base}' disabled>
-         </div>
-        </div>
-        <div class='step4_container'>
-         <div class='step4_name'>
-                    {t}Server{/t}
-         </div>
-         <div class='step4_value'>
-                                <input style='width:220' id='snapshot_server' name='snapshot_server'
-                                        type='text' value='{$generic_settings.snapshot_server}' disabled>
-        </div>
-        </div>
-        <div class='step4_container'>
-         <div class='step4_name'>
-                        {t}User{/t}
-         </div>
-         <div class='step4_value'>
-                                <input style='width:220' id='snapshot_user' name='snapshot_user'
-                                        type='text' value='{$generic_settings.snapshot_user}' disabled>
-        </div>
-        </div>
-        <div class='step4_container'>
-         <div class='step4_name'>
-                        {t}Password{/t}
-         </div>
-         <div class='step4_value'>
-                                <input style='width:220' id='snapshot_password' name='snapshot_password'
-                                        type='password' value='{$generic_settings.snapshot_password}' disabled>
-        </div>
-        </div>
-        </div>
-
-            {else}
-        <div class='step4_container'>
-         <div class='step4_name'>
-                <input type='checkbox' value='1' name='snapshot_active' checked>{t}Enable snapshots{/t}
-        </div>
-        </div>
-        <div style='margin-left:10px;'>
-        <div class='step4_container'>
-         <div class='step4_name'>
-                    {t}Snapshot base{/t}
-        </div>
-         <div class='step4_value'>
-           <input style='width:220' id='snapshot_base' name='snapshot_base'
-                                        type='text' value='{$generic_settings.snapshot_base}'>
-        </div>
-        </div>
-        <div class='step4_container'>
-         <div class='step4_name'>
-                        {t}Server{/t}
-        </div>
-         <div class='step4_value'>
-                                <input style='width:220' id='snapshot_server' name='snapshot_server'
-                                        type='text' value='{$generic_settings.snapshot_server}'>
-        </div>
-        </div>
-        <div class='step4_container'>
-         <div class='step4_name'>
-                    {t}User{/t}
-        </div>
-         <div class='step4_value'>
-                                <input style='width:220' id='snapshot_user' name='snapshot_user'
-                                        type='text' value='{$generic_settings.snapshot_user}'>
-        </div>
-        </div>
-        <div class='step4_container'>
-         <div class='step4_name'>
-                        {t}Password{/t}
-        </div>
-         <div class='step4_value'>
-                                <input style='width:220;' id='snapshot_password' name='snapshot_password'
-                                        type='password' value='{$generic_settings.snapshot_password}'>
-        </div>
-        </div>
-        </div>
-            {/if}
 </div>
 
 <input type='hidden' value='1' name='step6_posted'>