diff --git a/LICENSE b/LICENSE index 8a39128b9..ddcfe234f 100644 --- a/LICENSE +++ b/LICENSE @@ -36,10 +36,12 @@ Copyright (c) 2003-2006 Manuel Kasper Copyright (c) 2012 Marcello Coutinho Copyright (c) 2018 Martin Wasley Copyright (c) 2010-2015 Michael Bostock +Copyright (c) 2019 Michael Muenz Copyright (c) 2019 Pascal Mathis Copyright (c) 2005-2006 Paul Taylor Copyright (c) 2005-2006 Peter Allgeyer Copyright (c) 2004 Peter Curran +Copyright (c) 2020 Petr Kejval Copyright (c) 2018 René Muhr Copyright (c) 2015 S. Linke Copyright (c) 2007 Sam Wenham diff --git a/src/etc/inc/plugins.inc.d/dpinger.inc b/src/etc/inc/plugins.inc.d/dpinger.inc index edd332554..57f0df3db 100644 --- a/src/etc/inc/plugins.inc.d/dpinger.inc +++ b/src/etc/inc/plugins.inc.d/dpinger.inc @@ -238,7 +238,8 @@ function dpinger_configure_do($verbose = false, $gwname = null) /* command to run on alarm */ $params .= '-C "/usr/local/etc/rc.syshook monitor" '; - foreach ([ + foreach ( + [ 'interval' => '-s %ss ', 'loss_interval' => '-l %ss ', 'time_period' => '-t %ss ', @@ -246,7 +247,8 @@ function dpinger_configure_do($verbose = false, $gwname = null) 'latencyhigh' => '-D %s ', 'losshigh' => '-L %s ', 'data_length' => '-d %s ' - ] as $pname => $ppattern) { + ] as $pname => $ppattern + ) { $params .= exec_safe( $ppattern, isset($gateway[$pname]) && is_numeric($gateway[$pname]) ? diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LogController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LogController.php index 026350a07..81017909b 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LogController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LogController.php @@ -79,7 +79,7 @@ class LogController extends ApiControllerBase } $response = $backend->configdpRun("system diag log", array(0, 0, $searchPhrase, $module, $scope)); $this->response->setRawHeader("Content-Type: text/csv"); - $this->response->setRawHeader("Content-Disposition: attachment; filename=".$scope.".log"); + $this->response->setRawHeader("Content-Disposition: attachment; filename=" . $scope . ".log"); foreach (json_decode($response, true)['rows'] as $row) { printf("%s\t%s\n", $row['timestamp'], $row['line']); }