X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue_fn.php;h=c4ab229aee3cd10444b1de60431c807721381224;hb=27646cc4ad8d715317a2ca055b6c3318ddf555a9;hp=2aca338f50d4e250707dbedf6e046d159c711281;hpb=f2e648d62fe7cafb9a55c7505687ea4d1c294778;p=friendica.git

diff --git a/include/queue_fn.php b/include/queue_fn.php
index 2aca338f50..c4ab229aee 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -1,8 +1,11 @@
 <?php
 
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+
 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,43 +13,61 @@ 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",
-		intval($id)
-	);
+	dba::delete('queue', array('id' => $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;
 
-	$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d 
-		and last > UTC_TIMESTAMP() - interval 15 minute limit 1",
+	// 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)
 	);
-	if(count($r))
-		return true;
-	return false;
+
+	$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) {
 
-	$max_queue = get_config('system','max_contact_queue');
-	if($max_queue < 1)
+	$max_queue = Config::get('system','max_contact_queue');
+	if ($max_queue < 1) {
 		$max_queue = 500;
+	}
 
-	$batch_queue = get_config('system','max_batch_queue');
-	if($batch_queue < 1)
+	$batch_queue = Config::get('system','max_batch_queue');
+	if ($batch_queue < 1) {
 		$batch_queue = 1000;
+	}
 
-	$r = q("SELECT COUNT(*) AS `total` FROM `queue` left join `contact` ON `queue`.`cid` = `contact`.`id` 
+	$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($batch &&  ($r[0]['total'] > $batch_queue)) {
+	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;
-		}
-		elseif((! $batch) && ($r[0]['total'] > $max_queue)) {
+		} elseif ((! $batch) && ($r[0]['total'] > $max_queue)) {
 			logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message');
 			return;
 		}