aboutsummaryrefslogtreecommitdiffstats
path: root/util
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 /util
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 'util')
-rwxr-xr-xutil/fresh8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/fresh b/util/fresh
index 7f96a319c..8bee5dff7 100755
--- a/util/fresh
+++ b/util/fresh
@@ -99,7 +99,7 @@ function process_command($line) {
}
break;
case 'channel':
- if(! local_user())
+ if(! local_channel())
echo 'Permission denied.';
if(argv(1)) {
$r = q("select * from channel where channel_address = '%s' and channel_account_id = %d limit 1",
@@ -116,7 +116,7 @@ function process_command($line) {
}
break;
case 'conn':
- if(! local_user()) {
+ if(! local_channel()) {
echo "Permission denied.";
break;
}
@@ -124,14 +124,14 @@ function process_command($line) {
for($x = 1; $x < argc(); $x ++) {
$r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d",
intval(argv($x)),
- intval(local_user())
+ intval(local_channel())
);
if($r) echo jindent(json_encode($r[0])) . "\n";
}
}
else {
$r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d order by abook_id",
- intval(local_user())
+ intval(local_channel())
);
if($r) {
foreach($r as $rr)