X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirfind.php;h=884eca9a663d5426b49bd962d672f486352ed652;hb=7034d6efbd988e7481ac6f5d6413a8925221ed6b;hp=a64a804ba8d40dfbec5e45deafb7d3ed70c751bf;hpb=fd5d058156185c6c02c1285a794139d07f4d13ce;p=friendica.git diff --git a/mod/dirfind.php b/mod/dirfind.php index a64a804ba8..884eca9a66 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -37,7 +37,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))); @@ -75,7 +75,7 @@ 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)) { + if (($contact["cid"] == 0) && ($contact["zid"] == 0) && ($contact["gid"] == 0)) { update_gcontact($user_data); } } elseif ($local) {