Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 16:35:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

suggestion work

Browse source
This commit is contained in:
nobody 2020-09-02 18:17:52 -07:00
parent dd7cec55de
commit c3fb6c890f
2 changed files with 11 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Zotlabs/Module/Directory.php
View file

@ -91,9 +91,9 @@ class Directory extends Controller {
$globaldir = Libzotdir::get_directory_setting($observer, 'globaldir');
// override your personal global search pref if we're doing a navbar search of the directory
// if (intval($_REQUEST['navsearch'])) {
// $globaldir = 1;
// }
if (intval($_REQUEST['navsearch'])) {
$globaldir = 1;
}
$safe_mode = Libzotdir::get_directory_setting($observer, 'safemode');
@ -130,7 +130,8 @@ class Directory extends Controller {
// only works if the suggestion query and the directory query have the
// same number of results
$r = suggestion_query(local_channel(),get_observer_hash(),0,DIRECTORY_PAGESIZE);
App::set_pager_itemspage(60);
$r = suggestion_query(local_channel(),get_observer_hash(),App::$pager['start'],DIRECTORY_PAGESIZE);
if (! $r) {
notice( t('No default suggestions were found.') . EOL);
@ -162,23 +163,10 @@ class Directory extends Controller {
$directory_admin = false;
// if (($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
$url = z_root() . '/dirsearch';
if (is_site_admin()) {
$directory_admin = true;
}
// }
// if (! $url) {
// $directory = Libzotdir::find_upstream_directory($dirmode);
// if ((! $directory) || (! array_key_exists('url',$directory)) || (! $directory['url'])) {
// logger('CRITICAL: No directory server URL');
// }
// $url = $directory['url'] . '/dirsearch';
// }
// $token = get_config('system','realm_token');
logger('mod_directory: URL = ' . $url, LOGGER_DEBUG);
$url = z_root() . '/dirsearch';
if (is_site_admin()) {
$directory_admin = true;
}
$contacts = array();
@ -305,14 +293,7 @@ class Directory extends Controller {
$page_type = '';
$rating_enabled = get_config('system','rating_enabled');
if ($rr['total_ratings'] && $rating_enabled) {
$total_ratings = sprintf( tt("%d rating", "%d ratings", $rr['total_ratings']), $rr['total_ratings']);
}
else {
$total_ratings = '';
}
$total_ratings = '';
$profile = $rr;

2
Zotlabs/Module/Dirsearch.php
View file

@ -181,7 +181,7 @@ class Dirsearch extends Controller {
// If &limit=n, return at most n entries
// If &return_total=1, we count matching entries and return that as 'total_items' for use in pagination.
// By default we return one page (default 80 items maximum) and do not count total entries
// By default we return one page (default 60 items maximum) and do not count total entries
$logic = ((strlen($sql_extra)) ? 'false' : 'true');