clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

You can now search for @username@domain.tld in dirfind and the search will resolve that.

This commit is contained in:
Michael Vogel 2015-11-08 14:48:47 +01:00
parent e74916d395
commit e12b0d27bb
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/text.php
View File

@ -1020,8 +1020,9 @@ if(! function_exists('valid_email')) {
*/ */
function valid_email($x){ function valid_email($x){
if(get_config('system','disable_email_validation')) // Removed because Fabio told me so.
return true; //if(get_config('system','disable_email_validation'))
// return true;
if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
return true; return true;

35
mod/dirfind.php
View File

@ -25,13 +25,19 @@ function dirfind_init(&$a) {
function dirfind_content(&$a, $prefix = "") { function dirfind_content(&$a, $prefix = "") {
$community = false; $community = false;
$discover_user = false;
$local = get_config('system','poco_local_search'); $local = get_config('system','poco_local_search');
$search = $prefix.notags(trim($_REQUEST['search'])); $search = $prefix.notags(trim($_REQUEST['search']));
if(strpos($search,'@') === 0) if(strpos($search,'@') === 0) {
$search = substr($search,1); $search = substr($search,1);
if (valid_email($search)) {
$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); $search = substr($search,1);
@ -42,7 +48,32 @@ function dirfind_content(&$a, $prefix = "") {
if($search) { if($search) {
if ($local) { if ($discover_user) {
$j = new stdClass();
$j->total = $count[0]["total"];
$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) if ($community)
$extra_sql = " AND `community`"; $extra_sql = " AND `community`";