X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdelivery.php;h=05fba7985cd9bc41a90c21185569b7faa034da3c;hb=791fc1d8b3c3cc6bb4e62ef4b6f81bb99c1d45ed;hp=c48e606f488264672e3759a9c54c419b434b4ada;hpb=f73389dd125157a87e638d99be20847f5255c4b6;p=friendica.git

diff --git a/include/delivery.php b/include/delivery.php
index c48e606f48..05fba7985c 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -1,21 +1,22 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\App;
+use Friendica\Core\Config;
 
-require_once('include/queue_fn.php');
-require_once('include/html2plain.php');
-require_once('include/Scrape.php');
-require_once('include/diaspora.php');
-require_once('include/ostatus.php');
-require_once('include/dfrn.php');
+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;
 
-	require_once('include/datetime.php');
-	require_once('include/items.php');
-	require_once('include/bbcode.php');
-	require_once('include/email.php');
+	require_once 'include/datetime.php';
+	require_once 'include/items.php';
+	require_once 'include/bbcode.php';
+	require_once 'include/email.php';
 
 	if ($argc < 3) {
 		return;
@@ -30,30 +31,6 @@ function delivery_run(&$argv, &$argc){
 
 		$contact_id = intval($argv[$x]);
 
-		/// @todo When switching completely to the worker we won't need this anymore
-		// Some other process may have delivered this item already.
-
-		$r = q("SELECT * FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d LIMIT 1",
-			dbesc($cmd),
-			dbesc($item_id),
-			dbesc($contact_id)
-		);
-		if (!dbm::is_result($r)) {
-			continue;
-		}
-
-		if ($a->maxload_reached()) {
-			return;
-		}
-
-		// It's ours to deliver. Remove it from the queue.
-
-		q("DELETE FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d",
-			dbesc($cmd),
-			dbesc($item_id),
-			dbesc($contact_id)
-		);
-
 		if (!$item_id || !$contact_id) {
 			continue;
 		}
@@ -114,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)
 			);
 
@@ -128,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)
 			);
 
@@ -189,7 +166,7 @@ function delivery_run(&$argv, &$argc){
 		$public_message = true;
 
 		if (!($mail || $fsuggest || $relocate)) {
-			require_once('include/group.php');
+			require_once 'include/group.php';
 
 			$parent = $items[0];
 
@@ -362,7 +339,7 @@ function delivery_run(&$argv, &$argc){
 
 						// 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');
@@ -476,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";
 
@@ -485,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'];
 							}
 						}