harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

retro-actively set standalone directory fix, also a fix for directory endless scroll when you hit the end.

Browse Source
This commit is contained in:
friendica 2014-08-28 19:05:13 -07:00
parent e20fe41f23
commit 95def2a247
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/directory.php
View File

@ -233,6 +233,11 @@ function directory_content(&$a) {
} }
else { else {
if($_REQUEST['aj']) {
$o = '<div id="content-complete"></div>';
echo $o;
killme();
}
if($a->pager['page'] == 1 && $j['records'] == 0 && strpos($search,'@')) { if($a->pager['page'] == 1 && $j['records'] == 0 && strpos($search,'@')) {
goaway(z_root() . '/chanview/?f=&address=' . $search); goaway(z_root() . '/chanview/?f=&address=' . $search);
} }

8
mod/dirsearch.php
View File

@ -29,6 +29,7 @@ function dirsearch_content(&$a) {
$sql_extra = ''; $sql_extra = '';
$tables = array('name','address','locale','region','postcode','country','gender','marital','sexual','keywords'); $tables = array('name','address','locale','region','postcode','country','gender','marital','sexual','keywords');
if($_REQUEST['query']) { if($_REQUEST['query']) {
@ -145,6 +146,11 @@ function dirsearch_content(&$a) {
if($hash) if($hash)
$logic = 1; $logic = 1;
if($dirmode == DIRECTORY_MODE_STANDALONE) {
$sql_extra .= " and xchan_addr like '%%" . get_app()->get_hostname() . "' ";
}
$safesql = (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " ) " : ''); $safesql = (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " ) " : '');
if($safe < 0) if($safe < 0)
$safesql = " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " ) "; $safesql = " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " ) ";
@ -254,8 +260,8 @@ function dirsearch_content(&$a) {
} }
} }
} }
json_return_and_die($ret);
json_return_and_die($ret);
} }
function dir_query_build($joiner,$field,$s) { function dir_query_build($joiner,$field,$s) {