diff options
| author | friendica <info@friendica.com> | 2014-09-15 13:37:57 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-15 13:37:57 -0700 |
| commit | 5ea6f27792f378fe21306ce8caef6b86911c3f6f (patch) | |
| tree | 963aeef032261567deec7d5fbdbff899f01c4eac | |
| parent | 007ba9a805fbc98abc7d18e14b4c449a81dc550c (diff) | |
| download | volse-hubzilla-5ea6f27792f378fe21306ce8caef6b86911c3f6f.tar.gz volse-hubzilla-5ea6f27792f378fe21306ce8caef6b86911c3f6f.tar.bz2 volse-hubzilla-5ea6f27792f378fe21306ce8caef6b86911c3f6f.zip | |
final piece of the mrjive delivery puzzle, and now we've got most all the tools to implement mod_hubman
| -rw-r--r-- | include/notifier.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/notifier.php b/include/notifier.php index ae781bcf8..3f34d6133 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -455,8 +455,8 @@ function notifier_run($argv, $argc){ // for public posts always include our own hub - - $sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' "); +// this shouldn't be needed any more. collect_recipients should take care of it. +// $sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' "); logger('notifier: hub choice: ' . intval($relay_to_owner) . ' ' . intval($private) . ' ' . $cmd, LOGGER_DEBUG); @@ -478,7 +478,9 @@ function notifier_run($argv, $argc){ } 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) . ") $sql_extra group by hubloc_sitekey"); + where hubloc_hash in (" . implode(',',$recipients) . ") and not (hubloc_flags & %d) group by hubloc_sitekey", + intval(HUBLOC_FLAGS_DELETED) + ); } if(! $r) { @@ -493,6 +495,7 @@ function notifier_run($argv, $argc){ foreach($hubs as $hub) { // don't try to deliver to deleted hublocs - and inexplicably SQL "distinct" and "group by" // both return records with duplicate keys in rare circumstances +// FIXME this is probably redundant now. if((! ($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) && (! in_array($hub['hubloc_sitekey'],$keys))) { $hublist[] = $hub['hubloc_host']; $keys[] = $hub['hubloc_sitekey']; |