diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2012-10-23 21:26:12 +1100 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2012-10-23 21:26:12 +1100 |
| commit | 7acba41dc67e85fe889f7213c9ba0ba158983f81 (patch) | |
| tree | 08ab0d31599b17a58914a351da71c651937e7f71 /include/Contact.php | |
| parent | 672da80282d4a99adb12fc09bde89af656f0b13b (diff) | |
| download | volse-hubzilla-7acba41dc67e85fe889f7213c9ba0ba158983f81.tar.gz volse-hubzilla-7acba41dc67e85fe889f7213c9ba0ba158983f81.tar.bz2 volse-hubzilla-7acba41dc67e85fe889f7213c9ba0ba158983f81.zip | |
more cleanup
Diffstat (limited to 'include/Contact.php')
| -rw-r--r-- | include/Contact.php | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/include/Contact.php b/include/Contact.php index 6b565f27c..fc0a6dd25 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -209,29 +209,7 @@ function terminate_friendship($user,$self,$contact) { 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:' . random_string(), - '$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" - )); - - if((x($contact,'notify')) && (strlen($contact['notify']))) { - require_once('include/salmon.php'); - slapper($user,$contact['notify'],$slap); - } - } - elseif($contact['network'] === NETWORK_DFRN) { + if($contact['network'] === NETWORK_DFRN) { require_once('include/items.php'); dfrn_deliver($user,$contact,'placeholder', 1); } |