diff options
| author | Ermal <eri@pfsense.org> | 2012-11-26 08:32:15 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-11-26 08:32:15 +0000 |
| commit | 0e296bce07cfe920b6e86d319acb2d159f0f384a (patch) | |
| tree | 37925673565987b1f42d8b62aadb7a2b0cdcd4ab /etc | |
| parent | c06bdb94db8275c4c30ff81aaa36c752669cd70f (diff) | |
| download | pfsense-0e296bce07cfe920b6e86d319acb2d159f0f384a.zip pfsense-0e296bce07cfe920b6e86d319acb2d159f0f384a.tar.gz | |
No need to duplicate all this code here. If vouchers are enabled just display even the voucher input box along side the user/pass ones.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 210 |
1 files changed, 76 insertions, 134 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 57de052..9913af6 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -51,152 +51,94 @@ require_once("voucher.inc"); function get_default_captive_portal_html() { global $config, $g, $cpzone; - // Detect if vouchers are being used and default to the voucher page - if(isset($config['voucher'][$cpzone]['enable'])) { - $htmltext = <<<EOD + + $htmltext = <<<EOD <html> - <body> - <form method="post" action="\$PORTAL_ACTION\$"> - <input name="redirurl" type="hidden" value="\$PORTAL_REDIRURL\$"> - <input name="zone" type="hidden" value="\$PORTAL_ZONE\$"> +<body> +<form method="post" action="\$PORTAL_ACTION\$"> + <input name="redirurl" type="hidden" value="\$PORTAL_REDIRURL\$"> + <input name="zone" type="hidden" value="\$PORTAL_ZONE\$"> + <center> + <table cellpadding="6" cellspacing="0" width="550" height="380" style="border:1px solid #000000"> + <tr height="10" bgcolor="#990000"> + <td style="border-bottom:1px solid #000000"> + <font color='white'> + <b> + {$g['product_name']} captive portal + </b> + </font> + </td> + </tr> + <tr> + <td> + <div id="mainlevel"> <center> - <table cellpadding="6" cellspacing="0" width="550" height="380" style="border:1px solid #000000"> - <tr height="10" bgcolor="#990000"> - <td style="border-bottom:1px solid #000000"> - <font color='white'> - <b> - Guest Voucher code required to continue - </b> - </font> - </td> - </tr> + <table width="100%" border="0" cellpadding="5" cellspacing="0"> + <tr> + <td> + <center> + <div id="mainarea"> + <center> + <table width="100%" border="0" cellpadding="5" cellspacing="5"> <tr> <td> - <div id="mainlevel"> - <center> - <table width="100%" border="0" cellpadding="5" cellspacing="0"> - <tr> - <td> - <center> - <div id="mainarea"> - <center> - <table width="100%" border="0" cellpadding="5" cellspacing="5"> - <tr> - <td> - <div id="maindivarea"> - <center> - <div id='statusbox'> - <font color='red' face='arial' size='+1'> - <b> - \$PORTAL_MESSAGE\$ - </b> - </font> - </div> - <p/> - <div id='loginbox'> - Enter Voucher Code: - <input name="auth_voucher" type="text" style="border:1px dashed;" size="22"> - <input name="accept" type="submit" value="Continue"> - </div> - </center> - </div> - </td> - </tr> - </table> - </center> - </div> - </center> - </td> - </tr> - </table> - </center> - </div> - </td> - </tr> - </table> - </center> - </form> - </body> -</html> + <div id="maindivarea"> + <center> + <div id='statusbox'> + <font color='red' face='arial' size='+1'> + <b> + \$PORTAL_MESSAGE\$ + </b> + </font> + </div> + <br/> + <div id='loginbox'> + <table> + <tr><td colspan="2"><center>Welcome to the {$g['product_name']} Captive Portal!</td></tr> + <tr><td> </td></tr> + <tr><td align="right">Username:</td><td><input name="auth_user" type="text" style="border: 1px dashed;"></td></tr> + <tr><td align="right">Password:</td><td><input name="auth_pass" type="password" style="border: 1px dashed;"></td></tr> + <tr><td> </td></tr> + +EOD; + + if(isset($config['voucher'][$cpzone]['enable'])) { + $htmltext .= <<<EOD + <tr><td> + Enter Voucher Code: + <input name="auth_voucher" type="text" style="border:1px dashed;" size="22"> + </td></tr> EOD; - return $htmltext; } - // Vouchers are not found, return the normal user/pass auth page - $htmltext = <<<EOD -<html> - <body> - <form method="post" action="\$PORTAL_ACTION\$"> - <input name="redirurl" type="hidden" value="\$PORTAL_REDIRURL\$"> - <input name="zone" type="hidden" value="\$PORTAL_ZONE\$"> - <center> - <table cellpadding="6" cellspacing="0" width="550" height="380" style="border:1px solid #000000"> - <tr height="10" bgcolor="#990000"> - <td style="border-bottom:1px solid #000000"> - <font color='white'> - <b> - {$g['product_name']} captive portal - </b> - </font> - </td> - </tr> - <tr> - <td> - <div id="mainlevel"> - <center> - <table width="100%" border="0" cellpadding="5" cellspacing="0"> - <tr> - <td> - <center> - <div id="mainarea"> - <center> - <table width="100%" border="0" cellpadding="5" cellspacing="5"> - <tr> - <td> - <div id="maindivarea"> - <center> - <div id='statusbox'> - <font color='red' face='arial' size='+1'> - <b> - \$PORTAL_MESSAGE\$ - </b> - </font> - </div> - <br/> - <div id='loginbox'> - <table> - <tr><td colspan="2"><center>Welcome to the {$g['product_name']} Captive Portal!</td></tr> - <tr><td> </td></tr> - <tr><td align="right">Username:</td><td><input name="auth_user" type="text" style="border: 1px dashed;"></td></tr> - <tr><td align="right">Password:</td><td><input name="auth_pass" type="password" style="border: 1px dashed;"></td></tr> - <tr><td> </td></tr> - <tr> - <td colspan="2"> - <center><input name="accept" type="submit" value="Continue"></center> - </td> - </tr> - </table> - </div> - </center> - </div> - </td> - </tr> - </table> - </center> - </div> - </center> - </td> - </tr> - </table> - </center> + $htmltext .= <<<EOD + <tr> + <td colspan="2"> + <center><input name="accept" type="submit" value="Continue"></center> + </td> + </tr> + </table> + </div> + </center> </div> </td> </tr> - </table> + </table> + </center> + </div> + </center> + </td> + </tr> + </table> </center> - </form> - </body> + </div> + </td> + </tr> + </table> + </center> +</form> +</body> </html> EOD; |
