Fix contact import with Frio

diff --git a/mod/settings.php b/mod/settings.php
index d1eefefc0dfa0a9a2da5d84beb4007244f62bfe8..6c41856a4f808f9cc58872c41f2a284352127ef7 100644 (file)
--- 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 626d3b4d03a4985e6a95d6ee9c1f976274e3124a..91c89643e1df39a3b41998d8402668bd2048d4c3 100644 (file)
--- a/view/theme/frio/templates/settings/settings.tpl
+++ b/view/theme/frio/templates/settings/settings.tpl
@@ -234,7 +234,7 @@
                                                <input type="file" name="importcontact-filename" />
                                        </div>
                                        <div class="panel-footer">
-                                               <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+                                               <button type="submit" name="importcontact-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                        </div>
                                </div>
                        </div>
@@ -253,7 +253,7 @@
                                                <div id="settings-relocate-desc">{{$relocate_text}}</div>
                                        </div>
                                        <div class="panel-footer">
-                                               <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+                                               <button type="submit" name="resend_relocate" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                        </div>
                                </div>
                        </div>