X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=f2e57430d2d6ac14488be6cd7e363eb9632fbf52;hb=6e7f7210a8a3b0bb2d99f4bb7d83f764310332c9;hp=f572b430e83ed760d23161fd6ec5ce33f6f832e5;hpb=c60605ce0cae9a2bba27057f100fbd3fa501c98d;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index f572b430e8..f2e57430d2 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -51,7 +51,7 @@ function ping_init(&$a) {
 			intval(local_user()), intval(local_user())
 		);
 
-		if(is_filled_array($r)) {
+		if(dbm::is_result($r)) {
 
 			$arr = array('items' => $r);
 			call_hooks('network_ping', $arr);
@@ -150,7 +150,7 @@ function ping_init(&$a) {
 			dbesc(datetime_convert('UTC','UTC','now'))
 		);
 
-		if(is_filled_array($ev)) {
+		if(dbm::is_result($ev)) {
 			$all_events = intval($ev[0]['total']);
 
 			if($all_events) {
@@ -189,7 +189,12 @@ function ping_init(&$a) {
 		 *		'message' => notification message. "{0}" will be replaced by subject name
 		 **/
 		function xmlize($n){
-			$n['photo'] = proxy_url($n['photo'], false, PROXY_SIZE_MICRO);
+
+			$contact = get_contact_details_by_url($n['url']);
+			if (isset($contact["micro"]))
+				$n['photo'] = proxy_url($contact["micro"], false, PROXY_SIZE_MICRO);
+			else
+				$n['photo'] = proxy_url($n['photo'], false, PROXY_SIZE_MICRO);
 
 			$n['message'] = html_entity_decode($n['message'], ENT_COMPAT | ENT_HTML401, "UTF-8");
 			$n['name'] = html_entity_decode($n['name'], ENT_COMPAT | ENT_HTML401, "UTF-8");
@@ -219,7 +224,7 @@ function ping_init(&$a) {
 				<home>$home</home>\r\n";
 		if ($register!=0) echo "<register>$register</register>";
 
-		if ( is_filled_array($groups_unseen) ) {
+		if ( dbm::is_result($groups_unseen) ) {
 			echo '<groups>';
 			foreach ($groups_unseen as $it)
 				if ($it['count'] > 0)
@@ -228,7 +233,7 @@ function ping_init(&$a) {
 			echo "</groups>";
 		}
 
-		if ( is_filled_array($forums_unseen) ) {
+		if ( dbm::is_result($forums_unseen) ) {
 			echo '<forums>';
 			foreach ($forums_unseen as $it)
 				if ($it['count'] > 0)
@@ -245,7 +250,7 @@ function ping_init(&$a) {
 			<birthdays-today>$birthdays_today</birthdays-today>\r\n";
 
 
-		if (is_filled_array($notifs) && (! $sysnotify)) {
+		if (dbm::is_result($notifs) && (! $sysnotify)) {
 			foreach ($notifs as $zz) {
 				if($zz['seen'] == 0)
 					$sysnotify ++;
@@ -255,7 +260,7 @@ function ping_init(&$a) {
 		echo '	<notif count="'. ($sysnotify + $intro + $mail + $register) .'">';
 
 		// merge all notification types in one array
-		if ( is_filled_array($intros) ) {
+		if ( dbm::is_result($intros) ) {
 			foreach ($intros as $i) {
 				$n = array(
 					'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
@@ -270,7 +275,7 @@ function ping_init(&$a) {
 			}
 		}
 
-		if ( is_filled_array($mails) ) {
+		if ( dbm::is_result($mails) ) {
 			foreach ($mails as $i) {
 				$n = array(
 					'href' => $a->get_baseurl().'/message/'.$i['id'],
@@ -285,7 +290,7 @@ function ping_init(&$a) {
 			}
 		}
 
-		if ( is_filled_array($regs) ) {
+		if ( dbm::is_result($regs) ) {
 			foreach ($regs as $i) {
 				$n = array(
 					'href' => $a->get_baseurl().'/admin/users/',
@@ -311,7 +316,7 @@ function ping_init(&$a) {
 		};
 		usort($notifs, $sort_function);
 
-		if( is_filled_array($notifs) ) {
+		if( dbm::is_result($notifs) ) {
 			foreach($notifs as $n) {
 				echo xmlize($n);
 			}