aboutsummaryrefslogtreecommitdiffstats
path: root/mod/directory.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
committerfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
commit912be23e1627211fb417c4b7bced414cbbe38ef0 (patch)
tree2b8567d800624167b3eadf37c8855deb0ba74b0b /mod/directory.php
parentff68ea608786a698ad46637ef13854ac1b1e6beb (diff)
parent872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff)
downloadvolse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip
Merge branch 'master' into tres
Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
Diffstat (limited to 'mod/directory.php')
-rw-r--r--mod/directory.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/mod/directory.php b/mod/directory.php
index 2a07208a4..21940d57b 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -10,7 +10,7 @@ function directory_init(&$a) {
if(x($_GET,'ignore')) {
q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ",
- intval(local_user()),
+ intval(local_channel()),
dbesc($_GET['ignore'])
);
}
@@ -18,7 +18,7 @@ function directory_init(&$a) {
function directory_content(&$a) {
- if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
notice( t('Public access denied.') . EOL);
return;
}
@@ -51,17 +51,17 @@ function directory_content(&$a) {
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
- if(strpos($search,'=') && local_user() && get_pconfig(local_user(),'feature','expert'))
+ if(strpos($search,'=') && local_channel() && get_pconfig(local_channel(),'feature','expert'))
$advanced = $search;
$keywords = (($_GET['keywords']) ? $_GET['keywords'] : '');
// Suggest channels if no search terms or keywords are given
- $suggest = (local_user() && x($_REQUEST,'suggest')) ? $_REQUEST['suggest'] : '';
+ $suggest = (local_channel() && x($_REQUEST,'suggest')) ? $_REQUEST['suggest'] : '';
if($suggest) {
- $r = suggestion_query(local_user(),get_observer_hash());
+ $r = suggestion_query(local_channel(),get_observer_hash());
// Remember in which order the suggestions were
$addresses = array();
@@ -96,9 +96,9 @@ function directory_content(&$a) {
$contacts = array();
- if(local_user()) {
+ if(local_channel()) {
$x = q("select abook_xchan from abook where abook_channel = %d",
- intval(local_user())
+ intval(local_channel())
);
if($x) {
foreach($x as $xx)
@@ -161,7 +161,7 @@ function directory_content(&$a) {
$profile_link = chanlink_url($rr['url']);
$pdesc = (($rr['description']) ? $rr['description'] . '<br />' : '');
- $connect_link = ((local_user()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : '');
+ $connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : '');
// Checking status is disabled ATM until someone checks the performance impact more carefully
//$online = remote_online_status($rr['address']);
@@ -219,9 +219,9 @@ function directory_content(&$a) {
$karr = explode(' ', $keywords);
if($karr) {
- if(local_user()) {
+ if(local_channel()) {
$r = q("select keywords from profile where uid = %d and is_default = 1 limit 1",
- intval(local_user())
+ intval(local_channel())
);
if($r) {
$keywords = str_replace(',',' ', $r[0]['keywords']);