X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirfind.php;h=a1253b1442d9a8c9b917b2aaf327669ecb93e4e9;hb=478e363967165980eb826e8d109dd15770e2c784;hp=1b19ad92c459e6bad268224fbf2819fc53a7681d;hpb=5eaa5951a1b19b985017b5db20f3b1abf464a1ef;p=friendica.git diff --git a/mod/dirfind.php b/mod/dirfind.php index 1b19ad92c4..a1253b1442 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -1,9 +1,15 @@ page['aside'] .= follow_widget(); } - - function dirfind_content(App $a, $prefix = "") { $community = false; @@ -35,7 +39,7 @@ function dirfind_content(App $a, $prefix = "") { if (strpos($search,'@') === 0) { $search = substr($search,1); $header = sprintf( t('People Search - %s'), $search); - if ((valid_email($search) AND validate_email($search)) OR + if ((valid_email($search) && validate_email($search)) || (substr(normalise_link($search), 0, 7) == "http://")) { $user_data = probe_url($search); $discover_user = (in_array($user_data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))); @@ -73,9 +77,9 @@ function dirfind_content(App $a, $prefix = "") { $j->results[] = $objresult; // Add the contact to the global contacts if it isn't already in our system - if (($contact["cid"] == 0) AND ($contact["zid"] == 0) AND ($contact["gid"] == 0)) - poco_check($user_data["url"], $user_data["name"], $user_data["network"], $user_data["photo"], - "", "", "", "", "", datetime_convert(), 0); + if (($contact["cid"] == 0) && ($contact["zid"] == 0) && ($contact["gid"] == 0)) { + update_gcontact($user_data); + } } elseif ($local) { if ($community) @@ -161,7 +165,7 @@ function dirfind_content(App $a, $prefix = "") { } // Add found profiles from the global directory to the local directory - proc_run(PRIORITY_LOW, 'include/discover_poco.php', "dirsearch", urlencode($search)); + Worker::add(PRIORITY_LOW, 'discover_poco', "dirsearch", urlencode($search)); } else { $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); @@ -203,7 +207,7 @@ function dirfind_content(App $a, $prefix = "") { $photo_menu = array(); } } else { - $connlnk = App::get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url); + $connlnk = System::baseUrl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url); $conntxt = t('Connect'); $photo_menu = array( 'profile' => array(t("View Profile"), zrl($jj->url)),