|
@@ 146-151 (lines=6) @@
|
| 143 |
|
$query = sprintf("DELETE FROM `$table` WHERE |
| 144 |
|
`$table`.`$type` = INET_ATON('%s') LIMIT 1", $value); |
| 145 |
|
break; |
| 146 |
|
case 'network': |
| 147 |
|
list($sub['net'],$sub['mask'])=explode('/',$value); |
| 148 |
|
$query = sprintf("DELETE FROM `$table` WHERE |
| 149 |
|
`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s') LIMIT 1", |
| 150 |
|
$sub['net'],$sub['mask']); |
| 151 |
|
break; |
| 152 |
|
default: |
| 153 |
|
$query = sprintf("DELETE FROM `$table` WHERE |
| 154 |
|
`$table`.`$type` = %s LIMIT 1", $value); |
|
@@ 314-325 (lines=12) @@
|
| 311 |
|
$table,$table); |
| 312 |
|
else { |
| 313 |
|
switch ($type) { |
| 314 |
|
case 'network': |
| 315 |
|
list($sub['net'],$sub['mask'])=explode('/',$value); |
| 316 |
|
$query = sprintf('SELECT * FROM ( |
| 317 |
|
SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) |
| 318 |
|
WHERE ( |
| 319 |
|
inet_aton(\'%s\') >= network AND |
| 320 |
|
( inet_aton(\'%s\') | ( inet_aton(\'%s\') ^ (power(2,32)-1) ) ) |
| 321 |
|
<= network | ( netmask ^ (power(2,32)-1) ) |
| 322 |
|
) |
| 323 |
|
GROUP by idmilt |
| 324 |
|
) AS val WHERE val.network IS NOT null', $table, $table, $sub['net'], $sub['net'], $sub['mask']); |
| 325 |
|
break; |
| 326 |
|
case 'ip': |
| 327 |
|
$query = sprintf('SELECT * FROM ( |
| 328 |
|
SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id)' . |
|
@@ 347-356 (lines=10) @@
|
| 344 |
|
case 'ip': |
| 345 |
|
$query= "select * from $table where $type = INET_ATON('$value')"; |
| 346 |
|
break; |
| 347 |
|
case 'network': |
| 348 |
|
list($sub['net'],$sub['mask'])=explode('/',$value); |
| 349 |
|
$query= sprintf('select * from `%s` |
| 350 |
|
WHERE ( |
| 351 |
|
inet_aton(\'%s\') >= network AND |
| 352 |
|
( inet_aton(\'%s\') | ( inet_aton(\'%s\') ^ (power(2,32)-1) ) ) |
| 353 |
|
<= network | ( netmask ^ (power(2,32)-1) ) |
| 354 |
|
)', $table, $sub['net'], $sub['net'], $sub['mask']); |
| 355 |
|
; |
| 356 |
|
break; |
| 357 |
|
default: |
| 358 |
|
$query= "select * from $table where $type = '$value'"; |
| 359 |
|
} |