diff options
| author | Chris Buechler <cmb@pfsense.org> | 2012-12-30 15:22:03 -0800 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2012-12-30 15:22:03 -0800 |
| commit | 8301cc5fb7c086fd7769fec503aa32b4face3eab (patch) | |
| tree | 64118d8cf9b116476759e6e8b5de81b371ef41ce /etc | |
| parent | 1d2c5de8e6292985629f5f47fa583505d393a733 (diff) | |
| parent | be0a33efff2e1c002257dc3391252707671ff5a0 (diff) | |
| download | pfsense-8301cc5fb7c086fd7769fec503aa32b4face3eab.zip pfsense-8301cc5fb7c086fd7769fec503aa32b4face3eab.tar.gz | |
Merge pull request #298 from bcyrill/cp-sqlite
Various fixes to removal of pipes
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index a06868b..b5d0576 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1259,7 +1259,7 @@ function captiveportal_remove_entries($remove) { return; $query = "DELETE FROM captiveportal WHERE sessionid in ("; - foreach($remove as $idx => $rid) { + foreach($remove as $idx => $unindex) { $query .= "'{$unindex}'"; if ($idx < (count($remove) - 1)) $query .= ","; @@ -1363,7 +1363,7 @@ function captiveportal_free_dn_ruleno($ruleno) { global $config, $g; $cpruleslck = lock("captiveportalrulesdn", LOCK_EX); - if (file_exists("{$g['vardb_path']}/captiveportal_{$cpzone}.rules")) { + if (file_exists("{$g['vardb_path']}/captiveportaldn.rules")) { $rules = unserialize(file_get_contents("{$g['vardb_path']}/captiveportaldn.rules")); $rules[$ruleno] = false; $rules[++$ruleno] = false; |
