require_once('include/socgraph.php');
require_once('include/Contact.php');
require_once('include/contact_selectors.php');
+require_once('mod/contacts.php');
-function dirfind_init(&$a) {
+function dirfind_init(App $a) {
- if(! local_user()) {
+ if (! local_user()) {
notice( t('Permission denied.') . EOL );
return;
}
- if(! x($a->page,'aside'))
+ if (! x($a->page,'aside')) {
$a->page['aside'] = '';
+ }
$a->page['aside'] .= findpeople_widget();
-function dirfind_content(&$a, $prefix = "") {
+function dirfind_content(App $a, $prefix = "") {
$community = false;
+ $discover_user = false;
$local = get_config('system','poco_local_search');
$search = $prefix.notags(trim($_REQUEST['search']));
- if(strpos($search,'@') === 0)
+ if (strpos($search,'@') === 0) {
$search = substr($search,1);
+ $header = sprintf( t('People Search - %s'), $search);
+ 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) {
+ if (strpos($search,'!') === 0) {
$search = substr($search,1);
$community = true;
+ $header = sprintf( t('Forum Search - %s'), $search);
}
$o = '';
- if($search) {
+ if ($search) {
- if ($local) {
+ 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 = get_contact_details_by_url($user_data["url"], local_user());
+ $objresult->cid = $contact["cid"];
+
+ $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)) {
+ update_gcontact($user_data);
+ }
+ } elseif ($local) {
if ($community)
$extra_sql = " AND `community`";
$perpage = 80;
$startrec = (($a->pager['page']) * $perpage) - $perpage;
- $count = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `network` IN ('%s', '%s', '%s') AND
- (`url` REGEXP '%s' OR `name` REGEXP '%s' OR `location` REGEXP '%s' OR
- `about` REGEXP '%s' OR `keywords` REGEXP '%s')".$extra_sql,
- dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA),
- dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)),
- dbesc(escape_tags($search)), dbesc(escape_tags($search)));
+ if (get_config('system','diaspora_enabled')) {
+ $diaspora = NETWORK_DIASPORA;
+ } else {
+ $diaspora = NETWORK_DFRN;
+ }
- $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network` , `gcontact`.`keywords`
+ if (!get_config('system','ostatus_disabled')) {
+ $ostatus = NETWORK_OSTATUS;
+ } 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`
+ 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` LIKE '%s' OR `gcontact`.`name` LIKE '%s' OR `gcontact`.`location` LIKE '%s' OR
+ `gcontact`.`addr` LIKE '%s' OR `gcontact`.`about` LIKE '%s' OR `gcontact`.`keywords` LIKE '%s') $extra_sql",
+ intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
+ dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
+ dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),
+ dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)));
+
+ $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`.`network` = `gcontact`.`network`
AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
- WHERE `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
+ 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` LIKE '%s' OR `gcontact`.`name` LIKE '%s' OR `gcontact`.`location` LIKE '%s' OR
+ `gcontact`.`addr` LIKE '%s' OR `gcontact`.`about` LIKE '%s' OR `gcontact`.`keywords` LIKE '%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(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA),
- dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)),
- dbesc(escape_tags($search)), dbesc(escape_tags($search)),
+ dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
+ dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),
+ dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),
intval($startrec), intval($perpage));
$j = new stdClass();
$j->total = $count[0]["total"];
$j->items_page = $perpage;
- $j->page = $a->pager['page'];
+ $j->page = $a->pager['page'];
foreach ($results AS $result) {
- if (poco_alternate_ostatus_url($result["url"]))
- continue;
+ if (poco_alternate_ostatus_url($result["url"])) {
+ continue;
+ }
+
+ $result = get_contact_details_by_url($result["url"], local_user(), $result);
if ($result["name"] == "") {
$urlparts = parse_url($result["url"]);
$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"];
}
// Add found profiles from the global directory to the local directory
- proc_run('php','include/discover_poco.php', "dirsearch", urlencode($search));
+ proc_run(PRIORITY_LOW, 'include/discover_poco.php', "dirsearch", urlencode($search));
} else {
$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
$j = json_decode($x);
}
- if($j->total) {
+ if ($j->total) {
$a->set_pager_total($j->total);
$a->set_pager_itemspage($j->items_page);
}
- if(count($j->results)) {
+ if (count($j->results)) {
$id = 0;
- foreach($j->results as $jj) {
+ foreach ($j->results as $jj) {
+
+ $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) {
$conntxt = "";
$contact = q("SELECT * FROM `contact` WHERE `id` = %d",
intval($jj->cid));
- if ($contact)
+ if ($contact) {
$photo_menu = contact_photo_menu($contact[0]);
- else
+ $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);
+ $connlnk = App::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);
+ $photo_menu = array(
+ 'profile' => array(t("View Profile"), zrl($jj->url)),
+ 'follow' => 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' => $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' => account_type($contact_details),
'network' => network_to_name($jj->network, $jj->url),
'id' => ++$id,
);
$tpl = get_markup_template('viewcontact_template.tpl');
$o .= replace_macros($tpl,array(
- 'title' => sprintf( t('People Search - %s'), $search),
+ 'title' => $header,
'$contacts' => $entries,
'$paginate' => paginate($a),
));
- }
- else {
+ } else {
info( t('No matches') . EOL);
}
projects / friendica.git / blobdiff