aboutsummaryrefslogtreecommitdiffstats
path: root/include/apps.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 /include/apps.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 'include/apps.php')
-rw-r--r--include/apps.php26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/apps.php b/include/apps.php
index e08e6a6f5..504641102 100644
--- a/include/apps.php
+++ b/include/apps.php
@@ -88,15 +88,15 @@ function parse_app_description($f) {
$require = trim(strtolower($require));
switch($require) {
case 'nologin':
- if(local_user())
+ if(local_channel())
unset($ret);
break;
case 'admin':
if(! is_site_admin())
unset($ret);
break;
- case 'local_user':
- if(! local_user())
+ case 'local_channel':
+ if(! local_channel())
unset($ret);
break;
case 'public_profile':
@@ -108,7 +108,7 @@ function parse_app_description($f) {
unset($ret);
break;
default:
- if(! (local_user() && feature_enabled(local_user(),$require)))
+ if(! (local_channel() && feature_enabled(local_channel(),$require)))
unset($ret);
break;
@@ -196,15 +196,15 @@ function app_render($papp,$mode = 'view') {
$require = trim(strtolower($require));
switch($require) {
case 'nologin':
- if(local_user())
+ if(local_channel())
return '';
break;
case 'admin':
if(! is_site_admin())
return '';
break;
- case 'local_user':
- if(! local_user())
+ case 'local_channel':
+ if(! local_channel())
return '';
break;
case 'public_profile':
@@ -217,7 +217,7 @@ function app_render($papp,$mode = 'view') {
return '';
break;
default:
- if(! (local_user() && feature_enabled(local_user(),$require)))
+ if(! (local_channel() && feature_enabled(local_channel(),$require)))
return '';
break;
@@ -229,11 +229,11 @@ function app_render($papp,$mode = 'view') {
$hosturl = '';
- if(local_user()) {
- $installed = app_installed(local_user(),$papp);
+ if(local_channel()) {
+ $installed = app_installed(local_channel(),$papp);
$hosturl = z_root() . '/';
}
- elseif(remote_user()) {
+ elseif(remote_channel()) {
$observer = get_app()->get_observer();
if($observer && $observer['xchan_network'] === 'zot') {
// some folks might have xchan_url redirected offsite, use the connurl
@@ -251,8 +251,8 @@ function app_render($papp,$mode = 'view') {
'$hosturl' => $hosturl,
'$purchase' => (($papp['page'] && (! $installed)) ? t('Purchase') : ''),
'$install' => (($hosturl && $mode == 'view') ? $install_action : ''),
- '$edit' => ((local_user() && $installed && $mode == 'edit') ? t('Edit') : ''),
- '$delete' => ((local_user() && $installed && $mode == 'edit') ? t('Delete') : '')
+ '$edit' => ((local_channel() && $installed && $mode == 'edit') ? t('Edit') : ''),
+ '$delete' => ((local_channel() && $installed && $mode == 'edit') ? t('Delete') : '')
));
}