diff options
| author | Scott Ullrich <sullrich@gmail.com> | 2012-06-09 08:46:22 -0700 |
|---|---|---|
| committer | Scott Ullrich <sullrich@gmail.com> | 2012-06-09 08:46:22 -0700 |
| commit | 85317bfdf6d0941deee545512f04b57aa7223746 (patch) | |
| tree | 06a50c180cff5ca80969f71fa3f6c86f5a9e8c09 | |
| parent | 99897bf5ef42f3cde608ea87f89ca5dbf2814a01 (diff) | |
| parent | a636682dca354d4a3a4c2deba7b9169f083543f0 (diff) | |
| download | pfsense-85317bfdf6d0941deee545512f04b57aa7223746.zip pfsense-85317bfdf6d0941deee545512f04b57aa7223746.tar.gz | |
Merge pull request #132 from bcyrill/patch-4
Update Captiveportal
| -rwxr-xr-x | usr/local/www/services_captiveportal.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index 472fccd..37ff181 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -63,20 +63,20 @@ $a_cp =& $config['captiveportal']; $pgtitle = array(gettext("Services"),gettext("Captive portal"), $a_cp[$cpzone]['zone']); if ($_GET['act'] == "viewhtml") { - if (isset($cpzone) && $a_cp[$cpzone]) - echo base64_decode($pconfig['page']['htmltext']); + if ($a_cp[$cpzone] && $a_cp[$cpzone]['page']['htmltext']) + echo base64_decode($a_cp[$cpzone]['page']['htmltext']); exit; } else if ($_GET['act'] == "viewerrhtml") { - if (isset($cpzone) && $a_cp[$cpzone]) - echo base64_decode($pconfig['page']['errtext']); + if ($a_cp[$cpzone] && $a_cp[$cpzone]['page']['errtext']) + echo base64_decode($a_cp[$cpzone]['page']['errtext']); exit; } else if ($_GET['act'] == "viewlogouthtml") { - if (isset($cpzone) && $a_cp[$cpzone]) - echo base64_decode($pconfig['page']['logouttext']); + if ($a_cp[$cpzone] && $a_cp[$cpzone]['page']['logouttext']) + echo base64_decode($a_cp[$cpzone]['page']['logouttext']); exit; } -if (isset($cpzone) && $a_cp[$cpzone]) { +if ($a_cp[$cpzone]) { $pconfig['zoneid'] = $a_cp[$cpzone]['zoneid']; $pconfig['cinterface'] = $a_cp[$cpzone]['interface']; $pconfig['maxproc'] = $a_cp[$cpzone]['maxproc']; @@ -941,7 +941,7 @@ function enable_change(enable_change) { <td class="vtable"> <input name="errfile" type="file" class="formfld file" id="errfile"><br> <?php if ($pconfig['page']['errtext']): ?> - <a href="?act=viewerrhtml" target="_blank"><?=gettext("View current page"); ?></a> + <a href="?zone=<?=$cpzone?>&act=viewerrhtml" target="_blank"><?=gettext("View current page"); ?></a> <br> <br> <?php endif; ?> @@ -955,7 +955,7 @@ function enable_change(enable_change) { <td class="vtable"> <input name="logoutfile" type="file" class="formfld file" id="logoutfile"><br> <?php if ($pconfig['page']['logouttext']): ?> - <a href="?act=viewlogouthtml" target="_blank"><?=gettext("View current page"); ?></a> + <a href="?zone=<?=$cpzone?>&act=viewlogouthtml" target="_blank"><?=gettext("View current page"); ?></a> <br> <br> <?php endif; ?> |
