From 52c88ae41434c10d4def7fa3394e1a417cfcbd81 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 10 Nov 2020 06:37:27 +0000 Subject: [PATCH] Fix contact import with Frio --- mod/settings.php | 4 ++++ view/theme/frio/templates/settings/settings.tpl | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index d1eefefc0..6c41856a4 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -229,6 +229,7 @@ function settings_post(App $a) notice(DI::l10n()->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)]); // import contacts foreach ($csvArray as $csvRow) { // The 1st row may, or may not contain the headers of the table @@ -240,11 +241,14 @@ function settings_post(App $a) Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]); } } + Logger::info('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.'); } return; diff --git a/view/theme/frio/templates/settings/settings.tpl b/view/theme/frio/templates/settings/settings.tpl index 626d3b4d0..91c89643e 100644 --- a/view/theme/frio/templates/settings/settings.tpl +++ b/view/theme/frio/templates/settings/settings.tpl @@ -234,7 +234,7 @@ @@ -253,7 +253,7 @@
{{$relocate_text}}