harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provide text log results of email success/failure rather than 1 and 0.

Browse Source
This commit is contained in:
zotlabs 2016-10-13 16:47:45 -07:00
parent 6532972e61
commit daaefed61b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Lib/Enotify.php
View File

@ -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;
}

6
Zotlabs/Lib/ThreadStream.php
View File

@ -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');

4
include/network.php
View File

@ -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;
}