diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/acl_selectors.php | 10 | ||||
| -rw-r--r-- | include/delivery.php | 6 | ||||
| -rw-r--r-- | include/notifier.php | 6 |
3 files changed, 4 insertions, 18 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 461ad0c36..8c45292cf 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -75,16 +75,10 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { $networks = array('dfrn'); break; case 'PRIVATE': - if(is_array($a->user) && $a->user['prvnets']) - $networks = array('dfrn','mail','dspr'); - else - $networks = array('dfrn','face','mail', 'dspr'); + $networks = array('dfrn','face','mail', 'dspr'); break; case 'TWO_WAY': - if(is_array($a->user) && $a->user['prvnets']) - $networks = array('dfrn','mail','dspr'); - else - $networks = array('dfrn','face','mail','dspr','stat'); + $networks = array('dfrn','face','mail','dspr','stat'); break; default: break; diff --git a/include/delivery.php b/include/delivery.php index 595c5279d..38b6690a9 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -155,8 +155,7 @@ function delivery_run($argv, $argc){ } $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, - `user`.`timezone`, `user`.`nickname`, - `user`.`page-flags`, `user`.`prvnets` + `user`.`timezone`, `user`.`nickname`, `user`.`page-flags` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($uid) @@ -366,9 +365,6 @@ function delivery_run($argv, $argc){ case NETWORK_OSTATUS : - // Do not send to otatus if we are not configured to send to public networks - if($owner['prvnets']) - break; if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) break; diff --git a/include/notifier.php b/include/notifier.php index 241587eea..641a0e1c5 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -153,8 +153,7 @@ function notifier_run($argv, $argc){ } $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, - `user`.`timezone`, `user`.`nickname`, - `user`.`page-flags`, `user`.`prvnets` + `user`.`timezone`, `user`.`nickname`, `user`.`page-flags` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($uid) @@ -597,9 +596,6 @@ function notifier_run($argv, $argc){ break; case NETWORK_OSTATUS: - // Do not send to ostatus if we are not configured to send to public networks - if($owner['prvnets']) - break; if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) break; |