diff options
Diffstat (limited to 'Zotlabs/Lib/Apps.php')
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 8db4e000f..e6757497a 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -59,8 +59,7 @@ class Apps { static public function get_base_apps() { return get_config('system','base_apps',[ 'Connections', - 'Suggest Channels', - 'Grid', + 'Network', 'Settings', 'Files', 'Channel Home', @@ -75,8 +74,6 @@ class Apps { ]); } - - static public function import_system_apps() { if(! local_channel()) return; @@ -272,7 +269,7 @@ class Apps { unset($ret); break; case 'custom_role': - if(get_pconfig(local_channel(),'system','permissions_role') != 'custom') + if(get_pconfig(local_channel(),'system','permissions_role') !== 'custom') unset($ret); break; case 'observer': @@ -306,14 +303,14 @@ class Apps { 'Cards' => t('Cards'), 'Admin' => t('Site Admin'), 'Report Bug' => t('Report Bug'), - 'View Bookmarks' => t('View Bookmarks'), + 'Bookmarks' => t('Bookmarks'), 'Chatrooms' => t('Chatrooms'), 'Connections' => t('Connections'), 'Remote Diagnostics' => t('Remote Diagnostics'), 'Suggest Channels' => t('Suggest Channels'), 'Login' => t('Login'), 'Channel Manager' => t('Channel Manager'), - 'Grid' => t('Activity'), + 'Network' => t('Stream'), 'Settings' => t('Settings'), 'Files' => t('Files'), 'Webpages' => t('Webpages'), @@ -345,7 +342,6 @@ class Apps { 'CalDAV' => t('CalDAV'), 'CardDAV' => t('CardDAV'), 'Channel Sources' => t('Channel Sources'), - 'Gallery' => t('Gallery'), 'Guest Access' => t('Guest Access'), 'Notes' => t('Notes'), 'OAuth Apps Manager' => t('OAuth Apps Manager'), @@ -354,7 +350,8 @@ class Apps { 'Permission Categories' => t('Permission Categories'), 'Premium Channel' => t('Premium Channel'), 'Public Stream' => t('Public Stream'), - 'My Chatrooms' => t('My Chatrooms') + 'My Chatrooms' => t('My Chatrooms'), + 'Channel Export' => t('Channel Export') ); if(array_key_exists('name',$arr)) { @@ -535,8 +532,8 @@ class Apps { '$installed' => $installed, '$action_label' => (($hosturl && in_array($mode, ['view','install'])) ? $install_action : ''), '$edit' => ((local_channel() && $installed && $mode == 'edit') ? t('Edit') : ''), - '$delete' => ((local_channel() && $mode == 'edit') ? t('Delete') : ''), - '$undelete' => ((local_channel() && $mode == 'edit') ? t('Undelete') : ''), + '$delete' => ((local_channel() && $installed && $mode == 'edit') ? t('Delete') : ''), + '$undelete' => ((local_channel() && $installed && $mode == 'edit') ? t('Undelete') : ''), '$settings_url' => ((local_channel() && $installed && $mode == 'list') ? $papp['settings_url'] : ''), '$deleted' => $papp['deleted'], '$feature' => (($papp['embed'] || $mode == 'edit') ? false : true), @@ -985,7 +982,7 @@ class Apps { $arr['author'] = $sys['channel_hash']; } - if($arr['photo'] && (strpos($arr['photo'],'icon:') === false) && (! strpos($arr['photo'],z_root()))) { + if($arr['photo'] && (strpos($arr['photo'],'icon:') === false) && (strpos($arr['photo'],z_root()) !== false)) { $x = import_xchan_photo(str_replace('$baseurl',z_root(),$arr['photo']),get_observer_hash(),true); $arr['photo'] = $x[1]; } @@ -1071,7 +1068,7 @@ class Apps { if((! $darray['app_url']) || (! $darray['app_id'])) return $ret; - if($arr['photo'] && (strpos($arr['photo'],'icon:') === false) && (! strpos($arr['photo'],z_root()))) { + if($arr['photo'] && (strpos($arr['photo'],'icon:') === false) && (strpos($arr['photo'],z_root()) !== false)) { $x = import_xchan_photo(str_replace('$baseurl',z_root(),$arr['photo']),get_observer_hash(),true); $arr['photo'] = $x[1]; } |