|
@@ 164-169 (lines=6) @@
|
| 161 |
|
$query = sprintf("DELETE FROM `$table` WHERE |
| 162 |
|
`$table`.`$type` = INET_ATON('%s') LIMIT 1", $value); |
| 163 |
|
break; |
| 164 |
|
case 'network': |
| 165 |
|
list($sub['net'],$sub['mask'])=explode('/',$value); |
| 166 |
|
$query = sprintf("DELETE FROM `$table` WHERE |
| 167 |
|
`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s') LIMIT 1", |
| 168 |
|
$sub['net'],$sub['mask']); |
| 169 |
|
break; |
| 170 |
|
default: |
| 171 |
|
$query = sprintf("DELETE FROM `$table` WHERE |
| 172 |
|
`$table`.`$type` = %s LIMIT 1", $value); |
|
@@ 332-343 (lines=12) @@
|
| 329 |
|
$table,$table); |
| 330 |
|
else { |
| 331 |
|
switch ($type) { |
| 332 |
|
case 'network': |
| 333 |
|
list($sub['net'],$sub['mask'])=explode('/',$value); |
| 334 |
|
$query = sprintf('SELECT * FROM ( |
| 335 |
|
SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) |
| 336 |
|
WHERE ( |
| 337 |
|
inet_aton(\'%s\') >= network AND |
| 338 |
|
( inet_aton(\'%s\') | ( inet_aton(\'%s\') ^ (power(2,32)-1) ) ) |
| 339 |
|
<= network | ( netmask ^ (power(2,32)-1) ) |
| 340 |
|
) |
| 341 |
|
GROUP by idmilt |
| 342 |
|
) AS val WHERE val.network IS NOT null', $table, $table, $sub['net'], $sub['net'], $sub['mask']); |
| 343 |
|
break; |
| 344 |
|
case 'ip': |
| 345 |
|
$query = sprintf('SELECT * FROM ( |
| 346 |
|
SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id)' . |
|
@@ 365-374 (lines=10) @@
|
| 362 |
|
case 'ip': |
| 363 |
|
$query= "select * from $table where $type = INET_ATON('$value')"; |
| 364 |
|
break; |
| 365 |
|
case 'network': |
| 366 |
|
list($sub['net'],$sub['mask'])=explode('/',$value); |
| 367 |
|
$query= sprintf('select * from `%s` |
| 368 |
|
WHERE ( |
| 369 |
|
inet_aton(\'%s\') >= network AND |
| 370 |
|
( inet_aton(\'%s\') | ( inet_aton(\'%s\') ^ (power(2,32)-1) ) ) |
| 371 |
|
<= network | ( netmask ^ (power(2,32)-1) ) |
| 372 |
|
)', $table, $sub['net'], $sub['net'], $sub['mask']); |
| 373 |
|
; |
| 374 |
|
break; |
| 375 |
|
default: |
| 376 |
|
$query= "select * from $table where $type = '$value'"; |
| 377 |
|
} |