X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdelivery.php;h=c1ff07bd5438226b6b63a18e7327172e8329dff6;hb=b4361e37e062221c1dd2ae660cf7dc9be725ecc4;hp=71ce300235e04a1d2c3c53dd3e5e3380f0299046;hpb=94e396e6c4fda7a9113bfdb122fadfde0421e81c;p=friendica.git

diff --git a/include/delivery.php b/include/delivery.php
index 71ce300235..c1ff07bd54 100755
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -1,6 +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;
@@ -8,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");
@@ -21,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');
@@ -271,10 +273,10 @@ function delivery_run($argv, $argc){
 
 				if($normal_mode) {
 					if($item_id == $item['id'] || $item['id'] == $item['parent'])
-						$atom .= atom_entry($item,'text',$item_contact,$owner,true);
+						$atom .= atom_entry($item,'text',null,$owner,true);
 				}
 				else
-					$atom .= atom_entry($item,'text',$item_contact,$owner,true);
+					$atom .= atom_entry($item,'text',null,$owner,true);
 
 			}
 
@@ -292,7 +294,7 @@ function delivery_run($argv, $argc){
 					$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`, 
@@ -311,17 +313,24 @@ function delivery_run($argv, $argc){
 				);
 
 				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;					
+					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');
 				add_to_queue($contact['id'],NETWORK_DFRN,$atom);
@@ -355,7 +364,7 @@ function delivery_run($argv, $argc){
 						continue;
 
 					if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) 
-						$slaps[] = atom_entry($item,'html',$item_contact,$owner,true);
+						$slaps[] = atom_entry($item,'html',null,$owner,true);
 				}
 
 				logger('notifier: slapdelivery: ' . $contact['name']);
@@ -374,7 +383,7 @@ function delivery_run($argv, $argc){
 
 		case NETWORK_MAIL :
 		case NETWORK_MAIL2:
-				
+
 			if(get_config('system','dfrn_only'))
 				break;
 			// WARNING: does not currently convert to RFC2047 header encodings, etc.
@@ -413,20 +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")) ;
+				$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: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+					$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
 				else
-					$headers  = 'From: ' . $local_user[0]['username'] . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
+					$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: <' . iri2msgid($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: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
 					if(! strlen($it['title'])) {
 						$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
 							dbesc($it['parent-uri'])
@@ -442,13 +461,16 @@ function delivery_run($argv, $argc){
 						}
 					}
 				}
-				$headers .= 'MIME-Version: 1.0' . "\n";
-				$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
+				/*$headers .= 'MIME-Version: 1.0' . "\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);
+				mail($addr, $subject, $message, $headers);*/
+				email_send($addr, $subject, $headers, $it);
 			}
 			break;
 
@@ -465,7 +487,7 @@ function delivery_run($argv, $argc){
 
 			if((! $contact['pubkey']) && (! $public_message))
 				break;
-					
+
 			if($target_item['verb'] === ACTIVITY_DISLIKE) {
 				// unsupported
 				break;