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\DBM;
-use Friendica\Model\Photo;
+use Friendica\Database\DBA;
use Friendica\Model\Profile;
use Friendica\Network\Probe;
-use Friendica\Protocol\DFRN;
+use Friendica\Object\Image;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus;
use Friendica\Protocol\PortableContact;
use Friendica\Protocol\Salmon;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
-use Friendica\Object\Image;
-use dba;
require_once 'boot.php';
require_once 'include/dba.php';
*/
class Contact extends BaseObject
{
+ /**
+ * @name page/profile types
+ *
+ * PAGE_NORMAL is a typical personal profile account
+ * PAGE_SOAPBOX automatically approves all friend requests as Contact::SHARING, (readonly)
+ * PAGE_COMMUNITY automatically approves all friend requests as Contact::SHARING, but with
+ * write access to wall and comments (no email and not included in page owner's ACL lists)
+ * PAGE_FREELOVE automatically approves all friend requests as full friends (Contact::FRIEND).
+ *
+ * @{
+ */
+ const PAGE_NORMAL = 0;
+ const PAGE_SOAPBOX = 1;
+ const PAGE_COMMUNITY = 2;
+ const PAGE_FREELOVE = 3;
+ const PAGE_BLOG = 4;
+ const PAGE_PRVGROUP = 5;
+ /**
+ * @}
+ */
+
+ /**
+ * @name account types
+ *
+ * ACCOUNT_TYPE_PERSON - the account belongs to a person
+ * Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE
+ *
+ * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation
+ * Associated page type: PAGE_SOAPBOX
+ *
+ * ACCOUNT_TYPE_NEWS - the account is a news reflector
+ * Associated page type: PAGE_SOAPBOX
+ *
+ * ACCOUNT_TYPE_COMMUNITY - the account is community forum
+ * Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
+ *
+ * ACCOUNT_TYPE_RELAY - the account is a relay
+ * This will only be assigned to contacts, not to user accounts
+ * @{
+ */
+ const ACCOUNT_TYPE_PERSON = 0;
+ const ACCOUNT_TYPE_ORGANISATION = 1;
+ const ACCOUNT_TYPE_NEWS = 2;
+ const ACCOUNT_TYPE_COMMUNITY = 3;
+ const ACCOUNT_TYPE_RELAY = 4;
+ /**
+ * @}
+ */
+
+ /**
+ * @name Contact_is
+ *
+ * Relationship types
+ * @{
+ */
+ const FOLLOWER = 1;
+ const SHARING = 2;
+ const FRIEND = 3;
+ /**
+ * @}
+ */
+
/**
* @brief Returns a list of contacts belonging in a group
*
public static function getByGroupId($gid)
{
$return = [];
+
if (intval($gid)) {
- $stmt = dba::p('SELECT `group_member`.`contact-id`, `contact`.*
+ $stmt = DBA::p('SELECT `group_member`.`contact-id`, `contact`.*
FROM `contact`
INNER JOIN `group_member`
ON `contact`.`id` = `group_member`.`contact-id`
$gid,
local_user()
);
- if (DBM::is_result($stmt)) {
- $return = dba::inArray($stmt);
+
+ if (DBA::isResult($stmt)) {
+ $return = DBA::toArray($stmt);
}
}
{
$return = 0;
if (intval($gid)) {
- $contacts = dba::fetch_first('SELECT COUNT(*) AS `count`
+ $contacts = DBA::fetchFirst('SELECT COUNT(*) AS `count`
FROM `contact`
INNER JOIN `group_member`
ON `contact`.`id` = `group_member`.`contact-id`
AND `contact`.`notify` != ""',
$gid,
local_user(),
- NETWORK_OSTATUS
+ Protocol::OSTATUS
);
$return = $contacts['count'];
}
public static function createSelfFromUserId($uid)
{
// Only create the entry if it doesn't exist yet
- if (dba::exists('contact', ['uid' => $uid, 'self' => true])) {
+ if (DBA::exists('contact', ['uid' => $uid, 'self' => true])) {
return true;
}
- $user = dba::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]);
- if (!DBM::is_result($user)) {
+ $user = DBA::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]);
+ if (!DBA::isResult($user)) {
return false;
}
- $return = dba::insert('contact', [
+ $return = DBA::insert('contact', [
'uid' => $user['uid'],
'created' => DateTimeFormat::utcNow(),
'self' => 1,
{
$fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar',
'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'nurl'];
- $self = dba::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
- if (!DBM::is_result($self)) {
+ $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
+ if (!DBA::isResult($self)) {
return;
}
$fields = ['nickname', 'page-flags', 'account-type'];
- $user = dba::selectFirst('user', $fields, ['uid' => $uid]);
- if (!DBM::is_result($user)) {
+ $user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
+ if (!DBA::isResult($user)) {
return;
}
$fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
'country-name', 'gender', 'pub_keywords', 'xmpp'];
- $profile = dba::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
- if (!DBM::is_result($profile)) {
+ $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+ if (!DBA::isResult($profile)) {
return;
}
'gender' => $profile['gender'], 'avatar' => $profile['photo'],
'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']];
- $avatar = dba::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
- if (DBM::is_result($avatar)) {
+ $avatar = DBA::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
+ if (DBA::isResult($avatar)) {
if ($update_avatar) {
$fields['avatar-date'] = DateTimeFormat::utcNow();
}
$fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
}
- $fields['forum'] = $user['page-flags'] == PAGE_COMMUNITY;
- $fields['prv'] = $user['page-flags'] == PAGE_PRVGROUP;
+ $fields['forum'] = $user['page-flags'] == self::PAGE_COMMUNITY;
+ $fields['prv'] = $user['page-flags'] == self::PAGE_PRVGROUP;
// it seems as if ported accounts can have wrong values, so we make sure that now everything is fine.
$fields['url'] = System::baseUrl() . '/profile/' . $user['nickname'];
$update = false;
foreach ($fields as $field => $content) {
- if ($self[$field] != $content) {
+ if (isset($self[$field]) && $self[$field] != $content) {
$update = true;
}
}
if ($update) {
$fields['name-date'] = DateTimeFormat::utcNow();
- dba::update('contact', $fields, ['id' => $self['id']]);
+ DBA::update('contact', $fields, ['id' => $self['id']]);
// Update the public contact as well
- dba::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
+ DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
// Update the profile
$fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.jpg',
'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.jpg'];
- dba::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+ DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
}
}
public static function remove($id)
{
// We want just to make sure that we don't delete our "self" contact
- $contact = dba::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
- if (!DBM::is_result($contact) || !intval($contact['uid'])) {
- return;
- }
-
- $archive = PConfig::get($contact['uid'], 'system', 'archive_removed_contacts');
- if ($archive) {
- dba::update('contact', ['archive' => true, 'network' => 'none', 'writable' => false], ['id' => $id]);
+ $contact = DBA::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
+ if (!DBA::isResult($contact) || !intval($contact['uid'])) {
return;
}
- dba::delete('contact', ['id' => $id]);
+ // Archive the contact
+ DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM], ['id' => $id]);
- // Delete the rest in the background
+ // Delete it in the background
Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
}
*/
public static function terminateFriendship(array $user, array $contact)
{
- if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) {
+ if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
// create an unfollow slap
$item = [];
$item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
$item['follow'] = $contact["url"];
+ $item['body'] = '';
+ $item['title'] = '';
+ $item['guid'] = '';
+ $item['tag'] = '';
+ $item['attach'] = '';
$slap = OStatus::salmon($item, $user);
if (!empty($contact['notify'])) {
Salmon::slapper($user, $contact['notify'], $slap);
}
- } elseif ($contact['network'] == NETWORK_DIASPORA) {
+ } elseif ($contact['network'] == Protocol::DIASPORA) {
Diaspora::sendUnshare($user, $contact);
}
}
}
if ($contact['term-date'] <= NULL_DATE) {
- dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+ DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
if ($contact['url'] != '') {
- dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
+ DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
}
} else {
/* @todo
* delete, though if the owner tries to unarchive them we'll start
* the whole process over again.
*/
- dba::update('contact', ['archive' => 1], ['id' => $contact['id']]);
+ DBA::update('contact', ['archive' => 1], ['id' => $contact['id']]);
if ($contact['url'] != '') {
- dba::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
+ DBA::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
}
}
}
public static function unmarkForArchival(array $contact)
{
$condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], NULL_DATE];
- $exists = dba::exists('contact', $condition);
+ $exists = DBA::exists('contact', $condition);
// We don't need to update, we never marked this contact for archival
if (!$exists) {
// It's a miracle. Our dead contact has inexplicably come back to life.
$fields = ['term-date' => NULL_DATE, 'archive' => false];
- dba::update('contact', $fields, ['id' => $contact['id']]);
+ DBA::update('contact', $fields, ['id' => $contact['id']]);
if (!empty($contact['url'])) {
- dba::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
+ DBA::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
}
if (!empty($contact['batch'])) {
- $condition = ['batch' => $contact['batch'], 'contact-type' => ACCOUNT_TYPE_RELAY];
- dba::update('contact', $fields, $condition);
+ $condition = ['batch' => $contact['batch'], 'contact-type' => self::ACCOUNT_TYPE_RELAY];
+ DBA::update('contact', $fields, $condition);
}
}
$ssl_url = str_replace('http://', 'https://', $url);
// Fetch contact data from the contact table for the given user
- $s = dba::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+ $s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
FROM `contact` WHERE `nurl` = ? AND `uid` = ?", normalise_link($url), $uid);
- $r = dba::inArray($s);
+ $r = DBA::toArray($s);
// Fetch contact data from the contact table for the given user, checking with the alias
- if (!DBM::is_result($r)) {
- $s = dba::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+ if (!DBA::isResult($r)) {
+ $s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?", normalise_link($url), $url, $ssl_url, $uid);
- $r = dba::inArray($s);
+ $r = DBA::toArray($s);
}
// Fetch the data from the contact table with "uid=0" (which is filled automatically)
- if (!DBM::is_result($r)) {
- $s = dba::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+ if (!DBA::isResult($r)) {
+ $s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
FROM `contact` WHERE `nurl` = ? AND `uid` = 0", normalise_link($url));
- $r = dba::inArray($s);
+ $r = DBA::toArray($s);
}
// Fetch the data from the contact table with "uid=0" (which is filled automatically) - checked with the alias
- if (!DBM::is_result($r)) {
- $s = dba::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+ if (!DBA::isResult($r)) {
+ $s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0", normalise_link($url), $url, $ssl_url);
- $r = dba::inArray($s);
+ $r = DBA::toArray($s);
}
// Fetch the data from the gcontact table
- if (!DBM::is_result($r)) {
- $s = dba::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
+ if (!DBA::isResult($r)) {
+ $s = DBA::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
FROM `gcontact` WHERE `nurl` = ?", normalise_link($url));
- $r = dba::inArray($s);
+ $r = DBA::toArray($s);
}
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
// If there is more than one entry we filter out the connector networks
if (count($r) > 1) {
foreach ($r as $id => $result) {
- if ($result["network"] == NETWORK_STATUSNET) {
+ if ($result["network"] == Protocol::STATUSNET) {
unset($r[$id]);
}
}
}
if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0)
- && in_array($profile["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])
+ && in_array($profile["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])
) {
Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
}
// Show contact details of Diaspora contacts only if connected
- if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == NETWORK_DIASPORA)) {
+ if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == Protocol::DIASPORA)) {
$profile["location"] = "";
$profile["about"] = "";
$profile["gender"] = "";
$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
FROM `contact` WHERE `addr` = '%s' AND `uid` = %d",
- dbesc($addr),
+ DBA::escape($addr),
intval($uid)
);
// Fetch the data from the contact table with "uid=0" (which is filled automatically)
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
$r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
FROM `contact` WHERE `addr` = '%s' AND `uid` = 0",
- dbesc($addr)
+ DBA::escape($addr)
);
}
// Fetch the data from the gcontact table
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
$r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
FROM `gcontact` WHERE `addr` = '%s'",
- dbesc($addr)
+ DBA::escape($addr)
);
}
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
$data = Probe::uri($addr);
$profile = self::getDetailsByURL($data['url'], $uid);
}
// Look for our own contact if the uid doesn't match and isn't public
- $contact_own = dba::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
- if (DBM::is_result($contact_own)) {
+ $contact_own = DBA::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
+ if (DBA::isResult($contact_own)) {
return self::photoMenu($contact_own, $uid);
} else {
$profile_link = self::magicLink($contact['url']);
}
$sparkle = false;
- if (($contact['network'] === NETWORK_DFRN) && !$contact['self']) {
+ if (($contact['network'] === Protocol::DFRN) && !$contact['self']) {
$sparkle = true;
$profile_link = System::baseUrl() . '/redir/' . $contact['id'];
} else {
$profile_link = $profile_link . '?url=profile';
}
- if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA]) && !$contact['self']) {
+ if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) {
$pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
}
- if (($contact['network'] == NETWORK_DFRN) && !$contact['self']) {
+ if (($contact['network'] == Protocol::DFRN) && !$contact['self']) {
$poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id'];
}
/// @todo Verify if we can't use Contact::getDetailsByUrl instead of the following
// We first try the nurl (http://server.tld/nick), most common case
- $contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]);
+ $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]);
// Then the addr (nick@server.tld)
- if (!DBM::is_result($contact)) {
- $contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid]);
+ if (!DBA::isResult($contact)) {
+ $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid]);
}
// Then the alias (which could be anything)
- if (!DBM::is_result($contact)) {
+ if (!DBA::isResult($contact)) {
// The link could be provided as http although we stored it as https
$ssl_url = str_replace('http://', 'https://', $url);
$condition = ['`alias` IN (?, ?, ?) AND `uid` = ?', $url, normalise_link($url), $ssl_url, $uid];
- $contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
+ $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
}
- if (DBM::is_result($contact)) {
+ if (DBA::isResult($contact)) {
$contact_id = $contact["id"];
// Update the contact every 7 days
return 0;
}
- $data = Probe::uri($url, "", $uid);
+ // When we don't want to update, we look if some of our users already know this contact
+ if ($no_update) {
+ $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
+ 'photo', 'keywords', 'location', 'about', 'network',
+ 'priority', 'batch', 'request', 'confirm', 'poco'];
+ $data = DBA::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
+
+ if (DBA::isResult($data)) {
+ // For security reasons we don't fetch key data from our users
+ $data["pubkey"] = '';
+ }
+ } else {
+ $data = [];
+ }
+
+ if (empty($data)) {
+ $data = Probe::uri($url, "", $uid);
+ }
// Last try in gcontact for unsupported networks
- if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL, NETWORK_FEED])) {
+ if (!in_array($data["network"], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) {
if ($uid != 0) {
return 0;
}
// Get data from the gcontact table
$fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'];
- $contact = dba::selectFirst('gcontact', $fields, ['nurl' => normalise_link($url)]);
- if (!DBM::is_result($contact)) {
- $contact = dba::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
+ $contact = DBA::selectFirst('gcontact', $fields, ['nurl' => normalise_link($url)]);
+ if (!DBA::isResult($contact)) {
+ $contact = DBA::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
}
- if (!DBM::is_result($contact)) {
+ if (!DBA::isResult($contact)) {
$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
'photo', 'keywords', 'location', 'about', 'network',
'priority', 'batch', 'request', 'confirm', 'poco'];
- $contact = dba::selectFirst('contact', $fields, ['addr' => $url]);
+ $contact = DBA::selectFirst('contact', $fields, ['addr' => $url]);
}
- if (!DBM::is_result($contact)) {
+ if (!DBA::isResult($contact)) {
// The link could be provided as http although we stored it as https
$ssl_url = str_replace('http://', 'https://', $url);
$condition = ['alias' => [$url, normalise_link($url), $ssl_url]];
- $contact = dba::selectFirst('contact', $fields, $condition);
+ $contact = DBA::selectFirst('contact', $fields, $condition);
}
- if (!DBM::is_result($contact)) {
+ if (!DBA::isResult($contact)) {
$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
'photo', 'network', 'priority', 'batch', 'request', 'confirm'];
$condition = ['url' => [$url, normalise_link($url), $ssl_url]];
- $contact = dba::selectFirst('fcontact', $fields, $condition);
+ $contact = DBA::selectFirst('fcontact', $fields, $condition);
}
if (!empty($default)) {
$contact = $default;
}
- if (!DBM::is_result($contact)) {
+ if (!DBA::isResult($contact)) {
return 0;
} else {
$data = array_merge($data, $contact);
$url = $data["url"];
if (!$contact_id) {
- dba::insert('contact', [
+ DBA::insert('contact', [
'uid' => $uid,
'created' => DateTimeFormat::utcNow(),
'url' => $data["url"],
'about' => $data["about"],
'network' => $data["network"],
'pubkey' => $data["pubkey"],
- 'rel' => CONTACT_IS_SHARING,
+ 'rel' => self::SHARING,
'priority' => $data["priority"],
'batch' => $data["batch"],
'request' => $data["request"],
'pending' => 0]
);
- $s = dba::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
- $contacts = dba::inArray($s);
- if (!DBM::is_result($contacts)) {
+ $s = DBA::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
+ $contacts = DBA::toArray($s);
+ if (!DBA::isResult($contacts)) {
return 0;
}
$contact_id = $contacts[0]["id"];
// Update the newly created contact from data in the gcontact table
- $gcontact = dba::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => normalise_link($data["url"])]);
- if (DBM::is_result($gcontact)) {
+ $gcontact = DBA::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => normalise_link($data["url"])]);
+ if (DBA::isResult($gcontact)) {
// Only use the information when the probing hadn't fetched these values
if ($data['keywords'] != '') {
unset($gcontact['keywords']);
if ($data['about'] != '') {
unset($gcontact['about']);
}
- dba::update('contact', $gcontact, ['id' => $contact_id]);
+ DBA::update('contact', $gcontact, ['id' => $contact_id]);
}
if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
- dba::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
+ DBA::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
normalise_link($data["url"]), $contact_id]);
}
}
self::updateAvatar($data["photo"], $uid, $contact_id);
$fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey'];
- $contact = dba::selectFirst('contact', $fields, ['id' => $contact_id]);
+ $contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
// This condition should always be true
- if (!DBM::is_result($contact)) {
+ if (!DBA::isResult($contact)) {
return $contact_id;
}
$updated['avatar-date'] = DateTimeFormat::utcNow();
- dba::update('contact', $updated, ['id' => $contact_id], $contact);
+ DBA::update('contact', $updated, ['id' => $contact_id], $contact);
return $contact_id;
}
return false;
}
- $blocked = dba::selectFirst('contact', ['blocked'], ['id' => $cid]);
- if (!DBM::is_result($blocked)) {
+ $blocked = DBA::selectFirst('contact', ['blocked'], ['id' => $cid]);
+ if (!DBA::isResult($blocked)) {
return false;
}
return (bool) $blocked['blocked'];
return false;
}
- $hidden = dba::selectFirst('contact', ['hidden'], ['id' => $cid]);
- if (!DBM::is_result($hidden)) {
+ $hidden = DBA::selectFirst('contact', ['hidden'], ['id' => $cid]);
+ if (!DBA::isResult($hidden)) {
return false;
}
return (bool) $hidden['hidden'];
// This speeds up the query a lot
$r = q("SELECT `network`, `id` AS `author-id`, `contact-type` FROM `contact`
WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
- dbesc(normalise_link($contact_url))
+ DBA::escape(normalise_link($contact_url))
);
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
return '';
}
- if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
+ if (in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
} else {
$sql = "`item`.`uid` = ?";
$author_id = intval($r[0]["author-id"]);
- $contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
+ $contact = ($r[0]["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
$condition = ["`$contact` = ? AND `gravity` IN (?, ?) AND " . $sql,
$author_id, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
{
// There are several fields that indicate that the contact or user is a forum
// "page-flags" is a field in the user table,
- // "forum" and "prv" are used in the contact table. They stand for PAGE_COMMUNITY and PAGE_PRVGROUP.
- // "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP.
- if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
- || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP))
+ // "forum" and "prv" are used in the contact table. They stand for self::PAGE_COMMUNITY and self::PAGE_PRVGROUP.
+ // "community" is used in the gcontact table and is true if the contact is self::PAGE_COMMUNITY or self::PAGE_PRVGROUP.
+ if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_COMMUNITY))
+ || (isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_PRVGROUP))
|| (isset($contact['forum']) && intval($contact['forum']))
|| (isset($contact['prv']) && intval($contact['prv']))
|| (isset($contact['community']) && intval($contact['community']))
) {
- $type = ACCOUNT_TYPE_COMMUNITY;
+ $type = self::ACCOUNT_TYPE_COMMUNITY;
} else {
- $type = ACCOUNT_TYPE_PERSON;
+ $type = self::ACCOUNT_TYPE_PERSON;
}
// The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
}
switch ($type) {
- case ACCOUNT_TYPE_ORGANISATION:
+ case self::ACCOUNT_TYPE_ORGANISATION:
$account_type = L10n::t("Organisation");
break;
- case ACCOUNT_TYPE_NEWS:
+
+ case self::ACCOUNT_TYPE_NEWS:
$account_type = L10n::t('News');
break;
- case ACCOUNT_TYPE_COMMUNITY:
+
+ case self::ACCOUNT_TYPE_COMMUNITY:
$account_type = L10n::t("Forum");
break;
+
default:
$account_type = "";
break;
*/
public static function block($uid)
{
- $return = dba::update('contact', ['blocked' => true], ['id' => $uid]);
+ $return = DBA::update('contact', ['blocked' => true], ['id' => $uid]);
return $return;
}
*/
public static function unblock($uid)
{
- $return = dba::update('contact', ['blocked' => false], ['id' => $uid]);
+ $return = DBA::update('contact', ['blocked' => false], ['id' => $uid]);
return $return;
}
*/
public static function updateAvatar($avatar, $uid, $cid, $force = false)
{
- $contact = dba::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]);
- if (!DBM::is_result($contact)) {
+ $contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]);
+ if (!DBA::isResult($contact)) {
return false;
} else {
$data = [$contact["photo"], $contact["thumb"], $contact["micro"]];
$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
if ($photos) {
- dba::update(
+ DBA::update(
'contact',
['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()],
['id' => $cid]
// Update the public contact (contact id = 0)
if ($uid != 0) {
- $pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
- if (DBM::is_result($pcontact)) {
+ $pcontact = DBA::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
+ if (DBA::isResult($pcontact)) {
self::updateAvatar($avatar, 0, $pcontact['id'], $force);
}
}
*/
$fields = ['url', 'nurl', 'addr', 'alias', 'batch', 'notify', 'poll', 'poco', 'network'];
- $contact = dba::selectFirst('contact', $fields, ['id' => $id]);
- if (!DBM::is_result($contact)) {
+ $contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
+ if (!DBA::isResult($contact)) {
return false;
}
return true;
}
- dba::update(
+ DBA::update(
'contact', [
'url' => $ret['url'],
'nurl' => normalise_link($ret['url']),
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` IN ('%s', '%s') AND `network` = '%s' AND NOT `pending` LIMIT 1",
intval($uid),
- dbesc($ret['poll']),
- dbesc(normalise_link($ret['poll'])),
- dbesc($ret['network'])
+ DBA::escape($ret['poll']),
+ DBA::escape(normalise_link($ret['poll'])),
+ DBA::escape($ret['network'])
);
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' AND NOT `pending` LIMIT 1",
intval($uid),
- dbesc(normalise_link($url)),
- dbesc($ret['network'])
+ DBA::escape(normalise_link($url)),
+ DBA::escape($ret['network'])
);
}
- if (($ret['network'] === NETWORK_DFRN) && !DBM::is_result($r)) {
+ if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($r)) {
if ($interactive) {
- if (strlen($a->path)) {
+ if (strlen($a->urlpath)) {
$myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
} else {
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
// NOTREACHED
}
- } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != NETWORK_DFRN)) {
+ } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) {
$result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL;
$result['message'] != L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
return $result;
}
// This extra param just confuses things, remove it
- if ($ret['network'] === NETWORK_DIASPORA) {
+ if ($ret['network'] === Protocol::DIASPORA) {
$ret['url'] = str_replace('?absolute=true', '', $ret['url']);
}
return $result;
}
- if ($ret['network'] === NETWORK_OSTATUS && Config::get('system', 'ostatus_disabled')) {
+ if ($ret['network'] === Protocol::OSTATUS && Config::get('system', 'ostatus_disabled')) {
$result['message'] .= L10n::t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
$ret['notify'] = '';
}
$result['message'] .= L10n::t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
}
- $writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
+ $writeable = ((($ret['network'] === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0);
- $subhub = (($ret['network'] === NETWORK_OSTATUS) ? true : false);
+ $subhub = (($ret['network'] === Protocol::OSTATUS) ? true : false);
- $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
+ $hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0);
- if (in_array($ret['network'], [NETWORK_MAIL, NETWORK_DIASPORA])) {
+ if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA])) {
$writeable = 1;
}
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
// update contact
- $new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+ $new_relation = (($r[0]['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
- dba::update('contact', $fields, ['id' => $r[0]['id']]);
+ DBA::update('contact', $fields, ['id' => $r[0]['id']]);
} else {
- $new_relation = ((in_array($ret['network'], [NETWORK_MAIL])) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+ $new_relation = ((in_array($ret['network'], [Protocol::MAIL])) ? self::FRIEND : self::SHARING);
// create contact record
- dba::insert('contact', [
+ DBA::insert('contact', [
'uid' => $uid,
'created' => DateTimeFormat::utcNow(),
'url' => $ret['url'],
]);
}
- $contact = dba::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
- if (!DBM::is_result($contact)) {
+ $contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
+ if (!DBA::isResult($contact)) {
$result['message'] .= L10n::t('Unable to retrieve contact information.') . EOL;
return $result;
}
intval($uid)
);
- if (DBM::is_result($r)) {
- if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) {
+ if (DBA::isResult($r)) {
+ if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
// create a follow slap
$item = [];
$item['verb'] = ACTIVITY_FOLLOW;
$item['follow'] = $contact["url"];
+ $item['body'] = '';
+ $item['title'] = '';
+ $item['guid'] = '';
+ $item['tag'] = '';
+ $item['attach'] = '';
$slap = OStatus::salmon($item, $r[0]);
if (!empty($contact['notify'])) {
Salmon::slapper($r[0], $contact['notify'], $slap);
}
- } elseif ($contact['network'] == NETWORK_DIASPORA) {
+ } elseif ($contact['network'] == Protocol::DIASPORA) {
$ret = Diaspora::sendShare($a->user, $contact);
logger('share returns: ' . $ret);
}
$fields = ['url' => $contact['url'], 'request' => $contact['request'],
'notify' => $contact['notify'], 'poll' => $contact['poll'],
'confirm' => $contact['confirm'], 'poco' => $contact['poco']];
- dba::update('contact', $fields, ['id' => $contact['id']]);
+ DBA::update('contact', $fields, ['id' => $contact['id']]);
}
return $contact;
}
public static function addRelationship($importer, $contact, $datarray, $item, $sharing = false) {
- $url = notags(trim($datarray['author-link']));
- $name = notags(trim($datarray['author-name']));
- $photo = notags(trim($datarray['author-avatar']));
- $nick = '';
-
- if (is_object($item)) {
- $rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
- if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) {
- $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
- }
- } else {
- $nick = $item;
+ // Should always be set
+ if (empty($datarray['author-id'])) {
+ return;
}
+ $fields = ['url', 'name', 'nick', 'photo', 'network'];
+ $pub_contact = DBA::selectFirst('contact', $fields, ['id' => $datarray['author-id']]);
+ if (!DBA::isResult($pub_contact)) {
+ // Should never happen
+ return;
+ }
+
+ $url = $pub_contact['url'];
+ $name = $pub_contact['name'];
+ $photo = $pub_contact['photo'];
+ $nick = $pub_contact['nick'];
+ $network = $pub_contact['network'];
+
if (is_array($contact)) {
- if (($contact['rel'] == CONTACT_IS_SHARING)
- || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
- dba::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true],
+ if (($contact['rel'] == self::SHARING)
+ || ($sharing && $contact['rel'] == self::FOLLOWER)) {
+ DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true],
['id' => $contact['id'], 'uid' => $importer['uid']]);
}
// send email notification to owner?
} else {
- if (dba::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) {
+ if (DBA::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) {
logger('ignoring duplicated connection request from pending contact ' . $url);
return;
}
`blocked`, `readonly`, `pending`, `writable`)
VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)",
intval($importer['uid']),
- dbesc(DateTimeFormat::utcNow()),
- dbesc($url),
- dbesc(normalise_link($url)),
- dbesc($name),
- dbesc($nick),
- dbesc($photo),
- dbesc(NETWORK_OSTATUS),
- intval(CONTACT_IS_FOLLOWER)
+ DBA::escape(DateTimeFormat::utcNow()),
+ DBA::escape($url),
+ DBA::escape(normalise_link($url)),
+ DBA::escape($name),
+ DBA::escape($nick),
+ DBA::escape($photo),
+ DBA::escape($network),
+ intval(self::FOLLOWER)
);
$contact_record = [
- 'id' => dba::lastInsertId(),
- 'network' => NETWORK_OSTATUS,
+ 'id' => DBA::lastInsertId(),
+ 'network' => $network,
'name' => $name,
'url' => $url,
'photo' => $photo
/// @TODO Encapsulate this into a function/method
$fields = ['uid', 'username', 'email', 'page-flags', 'notify-flags', 'language'];
- $user = dba::selectFirst('user', $fields, ['uid' => $importer['uid']]);
- if (DBM::is_result($user) && !in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
+ $user = DBA::selectFirst('user', $fields, ['uid' => $importer['uid']]);
+ if (DBA::isResult($user) && !in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
// create notification
$hash = random_string();
if (is_array($contact_record)) {
- dba::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
+ DBA::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
'blocked' => false, 'knowyou' => false,
'hash' => $hash, 'datetime' => DateTimeFormat::utcNow()]);
}
Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
if (($user['notify-flags'] & NOTIFY_INTRO) &&
- in_array($user['page-flags'], [PAGE_NORMAL])) {
+ in_array($user['page-flags'], [self::PAGE_NORMAL])) {
notification([
'type' => NOTIFY_INTRO,
'to_name' => $user['username'],
'to_email' => $user['email'],
'uid' => $user['uid'],
- 'link' => System::baseUrl() . '/notifications/intro',
+ 'link' => System::baseUrl() . '/notifications/intro',
'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')),
'source_link' => $contact_record['url'],
'source_photo' => $contact_record['photo'],
]);
}
- } elseif (DBM::is_result($user) && in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
+ } elseif (DBA::isResult($user) && in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
intval($importer['uid']),
- dbesc($url)
+ DBA::escape($url)
);
}
}
}
- public static function removeFollower($importer, $contact, array $datarray = [], $item = "") {
-
- if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
- dba::update('contact', ['rel' => CONTACT_IS_SHARING], ['id' => $contact['id']]);
+ public static function removeFollower($importer, $contact, array $datarray = [], $item = "")
+ {
+ if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::SHARING)) {
+ DBA::update('contact', ['rel' => self::SHARING], ['id' => $contact['id']]);
} else {
Contact::remove($contact['id']);
}
}
- public static function removeSharer($importer, $contact, array $datarray = [], $item = "") {
-
- if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
- dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
+ public static function removeSharer($importer, $contact, array $datarray = [], $item = "")
+ {
+ if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::FOLLOWER)) {
+ DBA::update('contact', ['rel' => self::FOLLOWER], ['id' => $contact['id']]);
} else {
Contact::remove($contact['id']);
}
// In-network birthdays are handled within local_delivery
$r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` ");
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
foreach ($r as $rr) {
logger('update_contact_birthday: ' . $rr['bd']);
// Check for duplicates
$s = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
- intval($rr['uid']), intval($rr['id']), dbesc(DateTimeFormat::utc($nextbd)), dbesc('birthday'));
+ intval($rr['uid']), intval($rr['id']), DBA::escape(DateTimeFormat::utc($nextbd)), DBA::escape('birthday'));
- if (DBM::is_result($s)) {
+ if (DBA::isResult($s)) {
continue;
}
q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ", intval($rr['uid']), intval($rr['id']),
- dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utc($nextbd)),
- dbesc(DateTimeFormat::utc($nextbd . ' + 1 day ')), dbesc($bdtext), dbesc($bdtext2), dbesc('birthday'),
+ DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utc($nextbd)),
+ DBA::escape(DateTimeFormat::utc($nextbd . ' + 1 day ')), DBA::escape($bdtext), DBA::escape($bdtext2), DBA::escape('birthday'),
intval(0)
);
// update bdyear
- q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", dbesc(substr($nextbd, 0, 4)),
- dbesc($nextbd), intval($rr['uid']), intval($rr['id'])
+ q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", DBA::escape(substr($nextbd, 0, 4)),
+ DBA::escape($nextbd), intval($rr['uid']), intval($rr['id'])
);
}
}
return;
}
- $str = dbesc(implode(',', $contact_ids));
+ $str = DBA::escape(implode(',', $contact_ids));
- $stmt = dba::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
+ $stmt = DBA::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
$return = [];
- while($contact = dba::fetch($stmt)) {
+ while($contact = DBA::fetch($stmt)) {
$return[] = $contact['id'];
}
- dba::close($stmt);
+ DBA::close($stmt);
$contact_ids = $return;
}
*/
public static function magicLinkbyId($cid, $url = '')
{
- $contact = dba::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
+ $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
return self::magicLinkbyContact($contact, $url);
}
*/
public static function magicLinkbyContact($contact, $url = '')
{
- if ($contact['network'] != NETWORK_DFRN) {
+ if ($contact['network'] != Protocol::DFRN) {
return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
}
}
return $redirect;
- }
+ }
}
projects / friendica.git / blobdiff