X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=4765cca06d155c9a9c19fc387c6a41ebc82f3a11;hb=dd9432903ddb3e12381881da44fb84afff832d52;hp=18ad070120e95908c6e49da998317cc6180fdd8d;hpb=5dcc10a5d9d2be79070716fbcaf5c054f7ed9efa;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
old mode 100644
new mode 100755
index 18ad070120..4765cca06d
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,6 +1,8 @@
 <?php
 
 require_once("boot.php");
+require_once('include/queue_fn.php');
+require_once('include/html2plain.php');
 
 /*
  * This file was at one time responsible for doing all deliveries, but this caused
@@ -34,7 +36,7 @@ function notifier_run($argv, $argc){
 	require_once("datetime.php");
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
-
+	require_once('include/email.php');
 	load_config('config');
 	load_config('system');
 
@@ -110,7 +112,7 @@ function notifier_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)
 		);
 
@@ -127,7 +129,7 @@ function notifier_run($argv, $argc){
 			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)
 		);
 
@@ -205,7 +207,7 @@ function notifier_run($argv, $argc){
 
 		/**
 		 *
-		 * Be VERY CAREFUL if you make any changes to the following lines. Seemingly innocuous changes 
+		 * Be VERY CAREFUL if you make any changes to the following several lines. Seemingly innocuous changes 
 		 * have been known to cause runaway conditions which affected several servers, along with 
 		 * permissions issues. 
 		 *
@@ -218,6 +220,22 @@ function notifier_run($argv, $argc){
 		}
 
 
+		if(($cmd === 'uplink') && (intval($parent['forum_mode'])) && (! $top_level)) {
+			$relay_to_owner = true;			
+		} 
+
+		// until the 'origin' flag has been in use for several months
+		// we will just use it as a fallback test
+		// later we will be able to use it as the primary test of whether or not to relay.
+
+		if(! $target_item['origin'])
+			$relay_to_owner = false;
+
+		if($parent['origin'])
+			$relay_to_owner = false;
+
+
+
 		if($relay_to_owner) {
 			logger('notifier: followup', LOGGER_DEBUG);
 			// local followup to remote post
@@ -247,6 +265,13 @@ function notifier_run($argv, $argc){
 			$deny_people  = expand_acl($parent['deny_cid']);
 			$deny_groups  = expand_groups(expand_acl($parent['deny_gid']));
 
+			// if our parent is a forum, uplink to the origional author causing
+			// a delivery fork
+
+			if(intval($parent['forum_mode']) && (! $top_level) && ($cmd !== 'uplink')) {
+				proc_run('php','include/notifier','uplink',$item_id);
+			}
+
 			$conversants = array();
 
 			foreach($items as $item) {
@@ -299,7 +324,7 @@ function notifier_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)) ,
@@ -358,8 +383,8 @@ function notifier_run($argv, $argc){
 					continue;
 				if($item['id'] == $item_id) {
 					logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA);
-					$slap  = atom_entry($item,'html',$owner,$owner,false);
-					$atom .= atom_entry($item,'text',$owner,$owner,false);
+					$slap  = atom_entry($item,'html',null,$owner,false);
+					$atom .= atom_entry($item,'text',null,$owner,false);
 				}
 			}
 		}
@@ -386,13 +411,13 @@ function notifier_run($argv, $argc){
 					// older sites without a corresponding dfrn_notify change may do the wrong thing.
 
 				    if($item_id == $item['id'] || $item['id'] == $item['parent'])
-						$atom .= atom_entry($item,'text',$contact,$owner,true);
+						$atom .= atom_entry($item,'text',null,$owner,true);
 				}
 				else
-					$atom .= atom_entry($item,'text',$contact,$owner,true);
+					$atom .= atom_entry($item,'text',null,$owner,true);
 
 				if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) 
-					$slaps[] = atom_entry($item,'html',$contact,$owner,true);
+					$slaps[] = atom_entry($item,'html',null,$owner,true);
 			}
 		}
 	}
@@ -502,6 +527,14 @@ function notifier_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);
@@ -519,13 +552,7 @@ function notifier_run($argv, $argc){
 					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;
 				case NETWORK_OSTATUS:
@@ -542,14 +569,7 @@ function notifier_run($argv, $argc){
 
 						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($slap)
-							);
-
+							add_to_queue($contact['id'],NETWORK_OSTATUS,$slap);
 						}
 					}
 					else {
@@ -564,13 +584,7 @@ function notifier_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);
 									}
 								}
 							}
@@ -579,6 +593,7 @@ function notifier_run($argv, $argc){
 					break;
 
 				case NETWORK_MAIL:
+				case NETWORK_MAIL2:
 						
 					if(get_config('system','dfrn_only'))
 						break;
@@ -619,17 +634,27 @@ function notifier_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-out2-");
+						file_put_contents($file, json_encode($it));
+
+						$headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n";
 
 						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'])
@@ -646,19 +671,30 @@ function notifier_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;
 				case NETWORK_DIASPORA:
 					require_once('include/diaspora.php');
 
-					if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode))
+					if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')))
+						break;
+
+					if($mail) {
+						diaspora_send_mail($item,$owner,$contact);
+						break;
+					}
+
+					if(! $normal_mode)
 						break;
 
 					// special handling for followup to public post
@@ -691,7 +727,7 @@ function notifier_run($argv, $argc){
 						// we are the relay - send comments, likes and unlikes to our conversants
 						diaspora_send_relay($target_item,$owner,$contact);
 						break;
-					}		
+					}
 					elseif(($top_level) && (! $walltowall)) {
 						// currently no workable solution for sending walltowall
 						diaspora_send_status($target_item,$owner,$contact);
@@ -728,16 +764,17 @@ function notifier_run($argv, $argc){
 	if($public_message) {
 
 		$r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s' 
-			AND `uid` = %d AND `rel` != %d ORDER BY rand() ",
+			AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
 			dbesc(NETWORK_DIASPORA),
 			intval($owner['uid']),
 			intval(CONTACT_IS_SHARING)
 		);
 			
 		$r2 = q("SELECT `id`, `name`,`network` FROM `contact` 
-			WHERE `network` = '%s' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
+			WHERE `network` in ( '%s', '%s')  AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
 			AND `rel` != %d order by rand() ",
 			dbesc(NETWORK_DFRN),
+			dbesc(NETWORK_MAIL2),
 			intval($owner['uid']),
 			intval(CONTACT_IS_SHARING)
 		);
@@ -802,7 +839,6 @@ function notifier_run($argv, $argc){
 
 	call_hooks('notifier_end',$target_item);
 
-
 	return;
 }