X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fonepoll.php;h=d92cb915b6eb0ce96801086699f40c01fa542866;hb=d82ed5d1b4a3af4d0a4782b809837e3b22d1211d;hp=eb1045de142957dcab4e08d8b66ff8aa3ecb4750;hpb=01b02dbcaa8532f965389375e961d9c47d74eeec;p=friendica.git

diff --git a/include/onepoll.php b/include/onepoll.php
index eb1045de14..d92cb915b6 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -24,7 +24,6 @@ function onepoll_run(&$argv, &$argc){
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
-
 	require_once('include/session.php');
 	require_once('include/datetime.php');
 	require_once('include/items.php');
@@ -94,7 +93,7 @@ function onepoll_run(&$argv, &$argc){
 			where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
 			intval($contact['id'])
 		);
-		if (count($r))
+		if (dbm::is_result($r))
 			if (!$r[0]['total'])
 				poco_load($contact['id'],$importer_uid,0,$contact['poco']);
 	}
@@ -144,8 +143,9 @@ function onepoll_run(&$argv, &$argc){
 	$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
 		intval($importer_uid)
 	);
-	if(! count($r))
+	if (! dbm::is_result($r)) {
 		return;
+	}
 
 	$importer = $r[0];
 
@@ -394,7 +394,7 @@ function onepoll_run(&$argv, &$argc){
 							dbesc($datarray['uri'])
 						);
 
-						if(count($r)) {
+						if (dbm::is_result($r)) {
 							logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG);
 
 							// Only delete when mails aren't automatically moved or deleted
@@ -444,10 +444,10 @@ function onepoll_run(&$argv, &$argc){
 									$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'";
 							}
 							$qstr = implode(',',$refs_arr);
-							$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1",
+							$r = q("SELECT `uri` , `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1",
 								intval($importer_uid)
 							);
-							if(count($r))
+							if (dbm::is_result($r))
 								$datarray['parent-uri'] = $r[0]['parent-uri'];  // Set the parent as the top-level item
 	//							$datarray['parent-uri'] = $r[0]['uri'];
 						}
@@ -476,10 +476,11 @@ function onepoll_run(&$argv, &$argc){
 
 						// If it seems to be a reply but a header couldn't be found take the last message with matching subject
 						if(!x($datarray,'parent-uri') and $reply) {
-							$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
+							$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d AND `network` = '%s' ORDER BY `created` DESC LIMIT 1",
 								dbesc(protect_sprintf($datarray['title'])),
-								intval($importer_uid));
-							if(count($r))
+								intval($importer_uid),
+								dbesc(NETWORK_MAIL));
+							if (dbm::is_result($r))
 								$datarray['parent-uri'] = $r[0]['parent-uri'];
 						}