X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdelivery.php;h=421e205e345ba85411230b24bec7ea8e8a9c1225;hb=660bd39efad52b1c69bd8dd0ca27141b81f84ca5;hp=61b0bd33a5d98f002f72647d4a8027582075aef0;hpb=a71e3134bf7250b60cafd1e51098eea70c3459de;p=friendica.git

diff --git a/include/delivery.php b/include/delivery.php
index 61b0bd33a5..421e205e34 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -3,7 +3,7 @@ require_once("boot.php");
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
 
-function delivery_run($argv, $argc){
+function delivery_run(&$argv, &$argc){
 	global $a, $db;
 
 	if(is_null($a)){
@@ -12,13 +12,13 @@ function delivery_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);
 	}
 
-	require_once("session.php");
-	require_once("datetime.php");
+	require_once("include/session.php");
+	require_once("include/datetime.php");
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 	require_once('include/diaspora.php');
@@ -52,7 +52,7 @@ function delivery_run($argv, $argc){
 		);
 		if(! count($r)) {
 			continue;
-		}	
+		}
 
 		$maxsysload = intval(get_config('system','maxloadavg'));
 		if($maxsysload < 1)
@@ -67,7 +67,7 @@ function delivery_run($argv, $argc){
 
 		// It's ours to deliver. Remove it from the queue.
 
-		q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
+		q("delete from deliverq where cmd = '%s' and item = %d and contact = %d",
 			dbesc($cmd),
 			dbesc($item_id),
 			dbesc($contact_id)
@@ -113,6 +113,7 @@ function delivery_run($argv, $argc){
 			$uid = $r[0]['uid'];
 			$updated = $r[0]['edited'];
 
+			// POSSIBLE CLEANUP --> The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
 			if(! $parent_id)
 				continue;
 
@@ -156,7 +157,7 @@ function delivery_run($argv, $argc){
 		$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, 
 			`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, 
 			`user`.`page-flags`, `user`.`prvnets`
-			FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
+			FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` 
 			WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
 			intval($uid)
 		);
@@ -279,7 +280,7 @@ function delivery_run($argv, $argc){
 						continue;
 
 					// private emails may be in included in public conversations. Filter them.
-					if(($public_message) && $item['private'])
+					if(($public_message) && $item['private'] == 1)
 						continue;
 
 					$item_contact = get_item_contact($item,$icontacts);
@@ -288,7 +289,7 @@ function delivery_run($argv, $argc){
 
 					if($normal_mode) {
 						if($item_id == $item['id'] || $item['id'] == $item['parent'])
-							$atom .= atom_entry($item,'text',null,$owner,true);
+							$atom .= atom_entry($item,'text',null,$owner,true,(($top_level) ? $contact['id'] : 0));
 					}
 					else
 						$atom .= atom_entry($item,'text',null,$owner,true);
@@ -318,18 +319,19 @@ function delivery_run($argv, $argc){
 						`contact`.`name` as `senderName`,
 						`user`.* 
 						FROM `contact` 
-						LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
+						INNER 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",
+						AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 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",
+					if($x && count($x)) {
+						$write_flag = ((($x[0]['rel']) && ($x[0]['rel'] != CONTACT_IS_SHARING)) ? true : false);
+						if((($owner['page-flags'] == PAGE_COMMUNITY) || ($write_flag)) && (! $x[0]['writable'])) {
+							q("update contact set writable = 1 where id = %d",
 								intval($x[0]['id'])
 							);
 							$x[0]['writable'] = 1;
@@ -364,7 +366,6 @@ function delivery_run($argv, $argc){
 				break;
 
 			case NETWORK_OSTATUS :
-
 				// Do not send to otatus if we are not configured to send to public networks
 				if($owner['prvnets'])
 					break;
@@ -382,9 +383,9 @@ function delivery_run($argv, $argc){
 							continue;
 
 						// private emails may be in included in public conversations. Filter them.
-						if(($public_message) && $item['private'])
+						if(($public_message) && $item['private'] == 1)
 							continue;
-	
+
 						$item_contact = get_item_contact($item,$icontacts);
 						if(! $item_contact)
 							continue;
@@ -428,7 +429,7 @@ function delivery_run($argv, $argc){
 					if($cmd === 'wall-new') 
 						$it = $items[0];
 					else {
-						$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", 
+						$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 							intval($argv[2]),
 							intval($uid)
 						);
@@ -437,14 +438,14 @@ function delivery_run($argv, $argc){
 					}
 					if(! $it)
 						break;
-					
+
 
 					$local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 						intval($uid)
 					);
 					if(! count($local_user))
 						break;
-					
+
 					$reply_to = '';
 					$r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 						intval($uid)
@@ -456,18 +457,18 @@ function delivery_run($argv, $argc){
 
 					// 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
+					if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked'])) {
+						if($reply_to) {
+							$headers  = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$reply_to.'>'."\n";
+							$headers .= 'Sender: '.$local_user[0]['email']."\n";
+						} else
+							$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";
+					//if($reply_to)
+					//	$headers .= 'Reply-to: ' . $reply_to . "\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);
@@ -475,13 +476,28 @@ function delivery_run($argv, $argc){
 					//logger("Mail: Data: ".print_r($it, true), LOGGER_DATA);
 
 					if($it['uri'] !== $it['parent-uri']) {
-						$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']));
+						$headers .= "References: <".iri2msgid($it["parent-uri"]).">";
+
+						// If Threading is enabled, write down the correct parent
+						if (($it["thr-parent"] != "") and ($it["thr-parent"] != $it["parent-uri"]))
+							$headers .= " <".iri2msgid($it["thr-parent"]).">";
+						$headers .= "\n";
+
+						if(!$it['title']) {
+							$r = q("SELECT `title` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+								dbesc($it['parent-uri']),
+								intval($uid));
 
 							if(count($r) AND ($r[0]['title'] != ''))
 								$subject = $r[0]['title'];
+							else {
+								$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
+									dbesc($it['parent-uri']),
+									intval($uid));
+
+								if(count($r) AND ($r[0]['title'] != ''))
+									$subject = $r[0]['title'];
+							}
 						}
 						if(strncasecmp($subject,'RE:',3))
 							$subject = 'Re: '.$subject;
@@ -508,20 +524,20 @@ function delivery_run($argv, $argc){
 					// unsupported
 					break;
 				}
-				elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
-				logger('delivery: diaspora retract: ' . $loc);
-					// diaspora delete, 
+				elseif(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri'])) {
+					// top-level retraction
+					logger('delivery: diaspora retract: ' . $loc);
+
 					diaspora_send_retraction($target_item,$owner,$contact,$public_message);
 					break;
 				}
-				elseif($target_item['parent'] != $target_item['id']) {
+				elseif($target_item['uri'] !== $target_item['parent-uri']) {
+					// we are the relay - send comments, likes and relayable_retractions to our conversants
+					logger('delivery: diaspora relay: ' . $loc);
 
-				logger('delivery: diaspora relay: ' . $loc);
-
-					// we are the relay - send comments, likes and unlikes to our conversants
 					diaspora_send_relay($target_item,$owner,$contact,$public_message);
 					break;
-				}		
+				}
 				elseif(($top_level) && (! $walltowall)) {
 					// currently no workable solution for sending walltowall
 					logger('delivery: diaspora status: ' . $loc);
@@ -537,6 +553,9 @@ function delivery_run($argv, $argc){
 			case NETWORK_FACEBOOK :
 				if(get_config('system','dfrn_only'))
 					break;
+			case NETWORK_PUMPIO :
+				if(get_config('system','dfrn_only'))
+					break;
 			default:
 				break;
 		}