diff options
| author | friendica <info@friendica.com> | 2012-02-01 19:23:45 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-01 19:23:45 -0800 |
| commit | 94e396e6c4fda7a9113bfdb122fadfde0421e81c (patch) | |
| tree | 2eb48e4a901751d0fc7e8bdf3f26564f34db6a3d /include/notifier.php | |
| parent | 64d0616762efcff413a335f2fdde4d8219d44895 (diff) | |
| parent | 840f69e2c8ba014b89314191859ad0b8b35631d5 (diff) | |
| download | volse-hubzilla-94e396e6c4fda7a9113bfdb122fadfde0421e81c.tar.gz volse-hubzilla-94e396e6c4fda7a9113bfdb122fadfde0421e81c.tar.bz2 volse-hubzilla-94e396e6c4fda7a9113bfdb122fadfde0421e81c.zip | |
Merge branch 'master' into spam
Diffstat (limited to 'include/notifier.php')
| -rwxr-xr-x | include/notifier.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/notifier.php b/include/notifier.php index ead7aebad..53178ce53 100755 --- a/include/notifier.php +++ b/include/notifier.php @@ -584,6 +584,7 @@ function notifier_run($argv, $argc){ break; case NETWORK_MAIL: + case NETWORK_MAIL2: if(get_config('system','dfrn_only')) break; @@ -629,7 +630,7 @@ function notifier_run($argv, $argc){ // only expose our real email address to true friends - if($contact['rel'] == CONTACT_IS_FRIEND) + if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked'])) $headers = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n"; else $headers = 'From: ' . $local_user[0]['username'] . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n"; @@ -754,9 +755,10 @@ function notifier_run($argv, $argc){ ); $r2 = q("SELECT `id`, `name`,`network` FROM `contact` - WHERE `network` = '%s' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0 + WHERE `network` in ( '%s', '%s') AND `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `rel` != %d order by rand() ", dbesc(NETWORK_DFRN), + dbesc(NETWORK_MAIL2), intval($owner['uid']), intval(CONTACT_IS_SHARING) ); |