(status > monitoring) use last update date if end date is larger

pfsense · Jun 7, 2016 · 20bde27 · 20bde27
1 parent d8cfe96
commit 20bde27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/sysutils/pfSense-Status_Monitoring/files/usr/local/www/rrd_fetch_json.php b/sysutils/pfSense-Status_Monitoring/files/usr/local/www/rrd_fetch_json.php
@@ -92,13 +92,10 @@
 
 if ($timePeriod === "custom") {
 
-	//dates validation
-	if($end < $start) {
-		die ('{ "error" : "The start date must come before the end date." }');
-	} elseif ($end > time()) {
-		die ('{ "error" : "The end date can\'t be in the future." }');
-	}
+	// make sure end time isn't later than last updated time entry
+	if( $end > $last_updated ) { $end = $last_updated; }
 
+	/* ensure resolution intreval */
 	$resolution = 60; //defaults to highest resolution available
 	$start = floor($start/$resolution) * $resolution;
 	$end = floor($end/$resolution) * $resolution;

diff --git a/sysutils/pfSense-Status_Monitoring/files/usr/local/www/status_monitoring.php b/sysutils/pfSense-Status_Monitoring/files/usr/local/www/status_monitoring.php
@@ -844,7 +844,6 @@ function getOptions() {
     $( "#end-date" ).datepicker({
       changeMonth: true,
       changeYear: true,
-      maxDate: new Date
     });
 
 	function applySettings(defaults) {