Fixes #3223 fixed the mess in setup_config2

setup/class_setupStep_Config2.inc

@@ -27,7 +27,8 @@ class Step_Config2 extends setup_step
   var $sambaidmapping = FALSE;
   var $header_image   = "images/setup/server.png";
 
-  var $generic_settings  = array( "snapshot_active"     => TRUE);
+  var $generic_settings  = array( "snapshot_active"     => TRUE,
+                                  "snapshot_base"       => "ou=snapshots,%base%");
 
   var $timezone       = "Europe/Paris";
   var $timezones      = array();
@@ -67,8 +68,6 @@ class Step_Config2 extends setup_step
     $smarty = get_smarty();
     $smarty->assign("generic_settings",  reverse_html_entities($this->generic_settings));
 
-    $smarty->assign("bool", array(FALSE => _("No"), TRUE => _("Yes")));
-
     foreach ($this->attributes as $attr) {
       $smarty->assign($attr, reverse_html_entities($this->$attr));
     }

setup/setup_config2.tpl

 <div class='default' style='margin:12px; '>
   <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Timezone{/t}
-        </div>
-        <div class='step4_value'>
-            <select name='timezone' title='{t}Please choose your preferred timezone here{/t}' style="width:100%">
-    {foreach from=$timezones item=val}
-                <option {if $val == $timezone}selected{/if} value="{$val}">{$val}</option>
+    <div class='step4_name'>
+      <label for='timezone'>{t}Timezone{/t}</label>
+    </div>
+    <div class='step4_value'>
+      <select id='timezone' name='timezone' title='{t}Please choose your preferred timezone here{/t}' style="width:100%">
+        {foreach from=$timezones item=val}
+          <option {if $val == $timezone}selected{/if} value="{$val}">{$val}</option>
         {/foreach}
-
-            </select>
-        </div>
+      </select>
     </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");'/>{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>
-
-            {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>
-            {/if}
+  <p><b>{t}Snapshots{/t}</b></p>
+  <div class='step4_container'>
+    <div class='step4_name'>
+      <label for='snapshot_active'>{t}Enable snapshots{/t}</label>
+    </div>
+    <div class='step4_value'>
+      <input type='checkbox' value='1'
+              id='snapshot_active' name='snapshot_active'
+              onClick='changeState("snapshot_base");'
+{if $generic_settings.snapshot_active}
+              checked='checked'
+{/if}
+              />
+    </div>
+  </div>
+  <div class='step4_container'>
+    <div class='step4_name'>
+      <label for='snapshot_base'>{t}Snapshot base{/t}</label>
+    </div>
+    <div class='step4_value'>
+      <input style='width:220' id='snapshot_base' name='snapshot_base'
+              type='text' value='{$generic_settings.snapshot_base}'
+{if $generic_settings.snapshot_active == FALSE}
+                disabled='disabled'
+{/if}
+              />
+    </div>
+  </div>
 </div>
 
-<input type='hidden' value='1' name='step6_posted'>
+<input type='hidden' value='1' name='step6_posted'/>
 <div style="clear:both"></div>