WebSVN – ALCASAR – Diff – /web/acc/manager/htdocs/user_edit.php

 <?php
 //gestion de la langue
 if (is_file("../lib/langues.php"))
 	include("../lib/langues.php");
+//update Filter-Id for protocol filtering
+if (isset($_POST['Filter-Proto']) && isset($_POST['Filter-Id0']))
+{
+	$upId = (int)$_POST['Filter-Proto'];
+	$downId = (int)$_POST['Filter-Id0'];
+	$upId = $upId+$downId;
+	$upId = str_pad($upId, 8, '0', STR_PAD_LEFT);
+	$_POST['Filter-Id0'] = $upId;
+}
 require('/etc/freeradius-web/config.php');
 require('../lib/attrshow.php');
 require('../lib/defaults.php');
 if(!isset($change)) $change = 0;
 if(!isset($user_type)) $user_type = 'user';
 if(!isset($badusers)) $badusers = 0;
 if(!isset($cn)) $cn = '';
 if ($user_type != 'group'){
 	if (is_file("../lib/$config[general_lib_type]/user_info.php"))
 		include("../lib/$config[general_lib_type]/user_info.php");
 	if ($config['general_lib_type'] == 'sql' && $config['sql_show_all_groups'] == 'true'){
 		$saved_login = $login;
 		$login = '';
 		if (is_file("../lib/sql/group_info.php"))
 			include("../lib/sql/group_info.php");
 		$login = $saved_login;
+	}
+}
 else{
 	if (is_file("../lib/$config[general_lib_type]/group_info.php"))
 		include("../lib/$config[general_lib_type]/group_info.php");
+}
 if ($config['general_lib_type'] == 'sql' && $config['sql_use_operators'] == 'true'){
 	$colspan=2;
 	if(isset($member_groups))
+	{
 		$colspan=3;
+	}
 	$show_ops = 1;
 	include("../lib/operators.php");
+}
 else{
 	$show_ops = 0;
 	$colspan=1;
+}
 ?>
 <html>
 <head>
 <title>Users & groups edition</title>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config['general_charset']?>">
 <link rel="stylesheet" href="/css/style.css">
 <script language="javascript" type="text/javascript">
 var chars='0123456789abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ'
 function password(size)
+  {
   var pass=''
   while(pass.length < size)
+  {
     pass+=chars.charAt(Math.round(Math.random() * (chars.length)))
+  }
   document.edituser.passwd.value=pass
   document.edituser.pwdgene.value=pass
+}
 </script>
 <script type="text/javascript" src="/js/epoch_classes.js"></script>
 <script language="javascript" type="text/javascript">
 /*Insertion du calendrier */
 	var dp_cal;
 window.onload = function () {
 	dp_cal  = new Epoch('epoch_popup','popup',document.getElementById('popup_container'));
 };
 </script>
 </head>
 <body>
 <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr><th>
 <?php
 if($user_type != 'group'){ echo "$l_users_managment";} else{ echo "$l_groups_managment";}
 ?>
 	</th></tr>
 	<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1"
 height="2"></td></tr>
 </TABLE>
 <TABLE width="100%" border=1 cellspacing=0 cellpadding=1>
 	<tr><td valign="middle" align="left">
 	<center>
 	<table border=0 width=640 cellpadding=0 cellspacing=2>
 <?php
 if ($user_type != 'group'){
 	include("../html/user_toolbar.html.php");
 	$titre=$l_user;
 }else{
 	include("../html/group_toolbar.html.php");
 	$titre=$l_group;
+}
 print <<<EOM
 </table>
 <br>
 <table border=0 width=620 cellpadding=1 cellspacing=1>
 <tr valign=top>
 <td width=400></td>
 <td bgcolor="black">
 	<table border=0 width=100% cellpadding=2 cellspacing=0>
 	<tr bgcolor="#907030" align=center valign=top><th>
 	<font color="white">$titre : $login ($cn)</font>
 	</th></tr>
 	</table>
 </td></tr>
 <tr bgcolor="black" valign=top><td colspan=2>
 	<table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
 	<tr><td>
 EOM;
 if ($change == 1){
 	if (is_file("../lib/$config[general_lib_type]/change_attrs.php"))
 		include("../lib/$config[general_lib_type]/change_attrs.php");
 	if ($user_type != 'group'){
 		if ($config['general_show_user_password'] != 'no' && $passwd != ''
 			&& is_file("../lib/$config[general_lib_type]/change_passwd.php"))
 			include("../lib/$config[general_lib_type]/change_passwd.php");
 		if (is_file("../lib/$config[general_lib_type]/user_info.php"))
 			include("../lib/$config[general_lib_type]/user_info.php");
 		if ($group_change && $config['general_lib_type'] == 'sql' && $config['sql_show_all_groups'] == 'true'){
 			include("../lib/sql/group_change.php");
 			include("../lib/defaults.php");
+		}
 		# Disconnecting user for re-authentication
 		$mac=exec("sudo /usr/sbin/chilli_query list | grep \" $login \" | awk '{print $1}'");
 		exec("sudo /usr/sbin/chilli_query logout $mac");
+	}
 	else{
 		if (is_file("../lib/$config[general_lib_type]/group_info.php"))
 			include("../lib/$config[general_lib_type]/group_info.php");
 		# Disconnecting all users from the selected group for re-authentication
 		if (isset($group_members)){
 			foreach ($group_members as $g_member => $member){
 				$mac=exec("sudo /usr/sbin/chilli_query list | grep \" $member \" | awk '{print $1}'");
 				exec("sudo /usr/sbin/chilli_query logout $mac");
+			}
+		}
+	}
+}
 else if ($badusers == 1){
 	if (is_file("../lib/add_badusers.php"))
 		include("../lib/add_badusers.php");
+}
 $grp_simuse = "";
 $grp_logtime = "";
 $grp_exp = "";
 $grp_maxall = "";
 $grp_sesstim = "";
 $grp_maxday = "";
 $grp_maxweek = "";
 $grp_maxmonth = "";
 $grp_maxio = "";
 $grp_maxoo = "";
 $grp_maxto = "";
 $grp_bwup = "";
 $grp_bwdown = "";
 $grp_redir = "";
 $grp_filter = "";
 //si l'utilisateur fait parti d'un groupe, on charge les attributs du groupe, pour les afficher ensuite.
 	if(isset($member_groups) && ($user_type != 'group'))
+	{
 		$group = array_values($member_groups)[0];
 		$login_saved = $login;
 		$login = array_values($member_groups)[0];
 		include("../lib/sql/group_info.php");
 		$login = $login_saved;
 		foreach($show_attrs as $key => $desc){
 		$name = $attrmap["$key"];
 		$generic = (isset($attrmap['generic']["$key"])) ? $attrmap['generic']["$key"] : '';
 		if ($name == 'none')
 			continue;
 		unset($vals);
 		unset($selected);
 		unset($ops);
 		$def_added = 0;
 		if (isset($item_vals["$key"]['count']) && $item_vals["$key"]['count']){
 			for($i=0;$i<$item_vals["$key"]['count'];$i++){
 				$vals[] = $item_vals["$key"][$i];
 				$ops[] = $item_vals["$key"]['operator'][$i];
+			}
+		}
 		else{
 			if (isset($default_vals["$key"]['count']) && $default_vals["$key"]['count']){
 				for($i=0;$i<$default_vals["$key"]['count'];$i++){
 					$vals[] = $default_vals["$key"][$i];
 					$ops[] = $default_vals["$key"]['operator'][$i];
+				}
+			}
 			else{
 				$vals[] = '';
 				$ops[] = '=';
+			}
 			$def_added = 1;
+		}
 		if ($generic == 'generic' && $def_added == 0){
 			for($i=0;$i<$default_vals["$key"]['count'];$i++){
 				$vals[] = $default_vals["$key"][$i];
 				$ops[] = $default_vals["$key"]['operator'][$i];
+			}
+		}
 		if (isset($add) && $add && $name == $add_attr){
 			$vals[] = $default_vals["$key"][0];
 			$ops[] = ($default_vals["$key"]['operator'][0] != '') ? $default_vals["$key"]['operator'][0] : '=';
+		}
 		$i = 0;
 		foreach($vals as $val){
 			$name1 = $name . $i;
 			$val = preg_replace('/\"/','&quot;',$val);
 			$oper_name = $name1 . '_op';
 			$oper = $ops[$i];
 			$selected[$oper] = 'selected';
 			$i++;
 			if ($show_ops){
 				if(!isset($selected[$op_eq])) $selected[$op_eq] = '';
 				switch ($key)
+					{
 					case 'Simultaneous-Use' :
 						$grp_simuse="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'Login-Time' :
 						$grp_logtime="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'Expiration' :
 						if($login == "sms" && $user_type == 'group'){
 							$grp_exp="<td bgcolor=\"#BEBEBE\">$val</td>";
 						} else {
 							$grp_exp="<td bgcolor=\"#BEBEBE\">$val</td>";
+						}
 						break;
 					case 'Max-All-Session' :
 						$grp_maxall="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'Session-Timeout' :
 						$grp_sesstim="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'Max-Daily-Session' :
 						$grp_maxday="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'Max-Weekly-Session' :
 						$grp_maxweek="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'Max-Monthly-Session' :
 						$grp_maxmonth="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'ChilliSpot-Max-Input-Octets' :
 						$grp_maxio="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'ChilliSpot-Max-Output-Octets' :
 						$grp_maxoo="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'ChilliSpot-Max-Total-Octets' :
 						$grp_maxto="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'ChilliSpot-Bandwidth-Max-Up' :
 						$grp_bwup="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'ChilliSpot-Bandwidth-Max-Down' :
 						$grp_bwdown="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'WISPr-Redirection-URL' :
 						$grp_redir="<td bgcolor=\"#BEBEBE\">$val</td>";
 						break;
 					case 'Filter-Id' :
+						$grp_proto_select = array();
+						$grp_proto_select[0] = '';
+						$grp_proto_select[1] = '';
+						$grp_proto_select[2] = '';
+						$grp_proto_select[3] = '';
+						//WL
-						switch($val)
+						if($val[5] == '1')
+						{
+							$grp_filter="<td bgcolor=\"#BEBEBE\">$l_filtering_havp_wl</td>";
-							case "00000001":
+							if($val[0] == '1')
+							{
-								$grp_filter="<td bgcolor=\"#BEBEBE\">$l_filtering_havp</td>";
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_1</td>";
+								break;
+							}
+							if($val[1] == '1')
+							{
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_2</td>";
 								break;
+							}
-							case "00000011":
+							if($val[2] == '1')
+							{
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_3</td>";
+								break;
+							}
+							$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_0</td>";
+							break;
+							break;
+						}
+						//BL
+						if($val[6] == '1')
+						{
-								$grp_filter="<td bgcolor=\"#BEBEBE\">$l_filtering_havp_bl</td>";
+							$grp_filter="<td bgcolor=\"#BEBEBE\">$l_filtering_havp_bl</td>";
+							if($val[0] == '1')
+							{
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_1</td>";
+								break;
+							}
+							if($val[1] == '1')
+							{
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_2</td>";
+								break;
+							}
+							if($val[2] == '1')
+							{
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_3</td>";
+								break;
+							}
+							$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_0</td>";
+							break;
+						}
+						//HAVP
+						if($val[7] == '1')
+						{
+							$grp_filter="<td bgcolor=\"#BEBEBE\">$l_filtering_havp</td>";
+							if($val[0] == '1')
+							{
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_1</td>";
 								break;
+							}
-							case "00000101":
+							if($val[1] == '1')
+							{
-								$grp_filter="<td bgcolor=\"#BEBEBE\">$l_filtering_havp_wl</td>";
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_2</td>";
 								break;
+							}
+							if($val[2] == '1')
-							default :
+							{
-								$grp_filter="<td bgcolor=\"#BEBEBE\">$l_filtering_none</td>";
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_3</td>";
 								break;
+							}
+							$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_0</td>";
+							break;
+						}
+						else
+						{
+							$grp_filter="<td bgcolor=\"#BEBEBE\">$l_filtering_none</td>";
+							if($val[0] == '1')
+							{
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_1</td>";
+								break;
+							}
+							if($val[1] == '1')
+							{
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_2</td>";
+								break;
+							}
+							if($val[2] == '1')
+							{
+								$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_3</td>";
+								break;
+							}
+							$grp_proto="<td bgcolor=\"#BEBEBE\">$l_proto_0</td>";
+							break;
+						}
 						break;
+					}
+				}
+		}
+	}
 		/*on charge les attributs utilisateurs afin de montrer les groupes disponibles*/
 	if ($user_type != 'group'){
 		if (is_file("../lib/$config[general_lib_type]/user_info.php"))
 			include("../lib/$config[general_lib_type]/user_info.php");
 		if ($config['general_lib_type'] == 'sql' && $config['sql_show_all_groups'] == 'true'){
 			$saved_login = $login;
 			$login = '';
 			if (is_file("../lib/sql/group_info.php"))
 				include("../lib/sql/group_info.php");
 			$login = $saved_login;
+		}
+	}
+	}
 ?>
    <form name="edituser" method=post>
       <input type=hidden name=login value=<?php print $login ?>>
       <input type=hidden name=user_type value=<?php print $user_type ?>>
       <input type=hidden name=change value="0">
       <input type=hidden name=add value="0">
       <input type=hidden name=badusers value="0">
       <input type=hidden name=group_change value="0">
 	<table border=1 bordercolordark=#ffffe0 bordercolorlight=#000000 width=100% cellpadding=2 cellspacing=0 bgcolor="#ffffe0" valign=top>
 <?php
 if ($user_type != 'group' && $config['general_show_user_password'] != 'no'){
 if(isset($member_groups)){
 echo <<<EOM
 <tr>
 <td align=right colspan=2 bgcolor="#d0ddb0">
 <br>
 </td>
 <td>
 <br />$l_group_desc
 </td>
 <td>
 <br />$l_user_desc
 </td>
 </tr>
 EOM;
+}
 echo <<<EOM
 <tr>
 <td align=right colspan=2 bgcolor="#d0ddb0">
 $l_new_password<br>
 </td>
 EOM;
 if(isset($member_groups)){
 echo <<<EOM
 <td bgcolor="#BEBEBE">
 <br/>
 </td>
 EOM;
+}
 echo <<<EOM
 <td>
 <input type=password name=passwd value="" size=20>
 <br /><input type="button" value="$l_passwd_gen" onclick="password(8)">
 <input type="text" value="" name="pwdgene" size=10 readonly>
 </td>
 </tr>
 EOM;
+}
 	foreach($show_attrs as $key => $desc){
 		$name = $attrmap["$key"];
 		$generic = (isset($attrmap['generic']["$key"])) ? $attrmap['generic']["$key"] : '';
 		if ($name == 'none')
 			continue;
 		unset($vals);
 		unset($selected);
 		unset($ops);
 		$def_added = 0;
 		if (isset($item_vals["$key"]['count']) && $item_vals["$key"]['count']){
 			for($i=0;$i<$item_vals["$key"]['count'];$i++){
 				$vals[] = $item_vals["$key"][$i];
 				$ops[] = $item_vals["$key"]['operator'][$i];
+			}
+		}
 		else{
 			if (isset($default_vals["$key"]['count']) && $default_vals["$key"]['count']){
 				for($i=0;$i<$default_vals["$key"]['count'];$i++){
 					$vals[] = $default_vals["$key"][$i];
 					$ops[] = $default_vals["$key"]['operator'][$i];
+				}
+			}
 			else{
 				$vals[] = '';
 				$ops[] = '=';
+			}
 			$def_added = 1;
+		}
 		if ($generic == 'generic' && $def_added == 0){
 			for($i=0;$i<$default_vals["$key"]['count'];$i++){
 				$vals[] = $default_vals["$key"][$i];
 				$ops[] = $default_vals["$key"]['operator'][$i];
+			}
+		}
 		if (isset($add) && $add && $name == $add_attr){
 			$vals[] = $default_vals["$key"][0];
 			$ops[] = ($default_vals["$key"]['operator'][0] != '') ? $default_vals["$key"]['operator'][0] : '=';
+		}
 		$i = 0;
 		foreach($vals as $val){
 			$name1 = $name . $i;
 			$val = preg_replace('/\"/','&quot;',$val);
 			$oper_name = $name1 . '_op';
 			$oper = $ops[$i];
 			$selected[$oper] = 'selected';
 			$i++;
 		switch ($key)
+		{
 				// $advanced = 1 : champs de saisie amélioré (calendrier, convertisseur, etc.)
 			case 'Simultaneous-Use' :
 				$advanced=1;
 				$help_link="help/simultaneous_use_help.html";
 				$desc=$l_simultaneous_use;
 				break;
 			case 'Max-All-Session' :
 				$advanced=1;
 				$help_link="help/max_all_session_help.html";
 				$desc=$l_max_all_session;
 				break;
 			case 'Session-Timeout' :
 				$advanced=1;
 				$help_link="help/session_timeout_help.html";
 				$desc=$l_session_timeout;
 				break;
 			case 'Max-Daily-Session' :
 				$advanced=1;
 				$help_link="help/session_timeout_help.html";
 				$desc=$l_daily_timeout;
 				break;
 			case 'Max-Monthly-Session' :
 				$advanced=1;
 				$help_link="help/session_timeout_help.html";
 				$desc=$l_monthly_timeout;
 				break;
 			case 'Login-Time' :
 				$advanced=1;
 				$help_link="help/login_time_help.html";
 				$desc=$l_login_time;
 				break;
 			case 'Expiration' :
 				$advanced=1;
 				$help_link="help/expiration_help.html";
 				$desc=$l_expiration;
 				break;
 			case 'ChilliSpot-Max-Input-Octets' :
 				$advanced=1;
 				$help_link="help/chillispot_max_input_octets_help.html";
 				$desc=$l_max_input_octets;
 				break;
 			case 'ChilliSpot-Max-Output-Octets' :
 				$advanced=1;
 				$help_link="help/chillispot_max_output_octets_help.html";
 				$desc=$l_max_output_octets;
 				break;
 			case 'ChilliSpot-Max-Total-Octets' :
 				$advanced=1;
 				$help_link="help/chillispot_max_total_octets_help.html";
 				$desc=$l_max_total_octets;
 				break;
 			case 'ChilliSpot-Bandwidth-Max-Up' :
 				$advanced=1;
 				$help_link="help/chillispot_bandwidth_max_up_help.html";
 				$desc=$l_max_bandwidth_up;
 				break;
 			case 'ChilliSpot-Bandwidth-Max-Down' :
 				$advanced=1;
 				$help_link="help/chillispot_bandwidth_max_down_help.html";
 				$desc=$l_max_bandwidth_down;
 				break;
 			case 'WISPr-Redirection-URL' :
 				$advanced=1;
 				$help_link="help/wispr_redirection_url_help.html";
 				$desc=$l_wispr_redirection;
 				break;
 			case 'Filter-Id' :
 				$advanced=1;
 				$help_link="help/filtering_help.html";
 				$desc=$l_filtering;
 				break;
 			default:
 				$advanced=1;
 				break;
+		}
 			print <<<EOM
 			<tr>
 			<td class="etiquette">
 			<a href="$help_link" target=help onclick=window.open("$help_link","help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="$l_click_for_help"><font color="blue">$desc</font></a>
 EOM;
 			if ($show_ops){
 				if(!isset($selected[$op_eq])) $selected[$op_eq] = '';
 				switch ($key)
+					{
 					case 'Simultaneous-Use' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td>$grp_simuse<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'Login-Time' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td>$grp_logtime<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'Expiration' :
 						if($login == "sms" && $user_type == 'group'){
 							echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td>$grp_exp<td><input type=text name=\"$name1\" value=\"$val\" size=20 disabled></td>";
 						} else {
 							echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td>$grp_exp<td><input id=\"popup_container\" type=text name=\"$name1\" value=\"$val\" size=20></td>";
+						}
 						break;
 					case 'Max-All-Session' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td>$grp_maxall<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'Session-Timeout' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_sesstim<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'Max-Daily-Session' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td>$grp_maxday<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'Max-Weekly-Session' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td>$grp_maxweek<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'Max-Monthly-Session' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td>$grp_maxmonth<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'ChilliSpot-Max-Input-Octets' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_maxio<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'ChilliSpot-Max-Output-Octets' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_maxoo<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'ChilliSpot-Max-Total-Octets' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_maxto<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'ChilliSpot-Bandwidth-Max-Up' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_bwup<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'ChilliSpot-Bandwidth-Max-Down' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_bwdown<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'WISPr-Redirection-URL' :
 						echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_redir<td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
 						break;
 					case 'Filter-Id' :
+						$proto_select = array();
+						$proto_select[0] = '';
+						$proto_select[1] = '';
+						$proto_select[2] = '';
+						$proto_select[3] = '';
+						//WL
-						switch($val)
+						if($val[6] == '1')
+						{
-							case "00000001":
+							echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_filter<td><select name=\"$name1\"><option value=\"00000000\">$l_filtering_none</option><option value=\"00000001\">$l_filtering_havp</option><option value=\"00000011\" selected=\"selected\">$l_filtering_havp_bl</option><option value=\"00000101\">$l_filtering_havp_wl</option></select></td>";
+							if($val[0] == '1')
-								echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_filter<td><select name=\"$name1\"><option value=\"00000000\">$l_filtering_none</option><option value=\"00000001\" selected=\"selected\">$l_filtering_havp</option><option value=\"00000011\">$l_filtering_havp_bl</option><option value=\"00000101\">$l_filtering_havp_wl</option></select></td>";
+							{
+								$proto_select[1] = "selected";
 								break;
+							}
-							case "00000011":
+							if($val[1] == '1')
-								echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_filter<td><select name=\"$name1\"><option value=\"00000000\">$l_filtering_none</option><option value=\"00000001\">$l_filtering_havp</option><option value=\"00000011\" selected=\"selected\">$l_filtering_havp_bl</option><option value=\"00000101\">$l_filtering_havp_wl</option></select></td>";
+							{
+								$proto_select[2] = "selected";
 								break;
+							}
-							case "00000101":
+							if($val[2] == '1')
+							{
+								$proto_select[3] = "selected";
+								break;
+							}
+							$proto_select[0] = "selected";
+							break;
+						}
+						//BL
+						if($val[5] == '1')
+						{
 							echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_filter<td><select name=\"$name1\"><option value=\"00000000\">$l_filtering_none</option><option value=\"00000001\">$l_filtering_havp</option><option value=\"00000011\">$l_filtering_havp_bl</option><option value=\"00000101\" selected=\"selected\">$l_filtering_havp_wl</option></select></td>";
+							if($val[0] == '1')
+							{
+								$proto_select[1] = "selected";
+								break;
+							}
+							if($val[1] == '1')
+							{
+								$proto_select[2] = "selected";
+								break;
+							}
+							if($val[2] == '1')
+							{
+								$proto_select[3] = "selected";
 								break;
+							}
+							$proto_select[0] = "selected";
+							break;
+						}
+						//HAVP
+						if($val[7] == '1')
+						{
-							default :
+							echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_filter<td><select name=\"$name1\"><option value=\"00000000\">$l_filtering_none</option><option value=\"00000001\" selected=\"selected\">$l_filtering_havp</option><option value=\"00000011\">$l_filtering_havp_bl</option><option value=\"00000101\">$l_filtering_havp_wl</option></select></td>";
+							if($val[0] == '1')
+							{
+								$proto_select[1] = "selected";
+								break;
+							}
+							if($val[1] == '1')
+							{
+								$proto_select[2] = "selected";
+								break;
+							}
+							if($val[2] == '1')
+							{
+								$proto_select[3] = "selected";
+								break;
+							}
+							$proto_select[0] = "selected";
+							break;
+						}
+						else //none
+						{
 							echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td>$grp_filter<td><select name=\"$name1\"><option value=\"00000000\" selected=\"selected\">$l_filtering_none</option><option value=\"00000001\">$l_filtering_havp</option><option value=\"00000011\">$l_filtering_havp_bl</option><option value=\"00000101\">$l_filtering_havp_wl</option></select></td>";
+							if($val[0] == '1')
+							{
+								$proto_select[1] = "selected";
+								break;
+							}
+							if($val[1] == '1')
+							{
+								$proto_select[2] = "selected";
 								break;
+							}
+							if($val[2] == '1')
+							{
+								$proto_select[3] = "selected";
+								break;
+							}
+							$proto_select[0] = "selected";
+							break;
+						}
 						break;
 					default :
 						print <<<EOM
 <td>
 <select name=$oper_name>
 <option $selected[$op_eq] value="=">=
 <option $selected[$op_set] value=":=">:=
 <option $selected[$op_add] value="+=">+=
 <option $selected[$op_eq2] value="==">==
 <option $selected[$op_ne] value="!=">!=
 <option $selected[$op_gt] value=">">&gt;
 <option $selected[$op_ge] value=">=">&gt;=
 <option $selected[$op_lt] value="<">&lt;
 <option $selected[$op_le] value="<=">&lt;=
 <option $selected[$op_regeq] value="=~">=~
 <option $selected[$op_regne] value="!~">!~
 <option $selected[$op_exst] value="=*">=*
 <option $selected[$op_nexst] value="!*">!*
 </select>
 </td>
 <td><input type=text name="$name1" value="$val" size=20></td>
 EOM;
 						break;
+					}
+				}
 			print <<<EOM
 </tr>
 EOM;
+		}
+	}
+/*protocole filter*/
+print <<<EOM
+<tr>
+<td class="etiquette" colspan=2>
+	<a href="help/protocols_help.html" target=help onclick=window.open("help/protocols_help.html","help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="$l_click_for_help"><font color="blue">$l_proto</font></a>
+</td>
+EOM;
+if(isset($member_groups) && $user_type != 'group')
+{
+	echo $grp_proto;
+}
+echo "<td width=20>";
+echo"<select name='Filter-Proto'>
+	<option value=\"00000000\" $proto_select[0]>$l_proto_0</option>
+	<option value=\"10000000\" $proto_select[1]>$l_proto_1</option>
+	<option value=\"01000000\" $proto_select[2]>$l_proto_2</option>
+	<option value=\"00100000\" $proto_select[3]>$l_proto_3</option>
+	</select></td>
+	</tr>";
 if ($user_type != 'group'){
 	echo <<<EOM
 <tr>
 <td align=right colspan=$colspan bgcolor="#d0ddb0">
 $l_group_member<br><font size=-2><i>($l_main_group)</i></font>
 </td>
 <td>
 EOM;
 	if (isset($existing_groups)){
 	echo "<select size=5 name=\"edited_groups[]\"  OnChange=\"this.form.group_change.value=1\">";
 	if ($config['sql_show_all_groups'] == 'true'){
 		foreach ($existing_groups as $group => $count){
 			if (isset($member_groups[$group]) && ($member_groups[$group] == $group))
 				echo "<option selected value=\"$group\">$group\n";
 			else if(isset($member_groups[0]) && ($member_groups[0] == $group))
 				echo "<option selected value=\"$group\">$group\n";
 			else
 				echo "<option value=\"$group\">$group\n";
+			}
 		}else{
 		foreach ($member_groups as $group)
 			echo "<option value=\"$group\">$group\n";
+		}
 		echo "</select></td></tr>";
+	}
 	else{
 		echo "Aucun groupe</td></tr>";
+	}
+}
 echo "</table><br>";
 echo "<input type=submit class=button value=$l_change OnClick=\"this.form.change.value=1\">";
 //if ($user_type != 'group'){
 //	echo <<<EOM
 //<br><br>
 //<input type=submit class=button value="Add to Badusers" OnClick="this.form.badusers.value=1">
 //<a href="help/badusers_help.html" target=bu_help onclick=window.open("help/badusers_help.html","bu_help","width=600,height=210,toolbar=no,scrollbars=no,resizable=yes") title="BADUSERS Help Page"><font color="blue">&lt;--Help</font></a>
 //EOM;
 //}
 ?>
 </form>
 </td></tr>
 </table>
 </tr>
 </table>
 </td></tr>
 </TABLE>
 </body>
 </html>

Subversion Repositories ALCASAR

(root)/web/acc/manager/htdocs/user_edit.php @ 2512 – Rev 1883 → 2006