jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2960 from Hypolite/issue/#2955

Browse source 
ping.php Fix confusion between count vars and array vars
This commit is contained in:
Tobias Diekershoff 2016-11-22 08:13:36 +01:00 committed by GitHub
commit 754de768f2
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
mod/ping.php
View file

@ -37,7 +37,7 @@ function ping_init(&$a) {
} }
$notifs = ping_get_notifications(local_user()); $notifs = ping_get_notifications(local_user());
$sysnotify = 0; // we will update this in a moment $sysnotify_count = 0; // we will update this in a moment
$tags = array(); $tags = array();
$comments = array(); $comments = array();
@ -48,8 +48,8 @@ function ping_init(&$a) {
$regs = array(); $regs = array();
$mails = array(); $mails = array();
$home = 0; $home_count = 0;
$network = 0; $network_count = 0;
$groups_unseen = array(); $groups_unseen = array();
$forums_unseen = array(); $forums_unseen = array();
@ -71,14 +71,14 @@ function ping_init(&$a) {
foreach ($r as $it) { foreach ($r as $it) {
if ($it['wall']) { if ($it['wall']) {
$home++; $home_count++;
} else { } else {
$network++; $network_count++;
} }
} }
} }
if ($network) { if ($network_count) {
if (intval(feature_enabled(local_user(),'groups'))) { if (intval(feature_enabled(local_user(),'groups'))) {
// Find out how unseen network posts are spread across groups // Find out how unseen network posts are spread across groups
$group_counts = groups_count_unseen(); $group_counts = groups_count_unseen();
@ -116,7 +116,7 @@ function ping_init(&$a) {
intval(local_user()) intval(local_user())
); );
$intro = count($intros1) + count($intros2); $intro_count = count($intros1) + count($intros2);
$intros = $intros1+$intros2; $intros = $intros1+$intros2;
$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ; $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
@ -130,10 +130,10 @@ function ping_init(&$a) {
if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){ if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
$regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1"); $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
if ($regs) { if ($regs) {
$register = $regs[0]['total']; $register_count = $regs[0]['total'];
} }
} else { } else {
$register = 0; $register_count = 0;
} }
$all_events = 0; $all_events = 0;
@ -177,11 +177,11 @@ function ping_init(&$a) {
} }
$data = array(); $data = array();
$data['intro'] = $intro; $data['intro'] = $intro_count;
$data['mail'] = $mail_count; $data['mail'] = $mail_count;
$data['net'] = $network; $data['net'] = $network_count;
$data['home'] = $home; $data['home'] = $home_count;
$data['register'] = $register; $data['register'] = $register_count;
$data['all-events'] = $all_events; $data['all-events'] = $all_events;
$data['all-events-today'] = $all_events_today; $data['all-events-today'] = $all_events_today;
@ -190,10 +190,10 @@ function ping_init(&$a) {
$data['birthdays'] = $birthdays; $data['birthdays'] = $birthdays;
$data['birthdays-today'] = $birthdays_today; $data['birthdays-today'] = $birthdays_today;
if (dbm::is_result($notifs) && !$sysnotify) { if (dbm::is_result($notifs)) {
foreach ($notifs as $notif) { foreach ($notifs as $notif) {
if ($notif['seen'] == 0) { if ($notif['seen'] == 0) {
$sysnotify ++; $sysnotify_count ++;
} }
} }
} }
@ -304,7 +304,7 @@ function ping_init(&$a) {
if ($format == 'json') { if ($format == 'json') {
$data['groups'] = $groups_unseen; $data['groups'] = $groups_unseen;
$data['forums'] = $forums_unseen; $data['forums'] = $forums_unseen;
$data['notify'] = $sysnotify + $intro + $mail_count + $register; $data['notify'] = $sysnotify_count + $intro_count + $mail_count + $register_count;
$data['notifications'] = $notifications; $data['notifications'] = $notifications;
$data['sysmsgs'] = array( $data['sysmsgs'] = array(
'notice' => $sysmsgs, 'notice' => $sysmsgs,
@ -323,7 +323,7 @@ function ping_init(&$a) {
} }
} else { } else {
// Legacy slower XML format output // Legacy slower XML format output
$data = ping_format_xml_data($data, $sysnotify, $notifications, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen); $data = ping_format_xml_data($data, $sysnotify_count, $notifications, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen);
header("Content-type: text/xml"); header("Content-type: text/xml");
echo xml::from_array(array("result" => $data), $xml); echo xml::from_array(array("result" => $data), $xml);
@ -416,13 +416,13 @@ function ping_get_notifications($uid) {
* @deprecated * @deprecated
* *
* @param array $data The initial ping data array * @param array $data The initial ping data array
* @param int $sysnotify Number of unseen system notifications * @param int $sysnotify_count Number of unseen system notifications
* @param array $notifs Complete list of notification * @param array $notifs Complete list of notification
* @param array $sysmsgs List of system notice messages * @param array $sysmsgs List of system notice messages
* @param array $sysmsgs_info List of system info messages * @param array $sysmsgs_info List of system info messages
* @return array XML-transform ready data array * @return array XML-transform ready data array
*/ */
function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen) { function ping_format_xml_data($data, $sysnotify_count, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen) {
$notifications = array(); $notifications = array();
foreach($notifs as $key => $n) { foreach($notifs as $key => $n) {
$notifications[$key . ":note"] = $n['message']; $notifications[$key . ":note"] = $n['message'];
@ -448,7 +448,7 @@ function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_inf
} }
$data["notif"] = $notifications; $data["notif"] = $notifications;
$data["@attributes"] = array("count" => $sysnotify + $data["intro"] + $data["mail"] + $data["register"]); $data["@attributes"] = array("count" => $sysnotify_count + $data["intro"] + $data["mail"] + $data["register"]);
$data["sysmsgs"] = $sysmsg; $data["sysmsgs"] = $sysmsg;
if ($data["register"] == 0) { if ($data["register"] == 0) {