X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=9e1450ba2b5004a676f62375aab0f686290f3c23;hb=c0cc65304b06b027219a9f162deaab90fe2a0487;hp=825e4aac15caafe382c75bbb1830c855ac2703d7;hpb=c825cc8d0d61386cb00b6310fc4ea46c4354460d;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index 825e4aac15..9e1450ba2b 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -134,7 +134,7 @@ function notifier_run(&$argv, &$argc){
 	} elseif($cmd === 'removeme') {
 		$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`, `user`.`guid`
+				`user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`, `user`.`guid`
 			FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
 				WHERE `contact`.`uid` = %d AND `contact`.`self` LIMIT 1",
 				intval($item_id));
@@ -170,7 +170,7 @@ function notifier_run(&$argv, &$argc){
 			intval($item_id)
 		);
 
-		if((! count($r)) || (! intval($r[0]['parent']))) {
+		if((! dbm::is_result($r)) || (! intval($r[0]['parent']))) {
 			return;
 		}
 
@@ -204,14 +204,15 @@ function notifier_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`
+		`user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`
 		FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
 		WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
 		intval($uid)
 	);
 
-	if(! count($r))
+	if (! dbm::is_result($r)) {
 		return;
+	}
 
 	$owner = $r[0];
 
@@ -321,7 +322,7 @@ function notifier_run(&$argv, &$argc){
 						intval($uid),
 						dbesc(NETWORK_DFRN)
 					);
-					if(dbm::is_result($r))
+					if (dbm::is_result($r))
 						foreach($r as $rr)
 							$recipients_followup[] = $rr['id'];
 				}
@@ -424,20 +425,6 @@ function notifier_run(&$argv, &$argc){
 				$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
 			}
 
-			// Send a salmon to the parent author
-			$probed_contact = probe_url($thr_parent[0]['author-link']);
-			if ($probed_contact["notify"] != "") {
-				logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]);
-				$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
-			}
-
-			// Send a salmon to the parent owner
-			$probed_contact = probe_url($thr_parent[0]['owner-link']);
-			if ($probed_contact["notify"] != "") {
-				logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
-				$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
-			}
-
 			// Send a salmon notification to every person we mentioned in the post
 			$arr = explode(',',$target_item['tag']);
 			foreach($arr as $x) {
@@ -459,7 +446,7 @@ function notifier_run(&$argv, &$argc){
 
 		$r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra);
 
-		if(dbm::is_result($r))
+		if (dbm::is_result($r))
 			$contacts = $r;
 
 	} else
@@ -477,7 +464,7 @@ function notifier_run(&$argv, &$argc){
 				intval($uid),
 				dbesc(NETWORK_MAIL)
 			);
-			if(dbm::is_result($r)) {
+			if (dbm::is_result($r)) {
 				foreach($r as $rr)
 					$recipients[] = $rr['id'];
 			}
@@ -505,7 +492,7 @@ function notifier_run(&$argv, &$argc){
 
 	// delivery loop
 
-	if(dbm::is_result($r)) {
+	if (dbm::is_result($r)) {
 
 		foreach($r as $contact) {
 			if(!$contact['self']) {
@@ -571,7 +558,7 @@ function notifier_run(&$argv, &$argc){
 	if($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
 		if(!get_config('system','dfrn_only')) {
 			foreach($url_recipients as $url) {
-				if($url) {
+				if ($url) {
 					logger('notifier: urldelivery: ' . $url);
 					$deliver_status = slapper($owner,$url,$slap);
 					/// @TODO Redeliver/queue these items on failure, though there is no contact record
@@ -606,17 +593,17 @@ function notifier_run(&$argv, &$argc){
 
 		$r = array_merge($r2,$r1,$r0);
 
-		if(dbm::is_result($r)) {
+		if (dbm::is_result($r)) {
 			logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
 
 			// throw everything into the queue in case we get killed
 
 			foreach($r as $rr) {
 				if((! $mail) && (! $fsuggest) && (! $followup)) {
-					q("insert into deliverq ( `cmd`,`item`,`contact` ) values ('%s', %d, %d )",
-						dbesc($cmd),
-						intval($item_id),
-						intval($rr['id'])
+					q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)
+						ON DUPLICATE KEY UPDATE `cmd` = '%s', `item` = %d, `contact` = %d",
+						dbesc($cmd), intval($item_id), intval($rr['id']),
+						dbesc($cmd), intval($item_id), intval($rr['id'])
 					);
 				}
 			}
@@ -663,7 +650,7 @@ function notifier_run(&$argv, &$argc){
 
 				} else {
 
-					$params = 'hub.mode=publish&hub.url=' . urlencode( $a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
+					$params = 'hub.mode=publish&hub.url=' . urlencode( App::get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
 					post_url($h,$params);
 					logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
 				}