* Add more documentation for per user counter limit attributes (daily/weekly/monthly...

* Make all counter limits default to none so that people don't get confused

diff --git a/dialup_admin/Changelog b/dialup_admin/Changelog
index 315c6eb..fcf54c0 100644 (file)
--- a/dialup_admin/Changelog
+++ b/dialup_admin/Changelog
@@ -14,6 +14,8 @@ Ver 1.78:
 * Add an sqlrelay functions file. The user_admin page does not currently work. Looking into it.
 * Add sqlrelay support in the scripts. Add a sqlrelay_query script to run sqlrelay commands
 * Update password_check to work with all password attributes and use the configuration directives
+* Add more documentation for per user counter limit attributes (daily/weekly/monthly limits)
+* Make all counter limits default to none so that people don't get confused
 Ver 1.75:
 * A LOT of security related fixes. Now dialupadmin should hopefully be secure enough to
   be accessed by normal users (not administrators).

diff --git a/dialup_admin/conf/admin.conf b/dialup_admin/conf/admin.conf
index 7ee4e62..ba82e18 100644 (file)
--- a/dialup_admin/conf/admin.conf
+++ b/dialup_admin/conf/admin.conf
@@ -321,9 +321,16 @@ sql_connect_timeout: 3
 # Default values for the various user limits in case the counter module
 # is used to impose such limits.
 # The value should be the user limit in seconds or none for nothing
-#
-counter_default_daily: 14400
-counter_default_weekly: 72000
+# Check out conf/sql.attrmap or extra.ldap-attrmap (depending on if you are
+# using sql or ldap) for per user attributes. The mapping should be made to
+# the attributes configured in the counter module. The attributes used by
+# dialupadmin will always be the ones appearing in the attribute mapping files
+# so you should make sure they are mapped to the correct attributes
+#
+#counter_default_daily: 14400
+#counter_default_weekly: 72000
+counter_default_daily: none
+counter_default_weekly: none
 counter_default_monthly: none
 #
 # Since calculating monthly usage can be quite expensive we make

diff --git a/dialup_admin/conf/extra.ldap-attrmap b/dialup_admin/conf/extra.ldap-attrmap
index 69b5320..fb0637a 100644 (file)
--- a/dialup_admin/conf/extra.ldap-attrmap
+++ b/dialup_admin/conf/extra.ldap-attrmap
@@ -5,4 +5,8 @@ checkItem       Dialup-Lock-Msg         radiuslockmsg
 checkItem      User-Password           userpassword
 checkItem      Regular-Profile         radiusProfileDn
 checkItem      Check-Item              radiusCheckItem         generic
+checkItem      Max-Daily-Session       radiusMaxDailySession
+checkItem      Max-Weekly-Session      radiusMaxWeeklySession
+checkItem      Max-Monthly-Session     radiusMaxMonthlySession
+
 replyItem      Reply-Item              radiusReplyItem         generic

diff --git a/dialup_admin/conf/sql.attrmap b/dialup_admin/conf/sql.attrmap
index 7fa79fa..a5a44c9 100644 (file)
--- a/dialup_admin/conf/sql.attrmap
+++ b/dialup_admin/conf/sql.attrmap
@@ -16,6 +16,7 @@ checkItem     Calling-Station-Id              Calling-Station-Id
 checkItem      Dialup-Access                   none
 checkItem      Max-Daily-Session               Max-Daily-Session
 checkItem      Max-Weekly-Session              Max-Weekly-Session
+checkItem      Max-Monthly-Session             Max-Monthly-Session
 checkItem      Login-Time                      Login-Time
 checkItem      Expiration                      Expiration
 

diff --git a/dialup_admin/conf/user_edit.attrs b/dialup_admin/conf/user_edit.attrs
index 4e96ee3..8ec5903 100644 (file)
--- a/dialup_admin/conf/user_edit.attrs
+++ b/dialup_admin/conf/user_edit.attrs
@@ -38,6 +38,7 @@ Dialup-Lock-Msg                       <a href="help/lock_message_help.html" target=lm_help onclick=w
 #Reply-Message <a href="help/reply_message_help.html" target=lm_help onclick=window.open("help/reply_message_help.html","lm_help","width=600,height=210,toolbar=no,scrollbars=no,resizable=yes") title="Reply-Message Help Page"><font color="blue">Reply-Message</font></a>
 #Max-Daily-Session             Daily Limit (secs)
 #Max-Weekly-Session            Weekly Limit (secs)
+#Max-Monthly-Session           Monthly Limit (secs)
 #Login-Time                    <a href="login_time_create.php3?val=$name1&first=yes" target=lt_create onclick=window.open("login_time_create.php3?val=$name1&first=yes","lt_create","width=600,height=490,toolbar=no,scrollbars=yes,resizable=yes") title="Login-Time Creation Page"><font color="blue">User Login Period </font></a>(<a href="help/login_time_help.html" target=lt_help onclick=window.open("help/login_time_help.html","lt_help","width=600,height=370,toolbar=no,scrollbars=no,resizable=yes") title="Login-Time Help Page"><font color="blue">UUCP </font></a>Format)
 #Expiration                    <a href="help/expiration_help.html" target=lt_help onclick=window.open("help/expiration_help.html","lt_help","width=600,height=180,toolbar=no,scrollbars=no,resizable=yes") title="Expiration Help Page"><font color="blue">User Expiration Date</font></a>
 #