Merge pull request #3868 from rabuzarus/20171104_-_use_best_link_url_for_events

[friendica.git] / include / discover_poco.php

diff --git a/include/discover_poco.php b/include/discover_poco.php
index 11794c32d7d4e901d80a3a64cbeed4fbc38e933e..dd208d492f753c96bbe32b338f87c2fb93b7fe57 100644 (file)
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -47,13 +47,12 @@ function discover_poco_run(&$argv, &$argc) {
        logger('start '.$search);
 
        if ($mode == 8) {
-               $profile_url = base64_decode($argv[2]);
-               if ($profile_url != "") {
-                       poco_last_updated($profile_url, true);
+               if ($argv[2] != "") {
+                       poco_last_updated($argv[2], true);
                }
        } elseif ($mode == 7) {
                if ($argc == 6) {
-                       $url = base64_decode($argv[5]);
+                       $url = $argv[5];
                } else {
                        $url = '';
                }
@@ -63,7 +62,7 @@ function discover_poco_run(&$argv, &$argc) {
        } elseif ($mode == 5) {
                update_server();
        } elseif ($mode == 4) {
-               $server_url = base64_decode($argv[2]);
+               $server_url = $argv[2];
                if ($server_url == "") {
                        return;
                }
@@ -83,10 +82,10 @@ function discover_poco_run(&$argv, &$argc) {
                update_suggestions();
        } elseif (($mode == 2) && get_config('system','poco_completion')) {
                discover_users();
-       } elseif (($mode == 1) && ($search != "") and get_config('system','poco_local_search')) {
+       } elseif (($mode == 1) && ($search != "") && get_config('system','poco_local_search')) {
                discover_directory($search);
                gs_search_user($search);
-       } elseif (($mode == 0) && ($search == "") and (get_config('system','poco_discovery') > 0)) {
+       } elseif (($mode == 0) && ($search == "") && (get_config('system','poco_discovery') > 0)) {
                // Query Friendica and Hubzilla servers for their users
                poco_discover();
 
@@ -119,7 +118,7 @@ function update_server() {
                }
                logger('Update server status 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"]);
 
                if (++$updated > 250) {
                        return;
@@ -178,7 +177,7 @@ function discover_users() {
 
                if ((($server_url == "") && ($user["network"] == NETWORK_FEED)) || $force_update || poco_check_server($server_url, $user["network"])) {
                        logger('Check profile '.$user["url"]);
-                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", base64_encode($user["url"]));
+                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", $user["url"]);
 
                        if (++$checked > 100) {
                                return;