$contact['senderName'] = $contact['name'];
if ($uid != 0) {
- $condition = ['uid' => $uid, 'account_expired' => false, 'account_removed' => false];
+ $condition = ['uid' => $uid, 'verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false];
$user = DBA::selectFirst('user', [], $condition);
if (!DBA::isResult($user)) {
return [];
/// @Todo
/// - Check real image type and image size
- /// - Check which of these boths elements we should use
+ /// - Check which of these elements we should use
$attributes = [
'rel' => 'photo',
'type' => 'image/jpeg',
XML::addElement($doc, $entry, 'dfrn:diaspora_guid', $item['guid']);
- // The signed text contains the content in Markdown, the sender handle and the signatur for the content
+ // The signed text contains the content in Markdown, the sender handle and the signature for the content
// It is needed for relayed comments to Diaspora.
if ($item['signed_text']) {
$sign = base64_encode(json_encode(['signed_text' => $item['signed_text'],'signature' => '','signer' => '']));
*/
private static function processMail(DOMXPath $xpath, DOMNode $mail, array $importer)
{
- Logger::notice("Processing mails");
+ Logger::info("Processing mails");
$msg = [];
$msg['uid'] = $importer['importer_uid'];
*/
private static function processSuggestion(DOMXPath $xpath, DOMNode $suggestion, array $importer)
{
- Logger::notice('Processing suggestions');
+ Logger::info('Processing suggestions');
$url = $xpath->evaluate('string(dfrn:url[1]/text())', $suggestion);
$cid = Contact::getIdForURL($url);
*/
private static function processRelocation(DOMXPath $xpath, DOMNode $relocation, array $importer): bool
{
- Logger::notice("Processing relocations");
+ Logger::info("Processing relocations");
/// @TODO Rewrite this to one statement
$relocate = [];
Contact::updateAvatar($importer['id'], $relocate['avatar'], true);
- Logger::notice('Contacts are updated.');
+ Logger::info('Contacts are updated.');
/// @TODO
/// merge with current record, current contents have priority
Logger::info('Process verb ' . $item['verb'] . ' and object-type ' . $item['object-type'] . ' for entrytype ' . $entrytype);
if (($entrytype == self::TOP_LEVEL) && !empty($importer['id'])) {
- // The filling of the the "contact" variable is done for legcy reasons
+ // The filling of the "contact" variable is done for legacy reasons
// The functions below are partly used by ostatus.php as well - where we have this variable
$contact = Contact::selectFirst([], ['id' => $importer['id']]);
// Big question: Do we need these functions? They were part of the "consume_feed" function.
// This function once was responsible for DFRN and OStatus.
if ($activity->match($item['verb'], Activity::FOLLOW)) {
- Logger::notice("New follower");
+ Logger::info("New follower");
Contact::addRelationship($importer, $contact, $item);
return false;
}
if ($activity->match($item['verb'], Activity::UNFOLLOW)) {
- Logger::notice("Lost follower");
+ Logger::info("Lost follower");
Contact::removeFollower($contact);
return false;
}
if ($activity->match($item['verb'], Activity::REQ_FRIEND)) {
- Logger::notice("New friend request");
+ Logger::info("New friend request");
Contact::addRelationship($importer, $contact, $item, true);
return false;
}
if ($activity->match($item['verb'], Activity::UNFRIEND)) {
- Logger::notice("Lost sharer");
+ Logger::info("Lost sharer");
Contact::removeSharer($contact);
return false;
}
* Checks if an incoming message is wanted
*
* @param array $item
- * @param array $imporer
+ * @param array $importer
* @return boolean Is the message wanted?
*/
private static function isSolicitedMessage(array $item, array $importer): bool
*/
private static function processEntry(array $header, DOMXPath $xpath, DOMNode $entry, array $importer, string $xml, int $protocol)
{
- Logger::notice("Processing entries");
+ Logger::info("Processing entries");
$item = $header;
*/
private static function processDeletion(DOMXPath $xpath, DOMNode $deletion, array $importer)
{
- Logger::notice("Processing deletions");
+ Logger::info("Processing deletions");
$uri = null;
foreach ($deletion->attributes as $attributes) {
GServer::setProtocol($importer['gsid'], Post\DeliveryData::DFRN);
}
- // is it a public forum? Private forums aren't exposed with this method
- $forum = intval(XML::getFirstNodeValue($xpath, '/atom:feed/dfrn:community/text()'));
+ // is it a public group? Private groups aren't exposed with this method
+ $group = intval(XML::getFirstNodeValue($xpath, '/atom:feed/dfrn:community/text()'));
// The account type is new since 3.5.1
if ($xpath->query('/atom:feed/dfrn:account_type')->length > 0) {
// Updating the public contact as well
Contact::update(['contact-type' => $accounttype], ['uid' => 0, 'nurl' => $importer['nurl']]);
}
- // A forum contact can either have set "forum" or "prv" - but not both
+ // A group contact can either have set "forum" or "prv" - but not both
if ($accounttype == User::ACCOUNT_TYPE_COMMUNITY) {
- // It's a forum, so either set the public or private forum flag
- $condition = ['(`forum` != ? OR `prv` != ?) AND `id` = ?', $forum, !$forum, $importer['id']];
- Contact::update(['forum' => $forum, 'prv' => !$forum], $condition);
+ // It's a group, so either set the public or private forum flag
+ $condition = ['(`forum` != ? OR `prv` != ?) AND `id` = ?', $group, !$group, $importer['id']];
+ Contact::update(['forum' => $group, 'prv' => !$group], $condition);
// Updating the public contact as well
- $condition = ['(`forum` != ? OR `prv` != ?) AND `uid` = 0 AND `nurl` = ?', $forum, !$forum, $importer['nurl']];
- Contact::update(['forum' => $forum, 'prv' => !$forum], $condition);
+ $condition = ['(`forum` != ? OR `prv` != ?) AND `uid` = 0 AND `nurl` = ?', $group, !$group, $importer['nurl']];
+ Contact::update(['forum' => $group, 'prv' => !$group], $condition);
} else {
- // It's not a forum, so remove the flags
+ // It's not a group, so remove the flags
$condition = ['(`forum` OR `prv`) AND `id` = ?', $importer['id']];
Contact::update(['forum' => false, 'prv' => false], $condition);
$condition = ['(`forum` OR `prv`) AND `uid` = 0 AND `nurl` = ?', $importer['nurl']];
Contact::update(['forum' => false, 'prv' => false], $condition);
}
- } elseif ($forum != $importer['forum']) { // Deprecated since 3.5.1
- $condition = ['`forum` != ? AND `id` = ?', $forum, $importer['id']];
- Contact::update(['forum' => $forum], $condition);
+ } elseif ($group != $importer['forum']) { // Deprecated since 3.5.1
+ $condition = ['`forum` != ? AND `id` = ?', $group, $importer['id']];
+ Contact::update(['forum' => $group], $condition);
// Updating the public contact as well
- $condition = ['`forum` != ? AND `uid` = 0 AND `nurl` = ?', $forum, $importer['nurl']];
- Contact::update(['forum' => $forum], $condition);
+ $condition = ['`forum` != ? AND `uid` = 0 AND `nurl` = ?', $group, $importer['nurl']];
+ Contact::update(['forum' => $group], $condition);
}
self::processDeletion($xpath, $deletion, $importer);
}
if (count($deletions) > 0) {
- Logger::notice(count($deletions) . ' deletions had been processed');
+ Logger::info(count($deletions) . ' deletions had been processed');
return 200;
}
}
projects / friendica.git / blobdiff