[cross] Moved CONTACT_* constants to class Friendica\Model\Contact (#670)

* [cross] Moved CONTACT_* constants to class Friendica\Model\Contact

* Other PR request:
- renamed Contact::CONTACT_IS_* to just plain Contact::* :-) (MrPetovan)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 5cda94d07efa15f022e22a15ac4e8dec771dfda9..eea1c2845f614370ed0b18c1d86fc685658f6942 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -1035,7 +1035,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
                        DBA::escape($contact->preferredUsername),
                        DBA::escape($contact->image->url),
                        DBA::escape(NETWORK_PUMPIO),
-                       intval(CONTACT_IS_FRIEND),
+                       intval(Contact::FRIEND),
                        intval(1),
                        DBA::escape($contact->location->displayName),
                        DBA::escape($contact->summary),

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 58f4485e164b6bc84567fbfa5513654f2c2c62d6..6f987f36b3ef478e0d7c01b2357d230e9bae14fe 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -48,6 +48,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
@@ -928,7 +929,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
                        DBA::escape($contact->screen_name),
                        DBA::escape($contact->profile_image_url),
                        DBA::escape(NETWORK_STATUSNET),
-                       intval(CONTACT_IS_FRIEND),
+                       intval(Contact::FRIEND),
                        intval(1),
                        DBA::escape($contact->location),
                        DBA::escape($contact->description),

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 591887057e641e58f185de6cd27cd251254d1133..8ac6197bf2f49d1f1ad43efe0ff24798d8a7d669 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1029,7 +1029,7 @@ function twitter_fetch_contact($uid, $data, $create_user)
                $fields['nurl'] = normalise_link($url);
                $fields['alias'] = 'twitter::' . $data->id_str;
                $fields['poll'] = 'twitter::' . $data->id_str;
-               $fields['rel'] = CONTACT_IS_FRIEND;
+               $fields['rel'] = Contact::FRIEND;
                $fields['priority'] = 1;
                $fields['writable'] = true;
                $fields['blocked'] = false;