sqlcounter start and end attributes are by default in the control list

diff --git a/raddb/mods-config/sql/counter/mysql/dailycounter.conf b/raddb/mods-config/sql/counter/mysql/dailycounter.conf
index 26f2887dda5b51a968cdd08d4b2cf11809ffa855..0224659f0ea0ef194c5d126626eed4296e3fc212 100644 (file)
--- a/raddb/mods-config/sql/counter/mysql/dailycounter.conf
+++ b/raddb/mods-config/sql/counter/mysql/dailycounter.conf
@@ -5,10 +5,10 @@
 #  below
 #
 query = "\
-       SELECT SUM(acctsessiontime - GREATEST((%{dailycounter-reset-start} - UNIX_TIMESTAMP(acctstarttime)), 0)) \
+       SELECT SUM(acctsessiontime - GREATEST((%{control.dailycounter-reset-start} - UNIX_TIMESTAMP(acctstarttime)), 0)) \
        FROM radacct \
        WHERE username = '%{${key}}' \
-       AND UNIX_TIMESTAMP(acctstarttime) + acctsessiontime > '%{dailycounter-reset-start}'"
+       AND UNIX_TIMESTAMP(acctstarttime) + acctsessiontime > '%{control.dailycounter-reset-start}'"
 
 #
 #  This query ignores calls that started in a previous
@@ -19,15 +19,15 @@ query = "\
 #      SELECT SUM(acctsessiontime) \
 #      FROM radacct \
 #      WHERE username = '%{${key}}' \
-#      AND acctstarttime > FROM_UNIXTIME('%{dailycounter-reset-start}')"
+#      AND acctstarttime > FROM_UNIXTIME('%{control.dailycounter-reset-start}')"
 
 #
 #  This query is the same as above, but demonstrates an
-#  additional counter parameter '%{dailycounter-reset-end}' which is the
+#  additional counter parameter '%{control.dailycounter-reset-end}' which is the
 #  timestamp for the end of the period
 #
 #query = "\
 #      SELECT SUM(acctsessiontime) \
 #      FROM radacct \
 #      WHERE username = '%{${key}}' \
-#      AND acctstarttime BETWEEN FROM_UNIXTIME('%{dailycounter-reset-start}') AND FROM_UNIXTIME('%{dailycounter-reset-end}')"
+#      AND acctstarttime BETWEEN FROM_UNIXTIME('%{control.dailycounter-reset-start}') AND FROM_UNIXTIME('%{control.dailycounter-reset-end}')"

diff --git a/raddb/mods-config/sql/counter/mysql/monthlycounter.conf b/raddb/mods-config/sql/counter/mysql/monthlycounter.conf
index 0b77ed191cee1e53515885419f75fa54fa02b870..c5bbc23c3daafd1bfd689500274202a8f7efa726 100644 (file)
--- a/raddb/mods-config/sql/counter/mysql/monthlycounter.conf
+++ b/raddb/mods-config/sql/counter/mysql/monthlycounter.conf
@@ -5,10 +5,10 @@
 #  below
 #
 query = "\
-       SELECT SUM(acctsessiontime - GREATEST((%{monthlycounter-reset-start} - UNIX_TIMESTAMP(acctstarttime)), 0)) \
+       SELECT SUM(acctsessiontime - GREATEST((%{control.monthlycounter-reset-start} - UNIX_TIMESTAMP(acctstarttime)), 0)) \
        FROM radacct \
        WHERE username='%{${key}}' \
-       AND UNIX_TIMESTAMP(acctstarttime) + acctsessiontime > '%{monthlycounter-reset-start}'"
+       AND UNIX_TIMESTAMP(acctstarttime) + acctsessiontime > '%{control.monthlycounter-reset-start}'"
 
 #
 #  This query ignores calls that started in a previous
@@ -19,16 +19,16 @@ query = "\
 #      SELECT SUM(acctsessiontime) \
 #      FROM radacct\
 #      WHERE username='%{${key}}' \
-#      AND acctstarttime > FROM_UNIXTIME('%{monthlycounter-reset-start}')"
+#      AND acctstarttime > FROM_UNIXTIME('%{control.monthlycounter-reset-start}')"
 
 #
 #  This query is the same as above, but demonstrates an
-#  additional counter parameter '%{monthlycounter-reset-end}' which is the
+#  additional counter parameter '%{control.monthlycounter-reset-end}' which is the
 #  timestamp for the end of the period
 #
 #query = "\
 #      SELECT SUM(acctsessiontime) \
 #      FROM radacct \
 #      WHERE username='%{${key}}' \
-#      AND acctstarttime BETWEEN FROM_UNIXTIME('%{monthlycounter-reset-start}') \
-#      AND FROM_UNIXTIME('%{monthlycounter-reset-end}')"
+#      AND acctstarttime BETWEEN FROM_UNIXTIME('%{control.monthlycounter-reset-start}') \
+#      AND FROM_UNIXTIME('%{control.monthlycounter-reset-end}')"

diff --git a/raddb/mods-config/sql/counter/postgresql/dailycounter.conf b/raddb/mods-config/sql/counter/postgresql/dailycounter.conf
index e0d3cd657fb9602c3427f5da8709221ae228da6c..6347291cf20cf4482a87e44a5662cea445c3f5dd 100644 (file)
--- a/raddb/mods-config/sql/counter/postgresql/dailycounter.conf
+++ b/raddb/mods-config/sql/counter/postgresql/dailycounter.conf
@@ -5,10 +5,10 @@
 #  below
 #
 query = "\
-       SELECT SUM(AcctSessionTime - GREATEST((%{dailycounter-reset-start} - EXTRACT(epoch FROM AcctStartTime)), 0)) \
+       SELECT SUM(AcctSessionTime - GREATEST((%{control.dailycounter-reset-start} - EXTRACT(epoch FROM AcctStartTime)), 0)) \
        FROM radacct \
        WHERE UserName='%{${key}}' \
-       AND EXTRACT(epoch FROM AcctStartTime) + AcctSessionTime > '%{dailycounter-reset-start}'"
+       AND EXTRACT(epoch FROM AcctStartTime) + AcctSessionTime > '%{control.dailycounter-reset-start}'"
 
 #
 #  This query ignores calls that started in a previous
@@ -19,16 +19,16 @@ query = "\
 #      SELECT SUM(AcctSessionTime) \
 #      FROM radacct \
 #      WHERE UserName='%{${key}}' \
-#      AND EXTRACT(epoch FROM AcctStartTime) > '%{dailycounter-reset-start}'"
+#      AND EXTRACT(epoch FROM AcctStartTime) > '%{control.dailycounter-reset-start}'"
 
 #
 #  This query is the same as above, but demonstrates an
-#  additional counter parameter '%{dailycounter-reset-end}' which is the
+#  additional counter parameter '%{control.dailycounter-reset-end}' which is the
 #  timestamp for the end of the period
 #
 #query = "\
 #      SELECT SUM(AcctSessionTime) \
 #      FROM radacct \
 #      WHERE UserName='%{${key}}' \
-#      AND EXTRACT(epoch FROM AcctStartTime) BETWEEN '%{dailycounter-reset-start}' \
-#      AND '%{dailycounter-reset-end}'"
+#      AND EXTRACT(epoch FROM AcctStartTime) BETWEEN '%{control.dailycounter-reset-start}' \
+#      AND '%{control.dailycounter-reset-end}'"

diff --git a/raddb/mods-config/sql/counter/postgresql/monthlycounter.conf b/raddb/mods-config/sql/counter/postgresql/monthlycounter.conf
index 92afae4dbeb3fa1bb5e9d5a01b8e3b0c8c73f42d..9f628d8d46f6f3e8915b7f0f78b077464c7befa1 100644 (file)
--- a/raddb/mods-config/sql/counter/postgresql/monthlycounter.conf
+++ b/raddb/mods-config/sql/counter/postgresql/monthlycounter.conf
@@ -3,10 +3,10 @@
 #  involves more work for the SQL server than those
 #  below
 query = "\
-       SELECT SUM(AcctSessionTime - GREATEST((%{monthlycounter-reset-start} - EXTRACT(epoch FROM AcctStartTime)), 0)) \
+       SELECT SUM(AcctSessionTime - GREATEST((%{control.monthlycounter-reset-start} - EXTRACT(epoch FROM AcctStartTime)), 0)) \
        FROM radacct \
        WHERE UserName='%{${key}}' \
-       AND EXTRACT(epoch FROM AcctStartTime) + AcctSessionTime > '%{monthlycounter-reset-start}'"
+       AND EXTRACT(epoch FROM AcctStartTime) + AcctSessionTime > '%{control.monthlycounter-reset-start}'"
 
 #
 #  This query ignores calls that started in a previous
@@ -17,15 +17,15 @@ query = "\
 #      SELECT SUM(AcctSessionTime) \
 #      FROM radacct \
 #      WHERE UserName='%{${key}}' \
-#      AND EXTRACT(epoch FROM AcctStartTime) > '%{monthlycounter-reset-start}'"
+#      AND EXTRACT(epoch FROM AcctStartTime) > '%{control.monthlycounter-reset-start}'"
 
 #
 #  This query is the same as above, but demonstrates an
-#  additional counter parameter '%{monthlycounter-reset-end}' which is the
+#  additional counter parameter '%{control.monthlycounter-reset-end}' which is the
 #  timestamp for the end of the period
 #
 #query = "\
 #      SELECT SUM(AcctSessionTime) \
 #      FROM radacct \
 #      WHERE UserName='%{${key}}' \
-#      AND EXTRACT(epoch FROM AcctStartTime) BETWEEN '%{monthlycounter-reset-start}' AND '%{monthlycounter-reset-end}'"
+#      AND EXTRACT(epoch FROM AcctStartTime) BETWEEN '%{control.monthlycounter-reset-start}' AND '%{control.monthlycounter-reset-end}'"

diff --git a/raddb/mods-config/sql/counter/sqlite/dailycounter.conf b/raddb/mods-config/sql/counter/sqlite/dailycounter.conf
index 26283d3a97ef3ea2e0d6a992d0d5d3a291d43e9e..e657dce5c3b7aa7198465a108049b7822ed4dc35 100644 (file)
--- a/raddb/mods-config/sql/counter/sqlite/dailycounter.conf
+++ b/raddb/mods-config/sql/counter/sqlite/dailycounter.conf
@@ -5,10 +5,10 @@
 #  below
 #
 query = "\
-       SELECT SUM(acctsessiontime - GREATEST((%{dailycounter-reset-start} - strftime('%%s', acctstarttime)), 0)) \
+       SELECT SUM(acctsessiontime - GREATEST((%{control.dailycounter-reset-start} - strftime('%%s', acctstarttime)), 0)) \
        FROM radacct \
        WHERE username = '%{${key}}' \
-       AND (strftime('%%s', acctstarttime) + acctsessiontime) > %{dailycounter-reset-start}"
+       AND (strftime('%%s', acctstarttime) + acctsessiontime) > %{control.dailycounter-reset-start}"
 
 #
 #  This query ignores calls that started in a previous
@@ -19,15 +19,15 @@ query = "\
 #      SELECT SUM(acctsessiontime) \
 #      FROM radacct \
 #      WHERE \username = '%{${key}}' \
-#      AND acctstarttime > %{dailycounter-reset-start}"
+#      AND acctstarttime > %{control.dailycounter-reset-start}"
 
 #
 #  This query is the same as above, but demonstrates an
-#  additional counter parameter '%{dailycounter-reset-end}' which is the
+#  additional counter parameter '%{control.dailycounter-reset-end}' which is the
 #  timestamp for the end of the period
 #
 #query = "\
 #      SELECT SUM(acctsessiontime) FROM radacct \
 #      WHERE username = '%{${key}}' \
-#      AND acctstarttime BETWEEN %{dailycounter-reset-start} \
+#      AND acctstarttime BETWEEN %{control.dailycounter-reset-start} \
 #      AND %{dailycounter-reset-end}"

diff --git a/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf b/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf
index e1a7ca764918daa06e7742090f9d743b3a9e4cc1..80fd21166cda0709724fe93a01984bf3c128a4e9 100644 (file)
--- a/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf
+++ b/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf
@@ -5,10 +5,10 @@
 #  below
 #
 query = "\
-       SELECT SUM(acctsessiontime - GREATEST((%{monthlycounter-reset-start} - strftime('%%s', acctstarttime)), 0)) \
+       SELECT SUM(acctsessiontime - GREATEST((%{control.monthlycounter-reset-start} - strftime('%%s', acctstarttime)), 0)) \
        FROM radacct \
        WHERE username = '%{${key}}' AND \
-       (strftime('%%s', acctstarttime) + acctsessiontime) > %{monthlycounter-reset-start}"
+       (strftime('%%s', acctstarttime) + acctsessiontime) > %{control.monthlycounter-reset-start}"
 
 #
 #  This query ignores calls that started in a previous
@@ -19,16 +19,16 @@ query = "\
 #      SELECT SUM(acctsessiontime) \
 #      FROM radacct \
 #      WHERE username = '%{${key}}' \
-#      AND acctstarttime > %{monthlycounter-reset-start}"
+#      AND acctstarttime > %{control.monthlycounter-reset-start}"
 
 #
 #  This query is the same as above, but demonstrates an
-#  additional counter parameter '%{monthlycounter-reset-end}' which is the
+#  additional counter parameter '%{control.monthlycounter-reset-end}' which is the
 #  timestamp for the end of the period
 #
 #query = "\
 #      SELECT SUM(acctsessiontime) \
 #      FROM radacct \
 #      WHERE username = '%{${key}}' \
-#      AND acctstarttime BETWEEN %{monthlycounter-reset-start} \
-#      AND %{monthlycounter-reset-end}"
+#      AND acctstarttime BETWEEN %{control.monthlycounter-reset-start} \
+#      AND %{control.monthlycounter-reset-end}"