Remove specifying ruleno as parameter to portal_allow function since we don't need it

git-svn-id: https://svn.m0n0.ch/wall/trunk@116 e36fee2c-cc09-0410-a7cc-ebac5c6737de

diff --git a/captiveportal/index.php b/captiveportal/index.php
index 3f731ad5c0b7ff1e59e294766d70fd324fd696a8..100d3324c7d9a85401808718bb9e09e310204102 100755 (executable)
--- a/captiveportal/index.php
+++ b/captiveportal/index.php
@@ -231,7 +231,7 @@ function portal_mac_radius($clientmac,$clientip) {
     return FALSE;
 }
 
-function portal_allow($clientip,$clientmac,$clientuser,$password = null, $attributes = null, $ruleno = null)  {
+function portal_allow($clientip,$clientmac,$clientuser,$password = null, $attributes = null)  {
 
     global $redirurl, $g, $config;
 
@@ -244,8 +244,7 @@ function portal_allow($clientip,$clientmac,$clientuser,$password = null, $attrib
 
     captiveportal_lock();
 
-    /* if no ruleno is passed to this function we will look one up in the pool */
-    $ruleno = (!is_null($ruleno)) ? $ruleno : captiveportal_get_next_ipfw_ruleno();
+    $ruleno = captiveportal_get_next_ipfw_ruleno();
 
     /* if the pool is empty, return appropriate message and exit */
     if (is_null($ruleno)) {

diff --git a/phpconf/inc/captiveportal.inc b/phpconf/inc/captiveportal.inc
index 3fab3da138b6f899ba204d57e7e037b7846051b6..a7d2ae1201ddbdd4ca14769f063406adb6b2b5cf 100644 (file)
--- a/phpconf/inc/captiveportal.inc
+++ b/phpconf/inc/captiveportal.inc
@@ -801,8 +801,7 @@ function radius($username,$password,$clientip,$clientmac,$type) {
                     $clientmac,
                     $username,
                     $password,
-                    $auth_list,
-                    $ruleno);
+                    $auth_list);
 
         if ($radacct_enable) {
             $auth_list['acct_val'] = RADIUS_ACCOUNTING_START($ruleno,