]> git.mxchange.org Git - friendica.git/blobdiff - include/socgraph.php
projects / friendica.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Now deletions will also work with complicated queries
[friendica.git] / include / socgraph.php
diff --git a/include/socgraph.php b/include/socgraph.php
index f19c53e1f2e83428ecb0ebb86179d8d8cd48cb81..55e0e6fc3a98a560c32573c442707e7c39de878a 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -38,7 +38,7 @@ require_once 'include/Photo.php';
  */
 function poco_load($cid, $uid = 0, $zcid = 0, $url = null) {
        // Call the function "poco_load_worker" via the worker
-       proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", intval($cid), intval($uid), intval($zcid), base64_encode($url));
+       proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
 }
 
 /**
@@ -669,7 +669,7 @@ function poco_last_updated($profile, $force = false) {
 
        $last_updated = "";
 
-       foreach ($entries AS $entry) {
+       foreach ($entries as $entry) {
                $published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
                $updated = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
 
@@ -778,7 +778,7 @@ function poco_detect_poco_data($data) {
                return false;
        }
 
-       foreach ($data->entry[0]->urls AS $url) {
+       foreach ($data->entry[0]->urls as $url) {
                if ($url->type == 'zot') {
                        $server = array();
                        $server["platform"] = 'Hubzilla';
@@ -813,7 +813,7 @@ function poco_fetch_nodeinfo($server_url) {
 
        $nodeinfo_url = '';
 
-       foreach ($nodeinfo->links AS $link) {
+       foreach ($nodeinfo->links as $link) {
                if ($link->rel == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
                        $nodeinfo_url = $link->href;
                }
@@ -866,7 +866,7 @@ function poco_fetch_nodeinfo($server_url) {
        $gnusocial = false;
 
        if (is_array($nodeinfo->protocols->inbound)) {
-               foreach ($nodeinfo->protocols->inbound AS $inbound) {
+               foreach ($nodeinfo->protocols->inbound as $inbound) {
                        if ($inbound == 'diaspora') {
                                $diaspora = true;
                        }
@@ -1159,54 +1159,78 @@ function poco_check_server($server_url, $network = "", $force = false) {
        }
 
        if (!$failure) {
-               // Test for Hubzilla, Redmatrix or Friendica
-               $serverret = z_fetch_url($server_url."/api/statusnet/config.json");
+               // Test for Hubzilla and Red
+               $serverret = z_fetch_url($server_url."/siteinfo.json");
                if ($serverret["success"]) {
                        $data = json_decode($serverret["body"]);
-                       if (isset($data->site->server)) {
-                               if (isset($data->site->platform)) {
-                                       $platform = $data->site->platform->PLATFORM_NAME;
-                                       $version = $data->site->platform->STD_VERSION;
-                                       $network = NETWORK_DIASPORA;
-                               }
-                               if (isset($data->site->BlaBlaNet)) {
-                                       $platform = $data->site->BlaBlaNet->PLATFORM_NAME;
-                                       $version = $data->site->BlaBlaNet->STD_VERSION;
-                                       $network = NETWORK_DIASPORA;
-                               }
-                               if (isset($data->site->hubzilla)) {
-                                       $platform = $data->site->hubzilla->PLATFORM_NAME;
-                                       $version = $data->site->hubzilla->RED_VERSION;
-                                       $network = NETWORK_DIASPORA;
-                               }
-                               if (isset($data->site->redmatrix)) {
-                                       if (isset($data->site->redmatrix->PLATFORM_NAME)) {
-                                               $platform = $data->site->redmatrix->PLATFORM_NAME;
-                                       } elseif (isset($data->site->redmatrix->RED_PLATFORM)) {
-                                               $platform = $data->site->redmatrix->RED_PLATFORM;
+                       if (isset($data->url)) {
+                               $platform = $data->platform;
+                               $version = $data->version;
+                               $network = NETWORK_DIASPORA;
+                       }
+                       $site_name = $data->site_name;
+                       switch ($data->register_policy) {
+                               case "REGISTER_OPEN":
+                                       $register_policy = REGISTER_OPEN;
+                                       break;
+                               case "REGISTER_APPROVE":
+                                       $register_policy = REGISTER_APPROVE;
+                                       break;
+                               case "REGISTER_CLOSED":
+                               default:
+                                       $register_policy = REGISTER_CLOSED;
+                                       break;
+                       }
+               } else {
+                       // Test for Hubzilla, Redmatrix or Friendica
+                       $serverret = z_fetch_url($server_url."/api/statusnet/config.json");
+                       if ($serverret["success"]) {
+                               $data = json_decode($serverret["body"]);
+                               if (isset($data->site->server)) {
+                                       if (isset($data->site->platform)) {
+                                               $platform = $data->site->platform->PLATFORM_NAME;
+                                               $version = $data->site->platform->STD_VERSION;
+                                               $network = NETWORK_DIASPORA;
+                                       }
+                                       if (isset($data->site->BlaBlaNet)) {
+                                               $platform = $data->site->BlaBlaNet->PLATFORM_NAME;
+                                               $version = $data->site->BlaBlaNet->STD_VERSION;
+                                               $network = NETWORK_DIASPORA;
                                        }
+                                       if (isset($data->site->hubzilla)) {
+                                               $platform = $data->site->hubzilla->PLATFORM_NAME;
+                                               $version = $data->site->hubzilla->RED_VERSION;
+                                               $network = NETWORK_DIASPORA;
+                                       }
+                                       if (isset($data->site->redmatrix)) {
+                                               if (isset($data->site->redmatrix->PLATFORM_NAME)) {
+                                                       $platform = $data->site->redmatrix->PLATFORM_NAME;
+                                               } elseif (isset($data->site->redmatrix->RED_PLATFORM)) {
+                                                       $platform = $data->site->redmatrix->RED_PLATFORM;
+                                               }
 
-                                       $version = $data->site->redmatrix->RED_VERSION;
-                                       $network = NETWORK_DIASPORA;
-                               }
-                               if (isset($data->site->friendica)) {
-                                       $platform = $data->site->friendica->FRIENDICA_PLATFORM;
-                                       $version = $data->site->friendica->FRIENDICA_VERSION;
-                                       $network = NETWORK_DFRN;
-                               }
+                                               $version = $data->site->redmatrix->RED_VERSION;
+                                               $network = NETWORK_DIASPORA;
+                                       }
+                                       if (isset($data->site->friendica)) {
+                                               $platform = $data->site->friendica->FRIENDICA_PLATFORM;
+                                               $version = $data->site->friendica->FRIENDICA_VERSION;
+                                               $network = NETWORK_DFRN;
+                                       }
 
-                               $site_name = $data->site->name;
+                                       $site_name = $data->site->name;
 
-                               $data->site->closed = poco_to_boolean($data->site->closed);
-                               $data->site->private = poco_to_boolean($data->site->private);
-                               $data->site->inviteonly = poco_to_boolean($data->site->inviteonly);
+                                       $data->site->closed = poco_to_boolean($data->site->closed);
+                                       $data->site->private = poco_to_boolean($data->site->private);
+                                       $data->site->inviteonly = poco_to_boolean($data->site->inviteonly);
 
-                               if (!$data->site->closed && !$data->site->private and $data->site->inviteonly) {
-                                       $register_policy = REGISTER_APPROVE;
-                               } elseif (!$data->site->closed && !$data->site->private) {
-                                       $register_policy = REGISTER_OPEN;
-                               } else {
-                                       $register_policy = REGISTER_CLOSED;
+                                       if (!$data->site->closed && !$data->site->private and $data->site->inviteonly) {
+                                               $register_policy = REGISTER_APPROVE;
+                                       } elseif (!$data->site->closed && !$data->site->private) {
+                                               $register_policy = REGISTER_OPEN;
+                                       } else {
+                                               $register_policy = REGISTER_CLOSED;
+                                       }
                                }
                        }
                }
@@ -1582,11 +1606,11 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
        );
 
        $list = array();
-       foreach ($r2 AS $suggestion) {
+       foreach ($r2 as $suggestion) {
                $list[$suggestion["nurl"]] = $suggestion;
        }
 
-       foreach ($r AS $suggestion) {
+       foreach ($r as $suggestion) {
                $list[$suggestion["nurl"]] = $suggestion;
        }
 
@@ -1662,13 +1686,13 @@ function poco_fetch_serverlist($poco) {
                return;
        }
 
-       foreach ($serverlist AS $server) {
+       foreach ($serverlist as $server) {
                $server_url = str_replace("/index.php", "", $server->url);
 
                $r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
                if (!dbm::is_result($r)) {
                        logger("Call server check for server ".$server_url, LOGGER_DEBUG);
-                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($server_url));
+                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server_url);
                }
        }
 }
@@ -1689,8 +1713,8 @@ function poco_discover_federation() {
        if ($serverdata) {
                $servers = json_decode($serverdata);
 
-               foreach ($servers->pods AS $server) {
-                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode("https://".$server->host));
+               foreach ($servers->pods as $server) {
+                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", "https://".$server->host);
                }
        }
 
@@ -1701,9 +1725,9 @@ function poco_discover_federation() {
                if ($serverdata) {
                        $servers = json_decode($serverdata);
 
-                       foreach ($servers AS $server) {
+                       foreach ($servers as $server) {
                                $url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
-                               proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($url));
+                               proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $url);
                        }
                }
        }
@@ -1718,7 +1742,7 @@ function poco_discover_federation() {
        //      if ($result["success"]) {
        //              $servers = json_decode($result["body"]);
 
-       //              foreach($servers->data AS $server)
+       //              foreach($servers->data as $server)
        //                      poco_check_server($server->instance_address);
        //      }
        //}
@@ -1804,7 +1828,7 @@ function poco_discover($complete = false) {
 
        $r = q("SELECT `id`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
        if (dbm::is_result($r)) {
-               foreach ($r AS $server) {
+               foreach ($r as $server) {
 
                        if (!poco_check_server($server["url"], $server["network"])) {
                                // The server is not reachable? Okay, then we will try it later
@@ -1813,7 +1837,7 @@ function poco_discover($complete = false) {
                        }
 
                        logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
-                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", intval($server['id']));
+                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", (int)$server['id']);
 
                        if (!$complete && (--$no_of_queries == 0)) {
                                break;
@@ -1828,7 +1852,7 @@ function poco_discover_server_users($data, $server) {
                return;
        }
 
-       foreach ($data->entry AS $entry) {
+       foreach ($data->entry as $entry) {
                $username = "";
                if (isset($entry->urls)) {
                        foreach ($entry->urls as $url) {
@@ -1861,7 +1885,7 @@ function poco_discover_server($data, $default_generation = 0) {
 
        $success = false;
 
-       foreach ($data->entry AS $entry) {
+       foreach ($data->entry as $entry) {
                $profile_url = '';
                $profile_photo = '';
                $connect_url = '';
@@ -2091,7 +2115,7 @@ function get_gcontact_id($contact) {
 
        if ($doprobing) {
                logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
-               proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"]));
+               proc_run(PRIORITY_LOW, 'include/gprobe.php', $contact["url"]);
        }
 
        return $gcontact_id;
@@ -2125,7 +2149,7 @@ function update_gcontact($contact) {
 
        // Get all field names
        $fields = array();
-       foreach ($r[0] AS $field => $data) {
+       foreach ($r[0] as $field => $data) {
                $fields[$field] = $data;
        }
 
@@ -2144,7 +2168,7 @@ function update_gcontact($contact) {
        }
 
        // assign all unassigned fields from the database entry
-       foreach ($fields as $field => $data)
+       foreach ($fields as $field => $data) {
                if (!isset($contact[$field]) || ($contact[$field] == "")) {
                        $contact[$field] = $r[0][$field];
                }
@@ -2198,7 +2222,7 @@ function update_gcontact($contact) {
        unset($fields["generation"]);
 
        if ((($contact["generation"] > 0) && ($contact["generation"] <= $r[0]["generation"])) || ($r[0]["generation"] == 0)) {
-               foreach ($fields AS $field => $data) {
+               foreach ($fields as $field => $data) {
                        if ($contact[$field] != $r[0][$field]) {
                                logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
                                $update = true;
@@ -2357,7 +2381,7 @@ function gs_fetch_users($server) {
        }
 
        if (is_object($statistics->users)) {
-               foreach ($statistics->users AS $nick => $user) {
+               foreach ($statistics->users as $nick => $user) {
                        $profile_url = $server."/".$user->nickname;
 
                        $contact = array("url" => $profile_url,
@@ -2389,7 +2413,7 @@ function gs_discover() {
                return;
        }
 
-       foreach ($r AS $server) {
+       foreach ($r as $server) {
                gs_fetch_users($server["url"]);
                q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
        }
Unnamed repository; edit this file 'description' to name the repository.