From 5358f5742e1332f25fc81bb9439a57c571eea569 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Tue, 9 Jan 2018 11:40:25 -0500 Subject: [PATCH] Rename create rename create function to createFromProbe and update calls. --- mod/contacts.php | 4 ++-- mod/follow.php | 2 +- mod/ostatus_subscribe.php | 2 +- mod/repair_ostatus.php | 2 +- mod/salmon.php | 2 +- src/Model/Contact.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index a2a734f75..f673f84f1 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -242,7 +242,7 @@ function _contact_update($contact_id) $uid = $contact["uid"]; if ($r[0]["network"] == NETWORK_OSTATUS) { - $result = Contact::create($uid, $contact["url"], false, $contact["network"]); + $result = Contact::createFromProbe($uid, $contact["url"], false, $contact["network"]); if ($result['success']) { q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d", intval($contact_id)); @@ -274,7 +274,7 @@ function _contact_update_profile($contact_id) $update = array(); if ($data["network"] == NETWORK_OSTATUS) { - $result = Contact::create($uid, $data["url"], false); + $result = Contact::createFromProbe($uid, $data["url"], false); if ($result['success']) { $update["subhub"] = true; diff --git a/mod/follow.php b/mod/follow.php index 58ebdf88e..503410fd0 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -30,7 +30,7 @@ function follow_post(App $a) { // This is just a precaution if maybe this page is called somewhere directly via POST $_SESSION["fastlane"] = $url; - $result = Contact::create($uid, $url, true); + $result = Contact::createFromProbe($uid, $url, true); if ($result['success'] == false) { if ($result['message']) { diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php index 0104c3ca1..9ec58e6f1 100644 --- a/mod/ostatus_subscribe.php +++ b/mod/ostatus_subscribe.php @@ -68,7 +68,7 @@ function ostatus_subscribe_content(App $a) { $data = Probe::uri($url); if ($data["network"] == NETWORK_OSTATUS) { - $result = Contact::create($uid, $url, true, NETWORK_OSTATUS); + $result = Contact::createFromProbe($uid, $url, true, NETWORK_OSTATUS); if ($result["success"]) { $o .= " - ".t("success"); } else { diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php index 5ac08890c..5b207c286 100644 --- a/mod/repair_ostatus.php +++ b/mod/repair_ostatus.php @@ -52,7 +52,7 @@ function repair_ostatus_content(App $a) { $o .= "

".t("Keep this window open until done.")."

"; - $result = Contact::create($uid,$r[0]["url"],true); + $result = Contact::createFromProbe($uid,$r[0]["url"],true); $a->page['htmlhead'] = ''; diff --git a/mod/salmon.php b/mod/salmon.php index 9dddc0096..3a4dececd 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -164,7 +164,7 @@ function salmon_post(App $a) { if (! DBM::is_result($r)) { logger('mod-salmon: Author unknown to us.'); if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) { - $result = Contact::create($importer['uid'], $author_link); + $result = Contact::createFromProbe($importer['uid'], $author_link); if($result['success']) { $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s') AND `uid` = %d LIMIT 1", diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 1ab6d63ce..b0f5ef9f2 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1089,7 +1089,7 @@ class Contact extends BaseObject * @param string $network * @return boolean|string */ - public static function create($uid, $url, $interactive = false, $network = '') + public static function createFromProbe($uid, $url, $interactive = false, $network = '') { $result = array('cid' => -1, 'success' => false, 'message' => '');