Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 05:50:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

OnePoll reworked, improved "failed" behaviour

Browse source
This commit is contained in:
Michael 2020-11-22 14:42:24 +00:00
parent b52ba79620
commit 3ffd40c7da
4 changed files with 124 additions and 434 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Module/Contact.php
View file

@ -528,7 +528,7 @@ class Contact extends BaseModule
$last_update = (($contact['last-update'] <= DBA::NULL_DATETIME) ? DI::l10n()->t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
if ($contact['last-update'] > DBA::NULL_DATETIME) {
$last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? DI::l10n()->t('(Update was successful)') : DI::l10n()->t('(Update was not successful)'));
$last_update .= ' ' . ($contact['failed'] ? DI::l10n()->t('(Update was not successful)') : DI::l10n()->t('(Update was successful)'));
}
$lblsuggest = (($contact['network'] === Protocol::DFRN) ? DI::l10n()->t('Suggest friends') : '');
@ -679,7 +679,7 @@ class Contact extends BaseModule
array_unshift($sql_values, 0);
break;
case 'archived':
$sql_extra = " AND (`archive` OR `failed`) AND NOT `blocked` AND NOT `pending`";
$sql_extra = " AND `archive` AND NOT `blocked` AND NOT `pending`";
break;
case 'pending':
$sql_extra = " AND `pending` AND NOT `archive` AND NOT `failed` AND ((`rel` = ?)
@ -687,7 +687,7 @@ class Contact extends BaseModule
$sql_values[] = Model\Contact::SHARING;
break;
default:
$sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending` AND NOT `failed`";
$sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";
break;
}