function user_remove($uid) {
if(! $uid)
return;
- $a = get_app();
logger('Removing user: ' . $uid);
$r = q("select * from user where uid = %d limit 1", intval($uid));
$r[0]['nickname']
);
+ /// @todo Should be done in a background job since this likely will run into a time out
// don't delete yet, will be done later when contacts have deleted my stuff
// q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `gcign` WHERE `uid` = %d", intval($uid));
if($uid == local_user()) {
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
- goaway($a->get_baseurl());
+ goaway(App::get_baseurl());
}
}
$r = q("select uid from contact where id = %d limit 1",
intval($id)
);
- if((! count($r)) || (! intval($r[0]['uid'])))
+ if((! dbm::is_result($r)) || (! intval($r[0]['uid'])))
return;
$archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
return;
}
- q("DELETE FROM `contact` WHERE `id` = %d",
- intval($id)
- );
- q("DELETE FROM `item` WHERE `contact-id` = %d ",
- intval($id)
- );
- q("DELETE FROM `photo` WHERE `contact-id` = %d ",
- intval($id)
- );
- q("DELETE FROM `mail` WHERE `contact-id` = %d ",
- intval($id)
- );
- q("DELETE FROM `event` WHERE `cid` = %d ",
- intval($id)
- );
- q("DELETE FROM `queue` WHERE `cid` = %d ",
- intval($id)
- );
+ q("DELETE FROM `contact` WHERE `id` = %d", intval($id));
+ // Delete the rest in the background
+ proc_run(PRIORITY_LOW, 'include/remove_contact.php', $id);
}
function terminate_friendship($user,$self,$contact) {
-
$a = get_app();
require_once('include/datetime.php');
if($contact['network'] === NETWORK_OSTATUS) {
- $slap = replace_macros(get_markup_template('follow_slap.tpl'), array(
- '$name' => $user['username'],
- '$profile_page' => $a->get_baseurl() . '/profile/' . $user['nickname'],
- '$photo' => $self['photo'],
- '$thumb' => $self['thumb'],
- '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
- '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . get_guid(32),
- '$title' => '',
- '$type' => 'text',
- '$content' => t('stopped following'),
- '$nick' => $user['nickname'],
- '$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
- '$ostat_follow' => '' // '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
- ));
+ require_once('include/ostatus.php');
+
+ // create an unfollow slap
+ $item = array();
+ $item['verb'] = NAMESPACE_OSTATUS."/unfollow";
+ $item['follow'] = $contact["url"];
+ $slap = ostatus::salmon($item, $user);
if((x($contact,'notify')) && (strlen($contact['notify']))) {
require_once('include/salmon.php');
}
elseif($contact['network'] === NETWORK_DIASPORA) {
require_once('include/diaspora.php');
- diaspora::send_unshare($user,$contact);
+ Diaspora::send_unshare($user,$contact);
}
elseif($contact['network'] === NETWORK_DFRN) {
require_once('include/dfrn.php');
// This provides for the possibility that their database is temporarily messed
// up or some other transient event and that there's a possibility we could recover from it.
-if(! function_exists('mark_for_death')) {
function mark_for_death($contact) {
if($contact['archive'])
dbesc(datetime_convert()),
intval($contact['id'])
);
- }
- else {
+
+ if ($contact['url'] != '') {
+ q("UPDATE `contact` SET `term-date` = '%s'
+ WHERE `nurl` = '%s' AND `term-date` <= '1000-00-00'",
+ dbesc(datetime_convert()),
+ dbesc(normalise_link($contact['url']))
+ );
+ }
+ } else {
/// @todo
/// We really should send a notification to the owner after 2-3 weeks
/// so they won't be surprised when the contact vanishes and can take
/// remedial action if this was a serious mistake or glitch
+ /// @todo
+ /// Check for contact vitality via probing
+
$expiry = $contact['term-date'] . ' + 32 days ';
if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
// archive them rather than delete
// though if the owner tries to unarchive them we'll start the whole process over again
- q("update contact set `archive` = 1 where id = %d",
+ q("UPDATE `contact` SET `archive` = 1 WHERE `id` = %d",
intval($contact['id'])
);
- q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact['id']), intval($contact['uid']));
-
- //contact_remove($contact['id']);
+ if ($contact['url'] != '') {
+ q("UPDATE `contact` SET `archive` = 1 WHERE `nurl` = '%s'",
+ dbesc(normalise_link($contact['url']))
+ );
+ }
}
}
-}}
+}
-if(! function_exists('unmark_for_death')) {
function unmark_for_death($contact) {
+
+ $r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` > '%s'",
+ intval($contact['id']),
+ dbesc('1000-00-00 00:00:00')
+ );
+
+ // We don't need to update, we never marked this contact as dead
+ if (!dbm::is_result($r)) {
+ return;
+ }
+
// It's a miracle. Our dead contact has inexplicably come back to life.
q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
dbesc('0000-00-00 00:00:00'),
intval($contact['id'])
);
-}}
+
+ if ($contact['url'] != '') {
+ q("UPDATE `contact` SET `term-date` = '%s' WHERE `nurl` = '%s'",
+ dbesc('0000-00-00 00:00:00'),
+ dbesc(normalise_link($contact['url']))
+ );
+ }
+}
/**
* @brief Get contact data for a given profile link
*
* The function looks at several places (contact table and gcontact table) for the contact
+ * It caches its result for the same script execution to prevent duplicate calls
*
* @param string $url The profile link
* @param int $uid User id
* @return array Contact data
*/
function get_contact_details_by_url($url, $uid = -1, $default = array()) {
- if ($uid == -1)
+ static $cache = array();
+
+ if ($uid == -1) {
$uid = local_user();
+ }
+
+ if (isset($cache[$url][$uid])) {
+ return $cache[$url][$uid];
+ }
// Fetch contact data from the contact table for the given user
$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
FROM `gcontact` WHERE `nurl` = '%s'",
dbesc(normalise_link($url)));
- if ($r) {
+ if (dbm::is_result($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 (count($r) > 1) {
+ foreach ($r AS $id => $result) {
+ if ($result["network"] == NETWORK_STATUSNET) {
unset($r[$id]);
+ }
+ }
+ }
$profile = array_shift($r);
$profile["bd"] = $current_year."-".$month."-".$day;
$current = $current_year."-".$current_month."-".$current_day;
- if ($profile["bd"] < $current)
+ if ($profile["bd"] < $current) {
$profile["bd"] = (++$current_year)."-".$month."-".$day;
- } else
+ }
+ } else {
$profile["bd"] = "0000-00-00";
- } else
+ }
+ } else {
$profile = $default;
+ }
- if (($profile["photo"] == "") AND isset($default["photo"]))
+ if (($profile["photo"] == "") AND isset($default["photo"])) {
$profile["photo"] = $default["photo"];
+ }
- if (($profile["name"] == "") AND isset($default["name"]))
+ if (($profile["name"] == "") AND isset($default["name"])) {
$profile["name"] = $default["name"];
+ }
- if (($profile["network"] == "") AND isset($default["network"]))
+ if (($profile["network"] == "") AND isset($default["network"])) {
$profile["network"] = $default["network"];
+ }
- if (($profile["thumb"] == "") AND isset($profile["photo"]))
+ if (($profile["thumb"] == "") AND isset($profile["photo"])) {
$profile["thumb"] = $profile["photo"];
+ }
- if (($profile["micro"] == "") AND isset($profile["thumb"]))
+ if (($profile["micro"] == "") AND isset($profile["thumb"])) {
$profile["micro"] = $profile["thumb"];
+ }
if ((($profile["addr"] == "") OR ($profile["name"] == "")) AND ($profile["gid"] != 0) AND
- in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
+ in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
proc_run(PRIORITY_LOW, "include/update_gcontact.php", $profile["gid"]);
+ }
// Show contact details of Diaspora contacts only if connected
if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) {
$profile["birthday"] = "0000-00-00";
}
- return($profile);
+ $cache[$url][$uid] = $profile;
+
+ return $profile;
}
if (! function_exists('contact_photo_menu')) {
$sparkle = false;
if ($contact['network'] === NETWORK_DFRN) {
$sparkle = true;
- $profile_link = $a->get_baseurl() . '/redir/' . $contact['id'];
+ $profile_link = App::get_baseurl() . '/redir/' . $contact['id'];
} else {
$profile_link = $contact['url'];
}
}
if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
- $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
+ $pm_url = App::get_baseurl() . '/message/new/' . $contact['id'];
}
if ($contact['network'] == NETWORK_DFRN) {
- $poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
+ $poke_link = App::get_baseurl() . '/poke/?f=&c=' . $contact['id'];
}
- $contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
+ $contact_url = App::get_baseurl() . '/contacts/' . $contact['id'];
- $posts_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/posts';
- $contact_drop_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
+ $posts_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/posts';
+ $contact_drop_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
/**
* menu array:
ORDER BY rand() LIMIT 1",
dbesc(NETWORK_DFRN));
- if(count($r))
+ if (dbm::is_result($r))
return dirname($r[0]['url']);
return '';
}
return $o;
}
-
/**
- * @brief Returns posts from a given contact
+ * @brief Returns posts from a given contact url
*
* @param App $a argv application class
- * @param int $contact_id contact
+ * @param string $contact_url Contact URL
*
* @return string posts in HTML
*/
-function posts_from_contact($a, $contact_id) {
+function posts_from_contact_url($a, $contact_url) {
require_once('include/conversation.php');
- $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id));
- if (!$r)
- return false;
+ // There are no posts with "uid = 0" with connector networks
+ // This speeds up the query a lot
+ $r = q("SELECT `network`, `id` AS `author-id` FROM `contact`
+ WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
+ dbesc(normalise_link($contact_url)));
+ if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+ $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND `item`.`private`))";
+ } else {
+ $sql = "`item`.`uid` = %d";
+ }
- $contact = $r[0];
+ $author_id = intval($r[0]["author-id"]);
- if(get_config('system', 'old_pager')) {
+ if (get_config('system', 'old_pager')) {
$r = q("SELECT COUNT(*) AS `total` FROM `item`
- WHERE `item`.`uid` = %d AND `author-link` IN ('%s', '%s')",
- intval(local_user()),
- dbesc(str_replace("https://", "http://", $contact["url"])),
- dbesc(str_replace("http://", "https://", $contact["url"])));
+ WHERE `author-id` = %d and $sql",
+ intval($author_id),
+ intval(local_user()));
$a->set_pager_total($r[0]['total']);
}
- $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
- `author-name` AS `name`, `owner-avatar` AS `photo`,
- `owner-link` AS `url`, `owner-avatar` AS `thumb`
- FROM `item` FORCE INDEX (`uid_contactid_id`)
- WHERE `item`.`uid` = %d AND `contact-id` = %d
- AND `author-link` IN ('%s', '%s')
- AND NOT `deleted` AND NOT `moderated` AND `visible`
- ORDER BY `item`.`id` DESC LIMIT %d, %d",
+ $r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
+ " ORDER BY `item`.`created` DESC LIMIT %d, %d",
+ intval($author_id),
intval(local_user()),
- intval($contact_id),
- dbesc(str_replace("https://", "http://", $contact["url"])),
- dbesc(str_replace("http://", "https://", $contact["url"])),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
- $o .= conversation($a,$r,'community',false);
+ $o = conversation($a,$r,'community',false);
- if(!get_config('system', 'old_pager'))
+ if (!get_config('system', 'old_pager')) {
$o .= alt_pager($a,count($r));
- else
+ } else {
$o .= paginate($a);
+ }
return $o;
}
projects / friendica.git / blobdiff