Relocate class files from /include to /src/

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index 098e423d170d9d6efb8dd7e3903fb6e6cc307e36..754257773ccd935dd0dec4396cb8eaadd4f24960 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -1,14 +1,14 @@
 <?php
 
 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;
@@ -91,7 +91,7 @@ function delivery_run(&$argv, &$argc){
                        $uid = $item_id;
                } else {
                        // find ancestors
-                       $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
+                       $r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",
                                intval($item_id)
                        );
 
@@ -105,7 +105,7 @@ function delivery_run(&$argv, &$argc){
                        $updated = $r[0]['edited'];
 
                        $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
-                               FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
+                               FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC",
                                intval($parent_id)
                        );
 
@@ -243,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
@@ -260,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) {
@@ -289,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);
@@ -299,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']) {
@@ -334,22 +334,22 @@ 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
 
-                                               if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level) {
+                                               if (($x[0]['page-flags'] == PAGE_SOAPBOX) && $top_level) {
                                                        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);
                                }
@@ -374,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;
                                }
 
@@ -385,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.
@@ -453,7 +453,7 @@ function delivery_run(&$argv, &$argc){
                                                $headers .= "References: <".iri2msgid($it["parent-uri"]).">";
 
                                                // If Threading is enabled, write down the correct parent
-                                               if (($it["thr-parent"] != "") and ($it["thr-parent"] != $it["parent-uri"]))
+                                               if (($it["thr-parent"] != "") && ($it["thr-parent"] != $it["parent-uri"]))
                                                        $headers .= " <".iri2msgid($it["thr-parent"]).">";
                                                $headers .= "\n";
 
@@ -462,14 +462,14 @@ function delivery_run(&$argv, &$argc){
                                                                dbesc($it['parent-uri']),
                                                                intval($uid));
 
-                                                       if (dbm::is_result($r) AND ($r[0]['title'] != '')) {
+                                                       if (dbm::is_result($r) && ($r[0]['title'] != '')) {
                                                                $subject = $r[0]['title'];
                                                        } else {
                                                                $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
                                                                        dbesc($it['parent-uri']),
                                                                        intval($uid));
 
-                                                               if (dbm::is_result($r) AND ($r[0]['title'] != ''))
+                                                               if (dbm::is_result($r) && ($r[0]['title'] != ''))
                                                                        $subject = $r[0]['title'];
                                                        }
                                                }
@@ -488,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) {
@@ -507,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);