X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=551971e504f2e74b090a3226f5cd5f64e5aa5dc0;hb=3c9b33176f52790ff669ec2f2e28ed350a3944c8;hp=cafc112ef48678bba19095e40b8bdad588e5018a;hpb=2d0a749734bb33be00b9674cb34582c602ff0d74;p=friendica.git diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index cafc112ef4..551971e504 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -16,11 +16,12 @@ use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; +use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; -use Friendica\Database\DBM; use Friendica\Model\Contact; +use Friendica\Model\Conversation; use Friendica\Model\GContact; use Friendica\Model\Group; use Friendica\Model\Item; @@ -71,7 +72,7 @@ class Diaspora if (Config::get("system", "relay_directly", false)) { // We distribute our stuff based on the parent to ensure that the thread will be complete $parent = Item::selectFirst(['parent'], ['id' => $item_id]); - if (!DBM::is_result($parent)) { + if (!DBA::isResult($parent)) { return; } @@ -145,10 +146,10 @@ class Diaspora // Fetch the relay contact $condition = ['uid' => 0, 'nurl' => normalise_link($server_url), - 'contact-type' => ACCOUNT_TYPE_RELAY]; + 'contact-type' => Contact::ACCOUNT_TYPE_RELAY]; $contact = DBA::selectFirst('contact', $fields, $condition); - if (DBM::is_result($contact)) { + if (DBA::isResult($contact)) { if ($contact['archive'] || $contact['blocked']) { return false; } @@ -157,7 +158,7 @@ class Diaspora self::setRelayContact($server_url); $contact = DBA::selectFirst('contact', $fields, $condition); - if (DBM::is_result($contact)) { + if (DBA::isResult($contact)) { return $contact; } } @@ -176,15 +177,15 @@ class Diaspora { $fields = ['created' => DateTimeFormat::utcNow(), 'name' => 'relay', 'nick' => 'relay', - 'url' => $server_url, 'network' => NETWORK_DIASPORA, + 'url' => $server_url, 'network' => Protocol::DIASPORA, 'batch' => $server_url . '/receive/public', - 'rel' => CONTACT_IS_FOLLOWER, 'blocked' => false, + 'rel' => Contact::FOLLOWER, 'blocked' => false, 'pending' => false, 'writable' => true]; $fields = array_merge($fields, $network_fields); $condition = ['uid' => 0, 'nurl' => normalise_link($server_url), - 'contact-type' => ACCOUNT_TYPE_RELAY]; + 'contact-type' => Contact::ACCOUNT_TYPE_RELAY]; if (DBA::exists('contact', $condition)) { unset($fields['created']); @@ -364,15 +365,16 @@ class Diaspora /** * @brief: Decodes incoming Diaspora message in the new format * - * @param array $importer Array of the importer user - * @param string $raw raw post message + * @param array $importer Array of the importer user + * @param string $raw raw post message + * @param boolean $no_exit Don't do an http exit on error * * @return array * 'message' -> decoded Diaspora XML message * 'author' -> author diaspora handle * 'key' -> author public key (converted to pkcs#8) */ - public static function decodeRaw(array $importer, $raw) + public static function decodeRaw(array $importer, $raw, $no_exit = false) { $data = json_decode($raw); @@ -387,7 +389,11 @@ class Diaspora if (!is_object($j_outer_key_bundle)) { logger('Outer Salmon did not verify. Discarding.'); - System::httpExit(400); + if ($no_exit) { + return false; + } else { + System::httpExit(400); + } } $outer_iv = base64_decode($j_outer_key_bundle->iv); @@ -402,7 +408,11 @@ class Diaspora if (!is_object($basedom)) { logger('Received data does not seem to be an XML. Discarding. '.$xml); - System::httpExit(400); + if ($no_exit) { + return false; + } else { + System::httpExit(400); + } } $base = $basedom->children(NAMESPACE_SALMON_ME); @@ -424,19 +434,31 @@ class Diaspora $author_addr = base64_decode($key_id); if ($author_addr == '') { logger('No author could be decoded. Discarding. Message: ' . $xml); - System::httpExit(400); + if ($no_exit) { + return false; + } else { + System::httpExit(400); + } } $key = self::key($author_addr); if ($key == '') { logger("Couldn't get a key for handle " . $author_addr . ". Discarding."); - System::httpExit(400); + if ($no_exit) { + return false; + } else { + System::httpExit(400); + } } $verify = Crypto::rsaVerify($signed_data, $signature, $key); if (!$verify) { logger('Message did not verify. Discarding.'); - System::httpExit(400); + if ($no_exit) { + return false; + } else { + System::httpExit(400); + } } return ['message' => (string)base64url_decode($base->data), @@ -605,7 +627,7 @@ class Diaspora return false; } - $importer = ["uid" => 0, "page-flags" => PAGE_FREELOVE]; + $importer = ["uid" => 0, "page-flags" => Contact::PAGE_FREELOVE]; $success = self::dispatch($importer, $msg, $fields); return $success; @@ -899,8 +921,8 @@ class Diaspora { $update = false; - $person = DBA::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]); - if (DBM::is_result($person)) { + $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]); + if (DBA::isResult($person)) { logger("In cache " . print_r($person, true), LOGGER_DEBUG); // update record occasionally so it doesn't get stale @@ -914,18 +936,18 @@ class Diaspora } } - if (!DBM::is_result($person) || $update) { + if (!DBA::isResult($person) || $update) { logger("create or refresh", LOGGER_DEBUG); - $r = Probe::uri($handle, NETWORK_DIASPORA); + $r = Probe::uri($handle, Protocol::DIASPORA); // Note that Friendica contacts will return a "Diaspora person" // if Diaspora connectivity is enabled on their server - if ($r && ($r["network"] === NETWORK_DIASPORA)) { + if ($r && ($r["network"] === Protocol::DIASPORA)) { self::updateFContact($r); // Fetch the updated or added contact - $person = DBA::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]); - if (!DBM::is_result($person)) { + $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]); + if (!DBA::isResult($person)) { $person = $r; } } @@ -969,13 +991,10 @@ class Diaspora logger("contact id is ".$contact_id." - pcontact id is ".$pcontact_id, LOGGER_DEBUG); if ($pcontact_id != 0) { - $r = q( - "SELECT `addr` FROM `contact` WHERE `id` = %d AND `addr` != ''", - intval($pcontact_id) - ); + $contact = DBA::selectFirst('contact', ['addr'], ['id' => $pcontact_id]); - if (DBM::is_result($r)) { - return strtolower($r[0]["addr"]); + if (DBA::isResult($contact) && !empty($contact["addr"])) { + return strtolower($contact["addr"]); } } @@ -984,7 +1003,7 @@ class Diaspora intval($contact_id) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $contact = $r[0]; logger("contact 'self' = ".$contact['self']." 'url' = ".$contact['url'], LOGGER_DEBUG); @@ -1017,11 +1036,11 @@ class Diaspora $r = q( "SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'", - dbesc(NETWORK_DIASPORA), - dbesc($fcontact_guid) + DBA::escape(Protocol::DIASPORA), + DBA::escape($fcontact_guid) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { return $r[0]['url']; } @@ -1052,8 +1071,8 @@ class Diaspora return false; } - $contact = dba::selectFirst('contact', [], ['id' => $cid]); - if (!DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', [], ['id' => $cid]); + if (!DBA::isResult($contact)) { // This here shouldn't happen at all logger("Haven't found a contact for user " . $uid . " and handle " . $handle, LOGGER_DEBUG); return false; @@ -1080,14 +1099,14 @@ class Diaspora */ // It is deactivated by now, due to side effects. See issue https://github.com/friendica/friendica/pull/4033 // It is not removed by now. Possibly the code is needed? - //if (!$is_comment && $contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { - // dba::update( + //if (!$is_comment && $contact["rel"] == Contact::FOLLOWER && in_array($importer["page-flags"], array(Contact::PAGE_FREELOVE))) { + // DBA::update( // 'contact', - // array('rel' => CONTACT_IS_FRIEND, 'writable' => true), + // array('rel' => Contact::FRIEND, 'writable' => true), // array('id' => $contact["id"], 'uid' => $contact["uid"]) // ); // - // $contact["rel"] = CONTACT_IS_FRIEND; + // $contact["rel"] = Contact::FRIEND; // logger("defining user ".$contact["nick"]." as friend"); //} @@ -1096,11 +1115,11 @@ class Diaspora // Maybe blocked, don't accept. return false; // We are following this person? - } elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) { + } elseif (($contact["rel"] == Contact::SHARING) || ($contact["rel"] == Contact::FRIEND)) { // Yes, then it is fine. return true; // Is it a post to a community? - } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && in_array($importer["page-flags"], [PAGE_COMMUNITY, PAGE_PRVGROUP])) { + } elseif (($contact["rel"] == Contact::FOLLOWER) && in_array($importer["page-flags"], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) { // That's good return true; // Is the message a global user or a comment? @@ -1154,7 +1173,7 @@ class Diaspora private static function messageExists($uid, $guid) { $item = Item::selectFirst(['id'], ['uid' => $uid, 'guid' => $guid]); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { logger("message ".$guid." already exists for user ".$uid); return $item["id"]; } @@ -1374,12 +1393,13 @@ class Diaspora $condition = ['uid' => $uid, 'guid' => $guid]; $item = Item::selectFirst($fields, $condition); - if (!DBM::is_result($item)) { - $result = self::storeByGuid($guid, $contact["url"], $uid); + if (!DBA::isResult($item)) { + $person = self::personByHandle($author); + $result = self::storeByGuid($guid, $person["url"], $uid); - if (!$result) { - $person = self::personByHandle($author); - $result = self::storeByGuid($guid, $person["url"], $uid); + // We don't have an url for items that arrived at the public dispatcher + if (!$result && !empty($contact["url"])) { + $result = self::storeByGuid($guid, $contact["url"], $uid); } if ($result) { @@ -1389,7 +1409,7 @@ class Diaspora } } - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { logger("parent item not found: parent: ".$guid." - user: ".$uid); return false; } else { @@ -1413,12 +1433,12 @@ class Diaspora { $condition = ['nurl' => normalise_link($person["url"]), 'uid' => $uid]; $contact = DBA::selectFirst('contact', ['id', 'network'], $condition); - if (DBM::is_result($contact)) { + if (DBA::isResult($contact)) { $cid = $contact["id"]; $network = $contact["network"]; } else { $cid = $def_contact["id"]; - $network = NETWORK_DIASPORA; + $network = Protocol::DIASPORA; } return ["cid" => $cid, "network" => $network]; @@ -1458,7 +1478,7 @@ class Diaspora } } - if ($contact["network"] == NETWORK_DFRN) { + if ($contact["network"] == Protocol::DFRN) { return str_replace("/profile/" . $contact["nick"] . "/", "/display/" . $guid, $contact["url"] . "/"); } @@ -1508,7 +1528,7 @@ class Diaspora // change the technical stuff in contact and gcontact $data = Probe::uri($new_handle); - if ($data['network'] == NETWORK_PHANTOM) { + if ($data['network'] == Protocol::PHANTOM) { logger('Account for '.$new_handle." couldn't be probed."); return false; } @@ -1569,20 +1589,16 @@ class Diaspora private static function getUriFromGuid($author, $guid, $onlyfound = false) { $item = Item::selectFirst(['uri'], ['guid' => $guid]); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { return $item["uri"]; } elseif (!$onlyfound) { - $contact = Contact::getDetailsByAddr($author, 0); - if (!empty($contact['network'])) { - $prefix = 'urn:X-' . $contact['network'] . ':'; - } else { - // This fallback should happen most unlikely - $prefix = 'urn:X-dspr:'; - } + $person = self::personByHandle($author); - $author_parts = explode('@', $author); + $parts = parse_url($person['url']); + unset($parts['path']); + $host_url = Network::unparseURL($parts); - return $prefix . $author_parts[1] . ':' . $author_parts[0] . ':'. $guid; + return $host_url . '/objects/' . $guid; } return ""; @@ -1599,7 +1615,7 @@ class Diaspora private static function getGuidFromUri($uri, $uid) { $item = Item::selectFirst(['guid'], ['uri' => $uri, 'uid' => $uid]); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { return $item["guid"]; } else { return false; @@ -1616,10 +1632,10 @@ class Diaspora private static function importerForGuid($guid) { $item = Item::selectFirst(['uid'], ['origin' => true, 'guid' => $guid]); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { logger("Found user ".$item['uid']." as owner of item ".$guid, LOGGER_DEBUG); $contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $item['uid']]); - if (DBM::is_result($contact)) { + if (DBA::isResult($contact)) { return $contact; } } @@ -1706,7 +1722,7 @@ class Diaspora $datarray["object-type"] = ACTIVITY_OBJ_COMMENT; - $datarray["protocol"] = PROTOCOL_DIASPORA; + $datarray["protocol"] = Conversation::PARCEL_DIASPORA; $datarray["source"] = $xml; $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at; @@ -1786,12 +1802,7 @@ class Diaspora DBA::lock('mail'); - $r = q( - "SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1", - dbesc($msg_guid), - intval($importer["uid"]) - ); - if (DBM::is_result($r)) { + if (DBA::exists('mail', ['guid' => $msg_guid, 'uid' => $importer["uid"]])) { logger("duplicate message already delivered.", LOGGER_DEBUG); return false; } @@ -1800,19 +1811,19 @@ class Diaspora "INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`) VALUES (%d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')", intval($importer["uid"]), - dbesc($msg_guid), + DBA::escape($msg_guid), intval($conversation["id"]), - dbesc($person["name"]), - dbesc($person["photo"]), - dbesc($person["url"]), + DBA::escape($person["name"]), + DBA::escape($person["photo"]), + DBA::escape($person["url"]), intval($contact["id"]), - dbesc($subject), - dbesc($body), + DBA::escape($subject), + DBA::escape($body), 0, 0, - dbesc($message_uri), - dbesc($author.":".$guid), - dbesc($msg_created_at) + DBA::escape($message_uri), + DBA::escape($author.":".$guid), + DBA::escape($msg_created_at) ); DBA::unlock(); @@ -1827,10 +1838,10 @@ class Diaspora "to_name" => $importer["username"], "to_email" => $importer["email"], "uid" =>$importer["uid"], - "item" => ["subject" => $subject, "body" => $body], + "item" => ["id" => $conversation["id"], "title" => $subject, "subject" => $subject, "body" => $body], "source_name" => $person["name"], "source_link" => $person["url"], - "source_photo" => $person["thumb"], + "source_photo" => $person["photo"], "verb" => ACTIVITY_POST, "otype" => "mail"] ); @@ -1866,37 +1877,21 @@ class Diaspora return false; } - $conversation = null; - - $c = q( - "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", - intval($importer["uid"]), - dbesc($guid) - ); - if ($c) - $conversation = $c[0]; - else { + $conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]); + if (!DBA::isResult($conversation)) { $r = q( "INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`) VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s')", intval($importer["uid"]), - dbesc($guid), - dbesc($author), - dbesc($created_at), - dbesc(DateTimeFormat::utcNow()), - dbesc($subject), - dbesc($participants) + DBA::escape($guid), + DBA::escape($author), + DBA::escape($created_at), + DBA::escape(DateTimeFormat::utcNow()), + DBA::escape($subject), + DBA::escape($participants) ); if ($r) { - $c = q( - "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", - intval($importer["uid"]), - dbesc($guid) - ); - } - - if ($c) { - $conversation = $c[0]; + $conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]); } } if (!$conversation) { @@ -1968,7 +1963,7 @@ class Diaspora $datarray = []; - $datarray["protocol"] = PROTOCOL_DIASPORA; + $datarray["protocol"] = Conversation::PARCEL_DIASPORA; $datarray["uid"] = $importer["uid"]; $datarray["contact-id"] = $author_contact["cid"]; @@ -2047,14 +2042,10 @@ class Diaspora $conversation = null; - $c = q( - "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", - intval($importer["uid"]), - dbesc($conversation_guid) - ); - if ($c) { - $conversation = $c[0]; - } else { + $condition = ['uid' => $importer["uid"], 'guid' => $conversation_guid]; + $conversation = DBA::selectFirst('conv', [], $condition); + + if (!DBA::isResult($conversation)) { logger("conversation not available."); return false; } @@ -2073,12 +2064,7 @@ class Diaspora DBA::lock('mail'); - $r = q( - "SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1", - dbesc($guid), - intval($importer["uid"]) - ); - if (DBM::is_result($r)) { + if (DBA::exists('mail', ['guid' => $guid, 'uid' => $importer["uid"]])) { logger("duplicate message already delivered.", LOGGER_DEBUG); return false; } @@ -2087,19 +2073,19 @@ class Diaspora "INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`) VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')", intval($importer["uid"]), - dbesc($guid), + DBA::escape($guid), intval($conversation["id"]), - dbesc($person["name"]), - dbesc($person["photo"]), - dbesc($person["url"]), + DBA::escape($person["name"]), + DBA::escape($person["photo"]), + DBA::escape($person["url"]), intval($contact["id"]), - dbesc($conversation["subject"]), - dbesc($body), + DBA::escape($conversation["subject"]), + DBA::escape($body), 0, 1, - dbesc($message_uri), - dbesc($author.":".$conversation["guid"]), - dbesc($created_at) + DBA::escape($message_uri), + DBA::escape($author.":".$conversation["guid"]), + DBA::escape($created_at) ); DBA::unlock(); @@ -2134,7 +2120,7 @@ class Diaspora } $item = Item::selectFirst(['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => false]); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { logger('Item not found, no origin or private: '.$parent_guid); return false; } @@ -2280,7 +2266,7 @@ class Diaspora DBA::update('contact', $fields, ['id' => $contact['id']]); - $gcontact = ["url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2, + $gcontact = ["url" => $contact["url"], "network" => Protocol::DIASPORA, "generation" => 2, "photo" => $image_url, "name" => $name, "location" => $location, "about" => $about, "birthday" => $birthday, "gender" => $gender, "addr" => $author, "nick" => $nick, "keywords" => $keywords, @@ -2306,10 +2292,10 @@ class Diaspora { $a = get_app(); - if ($contact["rel"] == CONTACT_IS_SHARING) { + if ($contact["rel"] == Contact::SHARING) { DBA::update( 'contact', - ['rel' => CONTACT_IS_FRIEND, 'writable' => true], + ['rel' => Contact::FRIEND, 'writable' => true], ['id' => $contact["id"], 'uid' => $importer["uid"]] ); } @@ -2360,11 +2346,11 @@ class Diaspora // If we are now friends, we are sending a share message. // Normally we needn't to do so, but the first message could have been vanished. - if (in_array($contact["rel"], [CONTACT_IS_FRIEND])) { - $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"])); - if ($u) { + if (in_array($contact["rel"], [Contact::FRIEND])) { + $user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]); + if (DBA::isResult($user)) { logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG); - $ret = self::sendShare($u[0], $contact); + $ret = self::sendShare($user, $contact); } } return true; @@ -2375,7 +2361,7 @@ class Diaspora } } - if (!$following && $sharing && in_array($importer["page-flags"], [PAGE_SOAPBOX, PAGE_NORMAL])) { + if (!$following && $sharing && in_array($importer["page-flags"], [Contact::PAGE_SOAPBOX, Contact::PAGE_NORMAL])) { logger("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", LOGGER_DEBUG); return false; } elseif (!$following && !$sharing) { @@ -2391,7 +2377,7 @@ class Diaspora $ret = self::personByHandle($author); - if (!$ret || ($ret["network"] != NETWORK_DIASPORA)) { + if (!$ret || ($ret["network"] != Protocol::DIASPORA)) { logger("Cannot resolve diaspora handle ".$author." for ".$recipient); return false; } @@ -2402,18 +2388,18 @@ class Diaspora "INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`) VALUES (%d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d)", intval($importer["uid"]), - dbesc($ret["network"]), - dbesc($ret["addr"]), + DBA::escape($ret["network"]), + DBA::escape($ret["addr"]), DateTimeFormat::utcNow(), - dbesc($ret["url"]), - dbesc(normalise_link($ret["url"])), - dbesc($batch), - dbesc($ret["name"]), - dbesc($ret["nick"]), - dbesc($ret["photo"]), - dbesc($ret["pubkey"]), - dbesc($ret["notify"]), - dbesc($ret["poll"]), + DBA::escape($ret["url"]), + DBA::escape(normalise_link($ret["url"])), + DBA::escape($batch), + DBA::escape($ret["name"]), + DBA::escape($ret["nick"]), + DBA::escape($ret["photo"]), + DBA::escape($ret["pubkey"]), + DBA::escape($ret["notify"]), + DBA::escape($ret["poll"]), 1, 2 ); @@ -2433,7 +2419,7 @@ class Diaspora Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true); - if (in_array($importer["page-flags"], [PAGE_NORMAL, PAGE_PRVGROUP])) { + if (in_array($importer["page-flags"], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP])) { logger("Sending intra message for author ".$author.".", LOGGER_DEBUG); $hash = random_string().(string)time(); // Generate a confirm_key @@ -2445,9 +2431,9 @@ class Diaspora intval($contact_record["id"]), 0, 0, - dbesc(L10n::t("Sharing notification from Diaspora network")), - dbesc($hash), - dbesc(DateTimeFormat::utcNow()) + DBA::escape(L10n::t("Sharing notification from Diaspora network")), + DBA::escape($hash), + DBA::escape(DateTimeFormat::utcNow()) ); } else { // automatic friend approval @@ -2456,16 +2442,17 @@ class Diaspora Contact::updateAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]); - // technically they are sharing with us (CONTACT_IS_SHARING), - // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX - // we are going to change the relationship and make them a follower. - - if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following) { - $new_relation = CONTACT_IS_FRIEND; - } elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing) { - $new_relation = CONTACT_IS_SHARING; + /* + * technically they are sharing with us (Contact::SHARING), + * but if our page-type is Profile::PAGE_COMMUNITY or Profile::PAGE_SOAPBOX + * we are going to change the relationship and make them a follower. + */ + if (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing && $following) { + $new_relation = Contact::FRIEND; + } elseif (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing) { + $new_relation = Contact::SHARING; } else { - $new_relation = CONTACT_IS_FOLLOWER; + $new_relation = Contact::FOLLOWER; } $r = q( @@ -2478,15 +2465,15 @@ class Diaspora WHERE `id` = %d ", intval($new_relation), - dbesc(DateTimeFormat::utcNow()), - dbesc(DateTimeFormat::utcNow()), + DBA::escape(DateTimeFormat::utcNow()), + DBA::escape(DateTimeFormat::utcNow()), intval($contact_record["id"]) ); - $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"])); - if ($u) { + $user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]); + if (DBA::isResult($user)) { logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG); - $ret = self::sendShare($u[0], $contact_record); + $ret = self::sendShare($user, $contact_record); // Send the profile data, maybe it weren't transmitted before self::sendProfile($importer["uid"], [$contact_record]); @@ -2518,7 +2505,7 @@ class Diaspora $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false]; $item = Item::selectFirst($fields, $condition); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { logger("reshared message ".$guid." already exists on system."); // Maybe it is already a reshared item? @@ -2540,7 +2527,7 @@ class Diaspora } } - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { if (empty($orig_author)) { logger('Empty author for guid ' . $guid . '. Quitting.'); return false; @@ -2562,7 +2549,7 @@ class Diaspora $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false]; $item = Item::selectFirst($fields, $condition); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { // If it is a reshared post from another network then reformat to avoid display problems with two share elements if (self::isReshare($item["body"], false)) { $item["body"] = Markdown::toBBCode(BBCode::toMarkdown($item["body"])); @@ -2616,7 +2603,7 @@ class Diaspora $datarray["uid"] = $importer["uid"]; $datarray["contact-id"] = $contact["id"]; - $datarray["network"] = NETWORK_DIASPORA; + $datarray["network"] = Protocol::DIASPORA; $datarray["author-link"] = $contact["url"]; $datarray["author-id"] = Contact::getIdForURL($contact["url"], 0); @@ -2630,7 +2617,7 @@ class Diaspora $datarray["verb"] = ACTIVITY_POST; $datarray["gravity"] = GRAVITY_PARENT; - $datarray["protocol"] = PROTOCOL_DIASPORA; + $datarray["protocol"] = Conversation::PARCEL_DIASPORA; $datarray["source"] = $xml; $prefix = share_header( @@ -2704,7 +2691,7 @@ class Diaspora } $r = Item::select($fields, $condition); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { logger("Target guid ".$target_guid." was not found on this system for user ".$importer['uid']."."); return false; } @@ -2786,7 +2773,7 @@ class Diaspora * * @return int The message id of the newly created item */ - private static function receiveStatusMessage(array $importer, $data, $xml) + private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml) { $author = notags(unxmlify($data->author)); $guid = notags(unxmlify($data->guid)); @@ -2844,7 +2831,7 @@ class Diaspora $datarray["uid"] = $importer["uid"]; $datarray["contact-id"] = $contact["id"]; - $datarray["network"] = NETWORK_DIASPORA; + $datarray["network"] = Protocol::DIASPORA; $datarray["author-link"] = $contact["url"]; $datarray["author-id"] = Contact::getIdForURL($contact["url"], 0); @@ -2858,7 +2845,7 @@ class Diaspora $datarray["verb"] = ACTIVITY_POST; $datarray["gravity"] = GRAVITY_PARENT; - $datarray["protocol"] = PROTOCOL_DIASPORA; + $datarray["protocol"] = Conversation::PARCEL_DIASPORA; $datarray["source"] = $xml; $datarray["body"] = self::replacePeopleGuid($body, $contact["url"]); @@ -3106,10 +3093,10 @@ class Diaspora logger("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code); if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) { - if (!$no_queue && ($contact['contact-type'] != ACCOUNT_TYPE_RELAY)) { + if (!$no_queue && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::ACCOUNT_TYPE_RELAY)) { logger("queue message"); // queue message for redelivery - Queue::add($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch, $guid); + Queue::add($contact["id"], Protocol::DIASPORA, $envelope, $public_batch, $guid); } // The message could not be delivered. We mark the contact as "dead" @@ -3166,7 +3153,7 @@ class Diaspora $envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch); if ($spool) { - Queue::add($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch, $guid); + Queue::add($contact['id'], Protocol::DIASPORA, $envelope, $public_batch, $guid); return true; } else { $return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid); @@ -3213,7 +3200,7 @@ class Diaspora $author = self::myHandle($owner); $message = ["author" => $author, - "guid" => System::createGUID(32), + "guid" => System::createUUID(), "parent_type" => "Post", "parent_guid" => $item["guid"]]; @@ -3270,13 +3257,15 @@ class Diaspora /* switch ($contact["rel"]) { - case CONTACT_IS_FRIEND: + case Contact::FRIEND: $following = true; $sharing = true; - case CONTACT_IS_SHARING: + + case Contact::SHARING: $following = false; $sharing = true; - case CONTACT_IS_FOLLOWER: + + case Contact::FOLLOWER: $following = true; $sharing = false; } @@ -3355,9 +3344,9 @@ class Diaspora } if (($guid != "") && $complete) { - $condition = ['guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]]; + $condition = ['guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]]; $item = Item::selectFirst(['contact-id'], $condition); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { $ret= []; $ret["root_handle"] = self::handleFromContact($item["contact-id"]); $ret["root_guid"] = $guid; @@ -3410,7 +3399,7 @@ class Diaspora private static function buildEvent($event_id) { $r = q("SELECT `guid`, `uid`, `start`, `finish`, `nofinish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id)); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { return []; } @@ -3419,14 +3408,14 @@ class Diaspora $eventdata = []; $r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d", intval($event['uid'])); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { return []; } $user = $r[0]; $r = q("SELECT `addr`, `nick` FROM `contact` WHERE `uid` = %d AND `self`", intval($event['uid'])); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { return []; } @@ -3503,7 +3492,7 @@ class Diaspora $myaddr = self::myHandle($owner); - $public = (($item["private"]) ? "false" : "true"); + $public = ($item["private"] ? "false" : "true"); $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM); @@ -3538,7 +3527,7 @@ class Diaspora if ($item["attach"]) { $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER); - if (cnt) { + if ($cnt) { $body .= "\n".L10n::t("Attachments:")."\n"; foreach ($matches as $mtch) { $body .= "[".$mtch[3]."](".$mtch[1].")\n"; @@ -3624,7 +3613,7 @@ class Diaspora private static function constructLike(array $item, array $owner) { $parent = Item::selectFirst(['guid', 'uri', 'parent-uri'], ['uri' => $item["thr-parent"]]); - if (!DBM::is_result($parent)) { + if (!DBA::isResult($parent)) { return false; } @@ -3655,7 +3644,7 @@ class Diaspora private static function constructAttend(array $item, array $owner) { $parent = Item::selectFirst(['guid', 'uri', 'parent-uri'], ['uri' => $item["thr-parent"]]); - if (!DBM::is_result($parent)) { + if (!DBA::isResult($parent)) { return false; } @@ -3699,7 +3688,7 @@ class Diaspora } $parent = Item::selectFirst(['guid'], ['id' => $item["parent"], 'parent' => $item["parent"]]); - if (!DBM::is_result($parent)) { + if (!DBA::isResult($parent)) { return false; } @@ -3826,19 +3815,13 @@ class Diaspora logger("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG); // fetch the original signature - - $r = q( - "SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `iid` = %d LIMIT 1", - intval($item["id"]) - ); - - if (!$r) { + $fields = ['signed_text', 'signature', 'signer']; + $signature = DBA::selectFirst('sign', $fields, ['iid' => $item["id"]]); + if (!DBA::isResult($signature)) { logger("Couldn't fetch signatur for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG); return false; } - $signature = $r[0]; - // Old way - is used by the internal Friendica functions /// @todo Change all signatur storing functions to the new format if ($signature['signed_text'] && $signature['signature'] && $signature['signer']) { @@ -3919,17 +3902,11 @@ class Diaspora { $myaddr = self::myHandle($owner); - $r = q( - "SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($item["convid"]), - intval($item["uid"]) - ); - - if (!DBM::is_result($r)) { + $cnv = DBA::selectFirst('conv', [], ['id' => $item["convid"], 'uid' => $item["uid"]]); + if (!DBA::isResult($cnv)) { logger("conversation not found."); return; } - $cnv = $r[0]; $conv = [ "author" => $cnv["creator"], @@ -4084,7 +4061,7 @@ class Diaspora $arr = explode(' ', $profile['pub_keywords']); if (count($arr)) { for ($x = 0; $x < 5; $x ++) { - if (trim($arr[$x])) { + if (!empty($arr[$x])) { $tags .= '#'. trim($arr[$x]) .' '; } } @@ -4130,9 +4107,9 @@ class Diaspora $recips = q( "SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `rel` != %d", - dbesc(NETWORK_DIASPORA), + DBA::escape(Protocol::DIASPORA), intval($uid), - intval(CONTACT_IS_SHARING) + intval(Contact::SHARING) ); } @@ -4164,15 +4141,15 @@ class Diaspora return false; } - $r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid'])); - if (!DBM::is_result($r)) { + $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $contact["uid"]]); + if (!DBA::isResult($user)) { return false; } - $contact["uprvkey"] = $r[0]['prvkey']; + $contact["uprvkey"] = $user['prvkey']; $item = Item::selectFirst([], ['id' => $post_id]); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { return false; }