diff options
| author | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
| commit | fd0b6c967fce4d8a82e9dad121ae7d8301d3f342 (patch) | |
| tree | 5c37812ef7baeadc17fce088c4394d25f75b593c /include/apps.php | |
| parent | c993ddd86ee25832e35e65333fa25b396e7aefdf (diff) | |
| parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
| download | volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.gz volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.bz2 volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.zip | |
Merge branch 'master' into pocorate
Diffstat (limited to 'include/apps.php')
| -rw-r--r-- | include/apps.php | 26 |
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') : '') )); } |