From 5f4181384543a3fda7fd0101f0cbc7100584d323 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 6 Jul 2014 19:15:09 -0700 Subject: homepage revisions --- include/notifier.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'include/notifier.php') diff --git a/include/notifier.php b/include/notifier.php index 59f472539..9d5c7cb8e 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -169,6 +169,15 @@ function notifier_run($argv, $argc){ } elseif($cmd === 'expire') { + + // FIXME + // This will require a special zot packet containing a list of item message_id's to be expired. + // This packet will be public, since we cannot selectively deliver here. + // We need the handling on this end to create the array, and the handling on the remote end + // to verify permissions (for each item) and process it. Until this is complete, the expire feature will be disabled. + + return; + $normal_mode = false; $expire = true; $items = q("SELECT * FROM item WHERE uid = %d AND ( item_flags & %d ) @@ -182,13 +191,6 @@ function notifier_run($argv, $argc){ if(! $items) return; -// FIXME -// This will require a special zot packet containing a list of item message_id's to be expired. -// This packet will be public, since we cannot selectively deliver here. -// We need the handling on this end to create the array, and the handling on the remote end -// to verify permissions (for each item) and process it. Until this is complete, the expire feature will be disabled. - - return; } elseif($cmd === 'suggest') { $normal_mode = false; @@ -423,7 +425,6 @@ function notifier_run($argv, $argc){ $sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' "); - if($relay_to_owner && (! $private) && ($cmd !== 'relay')) { // If sending a followup to the post owner, only send it to one channel clone - to avoid race conditions. -- cgit v1.2.3