aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Lib/Enotify.php4
-rw-r--r--Zotlabs/Lib/ThreadStream.php6
-rw-r--r--include/network.php4
3 files changed, 7 insertions, 7 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index ccb014255..9b4117b9c 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -633,7 +633,7 @@ class Enotify {
call_hooks('email_send', $params);
if($params['sent']) {
- logger("notification: enotify::send (addon) returns " . $params['result'], LOGGER_DEBUG);
+ logger("notification: enotify::send (addon) returns " . (($params['result']) ? 'success' : 'failure'), LOGGER_DEBUG);
return $params['result'];
}
@@ -676,7 +676,7 @@ class Enotify {
$multipartMessageBody, // message body
$messageHeader // message headers
);
- logger("notification: enotify::send returns " . $res, LOGGER_DEBUG);
+ logger("notification: enotify::send returns " . (($res) ? 'success' : 'failure'), LOGGER_DEBUG);
return $res;
}
diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php
index a6d4f8517..beb626f31 100644
--- a/Zotlabs/Lib/ThreadStream.php
+++ b/Zotlabs/Lib/ThreadStream.php
@@ -58,7 +58,7 @@ class ThreadStream {
case 'display':
// in this mode we set profile_owner after initialisation (from conversation()) and then
// pull some trickery which allows us to re-invoke this function afterward
- // it's an ugly hack so FIXME
+ // it's an ugly hack so @FIXME
$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
break;
case 'page':
@@ -160,9 +160,9 @@ class ThreadStream {
}
elseif(($this->observer) && (! $item->is_commentable())) {
if((array_key_exists('owner',$item->data)) && intval($item->data['owner']['abook_self']))
- $item->set_commentable(perm_is_allowed($this->profile_owner,$this->observer['xchan_hash'],'post_comments'));
+ $item->set_commentable(perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'));
else
- $item->set_commentable(can_comment_on_post($this->observer['xchan_hash'],$item->data));
+ $item->set_commentable(can_comment_on_post($ob_hash,$item->data));
}
}
require_once('include/channel.php');
diff --git a/include/network.php b/include/network.php
index 97dca2b1a..53bb583fa 100644
--- a/include/network.php
+++ b/include/network.php
@@ -2266,7 +2266,7 @@ function z_mail($params) {
call_hooks('email_send', $params);
if($params['sent']) {
- logger('notification: z_mail returns ' . $params['result'], LOGGER_DEBUG);
+ logger('notification: z_mail returns ' . (($params['result']) ? 'success' : 'failure'), LOGGER_DEBUG);
return $params['result'];
}
@@ -2285,7 +2285,7 @@ function z_mail($params) {
$params['textVersion'],
$messageHeader // message headers
);
- logger('notification: z_mail returns ' . $res, LOGGER_DEBUG);
+ logger('notification: z_mail returns ' . (($res) ? 'success' : 'failure'), LOGGER_DEBUG);
return $res;
}