diff options
| author | Zach Prezkuta <fermion@gmx.com> | 2012-06-09 18:39:21 -0600 |
|---|---|---|
| committer | Zach Prezkuta <fermion@gmx.com> | 2012-06-25 19:03:03 -0600 |
| commit | 8bb7ab88fb8a1bfef198f6a2aff53a15e667aa59 (patch) | |
| tree | 7947b8b421da4e76758d1d04307dd59750d4b0ec /include/delivery.php | |
| parent | fad2679c7e2ac32027ffd42064213ab48762dda2 (diff) | |
| download | volse-hubzilla-8bb7ab88fb8a1bfef198f6a2aff53a15e667aa59.tar.gz volse-hubzilla-8bb7ab88fb8a1bfef198f6a2aff53a15e667aa59.tar.bz2 volse-hubzilla-8bb7ab88fb8a1bfef198f6a2aff53a15e667aa59.zip | |
Clean up the Diaspora connectivity:
- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled
Diffstat (limited to 'include/delivery.php')
| -rw-r--r-- | include/delivery.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/delivery.php b/include/delivery.php index e6cfc8155..b60fef3bf 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -492,6 +492,9 @@ function delivery_run($argv, $argc){ break; case NETWORK_DIASPORA : + if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode)) + break; + if($public_message) $loc = 'public batch ' . $contact['batch']; else @@ -499,9 +502,6 @@ function delivery_run($argv, $argc){ logger('delivery: diaspora batch deliver: ' . $loc); - if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode)) - break; - if((! $contact['pubkey']) && (! $public_message)) break; |