Relocate class files from /include to /src/

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index 507e17f4a5b3d81154dfaa5419f2c84f93c1ac7d..754257773ccd935dd0dec4396cb8eaadd4f24960 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -3,13 +3,12 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\Dfrn;
 
 require_once 'include/queue_fn.php';
 require_once 'include/html2plain.php';
-require_once 'include/probe.php';
-require_once 'include/diaspora.php';
 require_once 'include/ostatus.php';
-require_once 'include/dfrn.php';
 
 function delivery_run(&$argv, &$argc){
        global $a;
@@ -244,12 +243,12 @@ function delivery_run(&$argv, &$argc){
 
                                if ($mail) {
                                        $item['body'] = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
-                                       $atom = dfrn::mail($item, $owner);
+                                       $atom = Dfrn::mail($item, $owner);
                                } elseif ($fsuggest) {
-                                       $atom = dfrn::fsuggest($item, $owner);
+                                       $atom = Dfrn::fsuggest($item, $owner);
                                        q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id']));
                                } elseif ($relocate) {
-                                       $atom = dfrn::relocate($owner, $uid);
+                                       $atom = Dfrn::relocate($owner, $uid);
                                } elseif ($followup) {
                                        $msgitems = array();
                                        foreach ($items as $item) {  // there is only one item
@@ -261,7 +260,7 @@ function delivery_run(&$argv, &$argc){
                                                        $msgitems[] = $item;
                                                }
                                        }
-                                       $atom = dfrn::entries($msgitems,$owner);
+                                       $atom = Dfrn::entries($msgitems,$owner);
                                } else {
                                        $msgitems = array();
                                        foreach ($items as $item) {
@@ -290,7 +289,7 @@ function delivery_run(&$argv, &$argc){
                                                        $msgitems[] = $item;
                                                }
                                        }
-                                       $atom = dfrn::entries($msgitems,$owner);
+                                       $atom = Dfrn::entries($msgitems,$owner);
                                }
 
                                logger('notifier entry: '.$contact["url"].' '.$target_item["guid"].' entry: '.$atom, LOGGER_DEBUG);
@@ -300,7 +299,7 @@ function delivery_run(&$argv, &$argc){
 
                                // perform local delivery if we are on the same site
 
-                               if (link_compare($basepath,App::get_baseurl())) {
+                               if (link_compare($basepath,System::baseUrl())) {
 
                                        $nickname = basename($contact['url']);
                                        if ($contact['issued-id']) {
@@ -335,7 +334,7 @@ function delivery_run(&$argv, &$argc){
                                                        $x[0]['writable'] = 1;
                                                }
 
-                                               $ssl_policy = get_config('system','ssl_policy');
+                                               $ssl_policy = Config::get('system','ssl_policy');
                                                fix_contact_ssl_policy($x[0],$ssl_policy);
 
                                                // If we are setup as a soapbox we aren't accepting top level posts from this person
@@ -344,13 +343,13 @@ function delivery_run(&$argv, &$argc){
                                                        break;
                                                }
                                                logger('mod-delivery: local delivery');
-                                               dfrn::import($atom, $x[0]);
+                                               Dfrn::import($atom, $x[0]);
                                                break;
                                        }
                                }
 
                                if (!was_recently_delayed($contact['id'])) {
-                                       $deliver_status = dfrn::deliver($owner,$contact,$atom);
+                                       $deliver_status = Dfrn::deliver($owner,$contact,$atom);
                                } else {
                                        $deliver_status = (-1);
                                }
@@ -375,7 +374,7 @@ function delivery_run(&$argv, &$argc){
                                if ($owner['prvnets']) {
                                        break;
                                }
-                               if (get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) {
+                               if (Config::get('system','ostatus_disabled') || Config::get('system','dfrn_only')) {
                                        break;
                                }
 
@@ -386,7 +385,7 @@ function delivery_run(&$argv, &$argc){
                        case NETWORK_MAIL:
                        case NETWORK_MAIL2:
 
-                               if (get_config('system','dfrn_only')) {
+                               if (Config::get('system','dfrn_only')) {
                                        break;
                                }
                                // WARNING: does not currently convert to RFC2047 header encodings, etc.
@@ -489,7 +488,7 @@ function delivery_run(&$argv, &$argc){
 
                                logger('delivery: diaspora batch deliver: '.$loc);
 
-                               if (get_config('system','dfrn_only') || (!get_config('system','diaspora_enabled')))
+                               if (Config::get('system','dfrn_only') || (!Config::get('system','diaspora_enabled')))
                                        break;
 
                                if ($mail) {
@@ -508,6 +507,9 @@ function delivery_run(&$argv, &$argc){
                                        logger('diaspora retract: '.$loc);
                                        Diaspora::send_retraction($target_item,$owner,$contact,$public_message);
                                        break;
+                               } elseif ($relocate) {
+                                       Diaspora::sendAccountMigration($owner, $contact, $uid);
+                                       break;
                                } elseif ($followup) {
                                        // send comments and likes to owner to relay
                                        logger('diaspora followup: '.$loc);