Don't show an account as locked if Dialup-Access does not exist and the mapping corre...

diff --git a/Changelog b/Changelog
index 55b58a8a89292950f40f1e8b64d55c3e97febfcb..8cc83b5eaaecdaf700af23109a98e429af7e2ec2 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -49,6 +49,7 @@ Ver 1.63:
   Based on a report by "apellido jr., wilfredo p"
 * Add more comments in the admin.conf file
 * Show correct calculation of the montlhy usage time.
+* Don't show an account as locked if Dialup-Access does not exist and the mapping corresponds to 'none' attribute
 Ver 1.62:
 * Remove one sql query from user_admin which was not needed.
 * Instead of a query like "LIKE 'YYYY-MM-DD%'" use "AcctStopTime >= 'YYYY-MM-DD 00:00:00 AND AcctStopTime

diff --git a/htdocs/user_admin.php3 b/htdocs/user_admin.php3
index 1217aa2f79cb355267d56f32606aa5bd07eee9f9..11e17c380f2f5cb27d5a3c503ac21ac4176af721 100644 (file)
--- a/htdocs/user_admin.php3
+++ b/htdocs/user_admin.php3
@@ -281,7 +281,7 @@ $daily_limit = (is_numeric($daily_limit)) ? time2str($daily_limit) : $daily_limi
 $session_limit = (is_numeric($session_limit)) ? time2str($session_limit) : $session_limit;
 $remaining = (is_numeric($remaining)) ? time2str($remaining) : $remaining;
 
-if ($item_vals['Dialup-Access'][0] == 'FALSE' || (!isset($item_vals['Dialup-Access'][0]) && $attrmap['Dialup-Access'] != ''))
+if ($item_vals['Dialup-Access'][0] == 'FALSE' || (!isset($item_vals['Dialup-Access'][0]) && $attrmap['Dialup-Access'] != '' && $attrmap['Dialup-Access'] != 'none'))
        $msg =<<<EON
 <font color=red><b> The user account is locked </b></font>
 EON;