Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2504 → Rev 2505

/conf/freeradius-web/user_edit.attrs
59,5 → 59,5
#
#Regular-Profile User Regular Profile DN
Alcasar-Filter <a href="help/filtering_help.html" target=fid_help onclick=window.open("help/filtering_help.html","fid_help","width=560,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Filtering Help Page"><font color="blue">Filtering</font></a>
Alcasar-Filter-Proto <a href="help/protocols_help.html" target=help onclick=window.open("help/protocols_help.html","fid_help","width=560,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Protocol filtering Help Page"><font color="blue">Protocol filtering</font></a>
Alcasar-Status-Open-Required <a href="help/statusOpenRequired_help.html" target=help onclick=window.open("help/statusOpenRequired_help.html","fid_help","width=560,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Status open required Help Page"><font color="blue">Status open required</font></a>
Alcasar-Protocols-Filter <a href="help/protocols_help.html" target=help onclick=window.open("help/protocols_help.html","fid_help","width=560,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Protocol filtering Help Page"><font color="blue">Protocol filtering</font></a>
Alcasar-Status-Page-Must-Stay-Open <a href="help/statusOpenRequired_help.html" target=help onclick=window.open("help/statusOpenRequired_help.html","fid_help","width=560,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Status open required Help Page"><font color="blue">Status open required</font></a>
/conf/radius/dictionary.alcasar
17,17 → 17,17
VALUE Alcasar-Filter BL 3
VALUE Alcasar-Filter WL 4
 
ATTRIBUTE Alcasar-Filter-Proto 2 integer
VALUE Alcasar-Filter-Proto None 1
VALUE Alcasar-Filter-Proto Web 2
VALUE Alcasar-Filter-Proto Commons 3
VALUE Alcasar-Filter-Proto Custom 4
ATTRIBUTE Alcasar-Protocols-Filter 2 integer
VALUE Alcasar-Protocols-Filter None 1
VALUE Alcasar-Protocols-Filter Web 2
VALUE Alcasar-Protocols-Filter Commons 3
VALUE Alcasar-Protocols-Filter Custom 4
 
ATTRIBUTE Alcasar-Imputability-Warning 3 integer
VALUE Alcasar-Imputability-Warning Yes 1
 
ATTRIBUTE Alcasar-Status-Open-Required 4 integer
VALUE Alcasar-Status-Open-Required Yes 1
VALUE Alcasar-Status-Open-Required No 2
ATTRIBUTE Alcasar-Status-Page-Must-Stay-Open 4 integer
VALUE Alcasar-Status-Page-Must-Stay-Open Yes 1
VALUE Alcasar-Status-Page-Must-Stay-Open No 2
 
END-VENDOR Alcasar
/scripts/alcasar-condown.sh
17,12 → 17,12
 
# Remove user from his IPSET
 
db_query="SELECT attribute, value FROM (( SELECT attribute, value FROM radreply WHERE (attribute='Alcasar-Filter' OR attribute='Alcasar-Filter-Proto' OR attribute='Alcasar-Status-Open-Required') AND username='$USER_NAME') UNION ( SELECT attribute, value FROM radgroupreply gr LEFT JOIN radusergroup ug ON gr.groupname = ug.groupname WHERE (attribute='Alcasar-Filter' OR attribute='Alcasar-Filter-Proto' OR attribute='Alcasar-Status-Open-Required') AND username = '$USER_NAME' ORDER BY ug.priority)) attrs GROUP BY attribute;"
db_query="SELECT attribute, value FROM (( SELECT attribute, value FROM radreply WHERE (attribute='Alcasar-Filter' OR attribute='Alcasar-Protocols-Filter' OR attribute='Alcasar-Status-Page-Must-Stay-Open') AND username='$USER_NAME') UNION ( SELECT attribute, value FROM radgroupreply gr LEFT JOIN radusergroup ug ON gr.groupname = ug.groupname WHERE (attribute='Alcasar-Filter' OR attribute='Alcasar-Protocols-Filter' OR attribute='Alcasar-Status-Page-Must-Stay-Open') AND username = '$USER_NAME' ORDER BY ug.priority)) attrs GROUP BY attribute;"
db_res=$(mysql -u root -p$(cat $PASSWD_FILE | grep ^db_root= | cut -d'=' -f2-) -D radius -e "$db_query" -Ns)
 
filter=$(echo "$db_res" | awk '$1 == "Alcasar-Filter" { print $2 }')
filterProto=$(echo "$db_res" | awk '$1 == "Alcasar-Filter-Proto" { print $2 }')
statusOpenRequired=$(echo "$db_res" | awk '$1 == "Alcasar-Status-Open-Required" { print $2 }')
filterProto=$(echo "$db_res" | awk '$1 == "Alcasar-Protocols-Filter" { print $2 }')
statusOpenRequired=$(echo "$db_res" | awk '$1 == "Alcasar-Status-Page-Must-Stay-Open" { print $2 }')
 
if [ "$filter" == '4' ]; then # HAVP_WL
set_filter="havp_wl"
/scripts/alcasar-conup.sh
17,12 → 17,12
 
# Add user to his IPSET
 
db_query="SELECT attribute, value FROM (( SELECT attribute, value FROM radreply WHERE (attribute='Alcasar-Filter' OR attribute='Alcasar-Filter-Proto' OR attribute='Alcasar-Status-Open-Required') AND username='$USER_NAME') UNION ( SELECT attribute, value FROM radgroupreply gr LEFT JOIN radusergroup ug ON gr.groupname = ug.groupname WHERE (attribute='Alcasar-Filter' OR attribute='Alcasar-Filter-Proto' OR attribute='Alcasar-Status-Open-Required') AND username = '$USER_NAME' ORDER BY ug.priority)) attrs GROUP BY attribute;"
db_query="SELECT attribute, value FROM (( SELECT attribute, value FROM radreply WHERE (attribute='Alcasar-Filter' OR attribute='Alcasar-Protocols-Filter' OR attribute='Alcasar-Status-Page-Must-Stay-Open') AND username='$USER_NAME') UNION ( SELECT attribute, value FROM radgroupreply gr LEFT JOIN radusergroup ug ON gr.groupname = ug.groupname WHERE (attribute='Alcasar-Filter' OR attribute='Alcasar-Protocols-Filter' OR attribute='Alcasar-Status-Page-Must-Stay-Open') AND username = '$USER_NAME' ORDER BY ug.priority)) attrs GROUP BY attribute;"
db_res=$(mysql -u root -p$(cat $PASSWD_FILE | grep ^db_root= | cut -d'=' -f2-) -D radius -e "$db_query" -Ns)
 
filter=$(echo "$db_res" | awk '$1 == "Alcasar-Filter" { print $2 }')
filterProto=$(echo "$db_res" | awk '$1 == "Alcasar-Filter-Proto" { print $2 }')
statusOpenRequired=$(echo "$db_res" | awk '$1 == "Alcasar-Status-Open-Required" { print $2 }')
filterProto=$(echo "$db_res" | awk '$1 == "Alcasar-Protocols-Filter" { print $2 }')
statusOpenRequired=$(echo "$db_res" | awk '$1 == "Alcasar-Status-Page-Must-Stay-Open" { print $2 }')
 
if [ "$filter" == '4' ]; then # HAVP_WL
set_filter="havp_wl"
/web/acc/manager/htdocs/group_new.php
5,8 → 5,8
if (is_file("../lib/langues.php"))
include("../lib/langues.php");
 
// Update Alcasar-Status-Open-Required
if ((isset($_POST['Alcasar-Status-Open-Required'])) && ($_POST['Alcasar-Status-Open-Required'] === '2')) {
// Update Alcasar-Status-Page-Must-Stay-Open
if ((isset($_POST['Alcasar-Status-Page-Must-Stay-Open'])) && ($_POST['Alcasar-Status-Page-Must-Stay-Open'] === '2')) {
$_POST['Idle-Timeout'] = '600'; // 10 minutes
} else {
$_POST['Idle-Timeout'] = '';
255,12 → 255,12
$help_link = "help/filtering_help.html";
$desc = $l_filtering;
break;
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Protocols-Filter' :
$advanced = false;
$help_link = "help/protocols_help.html";
$desc = $l_proto;
break;
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
$advanced = false;
$help_link = "help/statusOpenRequired_help.html";
$desc = $l_statusOpenRequired;
297,8 → 297,8
case 'ChilliSpot-Bandwidth-Max-Down' :
case 'WISPr-Redirection-URL' :
case 'Alcasar-Filter' :
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Protocols-Filter' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\"=\">=";
break;
default :
338,8 → 338,8
case 'Login-Time' :
case 'Expiration' :
case 'Alcasar-Filter' :
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Protocols-Filter' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">";
break;
case 'Session-Timeout' :
422,7 → 422,7
echo "<option value=\"4\">$l_filtering_havp_wl</option>";
echo "</select>";
break;
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Protocols-Filter' :
echo "<select name=\"$name\">";
echo "<option value=\"\"></option>";
echo "<option value=\"1\">$l_proto_0</option>";
431,7 → 431,7
echo "<option value=\"4\">$l_proto_3</option>";
echo "</select>";
break;
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
echo "<label><input type=\"radio\" name=\"$name\" value=\"\" checked>$l_yes</label>
<label><input type=\"radio\" name=\"$name\" value=\"2\">$l_no</label>";
break;
/web/acc/manager/htdocs/user_edit.php
5,8 → 5,8
if (is_file("../lib/langues.php"))
include("../lib/langues.php");
 
// Update Alcasar-Status-Open-Required
if ((isset($_POST['Alcasar-Status-Open-Required0'])) && ($_POST['Alcasar-Status-Open-Required0'] === '2')) {
// Update Alcasar-Status-Page-Must-Stay-Open
if ((isset($_POST['Alcasar-Status-Page-Must-Stay-Open0'])) && ($_POST['Alcasar-Status-Page-Must-Stay-Open0'] === '2')) {
$_POST['Idle-Timeout0'] = '600'; // 10 minutes
} else {
$_POST['Idle-Timeout0'] = '';
290,7 → 290,7
$grp_filter = '';
}
break;
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Protocols-Filter' :
if ($val === '4') {
$grp_filterProto = $l_proto_3;
} else if ($val === '3') {
303,7 → 303,7
$grp_filterProto = '';
}
break;
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
if ($val === '2') {
$grp_statusOpenRequired = $l_no;
} else if ($val === '1') {
497,12 → 497,12
$help_link = "help/filtering_help.html";
$desc = $l_filtering;
break;
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Protocols-Filter' :
$advanced = false;
$help_link = "help/protocols_help.html";
$desc = $l_proto;
break;
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
$advanced = false;
$help_link = "help/statusOpenRequired_help.html";
$desc = $l_statusOpenRequired;
540,8 → 540,8
case 'ChilliSpot-Bandwidth-Max-Down' :
case 'WISPr-Redirection-URL' :
case 'Alcasar-Filter' :
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Protocols-Filter' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\"=\">=</option></select></td>";
break;
default :
590,8 → 590,8
case 'ChilliSpot-Bandwidth-Max-Down' :
case 'WISPr-Redirection-URL' :
case 'Alcasar-Filter' :
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Protocols-Filter' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\"=\">";
break;
default :
665,10 → 665,10
case 'Alcasar-Filter' :
echo "$grp_filter";
break;
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Protocols-Filter' :
echo "$grp_filterProto";
break;
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
echo "$grp_statusOpenRequired";
break;
default :
719,7 → 719,7
echo "<option value=\"4\"".(($val === '4') ? ' selected' : '').">$l_filtering_havp_wl</option>";
echo "</select>";
break;
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Protocols-Filter' :
echo "<select name=\"$name1\">";
echo "<option value=\"\"".(($val === '') ? ' selected' : '')."></option>";
echo "<option value=\"1\"".(($val === '1') ? ' selected' : '').">$l_proto_0</option>";
728,7 → 728,7
echo "<option value=\"4\"".(($val === '4') ? ' selected' : '').">$l_proto_3</option>";
echo "</select>";
break;
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
echo "<label><input type=\"radio\" name=\"$name1\" value=\"\"".(($val !== '2') ? ' checked' : '').">$l_yes</label>
<label><input type=\"radio\" name=\"$name1\" value=\"2\"".(($val === '2') ? ' checked' : '').">$l_no</label>";
break;
/web/acc/manager/htdocs/user_new.php
5,8 → 5,8
if (is_file("../lib/langues.php"))
include("../lib/langues.php");
 
// Update Alcasar-Status-Open-Required
if ((isset($_POST['Alcasar-Status-Open-Required'])) && ($_POST['Alcasar-Status-Open-Required'] === '2')) {
// Update Alcasar-Status-Page-Must-Stay-Open
if ((isset($_POST['Alcasar-Status-Page-Must-Stay-Open'])) && ($_POST['Alcasar-Status-Page-Must-Stay-Open'] === '2')) {
$_POST['Idle-Timeout'] = '600'; // 10 minutes
} else {
$_POST['Idle-Timeout'] = '';
330,12 → 330,12
$help_link = "help/filtering_help.html";
$desc = $l_filtering;
break;
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Protocols-Filter' :
$advanced = false;
$help_link = "help/protocols_help.html";
$desc = $l_proto;
break;
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
$advanced = false;
$help_link = "help/statusOpenRequired_help.html";
$desc = $l_statusOpenRequired;
372,8 → 372,8
case 'ChilliSpot-Bandwidth-Max-Down' :
case 'WISPr-Redirection-URL' :
case 'Alcasar-Filter' :
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Protocols-Filter' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\"=\">=</option></select></td>";
break;
default :
422,8 → 422,8
case 'ChilliSpot-Bandwidth-Max-Down' :
case 'WISPr-Redirection-URL' :
case 'Alcasar-Filter' :
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Protocols-Filter' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\"=\">";
break;
default :
496,7 → 496,7
echo "<option value=\"4\">$l_filtering_havp_wl</option>";
echo "</select>";
break;
case 'Alcasar-Filter-Proto' :
case 'Alcasar-Protocols-Filter' :
echo "<select name=\"$name\">";
echo "<option value=\"\"></option>";
echo "<option value=\"1\">$l_proto_0</option>";
505,7 → 505,7
echo "<option value=\"4\">$l_proto_3</option>";
echo "</select>";
break;
case 'Alcasar-Status-Open-Required' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
echo "<label><input type=\"radio\" name=\"$name\" value=\"\" checked>$l_yes</label>
<label><input type=\"radio\" name=\"$name\" value=\"2\">$l_no</label>";
break;