Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2507 → Rev 2510

/alcasar.sh
1000,11 → 1000,17
EOF
[ -e /etc/raddb/mods-config/sql/counter/mysql/noresetcounter.conf.default ] || cp /etc/raddb/mods-config/sql/counter/mysql/noresetcounter.conf /etc/raddb/mods-config/sql/counter/mysql/noresetcounter.conf.default
cat << EOF > /etc/raddb/mods-config/sql/counter/mysql/noresetcounter.conf
# This query was modified for ALCASAR needs (amount of time the voucher is enabled --> rename it in the future : 'Expire_on_login')
query = "\
SELECT IFNULL(SUM(AcctSessionTime),0) \
FROM radacct \
WHERE username='%{\${key}}'"
EOF
[ -e /etc/raddb/mods-config/sql/counter/mysql/expire_on_login.conf.default ] || cp /etc/raddb/mods-config/sql/counter/mysql/expire_on_login.conf /etc/raddb/mods-config/sql/counter/mysql/expire_on_login.conf.default
cat << EOF > /etc/raddb/mods-config/sql/counter/mysql/expire_on_login.conf
query = "\
SELECT IFNULL((SELECT TIME_TO_SEC(TIMEDIFF(NOW(), acctstarttime)) \
FROM radacct \
WHERE UserName='%{\${key}}' \
WHERE username='%{\${key}}' \
ORDER BY acctstarttime \
LIMIT 1),0)"
EOF
/conf/freeradius-web/user_edit.attrs
6,7 → 6,8
# Format: Attribute Comment
#
Expiration <a href="help/expiration_help.html" target=lt_help onclick=window.open("help/expiration_help.html","lt_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Expiration Help Page"><font color="blue">Date d'expiration</font></a>
Max-All-Session <a href="help/max_all_session_help.html" target=st_help onclick=window.open("help/max_all_session_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Max connection Time Help Page"><font color="blue">Dur&eacute;e totale de connexion autoris&eacute;e</font></a><BR>(en secondes)
Alcasar-Expire-After <a href="help/max_all_session_help.html" target=st_help onclick=window.open("help/max_all_session_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Max connection Time Help Page"><font color="blue">Dur&eacute;e totale de connexion autoris&eacute;e</font></a><BR>(en secondes)
#Max-All-Session <a href="help/max_all_session_help.html" target=st_help onclick=window.open("help/max_all_session_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Max connection Time Help Page"><font color="blue">Dur&eacute;e totale de connexion autoris&eacute;e</font></a><BR>(en secondes)
Session-Timeout <a href="help/session_timeout_help.html" target=st_help onclick=window.open("help/session_timeout_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Session Timeout Help Page"><font color="blue">Dur&eacute;e maximale d'une session</font></a><BR>(en secondes)
Idle-Timeout <a href="help/idle_timeout_help.html" target=it_help onclick=window.open("help/idle_timeout_help.html","it_help","width=600,height=170,toolbar=no,scrollbars=no,resizable=yes") title="Idle Timeout Help Page"><font color="blue">Idle Timeout</font></a>
Max-Daily-Session <a href="help/session_timeout_help.html" target=st_help onclick=window.open("help/session_timeout_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Session Timeout Help Page"><font color="blue">Dur&eacute;e limite journali&egrave;re</font></a><BR>(en secondes)
/conf/radius/dictionary.alcasar
30,4 → 30,6
VALUE Alcasar-Status-Page-Must-Stay-Open Yes 1
VALUE Alcasar-Status-Page-Must-Stay-Open No 2
 
ATTRIBUTE Alcasar-Expire-After 5 integer
 
END-VENDOR Alcasar
/conf/radius/sqlcounter
26,3 → 26,12
reset = never
$INCLUDE ${modconfdir}/sql/counter/mysql/${.:instance}.conf
}
 
sqlcounter expire_on_login {
sql_module_instance = sql
counter_name = Alcasar-Expire-After-Initial-Login
check_name = Alcasar-Expire-After
key = User-Name
reset = never
$INCLUDE ${modconfdir}/sql/counter/mysql/${.:instance}.conf
}
/web/acc/manager/htdocs/group_new.php
265,6 → 265,11
$help_link = "help/statusOpenRequired_help.html";
$desc = $l_statusOpenRequired;
break;
case 'Alcasar-Expire-After' :
$advanced = false;
$help_link = "help/max_all_session_help.html";
$desc = $l_max_all_session;
break;
default:
$advanced = true;
break;
287,6 → 292,7
case 'Max-Monthly-Session' :
case 'Login-Time' :
case 'Expiration' :
case 'Alcasar-Expire-After' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:=";
break;
case 'Session-Timeout' :
340,6 → 346,7
case 'Alcasar-Filter' :
case 'Alcasar-Protocols-Filter' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
case 'Alcasar-Expire-After' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">";
break;
case 'Session-Timeout' :
399,6 → 406,7
break;
case 'Max-Monthly-Session' :
case 'Max-All-Session' :
case 'Alcasar-Expire-After' :
/*valeur d'origine de durée limite */
echo"<input type=\"text\" name=\"$name\" onfocus=\"this.value=''\" value=\"$val\" size=10>";
/* Choix d'unité*/
/web/acc/manager/htdocs/user_edit.php
312,6 → 312,9
$grp_statusOpenRequired = '';
}
break;
case 'Alcasar-Expire-After' :
$grp_expireAfter = $val;
break;
}
}
}
507,6 → 510,11
$help_link = "help/statusOpenRequired_help.html";
$desc = $l_statusOpenRequired;
break;
case 'Alcasar-Expire-After' :
$advanced = false;
$help_link = "help/max_all_session_help.html";
$desc = $l_max_all_session;
break;
default:
$advanced = true;
break;
530,6 → 538,7
case 'Max-Monthly-Session' :
case 'Login-Time' :
case 'Expiration' :
case 'Alcasar-Expire-After' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:=</option></select></td>";
break;
case 'Session-Timeout' :
580,6 → 589,7
case 'Max-Monthly-Session' :
case 'Login-Time' :
case 'Expiration' :
case 'Alcasar-Expire-After' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">";
break;
case 'Session-Timeout' :
671,6 → 681,9
case 'Alcasar-Status-Page-Must-Stay-Open' :
echo "$grp_statusOpenRequired";
break;
case 'Alcasar-Expire-After' :
echo "$grp_expireAfter";
break;
default :
break;
}
696,6 → 709,7
break;
case 'Max-Monthly-Session' :
case 'Max-All-Session' :
case 'Alcasar-Expire-After' :
/*valeur d'origine de durée limite */
echo"<input type=\"text\" name=\"$name1\" onfocus=\"this.value=''\" value=\"$val\" size=10>";
/* Choix d'unité*/
/web/acc/manager/htdocs/user_new.php
340,6 → 340,11
$help_link = "help/statusOpenRequired_help.html";
$desc = $l_statusOpenRequired;
break;
case 'Alcasar-Expire-After' :
$advanced = false;
$help_link = "help/max_all_session_help.html";
$desc = $l_max_all_session;
break;
default:
$advanced = true;
break;
362,6 → 367,7
case 'Max-Monthly-Session' :
case 'Login-Time' :
case 'Expiration' :
case 'Alcasar-Expire-After' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:=</option></select></td>";
break;
case 'Session-Timeout' :
412,6 → 418,7
case 'Max-Monthly-Session' :
case 'Login-Time' :
case 'Expiration' :
case 'Alcasar-Expire-After' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">";
break;
case 'Session-Timeout' :
473,6 → 480,7
break;
case 'Max-Monthly-Session' :
case 'Max-All-Session' :
case 'Alcasar-Expire-After' :
/*valeur d'origine de durée limite */
echo"<input type=\"text\" name=\"$name\" onfocus=\"this.value=''\" value=\"$val\" size=10>";
/* Choix d'unité*/