webinterface.git

@@ -182,5 +182,44 @@ $(document).ready(function(){

   $('#more_forwards').click(moreForward);

   $('div.vmail-forward input').on("change keyup paste", checkForward);

+

+

+  $.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: "+3y"

+

+    });

+

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

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

+    $('#ar_valid_from_date').attr('checked', true)

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

     });

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

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

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

+    $('#ar_valid_until_date').attr('checked', true)

+    });

+});

+

+

@@ -134,8 +134,8 @@ if (! $startdate || $startdate <= date('Y-m-d')) {

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

 }

 $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=\"future\" id=\"ar_valid_from_future\"{$valid_from_future_checked} /> <label for=\"ar_valid_from_future\">Erst ab dem </label>".

-  html_datepicker("ar_valid_from", strtotime($startdate))."</p>";

+  "<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>";

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

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

@@ -146,7 +146,7 @@ if (! $enddate) {

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

 $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>".

-  html_datepicker("ar_valid_until", strtotime($enddate))."</p>";

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

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

@@ -80,12 +80,11 @@ if ($_GET['action'] == 'edit')

   if (isset($_POST['ar_valid_from']) && ($_POST['ar_valid_from'] == 'now')) {

     $valid_from_date = time();

   } else {

-    if (isset($_POST['ar_valid_from_day']) && isset($_POST['ar_valid_from_month']) && isset($_POST['ar_valid_from_year'])) {

-      $tmpdate = $_POST['ar_valid_from_year'].'-'.$_POST['ar_valid_from_month'].'-'.$_POST['ar_valid_from_day'];

-      if (date('Y-n-j', strtotime($tmpdate)) != $tmpdate) {

+    if (isset($_POST['ar_startdate'])) {

+      if (date('Y-m-d', strtotime($_POST['ar_startdate'])) != $_POST['ar_startdate']) {

         system_failure('Das Aktivierungs-Datum scheint ungültig zu sein.');

       } else {

-        $valid_from_date = strtotime($tmpdate);

+        $valid_from_date = strtotime($_POST['ar_startdate']);

       }

     }

   }

@@ -99,12 +98,11 @@ if ($_GET['action'] == 'edit')

   if (isset($_POST['ar_valid_until']) && ($_POST['ar_valid_until'] == 'infinity')) {

     $valid_until_date = NULL;

   } else {

-    if (isset($_POST['ar_valid_until_day']) && isset($_POST['ar_valid_until_month']) && isset($_POST['ar_valid_until_year'])) {

-      $tmpdate = $_POST['ar_valid_until_year'].'-'.$_POST['ar_valid_until_month'].'-'.$_POST['ar_valid_until_day'];

-      if (date('Y-n-j', strtotime($tmpdate)) != $tmpdate) {

+    if (isset($_POST['ar_enddate'])) {

+      if (date('Y-m-d', strtotime($_POST['ar_enddate'])) != $_POST['ar_enddate']) {

         system_failure('Das Deaktivierungs-Datum scheint ungültig zu sein.');

       } else {

-        $valid_until_date = strtotime($tmpdate);

+        $valid_until_date = strtotime($_POST['ar_enddate']);

       }

     }

   }