diff options
| -rw-r--r-- | docs/configuration.md | 7 | ||||
| -rw-r--r-- | includes/config.defaults.php | 6 | ||||
| -rw-r--r-- | routers/bird.php | 10 | ||||
| -rw-r--r-- | routers/cisco.php | 4 | ||||
| -rw-r--r-- | routers/quagga.php | 10 | ||||
| -rw-r--r-- | routers/router.php | 4 |
6 files changed, 30 insertions, 11 deletions
diff --git a/docs/configuration.md b/docs/configuration.md index 3c0061d..56d6efd 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -155,6 +155,13 @@ $config['routers']['router1']['auth'] = 'ssh-key'; ``` The passphrase option is not needed if the key is not passphrase protected. +### Output + +```php +$config['output']['show_command'] = true; +``` +Defines if the command used to get the output should be displayed or not. + ### Logs ```php diff --git a/includes/config.defaults.php b/includes/config.defaults.php index f7fc6d4..7c3b583 100644 --- a/includes/config.defaults.php +++ b/includes/config.defaults.php @@ -43,6 +43,12 @@ $config = array( 'mail' => 'support@example.com' ), + // Output control + 'output' => array( + // Show or hide command in output + 'show_command' => true + ), + // Filters 'filters' => array(), diff --git a/routers/bird.php b/routers/bird.php index 06aea32..bc0a851 100644 --- a/routers/bird.php +++ b/routers/bird.php @@ -36,9 +36,9 @@ final class Bird extends Router { } if (match_ipv4($destination)) { - $ping = 'ping -A -c 10 '.$fqdn; + $ping = 'ping -A -c 10 '.(isset($fqdn) ? $fqdn : $destination); } else if (match_ipv6($destination)) { - $ping = 'ping6 -A -c 10 '.$fqdn; + $ping = 'ping6 -A -c 10 '.(isset($fqdn) ? $fqdn : $destination); } else { throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.'); } @@ -69,9 +69,11 @@ final class Bird extends Router { } if (match_ipv4($destination)) { - $traceroute = 'traceroute -4 -A -q1 -N32 -w1 -m15 '.$fqdn; + $traceroute = 'traceroute -4 -A -q1 -N32 -w1 -m15 '. + (isset($fqdn) ? $fqdn : $destination); } else if (match_ipv6($destination)) { - $traceroute = 'traceroute -6 -A -q1 -N32 -w1 -m15 '.$fqdn; + $traceroute = 'traceroute -6 -A -q1 -N32 -w1 -m15 '. + (isset($fqdn) ? $fqdn : $destination); } else { throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.'); } diff --git a/routers/cisco.php b/routers/cisco.php index 26fdde5..4d94a62 100644 --- a/routers/cisco.php +++ b/routers/cisco.php @@ -55,9 +55,9 @@ final class Cisco extends Router { } if (match_ipv4($destination)) { - $traceroute = 'traceroute ip '.$fqdn; + $traceroute = 'traceroute ip '.(isset($fqdn) ? $fqdn : $destination); } else if (match_ipv6($destination)) { - $traceroute = 'traceroute ipv6 '.$fqdn; + $traceroute = 'traceroute ipv6 '.(isset($fqdn) ? $fqdn : $destination); } else { throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.'); } diff --git a/routers/quagga.php b/routers/quagga.php index f78bdec..16f5d9c 100644 --- a/routers/quagga.php +++ b/routers/quagga.php @@ -36,9 +36,9 @@ final class Quagga extends Router { } if (match_ipv4($destination)) { - $ping = 'ping -A -c 10 '.$destination; + $ping = 'ping -A -c 10 '.(isset($fqdn) ? $fqdn : $destination); } else if (match_ipv6($destination)) { - $ping = 'ping6 -A -c 10 '.$destination; + $ping = 'ping6 -A -c 10 '.(isset($fqdn) ? $fqdn : $destination); } else { throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.'); } @@ -69,9 +69,11 @@ final class Quagga extends Router { } if (match_ipv4($destination)) { - $traceroute = 'traceroute -4 -A -q1 -N32 -w1 -m15 '.$fqdn; + $traceroute = 'traceroute -4 -A -q1 -N32 -w1 -m15 '. + (isset($fqdn) ? $fqdn : $destination); } else if (match_ipv6($destination)) { - $traceroute = 'traceroute -6 -A -q1 -N32 -w1 -m15 '.$fqdn; + $traceroute = 'traceroute -6 -A -q1 -N32 -w1 -m15 '. + (isset($fqdn) ? $fqdn : $destination); } else { throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.'); } diff --git a/routers/router.php b/routers/router.php index d68c2f4..c11db5c 100644 --- a/routers/router.php +++ b/routers/router.php @@ -71,7 +71,9 @@ abstract class Router { } protected function format_output($command, $output) { - $displayable = '<p><kbd>Command: '.$command.'</kdb></p>'; + if ($this->global_config['output']['show_command']) { + $displayable = '<p><kbd>Command: '.$command.'</kdb></p>'; + } $displayable .= '<pre class="pre-scrollable">'.$output.'</pre>'; return $displayable; |