From a84695bb866574f0e66471dbbd70668e8f9c2b41 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 22 Apr 2017 23:15:00 -0700 Subject: if there is no site record, site_dead won't be 0, in a left join it will in fact be null. As long as it isn't 1, we should attempt delivery. --- Zotlabs/Daemon/Notifier.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 48f1d2757..3afe1a5dc 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -480,7 +480,7 @@ class Notifier { // Let's reduce this to a set of hubs; checking that the site is not dead. $r = q("select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . implode(',',$recipients) . ") - and hubloc_error = 0 and hubloc_deleted = 0 and site_dead = 0" + and hubloc_error = 0 and hubloc_deleted = 0 and ( site_dead = 0 OR site_dead is null ) " ); -- cgit v1.2.3 From 7d5ee81628a08dd560f7fdaa5b4d5a3f5ce3fb95 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 25 Apr 2017 21:52:24 -0700 Subject: database support for client side e2ee for private mail --- Zotlabs/Module/Mail.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 2fb89fed5..52f1ddf32 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -113,18 +113,18 @@ class Mail extends \Zotlabs\Web\Controller { if($preview) { $mail = [ - 'mailbox' => 'outbox', - 'id' => 0, - 'mid' => 'M0', - 'from_name' => $channel['xchan_name'], - 'from_url' => $channel['xchan_url'], - 'from_photo' => $channel['xchan_photo_s'], - 'subject' => zidify_links(smilies(bbcode($subject))), - 'body' => zidify_links(smilies(bbcode($body))), + 'mailbox' => 'outbox', + 'id' => 0, + 'mid' => 'M0', + 'from_name' => $channel['xchan_name'], + 'from_url' => $channel['xchan_url'], + 'from_photo' => $channel['xchan_photo_s'], + 'subject' => zidify_links(smilies(bbcode($subject))), + 'body' => zidify_links(smilies(bbcode($body))), 'attachments' => '', - 'can_recall' => false, + 'can_recall' => false, 'is_recalled' => '', - 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c') + 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c') ]; echo replace_macros(get_markup_template('mail_conv.tpl'), [ '$mail' => $mail ] ); -- cgit v1.2.3