X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=c8dbcb9105bf4443d67d1aa711f8159af46909d5;hb=7789ea25079801ee1425368e9bf2f7ce80d16d88;hp=c11ac37e3a1fedc5b94eb1e00abb9abcc2cb59a8;hpb=82e094179c5e104f552cab84c42f416dd7107388;p=friendica.git diff --git a/mod/settings.php b/mod/settings.php index c11ac37e3a..c8dbcb9105 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1,6 +1,6 @@ t('Contact CSV file upload error')); } else { $csvArray = array_map('str_getcsv', file($_FILES['importcontact-filename']['tmp_name'])); - Logger::info('Import started', ['lines' => count($csvArray)]); + Logger::notice('Import started', ['lines' => count($csvArray)]); // import contacts foreach ($csvArray as $csvRow) { // The 1st row may, or may not contain the headers of the table @@ -237,18 +237,20 @@ function settings_post(App $a) // or the handle of the account, therefore we check for either // "http" or "@" to be present in the string. // All other fields from the row will be ignored - if ((strpos($csvRow[0],'@') !== false) || (strpos($csvRow[0],'http') !== false)) { + if ((strpos($csvRow[0],'@') !== false) || in_array(parse_url($csvRow[0], PHP_URL_SCHEME), ['http', 'https'])) { Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]); + } else { + Logger::notice('Invalid account', ['url' => $csvRow[0]]); } } - Logger::info('Import done'); + Logger::notice('Import done'); info(DI::l10n()->t('Importing Contacts done')); // delete temp file unlink($_FILES['importcontact-filename']['tmp_name']); } } else { - Logger::info('Import triggered, but no import file was found.'); + Logger::notice('Import triggered, but no import file was found.'); } return;