diff options
| -rw-r--r-- | Zotlabs/Zot/Finger.php | 4 | ||||
| -rw-r--r-- | include/text.php | 9 | ||||
| -rw-r--r-- | include/zot.php | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php index 07798fbb1..229fda8bd 100644 --- a/Zotlabs/Zot/Finger.php +++ b/Zotlabs/Zot/Finger.php @@ -112,12 +112,12 @@ class Finger { if($signed_token) { $valid = rsa_verify('token.' . self::$token,base64url_decode($signed_token),$x['key']); if(! $valid) { - logger('invalid signed token: ' . $url . $rhs, LOGGER_NORMAL, LOG_WARN); + logger('invalid signed token: ' . $url . $rhs, LOGGER_NORMAL, LOG_ERR); return $ret; } } else { - logger('No signed token from ' . $url . $rhs, LOGGER_NORMAL, LOG_WARN); + logger('No signed token from ' . $url . $rhs, LOGGER_NORMAL, LOG_WARNING); // after 2017-01-01 this will be a hard error unless you over-ride it. if((time() > 1483228800) && (! get_config('system','allow_unsigned_zotfinger'))) return $ret; diff --git a/include/text.php b/include/text.php index a7cc4c9bd..375a89d3f 100644 --- a/include/text.php +++ b/include/text.php @@ -322,6 +322,15 @@ function autoname($len) { function xmlify($str) { $buffer = ''; + if(is_array($str)) { + + // allow to fall through so we ge a PHP error, as the log statement will + // probably get lost in the noise unless we're specifically looking for it. + + btlogger('xmlify called with array: ' . print_r($str,true), LOGGER_NORMAL, LOG_WARNING); + } + + $len = mb_strlen($str); for($x = 0; $x < $len; $x ++) { $char = mb_substr($str,$x,1); diff --git a/include/zot.php b/include/zot.php index b6424c272..ecfbfa128 100644 --- a/include/zot.php +++ b/include/zot.php @@ -373,12 +373,12 @@ function zot_refresh($them, $channel = null, $force = false) { if($signed_token) { $valid = rsa_verify('token.' . $token,base64url_decode($signed_token),$j['key']); if(! $valid) { - logger('invalid signed token: ' . $url . $rhs, LOGGER_NORMAL, LOG_WARN); + logger('invalid signed token: ' . $url . $rhs, LOGGER_NORMAL, LOG_ERR); return false; } } else { - logger('No signed token from ' . $url . $rhs, LOGGER_NORMAL, LOG_WARN); + logger('No signed token from ' . $url . $rhs, LOGGER_NORMAL, LOG_WARNING); // after 2017-01-01 this will be a hard error unless you over-ride it. if((time() > 1483228800) && (! get_config('system','allow_unsigned_zotfinger'))) { return false; |