X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fonepoll.php;h=e7cae773cad5a81fff7a36ab8cb586885a40ba08;hb=4487515d0c8dc295e5f8b7a137accfa741b5cf52;hp=9fbef168c6fa4d594f1fc875ce430794c616b959;hpb=234598280d96627861a1ff1dcfc8a4a59bd37054;p=friendica.git

diff --git a/include/onepoll.php b/include/onepoll.php
index 9fbef168c6..e7cae773ca 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -2,7 +2,14 @@
 
 require_once("boot.php");
 
-function onepoll_run($argv, $argc){
+function RemoveReply($subject) {
+	while (in_array(strtolower(substr($subject, 0, 3)), array("re:", "aw:")))
+		$subject = trim(substr($subject, 4));
+
+	return($subject);
+}
+
+function onepoll_run(&$argv, &$argc){
 	global $a, $db;
 
 	if(is_null($a)) {
@@ -11,7 +18,7 @@ function onepoll_run($argv, $argc){
   
 	if(is_null($db)) {
 	    @include(".htconfig.php");
-    	require_once("dba.php");
+    	require_once("include/dba.php");
 	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
     	unset($db_host, $db_user, $db_pass, $db_data);
   	};
@@ -35,7 +42,7 @@ function onepoll_run($argv, $argc){
 	load_hooks();
 
 	logger('onepoll: start');
-	
+
 	$manual_id  = 0;
 	$generation = 0;
 	$hub_update = false;
@@ -49,7 +56,17 @@ function onepoll_run($argv, $argc){
 		logger('onepoll: no contact');
 		return;
 	}
-	
+
+	// Test
+	$lockpath = get_config('system','lockpath');
+	if ($lockpath != '') {
+		$pidfile = new pidfile($lockpath, 'onepoll'.$contact_id.'.lck');
+		if($pidfile->is_already_running()) {
+			logger("onepoll: Already running for contact ".$contact_id);
+			exit;
+		}
+	}
+
 
 	$d = datetime_convert();
 
@@ -59,7 +76,7 @@ function onepoll_run($argv, $argc){
 
 	$contacts = q("SELECT `contact`.* FROM `contact` 
 		WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
-		AND NOT `network` IN ( '%s', '%s' )
+		AND NOT `network` IN ( '%s', '%s', '%s' )
 		AND `contact`.`id` = %d
 		AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 
 		AND `contact`.`archive` = 0 LIMIT 1",
@@ -67,6 +84,7 @@ function onepoll_run($argv, $argc){
 		intval(CONTACT_IS_FRIEND),
 		dbesc(NETWORK_DIASPORA),
 		dbesc(NETWORK_FACEBOOK),
+		dbesc(NETWORK_PUMPIO),
 		intval($contact_id)
 	);
 
@@ -111,6 +129,7 @@ function onepoll_run($argv, $argc){
 
 	if($contact['network'] === NETWORK_DFRN) {
 
+		
 		$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 		if(intval($contact['duplex']) && $contact['dfrn-id'])
 			$idtosend = '0:' . $orig_id;
@@ -120,6 +139,12 @@ function onepoll_run($argv, $argc){
 		// they have permission to write to us. We already filtered this in the contact query.
 		$perm = 'rw';
 
+		// But this may be our first communication, so set the writable flag if it isn't set already.
+
+		if(! intval($contact['writable']))
+			q("update contact set writable = 1 where id = %d limit 1", intval($contact['id']));
+
+
 		$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
 			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
 			. '&type=data&last_update=' . $last_update 
@@ -238,6 +263,9 @@ function onepoll_run($argv, $argc){
 
 		$stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0);
 
+		if($contact['network'] === NETWORK_OSTATUS && get_pconfig($importer_uid,'system','ostatus_autofriend'))
+			$stat_writeable = 1;
+
 		if($stat_writeable != $contact['writable']) {
 			q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
 				intval($stat_writeable),
@@ -294,34 +322,184 @@ function onepoll_run($argv, $argc){
 				$metas = email_msg_meta($mbox,implode(',',$msgs));
 				if(count($metas) != count($msgs)) {
 					logger("onepoll: for " . $mailconf[0]['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG);
-					break;
 				}
-				$msgs = array_combine($msgs, $metas);
+				else {
+					$msgs = array_combine($msgs, $metas);
+
+					foreach($msgs as $msg_uid => $meta) {
+						logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
+
+						$datarray = array();
+	//					$meta = email_msg_meta($mbox,$msg_uid);
+	//					$headers = email_msg_headers($mbox,$msg_uid);
+
+						$datarray['uri'] = msgid2iri(trim($meta->message_id,'<>'));
+
+						// Have we seen it before?
+						$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
+							intval($importer_uid),
+							dbesc($datarray['uri'])
+						);
 
-				foreach($msgs as $msg_uid => $meta) {
-					logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
+						if(count($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
+							if (($mailconf[0]['action'] != 1) AND ($mailconf[0]['action'] != 3))
+								if($meta->deleted && ! $r[0]['deleted']) {
+									q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
+										dbesc(datetime_convert()),
+										intval($r[0]['id'])
+									);
+								}
+
+							switch ($mailconf[0]['action']) {
+								case 0:
+									logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG);
+									break;
+								case 1:
+									logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']);
+									imap_delete($mbox, $msg_uid, FT_UID);
+									break;
+								case 2:
+									logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf[0]['user']);
+									imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
+									break;
+								case 3:
+									logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']." for ".$mailconf[0]['user']);
+									imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
+									if ($mailconf[0]['movetofolder'] != "")
+										imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
+									break;
+							}
+							continue;
+						}
 
-					$datarray = array();
-//					$meta = email_msg_meta($mbox,$msg_uid);
-//					$headers = email_msg_headers($mbox,$msg_uid);
 
-					$datarray['uri'] = msgid2iri(trim($meta->message_id,'<>'));
+						// look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally.
 
-					// Have we seen it before?
-					$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
-						intval($importer_uid),
-						dbesc($datarray['uri'])
-					);
+	//					$raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
+						$raw_refs = ((property_exists($meta,'references')) ? str_replace("\t",'',$meta->references) : '');
+						if(! trim($raw_refs))
+							$raw_refs = ((property_exists($meta,'in_reply_to')) ? str_replace("\t",'',$meta->in_reply_to) : '');
+						$raw_refs = trim($raw_refs);  // Don't allow a blank reference in $refs_arr
 
-					if(count($r)) {
-						logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'],LOGGER_DEBUG);
-						if($meta->deleted && ! $r[0]['deleted']) {
-							q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
-								dbesc(datetime_convert()),
-								intval($r[0]['id'])
+						if($raw_refs) {
+							$refs_arr = explode(' ', $raw_refs);
+							if(count($refs_arr)) {
+								for($x = 0; $x < count($refs_arr); $x ++)
+									$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",
+								intval($importer_uid)
 							);
+							if(count($r))
+								$datarray['parent-uri'] = $r[0]['parent-uri'];  // Set the parent as the top-level item
+	//							$datarray['parent-uri'] = $r[0]['uri'];
+						}
+
+						// Decoding the header
+						$subject = imap_mime_header_decode($meta->subject);
+						$datarray['title'] = "";
+						foreach($subject as $subpart)
+							if ($subpart->charset != "default")
+								$datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
+							else
+								$datarray['title'] .= $subpart->text;
+
+						$datarray['title'] = notags(trim($datarray['title']));
+
+						//$datarray['title'] = notags(trim($meta->subject));
+						$datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
+
+						// Is it a reply?
+						$reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or
+							(substr(strtolower($datarray['title']), 0, 3) == "re-") or
+							($raw_refs != ""));
+
+						// Remove Reply-signs in the subject
+						$datarray['title'] = RemoveReply($datarray['title']);
+
+						// 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 MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
+							$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
+								dbesc(protect_sprintf($datarray['title'])),
+								intval($importer_uid));
+							if(count($r))
+								$datarray['parent-uri'] = $r[0]['parent-uri'];
+						}
+
+						if(! x($datarray,'parent-uri'))
+							$datarray['parent-uri'] = $datarray['uri'];
+
+
+						$r = email_get_msg($mbox,$msg_uid, $reply);
+						if(! $r) {
+							logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']);
+							continue;
+						}
+						$datarray['body'] = escape_tags($r['body']);
+						$datarray['body'] = limit_body_size($datarray['body']);
+
+						logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']);
+
+						// some mailing lists have the original author as 'from' - add this sender info to msg body.
+						// todo: adding a gravatar for the original author would be cool
+
+						if(! stristr($meta->from,$contact['addr'])) {
+							$from = imap_mime_header_decode($meta->from);
+							$fromdecoded = "";
+							foreach($from as $frompart)
+								if ($frompart->charset != "default")
+									$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
+								else
+									$fromdecoded .= $frompart->text;
+
+							$fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->get_hostname());
+
+							$frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
+
+							if (isset($fromarr[0]->personal))
+								$fromname = $fromarr[0]->personal;
+							else
+								$fromname = $frommail;
+
+							//$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body'];
+
+							$datarray['author-name'] = $fromname;
+							$datarray['author-link'] = "mailto:".$frommail;
+							$datarray['author-avatar'] = $contact['photo'];
+
+							$datarray['owner-name'] = $contact['name'];
+							$datarray['owner-link'] = "mailto:".$contact['addr'];
+							$datarray['owner-avatar'] = $contact['photo'];
+
+						} else {
+							$datarray['author-name'] = $contact['name'];
+							$datarray['author-link'] = 'mailbox';
+							$datarray['author-avatar'] = $contact['photo'];
 						}
-						/*switch ($mailconf[0]['action']) {
+
+						$datarray['uid'] = $importer_uid;
+						$datarray['contact-id'] = $contact['id'];
+						if($datarray['parent-uri'] === $datarray['uri'])
+							$datarray['private'] = 1;
+						if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) {
+							$datarray['private'] = 1;
+							$datarray['allow_cid'] = '<' . $contact['id'] . '>';
+						}
+
+						$stored_item = item_store($datarray);
+						q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d",
+							dbesc($datarray['parent-uri']),
+							intval($importer_uid)
+						);
+						q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
+							intval($stored_item)
+						);
+						switch ($mailconf[0]['action']) {
 							case 0:
 								logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG);
 								break;
@@ -339,119 +517,7 @@ function onepoll_run($argv, $argc){
 								if ($mailconf[0]['movetofolder'] != "")
 									imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
 								break;
-						}*/
-						continue;
-					}
-
-
-					// look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally.
-
-//					$raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
-					$raw_refs = ((property_exists($meta,'references')) ? str_replace("\t",'',$meta->references) : '');
-					if(! trim($raw_refs))
-						$raw_refs = ((property_exists($meta,'in_reply_to')) ? str_replace("\t",'',$meta->in_reply_to) : '');
-					$raw_refs = trim($raw_refs);  // Don't allow a blank reference in $refs_arr
-
-					if($raw_refs) {
-						$refs_arr = explode(' ', $raw_refs);
-						if(count($refs_arr)) {
-							for($x = 0; $x < count($refs_arr); $x ++)
-								$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",
-							intval($importer_uid)
-						);
-						if(count($r))
-							$datarray['parent-uri'] = $r[0]['parent-uri'];  // Set the parent as the top-level item
-//							$datarray['parent-uri'] = $r[0]['uri'];
-					}
-
-
-					if(! x($datarray,'parent-uri'))
-						$datarray['parent-uri'] = $datarray['uri'];
-
-					// Decoding the header
-					$subject = imap_mime_header_decode($meta->subject);
-					$datarray['title'] = "";
-					foreach($subject as $subpart)
-						if ($subpart->charset != "default")
-							$datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
-						else
-							$datarray['title'] .= $subpart->text;
-
-					$datarray['title'] = notags(trim($datarray['title']));
-
-					//$datarray['title'] = notags(trim($meta->subject));
-					$datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
-
-					// Is it  reply?
-					$reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or
-						(substr(strtolower($datarray['title']), 0, 3) == "re-") or
-						(raw_refs != ""));
-
-					$r = email_get_msg($mbox,$msg_uid, $reply);
-					if(! $r) {
-						logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']);
-						continue;
-					}
-					$datarray['body'] = escape_tags($r['body']);
-
-					logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']);
-
-					// some mailing lists have the original author as 'from' - add this sender info to msg body.
-					// todo: adding a gravatar for the original author would be cool
-
-					if(! stristr($meta->from,$contact['addr'])) {
-						$from = imap_mime_header_decode($meta->from);
-						$fromdecoded = "";
-						foreach($from as $frompart)
-							if ($frompart->charset != "default")
-								$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
-							else
-								$fromdecoded .= $frompart->text;
-
-						$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body'];
-					}
-
-					$datarray['uid'] = $importer_uid;
-					$datarray['contact-id'] = $contact['id'];
-					if($datarray['parent-uri'] === $datarray['uri'])
-						$datarray['private'] = 1;
-					if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) {
-						$datarray['private'] = 1;
-						$datarray['allow_cid'] = '<' . $contact['id'] . '>';
-					}
-					$datarray['author-name'] = $contact['name'];
-					$datarray['author-link'] = 'mailbox';
-					$datarray['author-avatar'] = $contact['photo'];
-
-					$stored_item = item_store($datarray);
-					q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d",
-						dbesc($datarray['parent-uri']),
-						intval($importer_uid)
-					);
-					q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
-						intval($stored_item)
-					);
-					switch ($mailconf[0]['action']) {
-						case 0:
-							logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG);
-							break;
-						case 1:
-							logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']);
-							imap_delete($mbox, $msg_uid, FT_UID);
-							break;
-						case 2:
-							logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf[0]['user']);
-							imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-							break;
-						case 3:
-							logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']." for ".$mailconf[0]['user']);
-							imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-							if ($mailconf[0]['movetofolder'] != "")
-								imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
-							break;
 					}
 				}
 			}
@@ -461,6 +527,9 @@ function onepoll_run($argv, $argc){
 	elseif($contact['network'] === NETWORK_FACEBOOK) {
 		// This is picked up by the Facebook plugin on a cron hook.
 		// Ignored here.
+	} elseif($contact['network'] === NETWORK_PUMPIO) {
+		// This is picked up by the pump.io plugin on a cron hook.
+		// Ignored here.
 	}
 
 	if($xml) {
@@ -479,17 +548,17 @@ function onepoll_run($argv, $argc){
 
 
 		// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
-	
+
 		consume_feed($xml,$importer,$contact,$hub,1,2);
 
 		$hubmode = 'subscribe';
 		if($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly'])
 			$hubmode = 'unsubscribe';
 
-		if($contact['network'] === NETWORK_OSTATUS && (! $contact['hub-verify']))
+		if(($contact['network'] === NETWORK_OSTATUS ||  $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify']))
 			$hub_update = true;
 
-		if((strlen($hub)) && ($hub_update) && ($contact['rel'] != CONTACT_IS_FOLLOWER)) {
+		if((strlen($hub)) && ($hub_update) && (($contact['rel'] != CONTACT_IS_FOLLOWER) || $contact['network'] == NETWORK_FEED) ) {
 			logger('poller: hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
 			$hubs = explode(',', $hub);
 			if(count($hubs)) {