diff options
| -rw-r--r-- | src/etc/inc/gmirror.inc | 4 | ||||
| -rw-r--r-- | src/usr/local/www/system.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/etc/inc/gmirror.inc b/src/etc/inc/gmirror.inc index c183282..8ac173a 100644 --- a/src/etc/inc/gmirror.inc +++ b/src/etc/inc/gmirror.inc @@ -284,7 +284,7 @@ function gmirror_get_consumer_metadata($consumer) { if (!is_valid_consumer($consumer)) { return array(); } - $output = ""; + $output = array(); exec("/sbin/gmirror dump " . escapeshellarg($consumer), $output); return array_map('trim', $output); } @@ -341,7 +341,7 @@ function gmirror_get_all_unused_consumer_sizes_on_disk($disk) { if (!is_valid_disk($disk) || !is_consumer_unused($disk)) { return array(); } - $output = ""; + $output = array(); exec("/sbin/geom part list " . escapeshellarg($disk) . " | /usr/bin/egrep '(Name:|Mediasize:)' | /usr/bin/cut -c4- | /usr/bin/sed -l -e 'N;s/\\nMediasize://;P;D;' | /usr/bin/cut -c7-", $output); if (empty($output)) { exec("/sbin/geom disk list " . escapeshellarg($disk) . " | /usr/bin/egrep '(Name:|Mediasize:)' | /usr/bin/cut -c4- | /usr/bin/sed -l -e 'N;s/\\nMediasize://;P;D;' | /usr/bin/cut -c7-", $output); diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index 3663e21..884ab4c 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -175,7 +175,7 @@ if ($_POST) { $input_errors[] = gettext("The domain may only contain the characters a-z, 0-9, '-' and '.'."); } - $ignore_posted_dnsgw = array(); + $dnslist = $ignore_posted_dnsgw = array(); for ($dnscounter=1; $dnscounter<5; $dnscounter++) { $dnsname="dns{$dnscounter}"; |
