fixed deletion of groups - added deletion of group binding rules

html/admin/groups/index.php

@@ -8,6 +8,7 @@ if (isset($_POST["remove"])) {
         if (isset($val) and $val > 0) {
             run_sql($db_link, "UPDATE User_list SET ou_id=0 WHERE ou_id=$val");
             run_sql($db_link, "UPDATE User_auth SET ou_id=0 WHERE ou_id=$val");
+            run_sql($db_link, "DELETE FROM auth_rules WHERE ou_id=$val");
             delete_record($db_link, "OU", "id=" . $val);
             }
         }

html/admin/iplist/index.php

@@ -129,7 +129,13 @@ print_ip_submenu($page_url);
 <form id="def" name="def">
 
 <?php
-$countSQL="SELECT Count(*) FROM User_auth, User_list WHERE User_auth.user_id = User_list.id AND User_auth.deleted =0 $ip_list_filter";
+$countSQL="SELECT Count(*) FROM User_auth 
+LEFT JOIN User_list 
+ON User_auth.user_id = User_list.id 
+LEFT JOIN OU 
+ON OU.id=User_list.ou_id 
+WHERE User_auth.deleted =0 $ip_list_filter";
+
 $res = mysqli_query($db_link, $countSQL);
 $count_records = mysqli_fetch_array($res);
 $total=ceil($count_records[0]/$displayed);
@@ -143,25 +149,29 @@ print_navigation($page_url,$page,$displayed,$count_records[0],$total);
 <table class="data">
 	<tr>
         <td align=Center><input type="checkbox" onClick="checkAll(this.checked);"></td>
+		<td align=Center><?php print $sort_url . "&sort=OU_Name&order=$new_order>" . WEB_cell_ou . "</a>"; ?></td>
 		<td align=Center><?php print $sort_url . "&sort=login&order=$new_order>" . WEB_cell_login . "</a>"; ?></td>
 		<td align=Center><?php print $sort_url . "&sort=ip_int&order=$new_order>" . WEB_cell_ip . "</a>"; ?></td>
 		<td align=Center><?php print $sort_url . "&sort=mac&order=$new_order>" . WEB_cell_mac . "</a>"; ?></td>
 		<td align=Center><?php print WEB_cell_comment; ?></td>
 		<td align=Center><?php print WEB_cell_dns_name; ?></td>
-		<td align=Center><?php print WEB_cell_enabled; ?></td>
 		<td align=Center><?php print WEB_cell_filter; ?></td>
 		<td align=Center><?php print WEB_cell_shaper; ?></td>
 		<td align=Center><?php print WEB_cell_traf; ?></td>
 		<td align=Center><?php print WEB_cell_dhcp; ?></td>
 		<td align=Center><?php print WEB_cell_acl; ?></td>
-		<td align=Center><?php print $sort_url . "&sort=dhcp_time&order=$new_order>DHCP event</a>"; ?></td>
 		<td align=Center><?php print $sort_url . "&sort=last_found&order=$new_order>Last</a>"; ?></td>
 		<td align=Center><?php print WEB_cell_connection; ?></td>
 	</tr>
 <?php
 
-$sSQL = "SELECT User_auth.*, User_list.login, User_list.enabled as UEnabled, User_list.blocked as UBlocked FROM User_auth, User_list
-WHERE User_auth.user_id = User_list.id AND User_auth.deleted =0 $ip_list_filter
+$sSQL = "SELECT User_auth.*, User_list.login, User_list.enabled as UEnabled, User_list.blocked as UBlocked, User_list.ou_id as UOU, OU.ou_name as UOU_name 
+FROM User_auth 
+LEFT JOIN User_list 
+ON User_auth.user_id = User_list.id 
+LEFT JOIN OU 
+ON OU.id=User_list.ou_id 
+WHERE User_auth.deleted =0 $ip_list_filter
 ORDER BY $sort_table.$sort_field $order LIMIT $start,$displayed";
 
 $users = get_records_sql($db_link,$sSQL);
@@ -178,6 +188,7 @@ foreach ($users as $user) {
     if ($user['blocked']) { $cl = "error"; }
     if (!$user['UEnabled'] or $user['UBlocked']) { $cl = "off"; }
     print "<td class=\"$cl\" style='padding:0'><input type=checkbox name=fid[] value=".$user['id']."></td>\n";
+    print "<td class=\"$cl\" >".get_ou($db_link,$user['UOU'])."</td>\n";
     print "<td class=\"$cl\" ><a href=/admin/users/edituser.php?id=".$user['user_id'].">" . $user['login'] . "</a></td>\n";
     print "<td class=\"$cl\" ><a href=/admin/users/editauth.php?id=".$user['id'].">" . $user['ip'] . "</a></td>\n";
     print "<td class=\"$cl\" >" . expand_mac($db_link,$user['mac']) . "</td>\n";
@@ -193,7 +204,6 @@ foreach ($users as $user) {
     print "<td class=\"$cl\" >" . get_qa($user['save_traf']) . "</td>\n";
     print "<td class=\"$cl\" >" . get_qa($user['dhcp']) . "</td>\n";
     print "<td class=\"$cl\" >".$user['dhcp_acl']."</td>\n";
-    print "<td class=\"$cl\" >".$dhcp_str."</td>\n";
     print "<td class=\"$cl\" >".$user['last_found']."</td>\n";
     print "<td class=\"$cl\" >" . get_connection($db_link, $user['id']) . "</td>\n";
     print "</tr>\n";