tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #9519 from annando/fix-contact-import

Browse source 
Fix contact import with Frio
This commit is contained in:
Hypolite Petovan 2020-11-10 10:28:35 -05:00 committed by GitHub
parent 7765bd8e43 52c88ae414
commit 978208baa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/settings.php
View file

@ -229,6 +229,7 @@ function settings_post(App $a)
notice(DI::l10n()->t('Contact CSV file upload error')); notice(DI::l10n()->t('Contact CSV file upload error'));
} else { } else {
$csvArray = array_map('str_getcsv', file($_FILES['importcontact-filename']['tmp_name'])); $csvArray = array_map('str_getcsv', file($_FILES['importcontact-filename']['tmp_name']));
Logger::info('Import started', ['lines' => count($csvArray)]);
// import contacts // import contacts
foreach ($csvArray as $csvRow) { foreach ($csvArray as $csvRow) {
// The 1st row may, or may not contain the headers of the table // 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]); Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]);
} }
} }
Logger::info('Import done');
info(DI::l10n()->t('Importing Contacts done')); info(DI::l10n()->t('Importing Contacts done'));
// delete temp file // delete temp file
unlink($_FILES['importcontact-filename']['tmp_name']); unlink($_FILES['importcontact-filename']['tmp_name']);
} }
} else {
Logger::info('Import triggered, but no import file was found.');
} }
return; return;

4
view/theme/frio/templates/settings/settings.tpl
View file

@ -234,7 +234,7 @@
<input type="file" name="importcontact-filename" /> <input type="file" name="importcontact-filename" />
</div> </div>
<div class="panel-footer"> <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> </div>
</div> </div>
@ -253,7 +253,7 @@
<div id="settings-relocate-desc">{{$relocate_text}}</div> <div id="settings-relocate-desc">{{$relocate_text}}</div>
</div> </div>
<div class="panel-footer"> <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> </div>
</div> </div>