X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirfind.php;h=7d167494e6b6f7d1dd2f5729142cc846ca84adf2;hb=2894214347953f0d8f288ae1999688f2396d67a5;hp=2b2badb64031f0780dacc95df7f9c17a264cf5b8;hpb=70a042fd04d0481ed3893454c11e8d4323584e74;p=friendica.git

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 2b2badb640..7d167494e6 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -1,11 +1,16 @@
 <?php
-require_once('include/contact_widgets.php');
-require_once('include/socgraph.php');
-require_once('include/Contact.php');
-require_once('include/contact_selectors.php');
-require_once('mod/contacts.php');
 
-function dirfind_init(App &$a) {
+use Friendica\App;
+use Friendica\Core\System;
+
+require_once 'include/contact_widgets.php';
+require_once 'include/probe.php';
+require_once 'include/socgraph.php';
+require_once 'include/Contact.php';
+require_once 'include/contact_selectors.php';
+require_once 'mod/contacts.php';
+
+function dirfind_init(App $a) {
 
 	if (! local_user()) {
 		notice( t('Permission denied.') . EOL );
@@ -21,9 +26,7 @@ function dirfind_init(App &$a) {
 	$a->page['aside'] .= follow_widget();
 }
 
-
-
-function dirfind_content(&$a, $prefix = "") {
+function dirfind_content(App $a, $prefix = "") {
 
 	$community = false;
 	$discover_user = false;
@@ -35,7 +38,7 @@ function dirfind_content(&$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(&$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)
@@ -88,20 +91,19 @@ function dirfind_content(&$a, $prefix = "") {
 
 			if (get_config('system','diaspora_enabled')) {
 				$diaspora = NETWORK_DIASPORA;
-			}
-			else {
+			} else {
 				$diaspora = NETWORK_DFRN;
 			}
 
 			if (!get_config('system','ostatus_disabled')) {
 				$ostatus = NETWORK_OSTATUS;
-			}
-			else {
+			} else {
 				$ostatus = NETWORK_DFRN;
 			}
 
 			$search2 = "%".$search."%";
 
+			/// @TODO These 2 SELECTs are not checked on validity with dbm::is_result()
 			$count = q("SELECT count(*) AS `total` FROM `gcontact`
 					LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
 						AND `contact`.`network` = `gcontact`.`network`
@@ -200,12 +202,11 @@ function dirfind_content(&$a, $prefix = "") {
 						$photo_menu = contact_photo_menu($contact[0]);
 						$details = _contact_detail_for_template($contact[0]);
 						$alt_text = $details['alt_text'];
-					}
-					else {
+					} else {
 						$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)),
@@ -243,8 +244,7 @@ function dirfind_content(&$a, $prefix = "") {
 			'$paginate' => paginate($a),
 		));
 
-		}
-		else {
+		} else {
 			info( t('No matches') . EOL);
 		}