X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirfind.php;h=7d167494e6b6f7d1dd2f5729142cc846ca84adf2;hb=10ede7314136edb1c475e1af546a59ff4c5648cf;hp=1b19ad92c459e6bad268224fbf2819fc53a7681d;hpb=4ebebe96fee1ea3dda219fa7049e6d14a142aa19;p=friendica.git diff --git a/mod/dirfind.php b/mod/dirfind.php index 1b19ad92c4..7d167494e6 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -1,9 +1,14 @@ page['aside'] .= follow_widget(); } - - function dirfind_content(App $a, $prefix = "") { $community = false; @@ -35,7 +38,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 +76,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) @@ -203,7 +206,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)),