X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirfind.php;h=0dfe4d67a9b61960623d963f0f58718ccbabe2be;hb=ed6ada0da571ac88b039a162601ac172c3680710;hp=5c5d0e933ac5856444811e4479409f4cdcbbd93e;hpb=2cd3ec7b983327f8c162845d0f4b8d9753f30e27;p=friendica.git
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 5c5d0e933a..0dfe4d67a9 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -1,42 +1,164 @@
page,'aside'))
$a->page['aside'] = '';
- $a->page['aside'] .= follow_widget();
-
$a->page['aside'] .= findpeople_widget();
+
+ $a->page['aside'] .= follow_widget();
}
-function dirfind_content(&$a) {
+function dirfind_content(&$a, $prefix = "") {
+
+ $community = false;
+ $discover_user = false;
- $search = notags(trim($_REQUEST['search']));
+ $local = get_config('system','poco_local_search');
- if(strpos($search,'@') === 0)
+ $search = $prefix.notags(trim($_REQUEST['search']));
+
+ if(strpos($search,'@') === 0) {
+ $search = substr($search,1);
+ if ((valid_email($search) AND validate_email($search)) OR
+ (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)));
+ }
+ }
+
+ if(strpos($search,'!') === 0) {
$search = substr($search,1);
-
+ $community = true;
+ }
+
$o = '';
- $o .= '
' . t('People Search') . ' - ' . $search . '
';
-
if($search) {
- $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
-
- if(strlen(get_config('system','directory_submit_url')))
- $x = fetch_url('http://dir.friendica.com/lsearch?f=' . $p . '&search=' . urlencode($search));
+ if ($discover_user) {
+ $j = new stdClass();
+ $j->total = 1;
+ $j->items_page = 1;
+ $j->page = $a->pager['page'];
+
+ $objresult = new stdClass();
+ $objresult->cid = 0;
+ $objresult->name = $user_data["name"];
+ $objresult->addr = $user_data["addr"];
+ $objresult->url = $user_data["url"];
+ $objresult->photo = $user_data["photo"];
+ $objresult->tags = "";
+ $objresult->network = $user_data["network"];
+
+ $contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc(normalise_link($user_data["url"])), intval(local_user()));
+ if ($contact)
+ $objresult->cid = $contact[0]["id"];
+
+
+ $j->results[] = $objresult;
+
+ poco_check($user_data["url"], $user_data["name"], $user_data["network"], $user_data["photo"],
+ "", "", "", "", "", datetime_convert(), 0);
+ } elseif ($local) {
+
+ if ($community)
+ $extra_sql = " AND `community`";
+ else
+ $extra_sql = "";
+
+ $perpage = 80;
+ $startrec = (($a->pager['page']) * $perpage) - $perpage;
+
+ if (get_config('system','diaspora_enabled'))
+ $diaspora = NETWORK_DIASPORA;
+ else
+ $diaspora = NETWORK_DFRN;
+
+ if (!get_config('system','ostatus_disabled'))
+ $ostatus = NETWORK_OSTATUS;
+ else
+ $ostatus = NETWORK_DFRN;
+
+ $count = q("SELECT count(*) AS `total` FROM `gcontact`
+ LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
+ AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
+ AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
+ WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
+ ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
+ (`gcontact`.`url` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`location` REGEXP '%s' OR
+ `gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql",
+ intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
+ dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
+ dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)),
+ dbesc(escape_tags($search)), dbesc(escape_tags($search)));
+
+ $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`
+ FROM `gcontact`
+ LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
+ AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
+ AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
+ WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
+ ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
+ (`gcontact`.`url` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`location` REGEXP '%s' OR
+ `gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql
+ GROUP BY `gcontact`.`nurl`
+ ORDER BY `gcontact`.`updated` DESC LIMIT %d, %d",
+ intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
+ dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
+ dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)),
+ dbesc(escape_tags($search)), dbesc(escape_tags($search)),
+ intval($startrec), intval($perpage));
+ $j = new stdClass();
+ $j->total = $count[0]["total"];
+ $j->items_page = $perpage;
+ $j->page = $a->pager['page'];
+ foreach ($results AS $result) {
+ if (poco_alternate_ostatus_url($result["url"]))
+ continue;
+
+ if ($result["name"] == "") {
+ $urlparts = parse_url($result["url"]);
+ $result["name"] = end(explode("/", $urlparts["path"]));
+ }
+
+ $objresult = new stdClass();
+ $objresult->cid = $result["cid"];
+ $objresult->name = $result["name"];
+ $objresult->addr = $result["addr"];
+ $objresult->url = $result["url"];
+ $objresult->photo = $result["photo"];
+ $objresult->tags = $result["keywords"];
+ $objresult->network = $result["network"];
+
+ $j->results[] = $objresult;
+ }
+
+ // Add found profiles from the global directory to the local directory
+ proc_run('php','include/discover_poco.php', "dirsearch", urlencode($search));
+ } else {
-//TODO fallback local search if global dir not available.
-// else
-// $x = post_url($a->get_baseurl() . '/lsearch', $params);
+ $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
- $j = json_decode($x);
+ if(strlen(get_config('system','directory')))
+ $x = fetch_url(get_server().'/lsearch?f=' . $p . '&search=' . urlencode($search));
+
+ $j = json_decode($x);
+ }
if($j->total) {
$a->set_pager_total($j->total);
@@ -44,25 +166,72 @@ function dirfind_content(&$a) {
}
if(count($j->results)) {
-
- $tpl = get_markup_template('match.tpl');
+
+ $id = 0;
+
foreach($j->results as $jj) {
-
- $o .= replace_macros($tpl,array(
- '$url' => zrl($jj->url),
- '$name' => $jj->name,
- '$photo' => $jj->photo,
- '$tags' => $jj->tags
- ));
+
+ $alt_text = "";
+
+ $contact_details = get_contact_details_by_url($jj->url, local_user());
+
+ $itemurl = (($contact_details["addr"] != "") ? $contact_details["addr"] : $jj->url);
+
+ // If We already know this contact then don't show the "connect" button
+ if ($jj->cid > 0) {
+ $connlnk = "";
+ $conntxt = "";
+ $contact = q("SELECT * FROM `contact` WHERE `id` = %d",
+ intval($jj->cid));
+ if ($contact) {
+ $photo_menu = contact_photo_menu($contact[0]);
+ $details = _contact_detail_for_template($contact[0]);
+ $alt_text = $details['alt_text'];
+ } else
+ $photo_menu = array();
+ } else {
+ $connlnk = $a->get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
+ $conntxt = t('Connect');
+ $photo_menu = array(array(t("View Profile"), zrl($jj->url)));
+ $photo_menu[] = array(t("Connect/Follow"), $connlnk);
+ }
+
+ $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
+
+ $entry = array(
+ 'alt_text' => $alt_text,
+ 'url' => zrl($jj->url),
+ 'itemurl' => $itemurl,
+ 'name' => htmlentities($jj->name),
+ 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+ 'img_hover' => $jj->tags,
+ 'conntxt' => $conntxt,
+ 'connlnk' => $connlnk,
+ 'photo_menu' => $photo_menu,
+ 'details' => $contact_details['location'],
+ 'tags' => $contact_details['keywords'],
+ 'about' => $contact_details['about'],
+ 'account_type' => (($contact_details['community']) ? t('Forum') : ''),
+ 'network' => network_to_name($jj->network, $jj->url),
+ 'id' => ++$id,
+ );
+ $entries[] = $entry;
}
+
+ $tpl = get_markup_template('viewcontact_template.tpl');
+
+ $o .= replace_macros($tpl,array(
+ 'title' => sprintf( t('People Search - %s'), $search),
+ '$contacts' => $entries,
+ '$paginate' => paginate($a),
+ ));
+
}
else {
info( t('No matches') . EOL);
- }
+ }
}
- $o .= '';
- $o .= paginate($a);
return $o;
}