Change order of clientmac and radius system and include message that we need better...

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

diff --git a/captiveportal/index.php b/captiveportal/index.php
index fc5efc549c8d0675d39d804ff5f1f541805d64d0..4791c56c933133c2eb1c4b46c3ad1d46535cc995 100644 (file)
--- a/captiveportal/index.php
+++ b/captiveportal/index.php
@@ -71,20 +71,22 @@ if ($_POST['redirurl'])
 
 $macfilter = !isset($config['captiveportal']['nomacfilter']);
 
-if (file_exists("{$g['vardb_path']}/captiveportal_radius.db")) {
-       $radius_enable = TRUE;
-       if ($radius_enable && isset($config['captiveportal']['radmac_enable']))
-               $radmac_enable = TRUE;
-}
-
 /* find MAC address for client */
 $clientmac = arp_get_mac_by_ip($clientip);
 if (!$clientmac && $macfilter) {
        /* unable to find MAC address - shouldn't happen! - bail out */
        captiveportal_logportalauth("unauthenticated","noclientmac",$clientip,"ERROR");
+       /* We should return an error page to the client explaining what went wrong instead of exiting */
        exit;
 }
 
+/* find out if we need RADIUS + RADIUSMAC or not */
+if (file_exists("{$g['vardb_path']}/captiveportal_radius.db")) {
+       $radius_enable = TRUE;
+       if ($radius_enable && isset($config['captiveportal']['radmac_enable']))
+               $radmac_enable = TRUE;
+}
+
 if ($_POST['logout_id']) {
        disconnect_client($_POST['logout_id']);
        echo <<<EOD