aboutsummaryrefslogtreecommitdiffstats
path: root/mod/directory.php
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-11-19 09:15:24 +1100
committerRedMatrix <info@friendica.com>2014-11-19 09:15:24 +1100
commitbfde28f28eae1f4b00aac03b2714254d14ab7464 (patch)
tree9e3fc659dda7a83640087b4ca5c216190c99f012 /mod/directory.php
parent39178806736de54cbb0fda20b6bb65779136b9a5 (diff)
downloadvolse-hubzilla-bfde28f28eae1f4b00aac03b2714254d14ab7464.tar.gz
volse-hubzilla-bfde28f28eae1f4b00aac03b2714254d14ab7464.tar.bz2
volse-hubzilla-bfde28f28eae1f4b00aac03b2714254d14ab7464.zip
Revert "Directory shows channel suggestions by default"
Diffstat (limited to 'mod/directory.php')
-rw-r--r--mod/directory.php42
1 files changed, 2 insertions, 40 deletions
diff --git a/mod/directory.php b/mod/directory.php
index ee064e3ed..d4a4c383a 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,6 +1,5 @@
<?php
-require_once('include/socgraph.php');
require_once('include/dir_fns.php');
require_once('include/widgets.php');
require_once('include/bbcode.php');
@@ -8,12 +7,6 @@ require_once('include/bbcode.php');
function directory_init(&$a) {
$a->set_pager_itemspage(60);
- if(x($_GET,'ignore')) {
- q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ",
- intval(local_user()),
- dbesc($_GET['ignore'])
- );
- }
}
function directory_content(&$a) {
@@ -49,33 +42,11 @@ function directory_content(&$a) {
else
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
-
if(strpos($search,'=') && local_user() && get_pconfig(local_user(),'feature','expert'))
$advanced = $search;
-
$keywords = (($_GET['keywords']) ? $_GET['keywords'] : '');
- // Suggest channels if no search terms or keywords are given
- $suggest = ($search == '' && $keywords == '' && local_user());
-
- if($suggest) {
- $r = suggestion_query(local_user(),get_observer_hash());
-
- // Remember in which order the suggestions were
- $addresses = array();
- foreach($r as $rr) {
- $addresses[$rr['xchan_addr']] = $index++;
- }
-
- // Build query to get info about suggested people
- $advanced = '';
- foreach(array_keys($addresses) as $address) {
- $advanced .= "address=\"$address\" ";
- }
-
- }
-
$tpl = get_markup_template('directory_header.tpl');
@@ -256,28 +227,19 @@ function directory_content(&$a) {
'online' => $online,
'kw' => (($out) ? t('Keywords: ') : ''),
'keywords' => $out,
- 'ignlink' => $suggest ? $a->get_baseurl() . '/directory?ignore=' . $rr['hash'] : '',
- 'ignore_label' => "Don't suggest",
);
$arr = array('contact' => $rr, 'entry' => $entry);
call_hooks('directory_item', $arr);
- if($sort_order == '' && $suggest) {
- $entries[$addresses[$rr['address']]] = $arr['entry']; // Use the same indexes as originally to get the best suggestion first
- }
- else {
- $entries[] = $arr['entry'];
- }
+ $entries[] = $arr['entry'];
unset($profile);
unset($location);
}
- ksort($entries); // Sort array by key so that foreach-constructs work as expected
-
if($j['keywords']) {
$a->data['directory_keywords'] = $j['keywords'];
}
@@ -306,7 +268,7 @@ function directory_content(&$a) {
'$finddsc' => t('Finding:'),
'$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'),
'$entries' => $entries,
- '$dirlbl' => $suggest ? t('Channel Suggestions') : t('Directory'),
+ '$dirlbl' => t('Directory'),
'$submit' => t('Find'),
'$next' => alt_pager($a,$j['records'], t('next page'), t('previous page'))