aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-22 16:23:59 -0700
committerfriendica <info@friendica.com>2014-09-22 16:23:59 -0700
commitb735961560d676f46bc43679f169ec2b0134de69 (patch)
tree343b41aa56409057eac31f016cb48411460f93fd
parent2070dbfdeace4a902208e9dfb50d950647142e99 (diff)
downloadvolse-hubzilla-b735961560d676f46bc43679f169ec2b0134de69.tar.gz
volse-hubzilla-b735961560d676f46bc43679f169ec2b0134de69.tar.bz2
volse-hubzilla-b735961560d676f46bc43679f169ec2b0134de69.zip
found the sucker
-rw-r--r--include/notifier.php2
-rw-r--r--include/zot.php4
2 files changed, 4 insertions, 2 deletions
diff --git a/include/notifier.php b/include/notifier.php
index 0c7a15452..47072415b 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -477,11 +477,13 @@ function notifier_run($argv, $argc){
where hubloc_hash in (" . implode(',',$recipients) . ") group by hubloc_sitekey order by hubloc_connected desc limit 1");
}
else {
+
$r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc
where hubloc_hash in (" . implode(',',$recipients) . ") and not (hubloc_flags & %d) and not (hubloc_status & %d) group by hubloc_sitekey",
intval(HUBLOC_FLAGS_DELETED),
intval(HUBLOC_OFFLINE)
);
+
}
if(! $r) {
diff --git a/include/zot.php b/include/zot.php
index b7ffe14e4..828194c3a 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2399,7 +2399,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
);
if($r) {
// don't count yourself
- $total_friends = ((count($r) > 0) ? $count($r) - 1 : 0);
+ $total_friends = ((count($r) > 0) ? count($r) - 1 : 0);
foreach($r as $rr)
if($rr['abook_flags'] & ABOOK_FLAG_FEED)
$total_feeds ++;
@@ -2407,9 +2407,9 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
$disallowed = array('abook_id','abook_account','abook_channel');
- $clean = array();
foreach($arr['abook'] as $abook) {
+ $clean = array();
if($abook['abook_xchan'] && $abook['entry_deleted']) {
logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']);
require_once('include/Contact.php');