X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fping.php;h=f2e57430d2d6ac14488be6cd7e363eb9632fbf52;hb=6e7f7210a8a3b0bb2d99f4bb7d83f764310332c9;hp=2eb94576b375b47e13277a2f1cd1b7aa36795e9b;hpb=9261154eaba403d13e2dcc18aa5d3cc09aa60deb;p=friendica.git
diff --git a/mod/ping.php b/mod/ping.php
index 2eb94576b3..f2e57430d2 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -32,6 +32,8 @@ function ping_init(&$a) {
$dislikes = array();
$friends = array();
$posts = array();
+ $regs = array();
+ $mails = array();
$home = 0;
$network = 0;
@@ -49,7 +51,7 @@ function ping_init(&$a) {
intval(local_user()), intval(local_user())
);
- if(count($r)) {
+ if(dbm::is_result($r)) {
$arr = array('items' => $r);
call_hooks('network_ping', $arr);
@@ -116,8 +118,6 @@ function ping_init(&$a) {
$intro = count($intros1) + count($intros2);
$intros = $intros1+$intros2;
-
-
$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
$mails = q("SELECT * FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@@ -150,7 +150,7 @@ function ping_init(&$a) {
dbesc(datetime_convert('UTC','UTC','now'))
);
- if($ev && count($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");
@@ -207,7 +212,7 @@ function ping_init(&$a) {
call_hooks('ping_xmlize', $n);
$notsxml = '%s'."\n";
return sprintf ( $notsxml, intval($n['id']),
- xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']),
+ xmlify($n['href']), xmlify(xmlify($n['name'])), xmlify($n['url']), xmlify($n['photo']),
xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)),
xmlify($n['message'])
);
@@ -219,7 +224,7 @@ function ping_init(&$a) {
$home\r\n";
if ($register!=0) echo "$register";
- if (count($groups_unseen)) {
+ if ( dbm::is_result($groups_unseen) ) {
echo '';
foreach ($groups_unseen as $it)
if ($it['count'] > 0)
@@ -228,7 +233,7 @@ function ping_init(&$a) {
echo "";
}
- if (count($forums_unseen)) {
+ if ( dbm::is_result($forums_unseen) ) {
echo '';
foreach ($forums_unseen as $it)
if ($it['count'] > 0)
@@ -245,8 +250,8 @@ function ping_init(&$a) {
$birthdays_today\r\n";
- if(count($notifs) && (! $sysnotify)) {
- foreach($notifs as $zz) {
+ if (dbm::is_result($notifs) && (! $sysnotify)) {
+ foreach ($notifs as $zz) {
if($zz['seen'] == 0)
$sysnotify ++;
}
@@ -255,7 +260,7 @@ function ping_init(&$a) {
echo ' ';
// merge all notification types in one array
- if ($intro>0){
+ 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 ($mail>0){
+ 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 ($register>0){
+ if ( dbm::is_result($regs) ) {
foreach ($regs as $i) {
$n = array(
'href' => $a->get_baseurl().'/admin/users/',
@@ -299,6 +304,7 @@ function ping_init(&$a) {
$notifs[] = $n;
}
}
+
// sort notifications by $[]['date']
$sort_function = function($a, $b) {
$adate = date($a['date']);
@@ -310,7 +316,7 @@ function ping_init(&$a) {
};
usort($notifs, $sort_function);
- if(count($notifs)) {
+ if( dbm::is_result($notifs) ) {
foreach($notifs as $n) {
echo xmlize($n);
}