Quit on invalid avatars
This commit is contained in:
parent
80adad3ad2
commit
9da0e637a3
|
@ -92,7 +92,7 @@ HELP;
|
||||||
echo $this->l10n->t('no resource in photo %s', $contact['photo']) . ' ';
|
echo $this->l10n->t('no resource in photo %s', $contact['photo']) . ' ';
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->storeAvatar($resourceid, $contact);
|
$this->storeAvatar($resourceid, $contact, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
$count = 0;
|
$count = 0;
|
||||||
|
@ -103,12 +103,12 @@ HELP;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
echo ++$count . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t";
|
echo ++$count . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t";
|
||||||
$this->storeAvatar($photo['resource-id'], $contact);
|
$this->storeAvatar($photo['resource-id'], $contact, true);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function storeAvatar(string $resourceid, array $contact)
|
private function storeAvatar(string $resourceid, array $contact, bool $quit_on_invalid)
|
||||||
{
|
{
|
||||||
$valid = !empty($resourceid);
|
$valid = !empty($resourceid);
|
||||||
if ($valid) {
|
if ($valid) {
|
||||||
|
@ -145,6 +145,11 @@ HELP;
|
||||||
$fields = ['photo' => '', 'thumb' => '', 'micro' => ''];
|
$fields = ['photo' => '', 'thumb' => '', 'micro' => ''];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($quit_on_invalid && $fields['photo'] == '') {
|
||||||
|
echo ' ' . $this->l10n->t('Quit') . "\n";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
echo '5';
|
echo '5';
|
||||||
Contact::update($fields, ['uri-id' => $contact['uri-id']]);
|
Contact::update($fields, ['uri-id' => $contact['uri-id']]);
|
||||||
echo '6';
|
echo '6';
|
||||||
|
|
Loading…
Reference in a new issue