Merge pull request #6086 from friendica/fabrixxm-patch-1

Fix Friendica node info json

diff --git a/mod/friendica.php b/mod/friendica.php
index 2629a0a19e3c3bdd4b89f4745edb4b7d43248015..0e647eb5ea18ae31bc28035d54165f83af7b3eef 100644 (file)
--- 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 fb8b48d7cb39c8708371fe7646d0be8d7cfefd2d..9c22a216319ff3d5095bb3dc2df9e95e58edd22c 100644 (file)
--- 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'];
                                }
                        }