From 66386c1a42861f701812064db886d634e66d3292 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 27 Apr 2016 15:43:38 +0000
Subject: [PATCH] Remove 1 week limit if end date is not provided

---
 api/src/DateTime.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/api/src/DateTime.php b/api/src/DateTime.php
index be01e6cb75..2ecb2f89ae 100644
--- a/api/src/DateTime.php
+++ b/api/src/DateTime.php
@@ -228,11 +228,6 @@ class DateTime extends \DateTime
 				$end->setTime(0, 0, 0);
 				$end->add('+1day');
 			}
-			else
-			{
-				$end = new DateTime($start);
-				$end->add('+1week');
-			}
 		}
 		else
 		{
@@ -280,13 +275,19 @@ class DateTime extends \DateTime
 			}
 		}
 		// convert start + end from user to servertime for the filter
-		$sql = '('.DateTime::user2server($start, 'ts').' <= '.$column.' AND '.$column.' < '.DateTime::user2server($end, 'ts').')';
+		$sql = '('.DateTime::user2server($start, 'ts').' <= '.$column;
+		if($end)
+		{
+			$sql .=' AND '.$column.' < '.DateTime::user2server($end, 'ts');
+
+			// returned timestamps: $end is an inclusive date, eg. for today it's equal to start!
+			$end->add('-1day');
+			$end = $end->format('ts');
+		}
+		$sql .= ')';
 		//error_log(__METHOD__."('$name', ...) syear=$syear, smonth=$smonth, sday=$sday, sweek=$sweek, eyear=$eyear, emonth=$emonth, eday=$eday, eweek=$eweek --> start=".$start->format().', end='.$end->format().", sql='$sql'");
 
-		// returned timestamps: $end is an inclusive date, eg. for today it's equal to start!
 		$start = $start->format('ts');
-		$end->add('-1day');
-		$end = $end->format('ts');
 
 		return $sql;
 	}