X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue_fn.php;h=9dcefdd244b59288c9177a401735d186480a680b;hb=e884090efa4d0934a02e6844c97bbf54cdcc9c13;hp=2168d42d78c6657af60e2e08a38ff5c38687589b;hpb=6e76c86ad20c5c9ae3f8f2e2c226c8e22b9a8032;p=friendica.git

diff --git a/include/queue_fn.php b/include/queue_fn.php
index 2168d42d78..9dcefdd244 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -2,7 +2,7 @@
 
 function update_queue_time($id) {
 	logger('queue: requeue item ' . $id);
-	q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1",
+	q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d",
 		dbesc(datetime_convert()),
 		intval($id)
 	);
@@ -10,11 +10,41 @@ function update_queue_time($id) {
 
 function remove_queue_item($id) {
 	logger('queue: remove queue item ' . $id);
-	q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1",
+	q("DELETE FROM `queue` WHERE `id` = %d",
 		intval($id)
 	);
 }
 
+/**
+ * @brief Checks if the communication with a given contact had problems recently
+ *
+ * @param int $cid Contact id
+ *
+ * @return bool The communication with this contact has currently problems
+ */
+function was_recently_delayed($cid) {
+	$was_delayed = false;
+
+	// Are there queue entries that were recently added?
+	$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
+		AND `last` > UTC_TIMESTAMP() - INTERVAL 15 MINUTE LIMIT 1",
+		intval($cid)
+	);
+
+	$was_delayed = dbm::is_result($r);
+
+	// We set "term-date" to a current date if the communication has problems.
+	// If the communication works again we reset this value.
+	if ($was_delayed) {
+		$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
+			intval($cid)
+		);
+		$was_delayed = !dbm::is_result($r);
+	}
+
+	return $was_delayed;
+}
+
 
 function add_to_queue($cid,$network,$msg,$batch = false) {
 
@@ -26,10 +56,11 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
 	if($batch_queue < 1)
 		$batch_queue = 1000;
 
-	$r = q("SELECT COUNT(*) AS `total` FROM `queue` left join `contact` WHERE ``queue`.`cid` = %d AND `contact`.`self` = 0 ",
+	$r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
+		WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
 		intval($cid)
 	);
-	if($r && count($r)) {
+	if (dbm::is_result($r)) {
 		if($batch &&  ($r[0]['total'] > $batch_queue)) {
 			logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
 			return;
@@ -43,9 +74,11 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
 	q("INSERT INTO `queue` ( `cid`, `network`, `created`, `last`, `content`, `batch`)
 		VALUES ( %d, '%s', '%s', '%s', '%s', %d) ",
 		intval($cid),
+		dbesc($network),
 		dbesc(datetime_convert()),
 		dbesc(datetime_convert()),
 		dbesc($msg),
 		intval(($batch) ? 1: 0)
 	);
+
 }