minor fix

This commit is contained in:
fbsanchez 2020-04-08 12:26:01 +02:00
parent 47857de79f
commit 95d7a5d267
1 changed files with 46 additions and 44 deletions

View File

@ -308,51 +308,53 @@ class HostDevices extends Wizard
$interval = get_parameter('interval', 0); $interval = get_parameter('interval', 0);
if ($network_csv_enabled) { if ($network_csv_enabled) {
if ($_FILES['network_csv']['type'] != 'text/csv' if (isset($_FILES['network_csv']['type'])) {
&& $_FILES['network_csv']['type'] != 'text/plain' if ($_FILES['network_csv']['type'] != 'text/csv'
&& $_FILES['network_csv']['type'] != 'application/octet-stream' && $_FILES['network_csv']['type'] != 'text/plain'
&& $_FILES['network_csv']['type'] != 'application/vnd.ms-excel' && $_FILES['network_csv']['type'] != 'application/octet-stream'
&& $_FILES['network_csv']['type'] != 'text/x-csv' && $_FILES['network_csv']['type'] != 'application/vnd.ms-excel'
&& $_FILES['network_csv']['type'] != 'application/csv' && $_FILES['network_csv']['type'] != 'text/x-csv'
&& $_FILES['network_csv']['type'] != 'application/x-csv' && $_FILES['network_csv']['type'] != 'application/csv'
&& $_FILES['network_csv']['type'] != 'text/csv' && $_FILES['network_csv']['type'] != 'application/x-csv'
&& $_FILES['network_csv']['type'] != 'text/comma-separated-values' && $_FILES['network_csv']['type'] != 'text/csv'
&& $_FILES['network_csv']['type'] != 'text/x-comma-separated-values' && $_FILES['network_csv']['type'] != 'text/comma-separated-values'
&& $_FILES['network_csv']['type'] != 'text/tab-separated-values' && $_FILES['network_csv']['type'] != 'text/x-comma-separated-values'
) { && $_FILES['network_csv']['type'] != 'text/tab-separated-values'
$this->msg = __( ) {
'Invalid mimetype for csv file: %s', $this->msg = __(
$_FILES['network_csv']['type'] 'Invalid mimetype for csv file: %s',
); $_FILES['network_csv']['type']
return false; );
} return false;
$network = preg_split(
"/\n|,|;/",
trim(
file_get_contents(
$_FILES['network_csv']['tmp_name']
)
)
);
unlink($_FILES['network_csv']['tmp_name']);
if (empty($network) || is_array($network) === false) {
$this->msg = __(
'Invalid content readed from csv file: %s',
$_FILES['network_csv']['name']
);
return false;
}
// Sanitize.
$network = array_unique($network);
$network = array_filter(
$network,
function ($item) {
return (!empty($item));
} }
);
$network = join(',', $network); $network = preg_split(
"/\n|,|;/",
trim(
file_get_contents(
$_FILES['network_csv']['tmp_name']
)
)
);
unlink($_FILES['network_csv']['tmp_name']);
if (empty($network) || is_array($network) === false) {
$this->msg = __(
'Invalid content readed from csv file: %s',
$_FILES['network_csv']['name']
);
return false;
}
// Sanitize.
$network = array_unique($network);
$network = array_filter(
$network,
function ($item) {
return (!empty($item));
}
);
$network = join(',', $network);
}
} }
if (isset($task_id) === true) { if (isset($task_id) === true) {