aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-11-02 08:53:31 +0100
committerMario Vavti <mario@mariovavti.com>2017-11-02 08:53:31 +0100
commit00d8783e45034febe06ff9e7139921a2588702db (patch)
treee8313e9cc828cb2b9c56a5f12b2856e6e540b8cc /include
parentcdaf5f3fc0756157863008df185f6b344241c147 (diff)
parentbdf50a824e6ee7f72532ba9b6e31c8730a8a497e (diff)
downloadvolse-hubzilla-00d8783e45034febe06ff9e7139921a2588702db.tar.gz
volse-hubzilla-00d8783e45034febe06ff9e7139921a2588702db.tar.bz2
volse-hubzilla-00d8783e45034febe06ff9e7139921a2588702db.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
-rw-r--r--include/zot.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 5270ed8b8..bb87a234c 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -285,6 +285,16 @@ function zot_refresh($them, $channel = null, $force = false) {
return false;
}
+ $s = q("select site_dead from site where site_url = '%s' limit 1",
+ dbesc($url)
+ );
+
+ if($s && intval($s[0]['site_dead']) && (! $force)) {
+ logger('zot_refresh: site ' . $url . ' is marked dead and force flag is not set. Cancelling operation.');
+ return false;
+ }
+
+
$token = random_string();
$postvars = [];
@@ -3872,7 +3882,7 @@ function zot_reply_message_request($data) {
if ($messages) {
$env_recips = null;
- $r = q("select hubloc.*, site.site_crypto from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and hubloc_error = 0 and hubloc_deleted = 0",
+ $r = q("select hubloc.*, site.site_crypto from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and hubloc_error = 0 and hubloc_deleted = 0 and site.site_dead = 0 ",
dbesc($sender_hash)
);
if (! $r) {