WebSVN – ALCASAR – Path Comparison – /

Ignore whitespace Rev 2617 → Rev 2618

/CHANGELOG
9,6 → 9,7
- Add original "Max-All-Session" RADIUS attribute.
- Update acme.sh (Let's Encrypt client) to v2.7.9.
- Don't display "CERT" menu when HTTPS isn't enable for user's network flows
- Add counter to "CoovaChilli-Max-Total-Octets" (maximum of data exchanged) RADIUS attribute (in order to prevent quota reset on the login).

ACC
- Remove network check in ACC homepage.

/conf/freeradius-web/sql.attrmap
56,3 → 56,4
checkItem Alcasar-Expire-After Alcasar-Expire-After
checkItem CoovaChilli-Max-Total-Octets-Daily CoovaChilli-Max-Total-Octets-Daily
checkItem CoovaChilli-Max-Total-Octets-Monthly CoovaChilli-Max-Total-Octets-Monthly
checkItem CoovaChilli-Max-Total-Octets CoovaChilli-Max-Total-Octets

 /conf/radius/alcasar
 ,6 → 59,13
                 reject
         }
+        counterCoovaChilliMaxAllTotalOctets { reject = 1 }
+        if (reject) {
+                update reply {
+                        Reply-Message := "Your maximum usage volume has been reached"
+                }
+                reject
+        }
         counterCoovaChilliMaxTotalOctetsMonthly { reject = 1 }
         if (reject) {
                 update reply {

 /conf/radius/alcasar-with-ldap
 ,6 → 59,13
                 reject
         }
+        counterCoovaChilliMaxAllTotalOctets { reject = 1 }
+        if (reject) {
+                update reply {
+                        Reply-Message := "Your maximum usage volume has been reached"
+                }
+                reject
+        }
         counterCoovaChilliMaxTotalOctetsMonthly { reject = 1 }
         if (reject) {
                 update reply {

 /conf/radius/sqlcounter
 ,3 → 57,14
         reset = monthly
         query = "SELECT IFNULL((SUM(AcctInputOctets + AcctOutputOctets)),0) FROM radacct WHERE username='%{${key}}' AND UNIX_TIMESTAMP(AcctStartTime) + AcctSessionTime > '%%b'"
 }
+sqlcounter counterCoovaChilliMaxAllTotalOctets {
+        sql_module_instance = sql
+        counter_name = CoovaChilli-Max-All-Total-Octets
+        check_name = CoovaChilli-Max-Total-Octets
+        counter_type = data
+        reply_name = CoovaChilli-Max-Total-Octets
+        key = User-Name
+        reset = never
+        query = "SELECT IFNULL((SUM(AcctInputOctets + AcctOutputOctets)),0) FROM radacct WHERE username='%{${key}}'"
+}

/web/acc/manager/htdocs/group_new.php
192,7 → 192,7
$desc = $l_simultaneous_use;
break;
case 'Max-All-Session' :
$advanced = false;
$advanced = true;
$help_link = "help/max_all_session_help.html";
$desc = $l_max_all_session;
break;
306,12 → 306,12
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
case 'CoovaChilli-Max-Total-Octets' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:=";
break;
case 'Session-Timeout' :
case 'CoovaChilli-Max-Input-Octets' :
case 'CoovaChilli-Max-Output-Octets' :
case 'CoovaChilli-Max-Total-Octets' :
case 'CoovaChilli-Bandwidth-Max-Up' :
case 'CoovaChilli-Bandwidth-Max-Down' :
case 'WISPr-Redirection-URL' :
362,12 → 362,12
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
case 'CoovaChilli-Max-Total-Octets' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">";
break;
case 'Session-Timeout' :
case 'CoovaChilli-Max-Input-Octets' :
case 'CoovaChilli-Max-Output-Octets' :
case 'CoovaChilli-Max-Total-Octets' :
case 'CoovaChilli-Bandwidth-Max-Up' :
case 'CoovaChilli-Bandwidth-Max-Down' :
case 'WISPr-Redirection-URL' :

/web/acc/manager/htdocs/user_edit.php
444,7 → 444,7
$desc = $l_simultaneous_use;
break;
case 'Max-All-Session' :
$advanced = false;
$advanced = true;
$help_link = "help/max_all_session_help.html";
$desc = $l_max_all_session;
break;
559,12 → 559,12
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
case 'CoovaChilli-Max-Total-Octets' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:=</option></select></td>";
break;
case 'Session-Timeout' :
case 'CoovaChilli-Max-Input-Octets' :
case 'CoovaChilli-Max-Output-Octets' :
case 'CoovaChilli-Max-Total-Octets' :
case 'CoovaChilli-Bandwidth-Max-Up' :
case 'CoovaChilli-Bandwidth-Max-Down' :
case 'WISPr-Redirection-URL' :
612,12 → 612,12
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
case 'CoovaChilli-Max-Total-Octets' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">";
break;
case 'Session-Timeout' :
case 'CoovaChilli-Max-Input-Octets' :
case 'CoovaChilli-Max-Output-Octets' :
case 'CoovaChilli-Max-Total-Octets' :
case 'CoovaChilli-Bandwidth-Max-Up' :
case 'CoovaChilli-Bandwidth-Max-Down' :
case 'WISPr-Redirection-URL' :

/web/acc/manager/htdocs/user_new.php
262,7 → 262,7
$desc = $l_simultaneous_use;
break;
case 'Max-All-Session' :
$advanced = false;
$advanced = true;
$help_link = "help/max_all_session_help.html";
$desc = $l_max_all_session;
break;
376,12 → 376,12
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
case 'CoovaChilli-Max-Total-Octets' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:=</option></select></td>";
break;
case 'Session-Timeout' :
case 'CoovaChilli-Max-Input-Octets' :
case 'CoovaChilli-Max-Output-Octets' :
case 'CoovaChilli-Max-Total-Octets' :
case 'CoovaChilli-Bandwidth-Max-Up' :
case 'CoovaChilli-Bandwidth-Max-Down' :
case 'WISPr-Redirection-URL' :
429,12 → 429,12
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
case 'CoovaChilli-Max-Total-Octets' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">";
break;
case 'Session-Timeout' :
case 'CoovaChilli-Max-Input-Octets' :
case 'CoovaChilli-Max-Output-Octets' :
case 'CoovaChilli-Max-Total-Octets' :
case 'CoovaChilli-Bandwidth-Max-Up' :
case 'CoovaChilli-Bandwidth-Max-Down' :
case 'WISPr-Redirection-URL' :