Revision 019e5031
Added by Renato Botelho about 12 years ago
| etc/inc/filter.inc | ||
|---|---|---|
| 492 | 492 |
return $finallist; |
| 493 | 493 |
} |
| 494 | 494 |
|
| 495 |
function filter_expand_alias($alias_name, $all = false)
|
|
| 495 |
function filter_expand_alias($alias_name) |
|
| 496 | 496 |
{
|
| 497 | 497 |
global $config; |
| 498 | 498 |
|
| ... | ... | |
| 501 | 501 |
if($aliased['name'] == $alias_name) {
|
| 502 | 502 |
$aliasnesting = array(); |
| 503 | 503 |
$aliasaddrnesting = array(); |
| 504 |
$result = filter_generate_nested_alias($aliased['name'], $aliased['address'], $aliasnesting, $aliasaddrnesting); |
|
| 505 |
if ($all === true) |
|
| 506 |
foreach ($aliasaddrnesting as $addr) |
|
| 507 |
if (!preg_match("/\s*$addr\s*/", $result))
|
|
| 508 |
$result .= " {$addr}";
|
|
| 509 |
return $result; |
|
| 504 |
return filter_generate_nested_alias($aliased['name'], $aliased['address'], $aliasnesting, $aliasaddrnesting); |
|
| 510 | 505 |
} |
| 511 | 506 |
} |
| 512 | 507 |
} |
| 513 | 508 |
} |
| 514 | 509 |
|
| 515 |
function filter_expand_alias_array($alias_name, $all = false) {
|
|
| 516 |
$expansion = filter_expand_alias($alias_name, $all);
|
|
| 510 |
function filter_expand_alias_array($alias_name) {
|
|
| 511 |
$expansion = filter_expand_alias($alias_name); |
|
| 517 | 512 |
return explode(" ", preg_replace('/\s+/', ' ', trim($expansion)));
|
| 518 | 513 |
} |
| 519 | 514 |
|
Also available in: Unified diff
Partial revert of 5b431a20dea since the introduced parameter is not working as expected