Project

General

Profile

Bug #1956 ยป logout-message.patch

Patch index.php/captiveportal.inc - Benjamin P, 10/14/2011 04:03 AM

View differences:

etc/inc/captiveportal.inc
904 904
			$cpentry[10] = 'first';
905 905
		captiveportal_disconnect($cpentry, $radiusservers[$cpentry[10]], $term_cause);
906 906
		captiveportal_logportalauth($cpentry[4], $cpentry[3], $cpentry[2], "DISCONNECT");
907
	}		
907
		return true;
908
	}
909
	return false;
908 910
}
909 911

  
910 912
/* send RADIUS acct stop for all current clients */
usr/local/captiveportal/index.php
113 113
	$radiusctx = 'second';
114 114

  
115 115
if ($_POST['logout_id']) {
116
	if (captiveportal_disconnect_client($_POST['logout_id']))
117
		$message = "You have been disconnected.";
118
	else
119
		$message = "You already were logged out.";
120

  
116 121
	echo <<<EOD
117 122
<HTML>
118 123
<HEAD><TITLE>Disconnecting...</TITLE></HEAD>
119 124
<BODY BGCOLOR="#435370">
120 125
<SPAN STYLE="color: #ffffff; font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; font-size: 11px;">
121
<B>You have been disconnected.</B>
126
<B>$message</B>
122 127
</SPAN>
123 128
<SCRIPT LANGUAGE="JavaScript">
124 129
<!--
......
129 134
</HTML>
130 135

  
131 136
EOD;
132
	captiveportal_disconnect_client($_POST['logout_id']);
133 137
	exit;
134 138
} else if ($clientmac && $radmac_enable && portal_mac_radius($clientmac,$clientip, $radiusctx)) {
135 139
    /* radius functions handle everything so we exit here since we're done */
    (1-1/1)