X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdelivery.php;h=c7c2e8a3f3217a2a770e37810115b922f084d188;hb=f6320f3319a8009c7bdf51035b226f0ea688d8bd;hp=06cc1f679ed7bc9651c26abfab3e96a151b26add;hpb=e04d9b864606827f1ab85c6dff94d1e3d8b48908;p=friendica.git

diff --git a/include/delivery.php b/include/delivery.php
old mode 100644
new mode 100755
index 06cc1f679e..c7c2e8a3f3
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -1,5 +1,7 @@
 <?php
 require_once("boot.php");
+require_once('include/queue_fn.php');
+require_once('include/html2plain.php');
 
 function delivery_run($argv, $argc){
 	global $a, $db;
@@ -7,7 +9,7 @@ function delivery_run($argv, $argc){
 	if(is_null($a)){
 		$a = new App;
 	}
-  
+
 	if(is_null($db)) {
 		@include(".htconfig.php");
 		require_once("dba.php");
@@ -20,6 +22,7 @@ function delivery_run($argv, $argc){
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 	require_once('include/diaspora.php');
+	require_once('include/email.php');
 
 	load_config('config');
 	load_config('system');
@@ -72,7 +75,7 @@ function delivery_run($argv, $argc){
 		$normal_mode = false;
 		$expire = true;
 		$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 
-			AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP - INTERVAL 30 MINUTE",
+			AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE",
 			intval($item_id)
 		);
 		$uid = $item_id;
@@ -83,7 +86,7 @@ function delivery_run($argv, $argc){
 	else {
 
 		// find ancestors
-		$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
+		$r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
 			intval($item_id)
 		);
 
@@ -96,10 +99,12 @@ function delivery_run($argv, $argc){
 		$uid = $r[0]['uid'];
 		$updated = $r[0]['edited'];
 
+		if(! $parent_id)
+			return;
 
 
 		$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` 
-			FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d 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)
 		);
 
@@ -121,7 +126,6 @@ function delivery_run($argv, $argc){
 		if( ! ($icontacts && count($icontacts)))
 			return;
 
-
 		// avoid race condition with deleting entries
 
 		if($items[0]['deleted']) {
@@ -239,7 +243,7 @@ function delivery_run($argv, $argc){
 				$birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
 
 			$atom .= replace_macros($feed_template, array(
-					'$version'      => xmlify(FRIENDIKA_VERSION),
+					'$version'      => xmlify(FRIENDICA_VERSION),
 					'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
 					'$feed_title'   => xmlify($owner['name']),
 					'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
@@ -267,28 +271,69 @@ function delivery_run($argv, $argc){
 				if(! $item_contact)
 					continue;
 
-				$atom .= atom_entry($item,'text',$item_contact,$owner,true);
+				if($normal_mode) {
+					if($item_id == $item['id'] || $item['id'] == $item['parent'])
+						$atom .= atom_entry($item,'text',$item_contact,$owner,true);
+				}
+				else
+					$atom .= atom_entry($item,'text',$item_contact,$owner,true);
 
 			}
 
 			$atom .= '</feed>' . "\r\n";
 
 			logger('notifier: ' . $atom, LOGGER_DATA);
+			$basepath =  implode('/', array_slice(explode('/',$contact['url']),0,3));
+
+			// perform local delivery if we are on the same site
+
+			if(link_compare($basepath,$a->get_baseurl())) {
+
+				$nickname = basename($contact['url']);
+				if($contact['issued-id'])
+					$sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
+				else
+					$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id']));
+
+				$x = q("SELECT	`contact`.*, `contact`.`uid` AS `importer_uid`, 
+					`contact`.`pubkey` AS `cpubkey`, 
+					`contact`.`prvkey` AS `cprvkey`, 
+					`contact`.`thumb` AS `thumb`, 
+					`contact`.`url` as `url`,
+					`contact`.`name` as `senderName`,
+					`user`.* 
+					FROM `contact` 
+					LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
+					WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+					AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
+					$sql_extra
+					AND `user`.`account_expired` = 0 LIMIT 1",
+					dbesc(NETWORK_DFRN),
+					dbesc($nickname)
+				);
+
+				if(count($x)) {
+					if($owner['page-flags'] == PAGE_COMMUNITY && ! $x[0]['writable']) {
+						q("update contact set writable = 1 where id = %d limit 1",
+							intval($x[0]['id'])
+						);
+						$x[0]['writable'] = 1;
+					}
+
+					require_once('library/simplepie/simplepie.inc');
+					logger('mod-delivery: local delivery');
+					local_delivery($x[0],$atom);
+					break;
+				}
+			}
 
 			$deliver_status = dfrn_deliver($owner,$contact,$atom);
 
 			logger('notifier: dfrn_delivery returns ' . $deliver_status);
-	
+
 			if($deliver_status == (-1)) {
 				logger('notifier: delivery failed: queuing message');
-				// queue message for redelivery
-				q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-					VALUES ( %d, '%s', '%s', '%s') ",
-					intval($contact['id']),
-					dbesc(datetime_convert()),
-					dbesc(datetime_convert()),
-					dbesc($atom)
-				);
+				add_to_queue($contact['id'],NETWORK_DFRN,$atom);
 			}
 			break;
 
@@ -328,13 +373,7 @@ function delivery_run($argv, $argc){
 						$deliver_status = slapper($owner,$contact['notify'],$slappy);
 						if($deliver_status == (-1)) {
 							// queue message for redelivery
-							q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-								VALUES ( %d, '%s', '%s', '%s') ",
-								intval($contact['id']),
-								dbesc(datetime_convert()),
-								dbesc(datetime_convert()),
-								dbesc($slappy)
-							);								
+							add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
 						}
 					}
 				}
@@ -343,7 +382,8 @@ function delivery_run($argv, $argc){
 			break;
 
 		case NETWORK_MAIL :
-						
+		case NETWORK_MAIL2:
+
 			if(get_config('system','dfrn_only'))
 				break;
 			// WARNING: does not currently convert to RFC2047 header encodings, etc.
@@ -382,13 +422,30 @@ function delivery_run($argv, $argc){
 				if($r1 && $r1[0]['reply_to'])
 					$reply_to = $r1[0]['reply_to'];
 
-				$subject  = (($it['title']) ? $it['title'] : t("\x28no subject\x29")) ;
-				$headers  = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+				$subject  = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
+
+				// only expose our real email address to true friends
+
+				if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
+					$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
+				else
+					$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
+
 				if($reply_to)
 					$headers .= 'Reply-to: ' . $reply_to . "\n";
-				$headers .= 'Message-id: <' . $it['uri'] . '>' . "\n";
+
+				// for testing purposes: Collect exported mails
+				$file = tempnam("/tmp/friendica/", "mail-out-");
+				file_put_contents($file, json_encode($it));
+
+				$headers .= 'Message-Id: <' . cleanupmessageid($it['uri']). '>' . "\n";
+
+				//logger("Mail: uri: ".$it['uri']." parent-uri ".$it['parent-uri'], LOGGER_DEBUG);
+				//logger("Mail: Data: ".print_r($it, true), LOGGER_DEBUG);
+				//logger("Mail: Data: ".print_r($it, true), LOGGER_DATA);
+
 				if($it['uri'] !== $it['parent-uri']) {
-					$header .= 'References: <' . $it['parent-uri'] . '>' . "\n";
+					$headers .= 'References: <' . cleanupmessageid($it['parent-uri']) . '>' . "\n";
 					if(! strlen($it['title'])) {
 						$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
 							dbesc($it['parent-uri'])
@@ -405,10 +462,12 @@ function delivery_run($argv, $argc){
 					}
 				}
 				$headers .= 'MIME-Version: 1.0' . "\n";
-				$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
+				//$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
+				$headers .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
 				$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
 				$html    = prepare_body($it);
-				$message = '<html><body>' . $html . '</body></html>';
+				//$message = '<html><body>' . $html . '</body></html>';
+				$message = html2plain($html);
 				logger('notifier: email delivery to ' . $addr);
 				mail($addr, $subject, $message, $headers);
 			}
@@ -427,7 +486,7 @@ function delivery_run($argv, $argc){
 
 			if((! $contact['pubkey']) && (! $public_message))
 				break;
-					
+
 			if($target_item['verb'] === ACTIVITY_DISLIKE) {
 				// unsupported
 				break;
@@ -468,6 +527,14 @@ function delivery_run($argv, $argc){
 	return;
 }
 
+function cleanupmessageid($messageid) {
+	global $a;
+
+	if (!strpos($messageid, '@'))
+		$messageid = str_replace(":", ".", $messageid).'@'.$a->get_hostname();
+	return($messageid);
+}
+
 if (array_search(__file__,get_included_files())===0){
   delivery_run($argv,$argc);
   killme();