X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=84efe79526cd31399c20a373ac2b230284b4f506;hb=28b2e599fb6ee3ee9ca0f3e3791482686cdbb902;hp=5f700ee71632b96975f058f53d8534d18dc59ca3;hpb=22f32d9721809d2e655c7ab78d6a043b93de0af1;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index 5f700ee716..84efe79526 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -54,8 +54,6 @@ function notifier_run(&$argv, &$argc){
 			unset($db_host, $db_user, $db_pass, $db_data);
 	}
 
-	$a->start_process();
-
 	require_once("include/session.php");
 	require_once("include/datetime.php");
 	require_once('include/items.php');
@@ -136,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));
@@ -172,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;
 		}
 
@@ -206,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];
 
@@ -323,7 +322,7 @@ function notifier_run(&$argv, &$argc){
 						intval($uid),
 						dbesc(NETWORK_DFRN)
 					);
-					if(count($r))
+					if (dbm::is_result($r))
 						foreach($r as $rr)
 							$recipients_followup[] = $rr['id'];
 				}
@@ -447,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(count($r))
+		if (dbm::is_result($r))
 			$contacts = $r;
 
 	} else
@@ -465,7 +464,7 @@ function notifier_run(&$argv, &$argc){
 				intval($uid),
 				dbesc(NETWORK_MAIL)
 			);
-			if(count($r)) {
+			if (dbm::is_result($r)) {
 				foreach($r as $rr)
 					$recipients[] = $rr['id'];
 			}
@@ -493,7 +492,7 @@ function notifier_run(&$argv, &$argc){
 
 	// delivery loop
 
-	if(count($r)) {
+	if (dbm::is_result($r)) {
 
 		foreach($r as $contact) {
 			if(!$contact['self']) {
@@ -559,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
@@ -572,12 +571,12 @@ function notifier_run(&$argv, &$argc){
 	if($public_message) {
 
 		if (!$followup)
-			$r0 = diaspora::relay_list();
+			$r0 = Diaspora::relay_list();
 		else
 			$r0 = array();
 
 		$r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
-			AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
+			AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
 			dbesc(NETWORK_DIASPORA),
 			intval($owner['uid']),
 			intval(CONTACT_IS_SHARING)
@@ -594,22 +593,22 @@ function notifier_run(&$argv, &$argc){
 
 		$r = array_merge($r2,$r1,$r0);
 
-		if(count($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) {
+			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'])
 					);
 				}
 			}
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 
 				// except for Diaspora batch jobs
 				// Don't deliver to folks who have already been delivered to
@@ -651,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());
 				}