Includes and calls

Remove includes and update function calls

diff --git a/mod/contacts.php b/mod/contacts.php
index b347617a1c2bebf1f948b5d397bc5481b3119a9a..ea384fbefd845cb9bd0bb0a1218d9cad693c5e5f 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -14,7 +14,6 @@ use Friendica\Network\Probe;
 
 require_once 'include/contact_selectors.php';
 require_once 'include/contact_widgets.php';
-require_once 'include/follow.php';
 require_once 'mod/proxy.php';
 
 function contacts_init(App $a)
@@ -243,7 +242,7 @@ function _contact_update($contact_id)
        $uid = $contact["uid"];
 
        if ($r[0]["network"] == NETWORK_OSTATUS) {
-               $result = new_contact($uid, $contact["url"], false, $contact["network"]);
+               $result = Contact::new($uid, $contact["url"], false, $contact["network"]);
 
                if ($result['success']) {
                        q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d", intval($contact_id));
@@ -275,7 +274,7 @@ function _contact_update_profile($contact_id)
        $update = array();
 
        if ($data["network"] == NETWORK_OSTATUS) {
-               $result = new_contact($uid, $data["url"], false);
+               $result = Contact::new($uid, $data["url"], false);
 
                if ($result['success']) {
                        $update["subhub"] = true;

diff --git a/mod/follow.php b/mod/follow.php
index 41c008da514aeb9169c7a6d693fb715673526185..1f5abccae02c7cfed77d73dbfad3baa5f8cb129a 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,12 +1,13 @@
 <?php
-
+/**
+ * @file mod/follow.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Network\Probe;
 
-require_once 'include/follow.php';
 require_once 'include/contact_selectors.php';
 
 function follow_post(App $a) {
@@ -29,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 = new_contact($uid,$url,true);
+       $result = Contact::new($uid, $url, true);
 
        if ($result['success'] == false) {
                if ($result['message']) {

diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 59ea6c88b0efd7b2fd2af6e3fdb8314bbf3de716..0d088c02c8652abca44cd6788566b7dc9b6d9495 100644 (file)
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -1,11 +1,11 @@
 <?php
-
+/**
+ * @file mod/fsuggest.php
+ */
 use Friendica\App;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 
-require_once 'include/follow.php';
-
 function fsuggest_post(App $a) {
 
        if (! local_user()) {

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 70a36559e4483edf0ed4ca71e11619331f0fb870..cae042c6722b859799e14fa5343a31b311392127 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,12 +1,13 @@
 <?php
-
+/**
+ * @file mod/ostatus_subscribe.php
+ */
 use Friendica\App;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Model\Contact;
 use Friendica\Network\Probe;
 
-require_once 'include/follow.php';
-
 function ostatus_subscribe_content(App $a) {
 
        if (! local_user()) {
@@ -67,7 +68,7 @@ function ostatus_subscribe_content(App $a) {
 
        $data = Probe::uri($url);
        if ($data["network"] == NETWORK_OSTATUS) {
-               $result = new_contact($uid, $url, true, NETWORK_OSTATUS);
+               $result = Contact::new($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 3372d0326117833a680dd4d75a14a2b08791f7c6..b3d5a402b5a192219160a7ada345d0adb4e7a328 100644 (file)
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -1,9 +1,10 @@
 <?php
-
+/**
+ * @file mod/repair_ostatus.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
-
-require_once 'include/follow.php';
+use Friendica\Model\Contact;
 
 function repair_ostatus_content(App $a) {
 
@@ -51,7 +52,7 @@ function repair_ostatus_content(App $a) {
 
        $o .= "<p>".t("Keep this window open until done.")."</p>";
 
-       $result = new_contact($uid,$r[0]["url"],true);
+       $result = Contact::new($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 bd08431a4cfeea8f5a878c5845b6656647f6ad32..1cb118355b8c71f45a7ee0ff0311d47024fee2bc 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -5,12 +5,12 @@
 use Friendica\App;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
+use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
 use Friendica\Util\Crypto;
 
 require_once 'include/items.php';
-require_once 'include/follow.php';
 
 function salmon_return($val) {
 
@@ -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 = new_contact($importer['uid'],$author_link);
+                       $result = Contact::new($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/mod/unfollow.php b/mod/unfollow.php
index 907982cd8a023eccbe842c2114d44150c5dd0237..98ad9fd026d5995cfd2c6f8bf997e3078982c372 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -1,11 +1,12 @@
 <?php
-
+/**
+ * @file mod/unfollow.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 
-require_once 'include/follow.php';
 require_once 'include/contact_selectors.php';
 
 function unfollow_post(App $a) {

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 3c284b29f51d3e5c5b2dd3d92c3f5d8db7983643..1140f7a4e03113dec01a096ff4b98710ebf6f2a1 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -26,7 +26,6 @@ require_once 'include/bbcode.php';
 require_once 'include/items.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
-require_once 'include/follow.php';
 require_once 'include/api.php';
 require_once 'mod/proxy.php';
 

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 9cb33c471b0c68cacf4d8ae3d150dfff258161e7..f175c4aa5c6cab080785be26d8691db10f934017 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -13,7 +13,6 @@ use Friendica\Protocol\PortableContact;
 use dba;
 
 require_once 'include/dba.php';
-require_once 'include/follow.php';
 
 Class OnePoll
 {
@@ -118,7 +117,7 @@ Class OnePoll
                                return;
                        }
 
-                       if (!update_contact($contact["id"])) {
+                       if (!Contact::update($contact["id"])) {
                                Contact::markForArchival($contact);
                                logger('Contact is marked dead');