X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=40cfe31fa5e1ae3e61b9523e481dda9885805b06;hb=7d531afd00de35ef55d0cc5caa63242765341dae;hp=577a2c6c82016b3b46fffeb58a8b3924b58dcfac;hpb=b202e02fbf09859c06ed21cc3b6bec1530ccf1f1;p=friendica.git
diff --git a/mod/ping.php b/mod/ping.php
index 577a2c6c82..40cfe31fa5 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(dba::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(dba::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");
@@ -205,9 +210,9 @@ function ping_init(&$a) {
$local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
call_hooks('ping_xmlize', $n);
- $notsxml = '%s'."\n";
- return sprintf ( $notsxml,
- xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']),
+ $notsxml = '%s'."\n";
+ return sprintf ( $notsxml, intval($n['id']),
+ 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,19 +224,21 @@ function ping_init(&$a) {
$home\r\n";
if ($register!=0) echo "$register";
- if ( count($groups_unseen) ) {
+ if ( dba::is_result($groups_unseen) ) {
echo '';
- foreach ($groups_unseen as $it) {
- echo '' . $it['count'] . "";
- }
+ foreach ($groups_unseen as $it)
+ if ($it['count'] > 0)
+ echo ''.$it['count']."";
+
echo "";
}
- if ( count($forums_unseen) ) {
+ if ( dba::is_result($forums_unseen) ) {
echo '';
- foreach ($forums_unseen as $it) {
- echo '' . $it['count'] . "";
- }
+ foreach ($forums_unseen as $it)
+ if ($it['count'] > 0)
+ echo ''.$it['count']."";
+
echo "";
}
@@ -243,8 +250,8 @@ function ping_init(&$a) {
$birthdays_today\r\n";
- if(count($notifs) && (! $sysnotify)) {
- foreach($notifs as $zz) {
+ if (dba::is_result($notifs) && (! $sysnotify)) {
+ foreach ($notifs as $zz) {
if($zz['seen'] == 0)
$sysnotify ++;
}
@@ -253,7 +260,7 @@ function ping_init(&$a) {
echo ' ';
// merge all notification types in one array
- if ($intro>0){
+ if ( dba::is_result($intros) ) {
foreach ($intros as $i) {
$n = array(
'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
@@ -268,7 +275,7 @@ function ping_init(&$a) {
}
}
- if ($mail>0){
+ if ( dba::is_result($mails) ) {
foreach ($mails as $i) {
$n = array(
'href' => $a->get_baseurl().'/message/'.$i['id'],
@@ -283,7 +290,7 @@ function ping_init(&$a) {
}
}
- if ($register>0){
+ if ( dba::is_result($regs) ) {
foreach ($regs as $i) {
$n = array(
'href' => $a->get_baseurl().'/admin/users/',
@@ -297,6 +304,7 @@ function ping_init(&$a) {
$notifs[] = $n;
}
}
+
// sort notifications by $[]['date']
$sort_function = function($a, $b) {
$adate = date($a['date']);
@@ -308,7 +316,7 @@ function ping_init(&$a) {
};
usort($notifs, $sort_function);
- if(count($notifs)) {
+ if( dba::is_result($notifs) ) {
foreach($notifs as $n) {
echo xmlize($n);
}
@@ -389,7 +397,11 @@ function ping_get_notifications($uid) {
// Replace the name with {0} but ensure to make that only once
// The {0} is used later and prints the name in bold.
- $pos = strpos($notification["message"],$notification['name']);
+ if ($notification['name'] != "")
+ $pos = strpos($notification["message"],$notification['name']);
+ else
+ $pos = false;
+
if ($pos !== false)
$notification["message"] = substr_replace($notification["message"],"{0}",$pos,strlen($notification["name"]));