diff options
| -rw-r--r-- | Zotlabs/Zot/Receiver.php | 7 | ||||
| -rw-r--r-- | include/crypto.php | 15 | ||||
| -rw-r--r-- | include/datetime.php | 2 | ||||
| -rw-r--r-- | include/queue_fn.php | 4 |
4 files changed, 22 insertions, 6 deletions
diff --git a/Zotlabs/Zot/Receiver.php b/Zotlabs/Zot/Receiver.php index 238de1332..71d57eb35 100644 --- a/Zotlabs/Zot/Receiver.php +++ b/Zotlabs/Zot/Receiver.php @@ -41,9 +41,10 @@ class Receiver { if(! $this->messagetype) $this->error = true; - $this->sender = ((array_key_exists('sender',$this->data)) ? $this->data['sender'] : null); - $this->recipients = ((array_key_exists('recipients',$this->data)) ? $this->data['recipients'] : null); - + if($this->data) { + $this->sender = ((array_key_exists('sender',$this->data)) ? $this->data['sender'] : null); + $this->recipients = ((array_key_exists('recipients',$this->data)) ? $this->data['recipients'] : null); + } if($this->sender) $this->ValidateSender(); diff --git a/include/crypto.php b/include/crypto.php index 494a2a5b9..50ec2a3a6 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -21,6 +21,21 @@ function rsa_verify($data,$sig,$key,$alg = 'sha256') { if(intval(OPENSSL_ALGO_SHA256) && $alg === 'sha256') $alg = OPENSSL_ALGO_SHA256; $verify = openssl_verify($data,$sig,$key,$alg); + + if(! $verify) { + logger('openssl_verify: ' . openssl_error_string(),LOGGER_NORMAL,LOG_ERR); + logger('openssl_verify: key: ' . $key, LOGGER_DEBUG, LOG_ERR); + // provide a backtrace so that we can debug key issues + if(version_compare(PHP_VERSION, '5.4.0') >= 0) { + $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); + if($stack) { + foreach($stack as $s) { + logger('stack: ' . basename($s['file']) . ':' . $s['line'] . ':' . $s['function'] . '()',LOGGER_DEBUG,LOG_ERR); + } + } + } + } + return $verify; } diff --git a/include/datetime.php b/include/datetime.php index 2f2727ae5..bfd806f32 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -549,7 +549,7 @@ function update_birthdays() { $ev['event_xchan'] = $rr['xchan_hash']; $ev['start'] = datetime_convert('UTC', 'UTC', $rr['abook_dob']); $ev['finish'] = datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day '); - $ev['adjust'] = 0; + $ev['adjust'] = 1; $ev['summary'] = sprintf( t('%1$s\'s birthday'), $rr['xchan_name']); $ev['description'] = sprintf( t('Happy Birthday %1$s'), '[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]') ; diff --git a/include/queue_fn.php b/include/queue_fn.php index 3112a832b..676620e2f 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -126,7 +126,7 @@ function queue_deliver($outq, $immediate = false) { remove_queue_item($outq['outq_hash']); // server is responding - see if anything else is going to this destination and is piled up - // and try to send some more. We're relying on the fact that delivery_loop() results in an + // and try to send some more. We're relying on the fact that do_delivery() results in an // immediate delivery otherwise we could get into a queue loop. if(! $immediate) { @@ -141,7 +141,7 @@ function queue_deliver($outq, $immediate = false) { } } if($piled_up) { - delivery_loop($piled_up); + do_delivery($piled_up); } } } |