aboutsummaryrefslogtreecommitdiffstats
path: root/include/notifier.php
diff options
context:
space:
mode:
authorZach Prezkuta <fermion@gmx.com>2012-06-09 18:39:21 -0600
committerZach Prezkuta <fermion@gmx.com>2012-06-25 19:03:03 -0600
commit8bb7ab88fb8a1bfef198f6a2aff53a15e667aa59 (patch)
tree7947b8b421da4e76758d1d04307dd59750d4b0ec /include/notifier.php
parentfad2679c7e2ac32027ffd42064213ab48762dda2 (diff)
downloadvolse-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/notifier.php')
-rw-r--r--include/notifier.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/notifier.php b/include/notifier.php
index f0a1940d4..fe6cc394e 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -709,11 +709,11 @@ function notifier_run($argv, $argc){
}
break;
case NETWORK_DIASPORA:
- require_once('include/diaspora.php');
-
if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')))
break;
+ require_once('include/diaspora.php');
+
if($mail) {
diaspora_send_mail($item,$owner,$contact);
break;
@@ -860,13 +860,17 @@ function notifier_run($argv, $argc){
}
- // If the item was deleted, clean up the `sign` table
+
+ // If the item was deleted, clean up the `sign` table (for Diaspora signatures)
+ // Do this even if Diaspora support is disabled, as it may have been enabled in
+ // the past
if($target_item['deleted']) {
$r = q("DELETE FROM sign where `retract_iid` = %d",
intval($target_item['id'])
);
}
+
logger('notifier: calling hooks', LOGGER_DEBUG);
if($normal_mode)