From: Alexander Marx <alexander.marx@ipfire.org>
Date: Thu, 4 Feb 2016 11:04:47 +0000 (+0100)
Subject: Captive-Portal: fix wrong expiretime of unused vouchers
X-Git-Tag: v2.19-core115~60^2~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3802750ac9b03d7bfdb767e71436a1387607ec0;p=ipfire-2.x.git

Captive-Portal: fix wrong expiretime of unused vouchers

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
---

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 841f946b3c..a42e398154 100755
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -460,7 +460,7 @@ END
 		if ($voucherhash{$key}[2] eq '0'){
 			$endtime=$Lang::tr{'Captive nolimit'};
 		}else{
-			$endtime=sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime($voucherhash{$key}[0]+$voucherhash{$key}[2]));
+			$endtime=sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime(time()+$voucherhash{$key}[2]));
 		}
 
 		if ($count % 2){