From 56484eaaebc6dab03dcadf1bb02fda42960d5838 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Tue, 6 Nov 2018 10:07:22 +0100 Subject: [PATCH 1/3] Fix Friendica node info json And stop worker sending warning from PortableContacts.php --- mod/friendica.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/friendica.php b/mod/friendica.php index 2629a0a19e..2b77848d00 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -52,7 +52,7 @@ function friendica_init(App $a) 'locked_features' => $locked_features, 'explicit_content' => (int)Config::get('system', 'explicit_content', false), 'language' => Config::get('system','language'), - 'register_policy ' => $register_policy[intval(Config::get('config', 'register_policy'))], + 'register_policy' => $register_policy[intval(Config::get('config', 'register_policy'))], 'admin' => $admin, 'site_name' => Config::get('config', 'sitename'), 'platform' => FRIENDICA_PLATFORM, From 1858204cbdb6febbebb8d148b67302334b575e49 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Tue, 6 Nov 2018 12:10:23 +0100 Subject: [PATCH 2/3] Stop PortableContacts to raise warning on malformed register_policy --- src/Protocol/PortableContact.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php index fb8b48d7cb..e2d902ac58 100644 --- a/src/Protocol/PortableContact.php +++ b/src/Protocol/PortableContact.php @@ -1375,7 +1375,12 @@ class PortableContact } $info = $data['info']; - $register_policy = constant($data['register_policy']); + if (in_array($data['register_policy'], ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'])) { + $register_policy = constant($data['register_policy']); + } else { + Logger::log("Register policy '".$data['register_policy']."' from $server_url is invalid."); + $register_policy = REGISTER_CLOSED; // set a default value + } $platform = $data['platform']; } } From 0441a169a932c3ba19a2fedc16b4db895cdec127 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Tue, 6 Nov 2018 16:37:58 +0100 Subject: [PATCH 3/3] Fix code style --- mod/friendica.php | 2 +- src/Protocol/PortableContact.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/friendica.php b/mod/friendica.php index 2b77848d00..0e647eb5ea 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -52,7 +52,7 @@ function friendica_init(App $a) 'locked_features' => $locked_features, 'explicit_content' => (int)Config::get('system', 'explicit_content', false), 'language' => Config::get('system','language'), - 'register_policy' => $register_policy[intval(Config::get('config', 'register_policy'))], + 'register_policy' => $register_policy[intval(Config::get('config', 'register_policy'))], 'admin' => $admin, 'site_name' => Config::get('config', 'sitename'), 'platform' => FRIENDICA_PLATFORM, diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php index e2d902ac58..9c22a21631 100644 --- a/src/Protocol/PortableContact.php +++ b/src/Protocol/PortableContact.php @@ -1378,7 +1378,7 @@ class PortableContact if (in_array($data['register_policy'], ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'])) { $register_policy = constant($data['register_policy']); } else { - Logger::log("Register policy '".$data['register_policy']."' from $server_url is invalid."); + Logger::log("Register policy '{$data['register_policy']}' from $server_url is invalid."); $register_policy = REGISTER_CLOSED; // set a default value } $platform = $data['platform'];