diff options
| author | Friendika <info@friendika.com> | 2011-04-26 04:40:34 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-04-26 04:40:34 -0700 |
| commit | 7bf85eadb2cabedf955046722d1ff45e0f160421 (patch) | |
| tree | 155010109cd753c7498c62881feae7d3afdd5d1f /include | |
| parent | 1ec8fd416bae3071b6a9c33bc18d7f9ded34320f (diff) | |
| parent | 245a56f0c1c7db884d0bbd4265f6f74a20442748 (diff) | |
| download | volse-hubzilla-7bf85eadb2cabedf955046722d1ff45e0f160421.tar.gz volse-hubzilla-7bf85eadb2cabedf955046722d1ff45e0f160421.tar.bz2 volse-hubzilla-7bf85eadb2cabedf955046722d1ff45e0f160421.zip | |
Merge branch 'fb'
Diffstat (limited to 'include')
| -rw-r--r-- | include/acl_selectors.php | 6 | ||||
| -rw-r--r-- | include/notifier.php | 2 | ||||
| -rw-r--r-- | include/poller.php | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index d1303d933..f2763a569 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -48,7 +48,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $o = ''; - // When used for private messages, we limit correspondence to mutual friends and the selector + // When used for private messages, we limit correspondence to mutual DFRN/Friendika friends and the selector // to one recipient. By default our selector allows multiple selects amongst all contacts. $sql_extra = ''; @@ -61,7 +61,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $sql_extra .= " AND `network` IN ( 'dfrn' ) "; } elseif($privatenet) { - $sql_extra .= " AND `network` IN ( 'dfrn', 'mail' ) "; + $sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face' ) "; } if($privmail) @@ -83,8 +83,6 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p call_hooks($a->module . '_pre_' . $selname, $arr); - - if(count($r)) { foreach($r as $rr) { if((is_array($preselected)) && in_array($rr['id'], $preselected)) diff --git a/include/notifier.php b/include/notifier.php index 4cc6d7a99..b009cc870 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -20,6 +20,8 @@ function notifier_run($argv, $argc){ require_once('include/items.php'); require_once('include/bbcode.php'); + load_hooks(); + if($argc < 3) return; diff --git a/include/poller.php b/include/poller.php index b5639e034..dd2efcb76 100644 --- a/include/poller.php +++ b/include/poller.php @@ -26,6 +26,8 @@ function poller_run($argv, $argc){ $a->set_baseurl(get_config('system','url')); + load_hooks(); + logger('poller: start'); // run queue delivery process in the background @@ -61,10 +63,12 @@ function poller_run($argv, $argc){ $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); + reload_plugins(); + $d = datetime_convert(); + call_hooks('cron', $d); - reload_plugins(); $contacts = q("SELECT `id` FROM `contact` WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' |