Misspelled "detailed"

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index a64a804ba8d40dfbec5e45deafb7d3ed70c751bf..7d167494e6b6f7d1dd2f5729142cc846ca84adf2 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/contact_widgets.php';
 require_once 'include/probe.php';
@@ -37,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)));
@@ -75,7 +76,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) {
@@ -205,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)),