added: added a selection list for setting the dhcp parameters

html/admin/iplist/index.php

@@ -129,8 +129,8 @@ print_ip_submenu($page_url);
         <tr><td><input type=checkbox class="putField" name="e_group_id" value='1'></td><td align=left><?php print WEB_cell_filter."</td><td align=right>";print_group_select($db_link, 'a_group_id', 0);?></td></tr>
         <tr><td><input type=checkbox class="putField" name="e_queue_id" value='1'></td><td align=left><?php print WEB_cell_shaper."</td><td align=right>";print_queue_select($db_link, 'a_queue_id', 0);?></td></tr>
         <tr><td><input type=checkbox class="putField" name="e_dhcp" value='1'></td><td align=left><?php print "Dhcp"."</td><td align=right>"; print_qa_select('a_dhcp', 1);?></td></tr>
-        <tr><td><input type=checkbox class="putField" name="e_dhcp_acl" value='1'></td><td align=left><?php print "Dhcp-acl"."</td><td align=right>"; print_dhcp_acl($db_link,"a_dhcp_acl"); ?></td></tr>
-        <tr><td><input type=checkbox class="putField" name="e_dhcp_option_set" value='1'></td><td align=left><?php print "Dhcp-option-set"."</td><td align=right>"; print_dhcp_option_set($db_link,"a_dhcp_option_set"); ?></td></tr>
+        <tr><td><input type=checkbox class="putField" name="e_dhcp_acl" value='1'></td><td align=left><?php print "Dhcp-acl"."</td><td align=right>"; print_dhcp_acl_list($db_link,"a_dhcp_acl"); ?></td></tr>
+        <tr><td><input type=checkbox class="putField" name="e_dhcp_option_set" value='1'></td><td align=left><?php print "Dhcp-option-set"."</td><td align=right>"; print_dhcp_option_set_list($db_link,"a_dhcp_option_set"); ?></td></tr>
         <tr><td><input type=checkbox class="putField" name="e_traf" value='1'></td><td align=left><?php print "Save traffic"."</td><td align=right>"; print_qa_select('a_traf',1);?></td></tr>
         <tr><td><input type=checkbox class="putField" name="e_bind_mac" value='1'></td><td align=left><?php print WEB_user_bind_mac."</td><td align=right>";print_qa_select('a_bind_mac', 1);?></td></tr>
         <tr><td><input type=checkbox class="putField" name="e_bind_ip" value='1'></td><td align=left><?php print WEB_user_bind_ip."</td><td align=right>";print_qa_select('a_bind_ip', 1);?></td></tr>

html/admin/users/editauth.php

@@ -343,8 +343,8 @@ if (empty($auth_info['eof']) or $auth_info['eof'] == '0000-00-00 00:00:00') {
                 <td><input type="text" name="f_ip" value="<?php echo $auth_info['ip']; ?>" pattern="^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"></td>
                 <td><input type="text" name="f_mac" value="<?php echo $auth_info['mac']; ?>" pattern="^(([0-9A-Fa-f]{2}[\.\:\-]){5}[0-9A-Fa-f]{2}|([0-9a-fA-F]{4}[\.\-][0-9a-fA-F]{4}[\.\-][0-9a-fA-F]{4})|[0-9A-Fa-f]{12})$"></td>
                 <td><?php print_qa_select('f_dhcp', $auth_info['dhcp']); ?></td>
-                <td><input type="text" name="f_acl" value="<?php echo $auth_info['dhcp_acl']; ?>" size=10></td>
-                <td><input type="text" name="f_dhcp_option_set" value="<?php echo $auth_info['dhcp_option_set']; ?>" size=10></td>
+                <td><?php print_dhcp_acl_list($db_link,"f_acl",$auth_info['dhcp_acl']); ?></td>
+                <td><?php print_dhcp_option_set_list($db_link,"f_dhcp_option_set",$auth_info['dhcp_option_set']); ?></td>
             </tr>
             <tr>
                 <td><?php print WEB_cell_filter; ?></td>

html/inc/common.php

@@ -1233,6 +1233,38 @@ if (!empty($dhcp_option_sets) and count($dhcp_option_sets)>0) {
     }
 }
 
+function print_dhcp_acl_list($db,$qa_name,$value='')
+{
+$dhcp_acl = get_records_sql($db,"SELECT DISTINCT `dhcp_acl` FROM User_auth WHERE `dhcp_acl` IS NOT NULL AND `dhcp_acl` != '' AND  `deleted`=0");
+if (!empty($dhcp_acl) and count($dhcp_acl)>0) {
+    print "<input list=\"dhcp_acl\" id=\"$qa_name\" name=\"$qa_name\" value=\"$value\"/>";
+    print "<datalist id=\"dhcp_acl\">";
+    print "<option value=\"\">";
+    foreach ($dhcp_acl as $acl) {
+        print "<option value=\"{$acl['dhcp_acl']}\">";
+        }
+    print "</datalist>";
+    } else {
+    print "<input type=\"text\" name=\"$qa_name\" value=\"\" size=10/>";
+    }
+}
+
+function print_dhcp_option_set_list($db,$qa_name,$value='')
+{
+$dhcp_option_sets = get_records_sql($db,"SELECT DISTINCT `dhcp_option_set` FROM User_auth WHERE `dhcp_option_set` IS NOT NULL AND `dhcp_option_set` != '' AND `deleted`=0");
+if (!empty($dhcp_option_sets) and count($dhcp_option_sets)>0) {
+    print "<input list=\"dhcp_option_set\" id=\"$qa_name\" name=\"$qa_name\" value=\"$value\"/>";
+    print "<datalist id=\"dhcp_option_set\">";
+    print "<option value=\"\">";
+    foreach ($dhcp_option_sets as $dhcp_option_set) {
+        print "<option value=\"{$dhcp_option_set['dhcp_option_set']}\">";
+        }
+    print "</datalist>";
+    } else {
+    print "<input type=\"text\" name=\"$qa_name\" value=\"\" size=10/>";
+    }
+}
+
 function print_enabled_select($qa_name, $qa_value)
 {
     print "<select id=\"$qa_name\" name=\"$qa_name\">\n";