From 0122f147eb00c49a3b30efa49a05e796b0948561 Mon Sep 17 00:00:00 2001
From: Manuel Herrmann <0@0x17.de>
Date: Thu, 19 Oct 2017 23:44:02 +0200
Subject: [PATCH 1/2] email filter by nights

---
 registration-system/admin/pages_mail.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/registration-system/admin/pages_mail.php b/registration-system/admin/pages_mail.php
index 039d368..7622fce 100644
--- a/registration-system/admin/pages_mail.php
+++ b/registration-system/admin/pages_mail.php
@@ -37,10 +37,13 @@ public function getText() {
         foreach ($this->environment->oconfig['essen'] as $key => $typ) {
             $essen .= '<option value="' . $key . '">' . $typ . '</option>';
         }
-        $maxtage = $this->fahrt->getLenTage();
+        $fahrt_bereich = $this->environment->database->select('fahrten', ['von', 'bis'], ['fahrt_id' => $this->fahrt->getID()]);
+        $von = strtotime($fahrt_bereich[0]['von']);
+        $bis = strtotime($fahrt_bereich[0]['bis']);
+
         $tage = '';
-        for ($cnt = $maxtage; $cnt >= 0; $cnt--)
-            $tage .= '<option value="' . $cnt . '">' . $cnt . '</option>';
+        for ($tag = $von; $tag < $bis; $tag += 24*60*60)
+            $tage .= '<option value="' . date('Y-m-d', $tag) . '">' . date('d.m.Y', $tag) . '</option>';
 
         return '
             <script type="text/javascript">
@@ -138,7 +141,7 @@ private function transformContacts() {
     }
 
     private function buildQueryWhere() {
-        $where = ['fahrt_id' => $this->fahrt->getID(), 'OR' => ['on_waitlist' => 0,
+        $where = ['fahrt_id' => $this->fahrt->getID(), 'OR #waitlist' => ['on_waitlist' => 0,
             'AND' => [
                 'transferred[!]' => null,
                 'on_waitlist' => 1
@@ -154,7 +157,12 @@ private function buildQueryWhere() {
                 $where['abtyp'] = $_REQUEST['val_abtyp'];
             }
             if (isset($_REQUEST['check_nights'])) {
-                // TODO
+                $nights = $_REQUEST['val_nights'];
+                $conditions = [];
+                foreach ($nights as $night)
+                    $conditions['AND #'.$night] = ['anday[<=]' => $night, 'abday[>]' => $night];
+                if (sizeof($conditions) > 0)
+                    $where['OR #nights'] = $conditions;
             }
             if (isset($_REQUEST['check_essen'])) {
                 $where['essen'] = $_REQUEST['val_essen'];

From 275798d05e88ddd0718f1bd66d0d4844d5ffac9b Mon Sep 17 00:00:00 2001
From: Manuel Herrmann <0@0x17.de>
Date: Fri, 20 Oct 2017 15:33:05 +0200
Subject: [PATCH 2/2] use getPossibleDates function instead of userdefined
 query

---
 registration-system/admin/pages_mail.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/registration-system/admin/pages_mail.php b/registration-system/admin/pages_mail.php
index 7622fce..d2971ff 100644
--- a/registration-system/admin/pages_mail.php
+++ b/registration-system/admin/pages_mail.php
@@ -37,13 +37,11 @@ public function getText() {
         foreach ($this->environment->oconfig['essen'] as $key => $typ) {
             $essen .= '<option value="' . $key . '">' . $typ . '</option>';
         }
-        $fahrt_bereich = $this->environment->database->select('fahrten', ['von', 'bis'], ['fahrt_id' => $this->fahrt->getID()]);
-        $von = strtotime($fahrt_bereich[0]['von']);
-        $bis = strtotime($fahrt_bereich[0]['bis']);
 
+        $fahrt_bereich = $this->fahrt->getPossibleDates();
         $tage = '';
-        for ($tag = $von; $tag < $bis; $tag += 24*60*60)
-            $tage .= '<option value="' . date('Y-m-d', $tag) . '">' . date('d.m.Y', $tag) . '</option>';
+        for ($i = 0; $i < sizeof($fahrt_bereich)-1; $i += 1)
+            $tage .= '<option value="' . date('Y-m-d', strtotime($fahrt_bereich[$i])) . '">' . $fahrt_bereich[$i] . '</option>';
 
         return '
             <script type="text/javascript">