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;
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
$msgitems[] = $item;
}
}
- $atom = dfrn::entries($msgitems,$owner);
+ $atom = Dfrn::entries($msgitems,$owner);
} else {
$msgitems = array();
foreach ($items as $item) {
$msgitems[] = $item;
}
}
- $atom = dfrn::entries($msgitems,$owner);
+ $atom = Dfrn::entries($msgitems,$owner);
}
logger('notifier entry: '.$contact["url"].' '.$target_item["guid"].' entry: '.$atom, LOGGER_DEBUG);
$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
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);
}
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;
}
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.
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) {
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);