Change the portal_allow function to use attribute array, every other code should...

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

diff --git a/captiveportal/index.php b/captiveportal/index.php
index 490d97331c134e37a062db6b1ce8d340472d2ab0..db28cecfbcc432d7a99dc1753d20093159d33905 100755 (executable)
--- a/captiveportal/index.php
+++ b/captiveportal/index.php
@@ -232,10 +232,14 @@ function portal_mac_radius($clientmac,$clientip) {
     return FALSE;
 }
 
-function portal_allow($clientip,$clientmac,$clientuser,$password = null, $session_timeout = null, $idle_timeout = null, $url_redirection = null, $session_terminate_time = null)  {
+function portal_allow($clientip,$clientmac,$clientuser,$password = null, $attributes)  {
 
     global $redirurl, $g, $config;
 
+    // Ensure we create an array if we are missing attributes
+    if (!is_array($attributes))
+        $attributes = array();
+
     if ((isset($config['captiveportal']['noconcurrentlogins'])) && ($clientuser != 'unauthenticated'))
         kick_concurrent_logins($clientuser);
 
@@ -286,7 +290,7 @@ function portal_allow($clientip,$clientmac,$clientuser,$password = null, $sessio
 
     /* encode password in Base64 just in case it contains commas */
     $bpassword = base64_encode($password);
-    $cpdb[] = array(time(), $ruleno, $clientip, $clientmac, $clientuser, $sessionid, $bpassword, $session_timeout, $idle_timeout, $session_terminate_time);
+    $cpdb[] = array(time(), $ruleno, $clientip, $clientmac, $clientuser, $sessionid, $bpassword, $attributes['session_timeout'], $attributes['idle_timeout'], $attributes['session_terminate_time']);
 
     /* rewrite information to database */
     captiveportal_write_db($cpdb);

diff --git a/phpconf/inc/captiveportal.inc b/phpconf/inc/captiveportal.inc
index 14bfe391393b5b9f8a692e5e82b8bc49f10c7f63..18fa76744943a37b05c399374cadd9118f6812c2 100644 (file)
--- a/phpconf/inc/captiveportal.inc
+++ b/phpconf/inc/captiveportal.inc
@@ -798,10 +798,7 @@ function radius($username,$password,$clientip,$clientmac,$type) {
                     $clientmac,
                     $username,
                     $password,
-                    $auth_list['session_timeout'],
-                    $auth_list['idle_timeout'],
-                    $auth_list['url_redirection'],
-                    $auth_list['session_terminate_time']);
+                    $auth_list);
 
         if ($radacct_enable) {
             $auth_list['acct_val'] = RADIUS_ACCOUNTING_START($next_ruleno,