Bladeren bron

fix action for dns filters

rajven 2 jaren geleden
bovenliggende
commit
d8378c6bbe
2 gewijzigde bestanden met toevoegingen van 4 en 1 verwijderingen
  1. 2 1
      scripts/sync_mikrotik.pl
  2. 2 0
      updates/2-4-11/filter-uprades.sql

+ 2 - 1
scripts/sync_mikrotik.pl

@@ -416,7 +416,8 @@ foreach my $row (@grouplist_ref) {
 	        my @dyn_ips = @{$dyn_filters{$row->{filter_id}}};
 	        if (scalar @dyn_ips >0) {
 		        for (my $i = 0; $i < scalar @dyn_ips; $i++) {
-        	        $group_filters{'group_'.$row->{group_id}}->{$index}=$dyn_ips[$i];
+        	        $group_filters{'group_'.$row->{group_id}}->{$index}->{filter_id}=$dyn_ips[$i];
+                    $group_filters{'group_'.$row->{group_id}}->{$index}->{action}=$row->{action};
         	        $index++;
         	    }
 	        }

+ 2 - 0
updates/2-4-11/filter-uprades.sql

@@ -1,3 +1,5 @@
 ALTER TABLE `Group_filters` ADD `action` BOOLEAN NOT NULL DEFAULT FALSE AFTER `order`;
 UPDATE `Group_filters` as G set action = (SELECT action FROM Filter_list WHERE G.filter_id = id);
 ALTER TABLE `Filter_list` DROP `action`;
+DELETE FROM Group_filters WHERE filter_id NOT IN (SELECT id FROM Filter_list);
+DELETE FROM Group_filters WHERE group_id NOT IN (SELECT id FROM Group_list);