X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpubsubpublish.php;h=23348d6d702497e124f2da8deb35639235d87606;hb=b31b29c557d544446af06d9d0b896ae54115289f;hp=6bd90bfc21e083704f561c00ae03a6a9d533a36d;hpb=af2909bf8fa971c222bb7b0fca2ccb373c570988;p=friendica.git

diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index 6bd90bfc21..23348d6d70 100644
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -1,27 +1,61 @@
 <?php
-require_once("boot.php");
-require_once("include/ostatus.php");
 
-use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Core\Config;
+
+require_once('include/items.php');
+require_once('include/ostatus.php');
+
+function pubsubpublish_run(&$argv, &$argc){
+	global $a;
+
+	if ($argc > 1) {
+		$pubsubpublish_id = intval($argv[1]);
+	} else {
+		// We'll push to each subscriber that has push > 0,
+		// i.e. there has been an update (set in notifier.php).
+		$r = q("SELECT `id`, `callback_url` FROM `push_subscriber` WHERE `push` > 0 ORDER BY `last_update` DESC");
+
+		foreach ($r as $rr) {
+			logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG);
+			proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
+					'include/pubsubpublish.php', (int)$rr["id"]);
+		}
+	}
+
+	handle_pubsubhubbub($pubsubpublish_id);
+
+	return;
+}
 
 function handle_pubsubhubbub($id) {
-	global $a, $db;
+	global $a;
 
 	$r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id));
-	if (!$r)
+	if (!dbm::is_result($r)) {
 		return;
-	else
-		$rr = $r[0];
+	}
+
+	$rr = $r[0];
+
+	/// @todo Check server status with poco_check_server()
+	// Before this can be done we need a way to safely detect the server url.
 
 	logger("Generate feed of user ".$rr['nickname']." to ".$rr['callback_url']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
 
-	$params = ostatus::feed($a, $rr['nickname'], $rr['last_update']);
+	$last_update = $rr['last_update'];
+	$params = ostatus::feed($a, $rr['nickname'], $last_update);
+
+	if (!$params) {
+		return;
+	}
+
 	$hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
 
 	$headers = array("Content-type: application/atom+xml",
 			sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
-				App::get_baseurl().'/pubsubhubbub',
+				System::baseUrl().'/pubsubhubbub/'.$rr['nickname'],
 				$rr['topic']),
 			"X-Hub-Signature: sha1=".$hmac_sig);
 
@@ -33,10 +67,9 @@ function handle_pubsubhubbub($id) {
 	if ($ret >= 200 && $ret <= 299) {
 		logger('successfully pushed to '.$rr['callback_url']);
 
-		// set last_update to "now", and reset push=0
-		$date_now = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
+		// set last_update to the "created" date of the last item, and reset push=0
 		q("UPDATE `push_subscriber` SET `push` = 0, last_update = '%s' WHERE id = %d",
-			dbesc($date_now),
+			dbesc($last_update),
 			intval($rr['id']));
 
 	} else {
@@ -54,71 +87,3 @@ function handle_pubsubhubbub($id) {
 			intval($rr['id']));
 	}
 }
-
-
-function pubsubpublish_run(&$argv, &$argc){
-	global $a, $db;
-
-	if(is_null($a)){
-		$a = new App;
-	}
-
-	if(is_null($db)){
-		@include(".htconfig.php");
-		require_once("include/dba.php");
-		$db = new dba($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-	};
-
-	require_once('include/items.php');
-
-	load_config('config');
-	load_config('system');
-
-	// Don't check this stuff if the function is called by the poller
-	if (App::callstack() != "poller_run") {
-		if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540)) {
-			return;
-		}
-	}
-
-	$a->set_baseurl(get_config('system','url'));
-
-	load_hooks();
-
-	if ($argc > 1) {
-		$pubsubpublish_id = intval($argv[1]);
-	}
-	else {
-		// We'll push to each subscriber that has push > 0,
-		// i.e. there has been an update (set in notifier.php).
-		$r = q("SELECT `id`, `callback_url` FROM `push_subscriber` WHERE `push` > 0");
-
-		// Use the delivery interval that is also used for the notifier
-		$interval = Config::get("system", "delivery_interval", 2);
-
-		// If we are using the worker we don't need a delivery interval
-		if (get_config("system", "worker")) {
-			$interval = false;
-		}
-
-		foreach ($r as $rr) {
-			logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG);
-			proc_run(PRIORITY_HIGH, 'include/pubsubpublish.php', $rr["id"]);
-
-			if($interval)
-				@time_sleep_until(microtime(true) + (float) $interval);
-		}
-	}
-
-	handle_pubsubhubbub($pubsubpublish_id);
-
-	return;
-
-}
-
-if (array_search(__file__,get_included_files())===0){
-  pubsubpublish_run($_SERVER["argv"],$_SERVER["argc"]);
-  killme();
-}
-