X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fpubsubhubbub.php;h=051ae2e84264d74e6678869f02f0620aaef26902;hb=11e6b6358b6ff7c0de19b23d41b19a7cf481c757;hp=477d1e2968f2053d00aba2021a412068e39357ef;hpb=a0530d1066d7268f1b1ea67bc3c254e9f9fc5ec8;p=friendica.git

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index 477d1e2968..051ae2e842 100644
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -1,6 +1,11 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 
 function post_var($name) {
 	return (x($_POST, $name)) ? notags(trim($_POST[$name])) : '';
@@ -9,8 +14,8 @@ function post_var($name) {
 function pubsubhubbub_init(App $a) {
 	// PuSH subscription must be considered "public" so just block it
 	// if public access isn't enabled.
-	if (get_config('system', 'block_public')) {
-		http_status_exit(403);
+	if (Config::get('system', 'block_public')) {
+		System::httpExit(403);
 	}
 
 	// Subscription request from subscriber
@@ -38,7 +43,7 @@ function pubsubhubbub_init(App $a) {
 			$subscribe = 0;
 		} else {
 			logger("pubsubhubbub: invalid hub_mode=$hub_mode, ignoring.");
-			http_status_exit(404);
+			System::httpExit(404);
 		}
 
 		logger("pubsubhubbub: $hub_mode request from " .
@@ -54,7 +59,7 @@ function pubsubhubbub_init(App $a) {
 
 		if (!$nick) {
 			logger('pubsubhubbub: bad hub_topic=$hub_topic, ignoring.');
-			http_status_exit(404);
+			System::httpExit(404);
 		}
 
 		// fetch user from database given the nickname
@@ -62,9 +67,9 @@ function pubsubhubbub_init(App $a) {
 			   " AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 			   dbesc($nick));
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			logger('pubsubhubbub: local account not found: ' . $nick);
-			http_status_exit(404);
+			System::httpExit(404);
 		}
 
 		$owner = $r[0];
@@ -73,16 +78,16 @@ function pubsubhubbub_init(App $a) {
 		if ($r[0]['hidewall']) {
 			logger('pubsubhubbub: local user ' . $nick .
 				   'has chosen to hide wall, ignoring.');
-			http_status_exit(403);
+			System::httpExit(403);
 		}
 
 		// get corresponding row from contact table
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked`".
 			   " AND NOT `pending` AND `self` LIMIT 1",
 			   intval($owner['uid']));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			logger('pubsubhubbub: contact not found.');
-			http_status_exit(404);
+			System::httpExit(404);
 		}
 
 		$contact = $r[0];
@@ -91,7 +96,7 @@ function pubsubhubbub_init(App $a) {
 		if (!link_compare($hub_topic, $contact['poll'])) {
 			logger('pubsubhubbub: hub topic ' . $hub_topic . ' != ' .
 				   $contact['poll']);
-			http_status_exit(404);
+			System::httpExit(404);
 		}
 
 		// do subscriber verification according to the PuSH protocol
@@ -107,14 +112,14 @@ function pubsubhubbub_init(App $a) {
 		// we don't actually enforce the lease time because GNU
 		// Social/StatusNet doesn't honour it (yet)
 
-		$body = fetch_url($hub_callback . "?" . $params);
+		$body = Network::fetchUrl($hub_callback . "?" . $params);
 		$ret = $a->get_curl_code();
 
 		// give up if the HTTP return code wasn't a success (2xx)
 		if ($ret < 200 || $ret > 299) {
 			logger("pubsubhubbub: subscriber verification at $hub_callback ".
 				   "returned $ret, ignoring.");
-			http_status_exit(404);
+			System::httpExit(404);
 		}
 
 		// check that the correct hub_challenge code was echoed back
@@ -122,7 +127,7 @@ function pubsubhubbub_init(App $a) {
 			logger("pubsubhubbub: subscriber did not echo back ".
 				   "hub.challenge, ignoring.");
 			logger("\"$hub_challenge\" != \"".trim($body)."\"");
-			http_status_exit(404);
+			System::httpExit(404);
 		}
 
 		// fetch the old subscription if it exists
@@ -134,12 +139,12 @@ function pubsubhubbub_init(App $a) {
 		  dbesc($hub_callback));
 
 		if ($subscribe) {
-			$last_update = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
+			$last_update = DateTimeFormat::utcNow();
 			$push_flag = 0;
 
 			// if we are just updating an old subscription, keep the
 			// old values for push and last_update
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$last_update = $r[0]['last_update'];
 				$push_flag = $r[0]['push'];
 			}
@@ -160,7 +165,7 @@ function pubsubhubbub_init(App $a) {
 			logger("pubsubhubbub: successfully unsubscribed [$hub_callback].");
 			// we do nothing here, since the row was already deleted
 		}
-		http_status_exit(202);
+		System::httpExit(202);
 	}
 
 	killme();