harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move connection filtering setting from network to connections, provide a link to settings in the navbar if present for a module and some code optimisation

Browse Source
This commit is contained in:
Mario Vavti
2018-09-20 13:22:41 +02:00
parent a6db822a69
commit 1ca558f011
8 changed files with 113 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/nav.php
View File

@@ -199,17 +199,21 @@ function nav($template = 'default') {
// turned off until somebody discovers this and figures out a good location for it.
$powered_by = '';
$url = '';
$settings_url = '';
if(App::$profile_uid && App::$nav_sel['raw_name']) {
$active_app = q("SELECT app_url FROM app WHERE app_channel = %d AND app_name = '%s' LIMIT 1",
intval(App::$profile_uid),
dbesc(App::$nav_sel['raw_name'])
);
if($active_app) {
if(strpos($active_app[0]['app_url'], ',')) {
$urls = explode(',', $active_app[0]['app_url']);
$url = trim($urls[0]);
$settings_url = trim($urls[1]);
if($is_owner)
$settings_url = trim($urls[1]);
}
else {
$url = $active_app[0]['app_url'];
@@ -296,7 +300,8 @@ function nav($template = 'default') {
'$addapps' => t('Add Apps'),
'$orderapps' => t('Arrange Apps'),
'$sysapps_toggle' => t('Toggle System Apps'),
'$url' => (($url) ? $url : App::$cmd)
'$url' => (($url) ? $url : App::$cmd),
'$settings_url' => $settings_url
));
if(x($_SESSION, 'reload_avatar') && $observer) {