X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FPubSubPublish.php;h=eab68b43041e26d4d30eef6270b6d8d96d011ffe;hb=bf8fb215a9cc554b5ec5b774168a52fb56fa43e6;hp=bc9233d55ec61516489024461b83345e35c68da1;hpb=14fde5dc9b1915392601fb94efc6224c01f2b216;p=friendica.git

diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index bc9233d55e..eab68b4304 100644
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -1,19 +1,31 @@
 <?php
 /**
- * @file src/Worker/PubSubPublish.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Worker;
 
-use Friendica\BaseObject;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\PushSubscriber;
 use Friendica\Protocol\OStatus;
-use Friendica\Util\Network;
-
-require_once 'include/items.php';
 
 class PubSubPublish
 {
@@ -28,17 +40,15 @@ class PubSubPublish
 
 	private static function publish($id)
 	{
-		$a = BaseObject::getApp();
-
 		$subscriber = DBA::selectFirst('push_subscriber', [], ['id' => $id]);
 		if (!DBA::isResult($subscriber)) {
 			return;
 		}
 
-		/// @todo Check server status with PortableContact::checkServer()
+		/// @todo Check server status with GServer::check()
 		// Before this can be done we need a way to safely detect the server url.
 
-		Logger::log("Generate feed of user " . $subscriber['nickname']. " to " . $subscriber['callback_url']. " - last updated " . $subscriber['last_update'], LOGGER_DEBUG);
+		Logger::log("Generate feed of user " . $subscriber['nickname']. " to " . $subscriber['callback_url']. " - last updated " . $subscriber['last_update'], Logger::DEBUG);
 
 		$last_update = $subscriber['last_update'];
 		$params = OStatus::feed($subscriber['nickname'], $last_update);
@@ -51,17 +61,15 @@ class PubSubPublish
 
 		$headers = ["Content-type: application/atom+xml",
 				sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
-					System::baseUrl() . '/pubsubhubbub/' . $subscriber['nickname'],
+					DI::baseUrl() . '/pubsubhubbub/' . $subscriber['nickname'],
 					$subscriber['topic']),
 				"X-Hub-Signature: sha1=" . $hmac_sig];
 
-		Logger::log('POST ' . print_r($headers, true) . "\n" . $params, LOGGER_DATA);
+		Logger::log('POST ' . print_r($headers, true) . "\n" . $params, Logger::DATA);
 
-		$postResult = Network::post($subscriber['callback_url'], $params, $headers);
+		$postResult = DI::httpRequest()->post($subscriber['callback_url'], $params, $headers);
 		$ret = $postResult->getReturnCode();
 
-		$condition = ['id' => $subscriber['id']];
-
 		if ($ret >= 200 && $ret <= 299) {
 			Logger::log('Successfully pushed to ' . $subscriber['callback_url']);