Rename create

rename create function to createFromProbe and update calls.

diff --git a/mod/contacts.php b/mod/contacts.php
index a2a734f7588a1f4e40f895d25148a09ba8819e01..f673f84f1039ed61dc0d32ec4e4679385af4e760 100644 (file)
--- 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 58ebdf88ed46bce3423ba3d617a6c242ca2fc9f7..503410fd098ff4ed3b065ef22c01ea88d2dca18c 100644 (file)
--- 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 0104c3ca1b6cb51f39df2258208bffaa6576c592..9ec58e6f113695c136003bd5533f63127fa2bc94 100644 (file)
--- 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 5ac08890cd46313f230883a6913bd9678d36dcb0..5b207c28606aa8aa0f0803dc1455c500782f73ad 100644 (file)
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -52,7 +52,7 @@ function repair_ostatus_content(App $a) {
 
        $o .= "<p>".t("Keep this window open until done.")."</p>";
 
-       $result = Contact::create($uid,$r[0]["url"],true);
+       $result = Contact::createFromProbe($uid,$r[0]["url"],true);
 
        $a->page['htmlhead'] = '<meta http-equiv="refresh" content="1; URL='.System::baseUrl().'/repair_ostatus?counter='.$counter.'">';
 

diff --git a/mod/salmon.php b/mod/salmon.php
index 9dddc0096df57b9d9d3dc79cc06a28c6d59c3b4c..3a4dececdeeb87083cd696b5a570295ca52aef0d 100644 (file)
--- 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 1ab6d63ce84b94d4c85c661bf343a0f1b9fd797c..b0f5ef9f244a3fde42ea33c4d565cc8b32eadd5c 100644 (file)
--- 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' => '');