webinterface.git

@@ -428,32 +428,11 @@ function html_select($name, $options, $default='', $free='')

 }

-function html_datepicker($nameprefix, $timestamp)

-{

-    $valid_days = [ 1 =>  1,  2 =>  2,  3 =>  3,  4 =>  4,  5 =>  5,

-                       6 =>  6,  7 =>  7,  8 =>  8,  9 =>  9, 10 => 10,

-                      11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15,

-                      16 => 16, 17 => 17, 18 => 18, 19 => 19, 20 => 20,

-                      21 => 21, 22 => 22, 23 => 23, 24 => 24, 25 => 25,

-                      26 => 26, 27 => 27, 28 => 28, 29 => 29, 30 => 30,

-                      31 => 31, ];

-    $valid_months = [ 1 =>  1,  2 =>  2,  3 =>  3,  4 =>  4,  5 =>  5,

-                         6 =>  6,  7 =>  7,  8 =>  8,  9 =>  9, 10 => 10,

-                        11 => 11, 12 => 12, ];

-    $current_year = (int) date('Y');

-    $valid_years = [$current_year => $current_year,

-                       $current_year+1 => $current_year+1,

-                       $current_year+2 => $current_year+2,

-                       $current_year+3 => $current_year+3,

-                       $current_year+4 => $current_year+4, ];

-

-    $selected_day = date('d', $timestamp);

-    $selected_month = date('m', $timestamp);

-    $selected_year = date('Y', $timestamp);

+function html_datepicker($htmlname, $timestamp)

+{

+    $date = date('Y-m-d', $timestamp);

     $ret = '';

-    $ret .= html_select($nameprefix.'_day', $valid_days, $selected_day, 'style="text-align: right;"').". ";

-    $ret .= html_select($nameprefix.'_month', $valid_months, $selected_month, 'style="text-align: right;"').". ";

-    $ret .= html_select($nameprefix.'_year', $valid_years, $selected_year);

+    $ret .= '<input type="date" id="'.$htmlname.'" name="'.$htmlname.'" value="'.$date.'">';

     return $ret;

 }

@@ -146,47 +146,20 @@ $(document).ready(function(){

   $('div.vmail-forward input').change();

-  $.datepicker.regional['de'] = {clearText: 'löschen', clearStatus: 'aktuelles Datum löschen',

-                closeText: 'schließen', closeStatus: 'ohne Änderungen schließen',

-                prevText: '< zurück', prevStatus: 'letzten Monat zeigen',

-                nextText: 'vor >', nextStatus: 'nächsten Monat zeigen',

-                currentText: 'heute', currentStatus: '',

-                monthNames: ['Januar','Februar','März','April','Mai','Juni',

-                'Juli','August','September','Oktober','November','Dezember'],

-                monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun',

-                'Jul','Aug','Sep','Okt','Nov','Dez'],

-                monthStatus: 'anderen Monat anzeigen', yearStatus: 'anderes Jahr anzeigen',

-                weekHeader: 'Wo', weekStatus: 'Woche des Monats',

-                dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],

-                dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],

-                dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],

-                dayStatus: 'Setze DD als ersten Wochentag', dateStatus: 'Wähle D, M d',

-                dateFormat: 'dd.mm.yy', firstDay: 1, 

-                initStatus: 'Wähle ein Datum', isRTL: false};

-  $.datepicker.setDefaults( $.datepicker.regional[ "de" ] );

-  $.datepicker.setDefaults({

-    dateFormat: 'yy-mm-dd',

-    minDate: 1,

-    maxDate: "+2m"

-

-    });

-

-  $('#ar_startdate').datepicker();

-  $('#ar_startdate').change(function () {

-    $('#ar_valid_from_date').prop('checked', true)

-    mindate = $('#ar_startdate').datepicker("getDate");

-    mindate.setDate(mindate.getDate()+1);

-    $('#ar_enddate').datepicker("option", "minDate", mindate);

-    maxdate = $('#ar_startdate').datepicker("getDate");

-    maxdate.setDate(maxdate.getDate()+60);

-    $('#ar_enddate').datepicker("option", "maxDate", maxdate);

+  document.querySelector("#ar_startdate").addEventListener("change", (e) => {

+      document.querySelector("#ar_enddate").min = document.querySelector("#ar_startdate").value;

+      startdate = new Date(document.querySelector("#ar_startdate").value)

+      minenddate = new Date(startdate);

+      minenddate.setDate(startdate.getDate() + 1);

+      document.querySelector("#ar_enddate").min = minenddate.toISOString().split("T")[0];

+      if (document.querySelector("#ar_enddate").value < document.querySelector("#ar_startdate").value) {

+          document.querySelector("#ar_enddate").value = minenddate.toISOString().split("T")[0];

+      }

+      maxenddate = new Date(startdate);

+      maxenddate.setDate(startdate.getDate() + 60);

+      document.querySelector("#ar_enddate").max = maxenddate.toISOString().split("T")[0];

       });

-  $('#ar_enddate').datepicker();

-  $('#ar_enddate').datepicker("option", "minDate", $('#ar_startdate').val());

-  $('#ar_enddate').change(function () {

-    $('#ar_valid_until_date').prop('checked', true)

-    });

 });

@@ -128,25 +128,24 @@ if (! $startdate || $startdate <= date('Y-m-d')) {

 }

 $form .= "<p><input type=\"radio\" name=\"ar_valid_from\" value=\"now\" id=\"ar_valid_from_now\"{$valid_from_now_checked} /> <label for=\"ar_valid_from_now\">Ab sofort</label><br />".

   "<input type=\"radio\" name=\"ar_valid_from\" value=\"date\" id=\"ar_valid_from_date\"{$valid_from_future_checked} /> <label for=\"ar_valid_from_date\">Erst ab dem </label>".

-  "<input type=\"text\" value=\"$startdate\" id=\"ar_startdate\" name=\"ar_startdate\" /></p>";

+  "<input type=\"date\" value=\"$startdate\" id=\"ar_startdate\" name=\"ar_startdate\" min=\"".date('Y-m-d')."\" max=\"".date('Y-m-d', time() + 60*24*60*60)."\" /></p>";

-$valid_until_infinity_checked = ($ar['valid_until'] == null) ? ' checked="checked"' : '';

-$valid_until_date_checked = ($ar['valid_until'] != null) ? ' checked="checked"' : '';

 $enddate = $ar['valid_until'];

 if (! $enddate) {

     $enddate = date('Y-m-d', time() + 7*24*60*60);

 }

+$max_end = date('Y-m-d', time() + 60*24*60*60);

+if ($ar['valid_from'] > date('Y-m-d')) {

+    $max_end = date_create($ar['valid_from']);

+    $max_end->modify("+60 day");

+    $max_end = $max_end->format('Y-m-d');

+}

 $form .= "<h4>Deaktivierung</h4>";

 $form .= "<p><label for=\"ar_valid_until_date\">Keine Antworten mehr versenden ab dem </label>".

-  "<input type=\"text\" value=\"$enddate\" id=\"ar_enddate\" name=\"ar_enddate\" /><br/>";

+  "<input type=\"date\" value=\"$enddate\" id=\"ar_enddate\" name=\"ar_enddate\" min=\"".date('Y-m-d')."\" max=\"".$max_end."\" /><br/>";

 if (!$accountlogin && ($id != 0)) {

     $form .= "<small>(Automatische Antworten sind nur befristet erlaubt. Wenn Sie diese Adresse dauerhaft stilllegen möchten, können Sie dies am Ende dieser Seite tun.)</small></p>";

 }

-/*

-$form .= "<p><input type=\"radio\" name=\"ar_valid_until\" value=\"infinity\" id=\"ar_valid_until_infinity\"{$valid_until_infinity_checked} /> <label for=\"ar_valid_until_infinity\">Unbefristet</label><br />".

-  "<input type=\"radio\" name=\"ar_valid_until\" value=\"date\" id=\"ar_valid_until_date\"{$valid_until_date_checked} /> <label for=\"ar_valid_until_date\">Keine Antworten mehr versenden ab dem </label>".

-  "<input type=\"text\" value=\"$enddate\" id=\"ar_enddate\" name=\"ar_enddate\" /><br/><small>(Automatische Antworten sind nur befristet erlaubt. Benötigen Sie langfristig funktionierende automatische Antworten, sprechen Sie unsere Administratoren bitte an, dann suchen wir eine Lösung.)</small></p>";

-*/

 $subject = filter_output_html($ar['subject']);

 $ar_subject_default_checked = ($subject == null) ? ' checked="checked"' : '';

@@ -26,7 +26,7 @@ if ($_GET['action'] == 'new') {

     $gueltig_ab = $_REQUEST['gueltig_ab'];

     if ($gueltig_ab == 'datum') {

-        $gueltig_ab = $_REQUEST['gueltig_ab_datum_year'].'-'.$_REQUEST['gueltig_ab_datum_month'].'-'.$_REQUEST['gueltig_ab_datum_day'];

+        $gueltig_ab = $_REQUEST['gueltig_ab_datum'];

     }

     if (! check_date($gueltig_ab)) {

         system_failure('Konnte das Datum nicht auslesen');