From 8e51cc6a53d96f247c7195be030f529a4d1cea7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Fri, 31 Jul 2009 14:17:31 +0000
Subject: Circumvent weirdness of php when unsetting an array members during a
 loop.

---
 etc/inc/captiveportal.inc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 0a06d63..d529ade 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -464,6 +464,7 @@ function captiveportal_prune_old() {
      *  the loop would evalate count() on every iteration and since $i would increase and count() would decrement they
      *  would meet before we had a chance to iterate over all accounts.
      */
+    $unsetindexes = array();
     $no_users = count($cpdb);
     for ($i = 0; $i < $no_users; $i++) {
 
@@ -525,7 +526,7 @@ function captiveportal_prune_old() {
         if ($timedout) {
             captiveportal_disconnect($cpdb[$i], $radiusservers,$term_cause,$stop_time);
             captiveportal_logportalauth($cpdb[$i][4], $cpdb[$i][3], $cpdb[$i][2], "TIMEOUT");
-            unset($cpdb[$i]);
+	    $unsetindexes[$i] = $i;
         }
 
         /* do periodic RADIUS reauthentication? */
@@ -580,10 +581,13 @@ function captiveportal_prune_old() {
             if ($auth_list['auth_val'] == 3) {
                 captiveportal_disconnect($cpdb[$i], $radiusservers, 17);
                 captiveportal_logportalauth($cpdb[$i][4], $cpdb[$i][3], $cpdb[$i][2], "RADIUS_DISCONNECT", $auth_list['reply_message']);
-                unset($cpdb[$i]);
+	        $unsetindexes[$i] = $i;
             }
         }
     }
+    /* This is a kludge to overcome some php weirdness */
+    foreach($unsetindexes as $unsetindex)
+	unset($cpdb[$unsetindex]);
 
     /* write database */
     captiveportal_write_db($cpdb);
-- 
cgit v1.1