From b6e1571b1edf14f8080800cdd219194e443acbd1 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 15 Dec 2018 04:32:47 -0500 Subject: [PATCH] Fix various notices --- src/Content/Text/BBCode.php | 2 +- src/Model/GContact.php | 8 ++++---- src/Protocol/Email.php | 12 +++++------- src/Protocol/OStatus.php | 4 +++- src/Protocol/PortableContact.php | 4 ++-- src/Util/Network.php | 2 +- src/Worker/GProbe.php | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index e304f47637..6d2b152ee8 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -626,7 +626,7 @@ class BBCode extends BaseObject $data["title"] = $data["url"]; } - if (($data["text"] == "") && ($data["title"] != "") && ($data["url"] == "")) { + if (empty($data["text"]) && !empty($data["title"]) && empty($data["url"])) { return $data["title"] . $data["after"]; } diff --git a/src/Model/GContact.php b/src/Model/GContact.php index 3acffb059d..44d1edecd7 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -966,8 +966,8 @@ class GContact $statistics = json_decode($curlResult->getBody()); - if (!empty($statistics->config)) { - if ($statistics->config->instance_with_ssl) { + if (!empty($statistics->config->instance_address)) { + if (!empty($statistics->config->instance_with_ssl)) { $server = "https://"; } else { $server = "http://"; @@ -976,8 +976,8 @@ class GContact $server .= $statistics->config->instance_address; $hostname = $statistics->config->instance_address; - } elseif (!empty($statistics)) { - if ($statistics->instance_with_ssl) { + } elseif (!empty($statistics->instance_address)) { + if (!empty($statistics->instance_with_ssl)) { $server = "https://"; } else { $server = "http://"; diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php index ba8c311901..358ff27db0 100644 --- a/src/Protocol/Email.php +++ b/src/Protocol/Email.php @@ -117,7 +117,7 @@ class Email return $ret; } - if (!$struc->parts) { + if (empty($struc->parts)) { $ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'html'); $html = $ret['body']; @@ -482,13 +482,11 @@ class Email '[\r\n]\s*-----BEGIN PGP SIGNATURE-----\s*[\r\n].*'. '[\r\n]\s*-----END PGP SIGNATURE-----(.*)/is'; - preg_match($pattern, $message, $result); + if (preg_match($pattern, $message, $result)) { + $cleaned = trim($result[1].$result[2].$result[3]); - $cleaned = trim($result[1].$result[2].$result[3]); - - $cleaned = str_replace(["\n- --\n", "\n- -"], ["\n-- \n", "\n-"], $cleaned); - - if ($cleaned == '') { + $cleaned = str_replace(["\n- --\n", "\n- -"], ["\n-- \n", "\n-"], $cleaned); + } else { $cleaned = $message; } diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 45000d7700..361d333b40 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -1543,8 +1543,10 @@ class OStatus */ private static function constructObjecttype(array $item) { - if (in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT])) + if (!empty($item['object-type']) && in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT])) { return $item['object-type']; + } + return ACTIVITY_OBJ_NOTE; } diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php index 8a20142dba..de49a8d3ca 100644 --- a/src/Protocol/PortableContact.php +++ b/src/Protocol/PortableContact.php @@ -1375,7 +1375,7 @@ class PortableContact $site_name = $data['site_name']; } - $info = $data['info']; + $info = defaults($data, 'info', ''); $register_policy = defaults($data, 'register_policy', REGISTER_CLOSED); if (in_array($register_policy, ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'])) { $register_policy = constant($data['register_policy']); @@ -1383,7 +1383,7 @@ class PortableContact Logger::log("Register policy '$register_policy' from $server_url is invalid."); $register_policy = REGISTER_CLOSED; // set a default value } - $platform = $data['platform']; + $platform = defaults($data, 'platform', ''); } } } diff --git a/src/Util/Network.php b/src/Util/Network.php index e7707baf38..ab0958d642 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -362,7 +362,7 @@ class Network /// @TODO Really suppress function outcomes? Why not find them + debug them? $h = @parse_url($url); - if ((is_array($h)) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP) )) { + if (!empty($h['host']) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP) )) { return $url; } diff --git a/src/Worker/GProbe.php b/src/Worker/GProbe.php index 4f51db2dfb..49638c7c94 100644 --- a/src/Worker/GProbe.php +++ b/src/Worker/GProbe.php @@ -35,7 +35,7 @@ class GProbe { $result = Cache::get("gprobe:".$urlparts["host"]); if (!is_null($result)) { if (in_array($result["network"], [Protocol::FEED, Protocol::PHANTOM])) { - Logger::log("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), Logger::DEBUG); + Logger::log("DDoS attempt detected for ".$urlparts["host"]." by ".defaults($_SERVER, "REMOTE_ADDR", '').". server data: ".print_r($_SERVER, true), Logger::DEBUG); return; } }