Fixes for holiday configuration

diff --git a/inc/modules/admin/what-config_holiday.php b/inc/modules/admin/what-config_holiday.php
index 865c27fdaa93d3e496ec5c96626ea009d2954d0c..f93977a7f04c0631e92238ca91809d7da0ecc5ca 100644 (file)
--- a/inc/modules/admin/what-config_holiday.php
+++ b/inc/modules/admin/what-config_holiday.php
@@ -50,7 +50,12 @@ if (isFormSent()) {
        adminSaveSettingsFromPostData();
 } else {
        // Prepare constants for the template
-       $content['holiday_locked'] = createTimeSelections(getConfig('holiday_lock')  , 'holiday_lock'  , 'WDh');
+       $content['holiday_lock'] = createTimeSelections(getConfig('holiday_lock')  , 'holiday_lock'  , 'WDh');
+
+       // Init all entries
+       foreach (array('holiday_mode_direct','holiday_mode_reset') as $entry) {
+               $content[$entry] = '';
+       } // END - foreach
 
        // Set all entries
        foreach (array('holiday_mode') as $entry) {

diff --git a/templates/de/html/admin/admin_config_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl
index e4e6f29ad4705cee1bb298c5abb5be94b18aac95..88dac2b8322cd5fce77cac663f3be1227e676dea 100644 (file)
--- a/templates/de/html/admin/admin_config_holiday.tpl
+++ b/templates/de/html/admin/admin_config_holiday.tpl
@@ -15,14 +15,14 @@
        </tr>
        <tr>
                <td width="300" style="padding-left: 5px">{--ADMIN_HOLIDAY_LOCKED--}:</td>
-               <td width="270">$content[locked]</td>
+               <td width="270">$content[holiday_lock]</td>
        </tr>
        <tr>
                <td class="bottom" width="300" style="padding-left: 5px">{--ADMIN_HOLIDAY_MODE--}:</td>
                <td class="bottom" width="270">
-                       <input type="radio" class="form_field" name="holiday_mode" class="form_field" value="RESET"$content[holidy_mode_reset] />
+                       <input type="radio" class="form_field" name="holiday_mode" class="form_field" value="RESET"$content[holiday_mode_reset] />
                        {--ADMIN_HOLIDAY_MODE_RESET--}<br />
-                       <input type="radio" class="form_field" name="holiday_mode" class="form_field" value="DIRECT"$content[holidy_mode_direct] />
+                       <input type="radio" class="form_field" name="holiday_mode" class="form_field" value="DIRECT"$content[holiday_mode_direct] />
                        {--ADMIN_HOLIDAY_MODE_DIRECT--}
                </td>
        </tr>