add uid variable to b8 classes

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
old mode 100644 (file)
new mode 100755 (executable)
index c81ca2d..ead7aeb
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -111,7 +111,7 @@ function notifier_run($argv, $argc){
        else {
 
                // find ancestors
-               $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
+               $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
                        intval($item_id)
                );
 
@@ -128,7 +128,7 @@ function notifier_run($argv, $argc){
                        return;
 
                $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` 
-                       FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d ORDER BY `id` ASC",
+                       FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
                        intval($parent_id)
                );
 
@@ -323,7 +323,7 @@ function notifier_run($argv, $argc){
                $birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
 
        $atom .= replace_macros($feed_template, array(
-                       '$version'      => xmlify(FRIENDIKA_VERSION),
+                       '$version'      => xmlify(FRIENDICA_VERSION),
                        '$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
                        '$feed_title'   => xmlify($owner['name']),
                        '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
@@ -626,7 +626,13 @@ function notifier_run($argv, $argc){
                                                        $reply_to = $r1[0]['reply_to'];
        
                                                $subject  = (($it['title']) ? $it['title'] : t("\x28no subject\x29")) ;
-                                               $headers  = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+
+                                               // only expose our real email address to true friends
+
+                                               if($contact['rel'] == CONTACT_IS_FRIEND)
+                                                       $headers  = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+                                               else
+                                                       $headers  = 'From: ' . $local_user[0]['username'] . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
 
                                                if($reply_to)
                                                        $headers .= 'Reply-to: ' . $reply_to . "\n";
@@ -663,7 +669,15 @@ function notifier_run($argv, $argc){
                                case NETWORK_DIASPORA:
                                        require_once('include/diaspora.php');
 
-                                       if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode))
+                                       if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')))
+                                               break;
+
+                                       if($mail) {
+                                               diaspora_send_mail($item,$owner,$contact);
+                                               break;
+                                       }
+
+                                       if(! $normal_mode)
                                                break;
 
                                        // special handling for followup to public post