second version

html/admin/devices/edit_gw_subnets.php

@@ -45,25 +45,25 @@ print_editdevice_submenu($page_url,$id,$device['device_type'],$user_info['login'
 </b> <br>
 <table class="data">
 <tr align="center">
-	<td></td>
-	<td width=30><b>id</b></td>
-	<td><b><?php echo WEB_network_subnet; ?></b></td>
-	<td>
-	<input type="submit" onclick="return confirm('<?php print WEB_msg_delete; ?>?')" name="s_remove" value="<?php print WEB_btn_remove; ?>">
-	</td>
+        <td></td>
+        <td width=10><b>id</b></td>
+        <td><b><?php echo WEB_network_subnet; ?></b></td>
+        <td>
+        <input type="submit" onclick="return confirm('<?php print WEB_msg_delete; ?>?')" name="s_remove" value="<?php print WEB_btn_remove; ?>">
+        </td>
 </tr>
 <?php
-$gateway_subnets = get_records_sql($db_link,'SELECT gateway_subnets.*,subnets.subnet,subnets.comment FROM gateway_subnets LEFT JOIN subnets ON gateway_subnets.subnet_id = subnets.id WHERE gateway_subnets.device_id='.$id.' ORDER BY subnets.subnet ASC');
+$gateway_subnets = get_records_sql($db_link,'SELECT gateway_subnets.*,subnets.subnet,subnets.comment FROM gateway_subnets LEFT JOIN subnets ON gateway_subnets.subnet_id = subnets.id WHERE gateway_subnets.device_id='.$id);
 foreach ( $gateway_subnets as $row ) {
     print "<tr align=center>\n";
-    print "<td class=\"data\" style='padding:0'><input type=checkbox name=gs_id[] value='{$row['id']}'></td>\n";
+    print "<td class=\"data\" style='padding:0' width=30><input type=checkbox name=gs_id[] value='{$row['id']}'></td>\n";
     print "<td class=\"data\"><input type=\"hidden\" name='n_id[]' value='{$row['id']}'>{$row['id']}</td>\n";
-    print "<td class=\"data\">".get_subnet_description($db_link,$row['subnet_id'])."</td>\n";
-    print "</tr>\n";
+    print "<td class=\"data\">"; print get_subnet_description($db_link,$row['subnet_id']); print "</td>\n";
+    print "<td></td></tr>\n";
     }
 ?>
 <tr>
-<td colspan=2><?php print WEB_btn_add; print_gateway_select($db_link,"new_subnet",$id); ?>
+<td colspan=3><?php print WEB_btn_add; print_add_gw_subnets($db_link,$id,"new_subnet"); ?>
 </td>
 <td>
 <input type="submit" name="s_create" value="<?php echo WEB_btn_add; ?>">

html/admin/devices/editdevice.php

@@ -161,9 +161,11 @@ if ($device['device_type']==2) {
     print "<td class='data'>"; print_qa_select('f_queue_enabled', $device['queue_enabled']); print "</td>\n";
     print "<td class='data'>"; print_qa_select('f_connected_user_only', $device['connected_user_only']); print "</td>\n";
     print "</tr>\n";
-    print "<tr><td colspan=4>"; print_url(WEB_list_l3_interfaces,"/admin/devices/edit_l3int.php?id=$id"); print "</td></tr>";
-    print "<tr><td colspan=4 class='data'>"; print get_l3_interfaces($db_link,$device['id']); print "</td></tr>";
-    }
+    print "<tr><td colspan=2>"; print_url(WEB_list_l3_interfaces,"/admin/devices/edit_l3int.php?id=$id"); print "</td>";
+    print "<td colspan=2>"; print_url(WEB_list_gateway_subnets,"/admin/devices/edit_gw_subnets.php?id=$id"); print "</td></tr>";
+    print "<tr><td colspan=2 class='data'>"; print get_l3_interfaces($db_link,$device['id']); print "</td>";
+    print "<td colspan=2 class='data'>"; print get_gw_subnets($db_link,$device['id']); print "</td></tr>";
+}
 
 //print router settings
 if ($device['device_type']==0) {
@@ -171,10 +173,6 @@ if ($device['device_type']==0) {
     print "<tr>";
     print "<td class='data'>"; print_qa_select('f_dhcp', $device['dhcp']); print "</td><td></td><td></td><td></td>\n";
     print "</tr>\n";
-    print "<tr><td colspan=2>"; print_url(WEB_list_l3_interfaces,"/admin/devices/edit_l3int.php?id=$id"); print "</td>";
-    print "<td colspan=2>"; print_url(WEB_list_gateway_subnets,"/admin/devices/edit_gw_subnets.php?id=$id"); print "</td></tr>";
-    print "<tr><td colspan=2 class='data'>"; print get_l3_interfaces($db_link,$device['id']); print "</td>";
-    print "<td colspan=2 class='data'>"; print get_gw_subnets($db_link,$device['id']); print "</td></tr>";
     }
 
 //for all active network devices

html/inc/common.php

@@ -483,17 +483,18 @@ function print_ou_select($db, $ou_name, $ou_value)
 function get_subnet_description($db,$subnet_id)
 {
 if (empty($subnet_id)) { return '';}
-$result = get_record_sql($db,'SELECT * FROM subnets WHERE id='.$subnet_id);
-if (empty($result)) { return ''; }
+$subnet = get_record_sql($db,'SELECT * FROM subnets WHERE id='.$subnet_id);
+if (empty($subnet)) { return ''; }
+$result = $subnet['subnet'].'('.['description'].')';
 return $result;
 }
 
 function print_add_gw_subnets($db, $device_id, $gs_name)
 {
     print "<select name=\"$gs_name\" >\n";
-    $t_gs = mysqli_query($db, "SELECT id,subnet,comment FROM subnets WHERE subnets.id NOT IN (SELECT subnet_id FROM gateway_subnets WHERE gateway_subnets.id=".$device_id.") ORDER BY subnet");
+    $t_gs = mysqli_query($db, "SELECT id,subnet,comment FROM subnets WHERE subnets.free=0 AND subnets.id NOT IN (SELECT subnet_id FROM gateway_subnets WHERE gateway_subnets.device_id=".$device_id.") ORDER BY subnet");
     while (list($f_gs_id, $f_gs_name,$f_gs_comment) = mysqli_fetch_array($t_gs)) {
-        print_select_item($f_gs_name.'['.$f_gs_comment.']', $f_gs_id, 0);
+        print_select_item($f_gs_name.'('.$f_gs_comment.')', $f_gs_id, 0);
     }
     print "</select>\n";
 }