From dd353569a4a71298da57795df16ea9a5425d6784 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 14 Dec 2014 20:13:27 +0100
Subject: [PATCH] fix CP login

---
 src/captiveportal/index.php   | 1 +
 src/etc/inc/captiveportal.inc | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/captiveportal/index.php b/src/captiveportal/index.php
index 83cd33394..8c3df2d79 100644
--- a/src/captiveportal/index.php
+++ b/src/captiveportal/index.php
@@ -223,6 +223,7 @@ EOD;
 		if ($loginok){
 			captiveportal_logportalauth($_POST['auth_user'],$clientmac,$clientip,"LOGIN");
 			portal_allow($clientip, $clientmac,$_POST['auth_user']);
+			portal_reply_page($redirurl, "redir", "Just redirect the user.");
 		} else {
 			captiveportal_logportalauth($_POST['auth_user'],$clientmac,$clientip,"FAILURE");
 			portal_reply_page($redirurl, "error", $errormsg);
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc
index 5ac180da3..bcafc981b 100644
--- a/src/etc/inc/captiveportal.inc
+++ b/src/etc/inc/captiveportal.inc
@@ -154,7 +154,7 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut
     else if (!empty($config['captiveportal'][$cpzone]['redirurl']))
         $my_redirurl = $config['captiveportal'][$cpzone]['redirurl'];
 
-    if(isset($config['captiveportal'][$cpzone]['logoutwin_enable']) && !$passthrumac) {
+    if(isset($config['captiveportal'][$cpzone]['logoutwin_enable']) ) {
         $ourhostname = portal_hostname_from_client_ip($clientip);
         $protocol = (isset($config['captiveportal'][$cpzone]['httpslogin'])) ? 'https://' : 'http://';
         $logouturl = "{$protocol}{$ourhostname}/";
@@ -167,6 +167,7 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut
         include("{$g['varetc_path']}/captiveportal-{$cpzone}-logout.html");
 
     } else {
+		// TODO: remove? should be handled by login page
         portal_reply_page($my_redirurl, "redir", "Just redirect the user.");
     }