Revision 93a72cb8
Added by Phil Davis over 10 years ago
| etc/inc/util.inc | ||
|---|---|---|
| 1430 | 1430 |
function alias_expand($name) {
|
| 1431 | 1431 |
global $aliastable; |
| 1432 | 1432 |
|
| 1433 |
// alias names cannot be strictly numeric. redmine #4289
|
|
| 1434 |
if (is_numericint($name))
|
|
| 1435 |
return null;
|
|
| 1436 |
|
|
| 1437 |
if (isset($aliastable[$name]))
|
|
| 1433 |
if (isset($aliastable[$name])) {
|
|
| 1434 |
// alias names cannot be strictly numeric. redmine #4289
|
|
| 1435 |
if (is_numericint($name)) {
|
|
| 1436 |
return null; |
|
| 1437 |
}
|
|
| 1438 | 1438 |
return "\${$name}";
|
| 1439 |
else if (is_ipaddr($name) || is_subnet($name) || is_port($name) || is_portrange($name)) |
|
| 1439 |
} else if (is_ipaddr($name) || is_subnet($name) || is_port($name) || is_portrange($name))
|
|
| 1440 | 1440 |
return "{$name}";
|
| 1441 | 1441 |
else |
| 1442 | 1442 |
return null; |
Also available in: Unified diff
Be nicer when checking if alias is numeric
Because an ordinary port can be numeric here.
Forum https://forum.pfsense.org/index.php?topic=89906.0
Conflicts:
etc/inc/util.inc